Merge branch 'devdev' into feature/sponsors

# Conflicts:
#	.gitignore
#	pyconweb2022/program/serializers.py
#	pyconweb2022/program/tests.py

Author: golony6449

.github/workflows/deploy_on_dev.yml

@@ -69,6 +69,12 @@ jobs:
         run: |
          ./update_secrets.sh
 
+      - name: Test with Django Test
+        run: |
+          source ./pyconweb2022-zappa/bin/activate
+          cd pyconweb2022
+          python manage.py test
+
       - name: Test with pytest
         run: |
           source ./pyconweb2022-zappa/bin/activate

.gitignore

@@ -148,6 +148,5 @@ pyconweb2022/.idea
 
 /frontend/.serverless_nextjs
 /frontend/.serverless
-# Migrations
-/pyconweb2022/sponsor/migrations/
-/pyconweb2022/program/migrations/
+
+node_modules/

package.json

@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "workspaces": ["frontend"],
+    "scripts": {
+        "frontend": "yarn workspace frontend"
+    }
+}

pyconweb2022/content/admin.py

@@ -2,11 +2,14 @@
 from django.db import models
 
 from content.models import Content
+from content.resources import ContentResource
 
 from martor.widgets import AdminMartorWidget
+from import_export.admin import ImportExportModelAdmin
 
 
-class ContentAdmin(admin.ModelAdmin):
+class ContentAdmin(ImportExportModelAdmin):
+    resource_class = ContentResource
     list_display = (
         "slug",
         "title",

pyconweb2022/content/resources.py

@@ -0,0 +1,8 @@
+from import_export import resources
+
+from content.models import Content
+
+
+class ContentResource(resources.ModelResource):
+    class Meta:
+        model = Content

pyconweb2022/news/admin.py

@@ -1,9 +1,13 @@
 from django.contrib import admin
 
+from import_export.admin import ImportExportModelAdmin
+
 from news.models import News
+from news.resources import NewsResource
 
 
-class NewsAdmin(admin.ModelAdmin):
+class NewsAdmin(ImportExportModelAdmin):
+    resource_class = NewsResource
     app_label = "News"
     list_display = (
         "id",

pyconweb2022/news/resources.py

@@ -0,0 +1,8 @@
+from import_export import resources
+
+from news.models import News
+
+
+class NewsResource(resources.ModelResource):
+    class Meta:
+        model = News

pyconweb2022/program/admin.py

@@ -3,17 +3,20 @@
 
 from import_export.admin import ImportExportModelAdmin
 
-from .models import Proposal, ProgramCategory
+from program.models import Proposal, ProgramCategory
+from program.resources import ProgramCategoryResource, ProposalResource
 
 
-class ProgramCategoryAdmin(admin.ModelAdmin):
+class ProgramCategoryAdmin(ImportExportModelAdmin):
+    resource_class = ProgramCategoryResource
     list_display = ("name",)
 
 
 admin.site.register(ProgramCategory, ProgramCategoryAdmin)
 
 
-class ProgramAdmin(admin.ModelAdmin):
+class ProgramAdmin(ImportExportModelAdmin):
+    resource_class = ProposalResource
     list_display = (
         "title",
         "user_name",

pyconweb2022/program/models.py

@@ -45,7 +45,7 @@ class Proposal(models.Model):
 
     # TODO: 다국어 기능 추가
     language = models.CharField(
-        max_length=1,
+        max_length=2,
         choices=(
             ("", "---------"),
             ("K", "한글"),

pyconweb2022/program/resources.py

@@ -0,0 +1,13 @@
+from program.models import ProgramCategory, Proposal
+
+from import_export import resources
+
+
+class ProgramCategoryResource(resources.ModelResource):
+    class Meta:
+        model = ProgramCategory
+
+
+class ProposalResource(resources.ModelResource):
+    class Meta:
+        model = Proposal