Merge pull request #111 from golony6449/feature/golony/session

세션 관련 앱 분리

Author: golony6449

program/admin.py

@@ -1,29 +1,6 @@
 from django.contrib import admin
 
-from .models import Proposal, ProposalCategory, Program
-
-
-@admin.register(Proposal)
-class ProposalAdmin(admin.ModelAdmin):
-    list_display = [
-        "id",
-        "title",
-        "user",
-        "accepted",
-        "difficulty",
-        "duration",
-        "language",
-        "category",
-    ]
-    list_filter = ["accepted", "difficulty", "duration", "language", "category"]
-    search_fields = ["title", "user__username"]
-
-
-@admin.register(ProposalCategory)
-class ProposalCategoryAdmin(admin.ModelAdmin):
-    list_display = ["id", "name", "visible"]
-    list_filter = ["visible"]
-    search_fields = ["name"]
+from .models import Program
 
 
 @admin.register(Program)

program/migrations/0006_alter_program_options_delete_proposal_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.5 on 2023-07-09 14:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("program", "0005_alter_program_id"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="program",
+            options={"verbose_name": "프로그램", "verbose_name_plural": "프로그램들"},
+        ),
+        migrations.DeleteModel(
+            name="Proposal",
+        ),
+        migrations.DeleteModel(
+            name="ProposalCategory",
+        ),
+    ]

program/models.py

@@ -5,100 +5,6 @@
 
 User = get_user_model()
 
-
-class ProposalCategory(models.Model):
-    name = models.CharField(max_length=100, db_index=True)
-    visible = models.BooleanField(default=True)
-
-    class Meta:
-        verbose_name = "세션 카테고리"
-        verbose_name_plural = "세션 카테고리들"
-
-    def __str__(self):
-        return self.name
-
-
-class Proposal(models.Model):
-    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
-
-    title = models.CharField(max_length=255)
-    brief = models.TextField(max_length=1000, help_text="리뷰용: 발표에 대한 간단한 설명.")
-    desc = models.TextField(max_length=4000, help_text="리뷰용: 발표에 대한 자세한 설명")
-    comment = models.TextField(
-        max_length=4000, null=True, blank=True, help_text="리뷰용: 파준위에게 전하고 싶은 말"
-    )
-
-    difficulty = models.CharField(
-        max_length=15,
-        choices=(
-            ("BEGINNER", "Beginner"),
-            ("INTERMEDIATE", "Intermediate"),
-            ("EXPERIENCED", "Experienced"),
-        ),
-    )
-
-    duration = models.CharField(
-        max_length=15,
-        choices=(
-            ("SHORT", "25min"),
-            ("LONG", "40min"),
-        ),
-    )
-
-    language = models.CharField(
-        max_length=15,
-        choices=(
-            ("", "---------"),
-            ("KOREAN", "Korean"),
-            ("ENGLISH", "English"),
-        ),
-        default="",
-    )
-
-    category = models.ForeignKey(
-        ProposalCategory,
-        on_delete=models.SET_DEFAULT,
-        null=True,
-        blank=True,
-        default=14,
-    )
-    accepted = models.BooleanField(default=False)
-    introduction = models.TextField(
-        max_length=2000,
-        null=True,
-        blank=True,
-        help_text="발표 소개 페이지에 들어가는 내용입니다. 변경 사항은 최대 60분 이내에 적용됩니다.",
-    )
-    video_url = models.CharField(
-        max_length=255, null=True, blank=True, help_text="발표 영상 URL"
-    )
-    slide_url = models.CharField(
-        max_length=255, null=True, blank=True, help_text="발표 자료 URL"
-    )
-    room_num = models.CharField(
-        max_length=15,
-        null=True,
-        blank=True,
-        help_text="발표장소",
-        choices=(
-            ("101", "101"),
-            ("102", "102"),
-            ("103", "103"),
-            ("104", "104"),
-            ("105", "105"),
-        ),
-    )
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    class Meta:
-        verbose_name = "세션"
-        verbose_name_plural = "세션들"
-
-    def __str__(self):
-        return self.title
-
-
 CONFERENCE = "CONFERENCE"
 TUTORIAL = "TUTORIAL"
 SPRINT = "SPRINT"

program/urls.py

@@ -1,10 +1,10 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
 
-from program.viewsets import ProposalViewSet
+from session.viewsets import SessionViewSet
 
 session_router = DefaultRouter()
-session_router.register("sessions", ProposalViewSet, basename="session")
+session_router.register("sessions", SessionViewSet, basename="session")
 
 urlpatterns = [
     path("", include(session_router.urls)),     # TODO: 이전됨 -> FE 수정 후 삭제 예정

program/views.py

@@ -59,6 +59,7 @@
     "program",
     "payment",
     "accounts",
+    "session",
     # swagger
     "drf_spectacular",
     # cors

pyconkr/settings.py

@@ -0,0 +1,41 @@
+from django.contrib import admin
+
+from .models import Proposal, Session, Category
+
+
+@admin.register(Proposal)
+class ProposalAdmin(admin.ModelAdmin):
+    list_display = [
+        "id",
+        "title",
+        "user",
+        "accepted",
+        "difficulty",
+        "duration",
+        "language",
+        "category",
+    ]
+    list_filter = ["accepted", "difficulty", "duration", "language", "category"]
+    search_fields = ["title", "user__username"]
+
+
+@admin.register(Session)
+class SessionAdmin(admin.ModelAdmin):
+    list_display = [
+        "id",
+        "title",
+        "user",
+        "difficulty",
+        "duration",
+        "language",
+        "category",
+    ]
+    list_filter = ["difficulty", "duration", "language", "category"]
+    search_fields = ["title", "user__username"]
+
+
+@admin.register(Category)
+class CategoryAdmin(admin.ModelAdmin):
+    list_display = ["id", "name", "visible"]
+    list_filter = ["visible"]
+    search_fields = ["name"]