Develop -> Main Merge

.github/workflows/deploy_to_ecs.yml

@@ -12,6 +12,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Update version.txt
+        run: |
+          VERSION=$(TZ=Asia/Seoul date +'%Y.%m.%d.%H.%M.%S')  # 한국 시간대 사용
+          echo "onestep_dev@${VERSION}" > version.txt
 
       - name: Set Dockerfile Path
         id: dockerfile-path

.github/workflows/deploy_to_ecs_prod.yml

@@ -12,6 +12,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Update version.txt
+        run: |
+          VERSION=$(TZ=Asia/Seoul date +'%Y.%m.%d.%H.%M.%S')  # 한국 시간대 사용
+          echo "onestep_prod@${VERSION}" > version.txt
 
       - name: Set Dockerfile Path
         id: dockerfile-path

.github/workflows/deploy_to_ecs_test.yml

@@ -12,6 +12,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.ACCESS_TOKEN }}
+          submodules: true
 
       - name: Set Dockerfile Path
         id: dockerfile-path

.gitignore

@@ -8,6 +8,9 @@
 # Icon must end with two \r
 Icon
 
+# example.py
+example_1.py
+
 onestep_dev/
 # Thumbnails
 ._*
@@ -91,6 +94,7 @@ db.sqlite3
 
 /pyenv
 /.ruff_cache
+/patch_note
 
 # debug
 .vscode/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Lexorank"]
+	path = Lexorank
+	url = ../Lexorank

Dockerfile.dev

@@ -15,5 +15,6 @@ COPY . /app/
 EXPOSE 8000
 
 # 서버 실행 명령
-CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.dev gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
+CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.dev python -m gunicorn -w 2 -b 0.0.0.0:8000 onestep_be.asgi:application -k uvicorn.workers.UvicornWorker"]
+# CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.dev gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
 # CMD ["sh", "-c", "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=onestep_be.setting.dev"]

Dockerfile.prod

@@ -15,5 +15,6 @@ COPY . /app/
 EXPOSE 8000
 
 # 서버 실행 명령
-CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.prod gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
+CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.prod python -m gunicorn -w 2 -b 0.0.0.0:8000 onestep_be.asgi:application -k uvicorn.workers.UvicornWorker"]
+# CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.prod gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
 # CMD ["sh", "-c", "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=onestep_be.setting.prod"]

Dockerfile.test

@@ -15,5 +15,6 @@ COPY . /app/
 EXPOSE 8000
 
 # 서버 실행 명령
-CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.test gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
+CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.test python -m gunicorn -w 2 -b 0.0.0.0:8000 onestep_be.asgi:application -k uvicorn.workers.UvicornWorker"]
+# CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && DJANGO_SETTINGS_MODULE=onestep_be.setting.test gunicorn -w 2 --timeout 300 -b 0.0.0.0:8000 onestep_be.wsgi:application"]
 # CMD ["sh", "-c", "python manage.py migrate && python manage.py runserver 0.0.0.0:8000 --settings=onestep_be.setting.test"]

accounts/admin.py

@@ -1 +1,63 @@
 # Register your models here.
+from django.contrib import admin
+
+from .models import Device, PatchNote, User
+
+
+class UserAdmin(admin.ModelAdmin):
+    readonly_fields = [
+        "id",
+        "social_provider",
+        "username",
+        "created_at",
+        "updated_at",
+    ]
+    list_display = [
+        "id",
+        "username",
+        "social_provider",
+        "created_at",
+        "deleted_at",
+        "updated_at",
+        "is_active",
+        "is_staff",
+        "is_superuser",
+    ]
+    fieldsets = [
+        (
+            None,
+            {
+                "fields": [
+                    "id",
+                    "username",
+                    "social_provider",
+                    "created_at",
+                    "deleted_at",
+                    "updated_at",
+                    "is_active",
+                    "is_staff",
+                    "is_superuser",
+                ]
+            },
+        ),
+    ]
+
+
+class DeviceAdmin(admin.ModelAdmin):
+    readonly_fields = ["id", "created_at"]
+    list_display = ["id", "user_id", "created_at", "deleted_at"]
+    fieldsets = [
+        (
+            None,
+            {"fields": ["id", "user_id", "created_at", "deleted_at"]},
+        ),
+    ]
+
+
+class PatchNoteAdmin(admin.ModelAdmin):
+    list_display = ("title", "created_at")
+
+
+admin.site.register(User, UserAdmin)
+admin.site.register(Device, DeviceAdmin)
+admin.site.register(PatchNote, PatchNoteAdmin)

accounts/authentication.py

@@ -0,0 +1,29 @@
+from rest_framework_simplejwt.authentication import JWTAuthentication
+from rest_framework_simplejwt.exceptions import InvalidToken
+from rest_framework_simplejwt.settings import api_settings
+from jwt import DecodeError, ExpiredSignatureError
+import jwt
+
+
+class CustomJWTAuthentication(JWTAuthentication):
+    def authenticate(self, request):
+        header = self.get_header(request)
+        if header is None:
+            return None
+
+        raw_token = self.get_raw_token(header)
+        if raw_token is None:
+            return None
+
+        try:
+            validated_token = self.get_validated_token(raw_token)
+            token_payload = jwt.decode(
+                raw_token, 
+                api_settings.SIGNING_KEY, 
+                algorithms=[api_settings.ALGORITHM]
+            )
+            request.auth = token_payload
+        except (InvalidToken, DecodeError, ExpiredSignatureError) as e:
+            raise InvalidToken(e)
+
+        return self.get_user(validated_token), token_payload

accounts/aws.py

@@ -1,5 +1,4 @@
 import os
-
 import boto3
 from dotenv import load_dotenv
 

accounts/exceptions.py

@@ -0,0 +1,16 @@
+from rest_framework import exceptions, status
+
+
+class LoginException(exceptions.APIException):
+    status_code = status.HTTP_400_BAD_REQUEST
+    default_detail = "device type and token is required"
+    default_code = "error"
+
+    def __init__(self, detail=None, code=None):
+        if detail is not None:
+            self.detail = detail
+        else:
+            self.detail = self.default_detail
+        if code is not None:
+            self.default_code = code
+        super().__init__(self.detail, self.default_code)

accounts/migrations/0010_patchnote.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.6 on 2024-09-22 05:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0009_merge_20240719_1133'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PatchNote',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('html_file', models.FileField(upload_to='patch_note/')),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('email_sent', models.BooleanField(default=False)),
+            ],
+        ),
+    ]

accounts/migrations/0011_alter_patchnote_email_sent.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-09-22 06:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0010_patchnote'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='patchnote',
+            name='email_sent',
+            field=models.BooleanField(default=True),
+        ),
+    ]

accounts/migrations/0012_patchnote_email_list_alter_patchnote_email_sent.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.6 on 2024-09-23 06:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0011_alter_patchnote_email_sent'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='patchnote',
+            name='email_list',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='patchnote',
+            name='email_sent',
+            field=models.BooleanField(default=False),
+        ),
+    ]

accounts/migrations/0013_user_is_subscribed.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-09-23 11:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0012_patchnote_email_list_alter_patchnote_email_sent'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='is_subscribed',
+            field=models.BooleanField(default=False),
+        ),
+    ]

accounts/migrations/0014_user_is_premium.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-09-25 08:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0013_user_is_subscribed'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='is_premium',
+            field=models.BooleanField(default=False),
+        ),
+    ]

accounts/migrations/0015_alter_user_social_provider.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-10-17 07:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_user_is_premium'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='social_provider',
+            field=models.CharField(choices=[('GOOGLE', 'Google'), ('APPLE', 'Apple')], default='GOOGLE', max_length=30),
+        ),
+    ]