Merge branch 'feature/ticket' into devdev

Author: emscb

program/migrations/0003_program.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.1.5 on 2023-05-24 13:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0002_alter_proposal_options_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Program',
+            fields=[
+                ('id', models.UUIDField(primary_key=True, serialize=False)),
+                ('host', models.CharField(max_length=100)),
+                ('title', models.CharField(max_length=100)),
+                ('short_desc', models.CharField(max_length=1000)),
+                ('desc', models.CharField(max_length=4000)),
+                ('room', models.CharField(blank=True, choices=[('101', '101'), ('102', '102'), ('103', '103'), ('104', '104'), ('105', '105'), ('201', '201'), ('202', '202'), ('203', '203')], max_length=15, null=True)),
+                ('capacity', models.IntegerField(blank=True, help_text='최대 참가 가능 인원 수', null=True)),
+                ('start_at', models.DateTimeField(blank=True, null=True)),
+                ('end_at', models.DateTimeField(blank=True, null=True)),
+                ('program_type', models.CharField(choices=[('CONFERENCE', '컨퍼런스'), ('TUTORIAL', '튜토리얼'), ('SPRINT', '스프린트')], max_length=30)),
+            ],
+        ),
+    ]

program/models.py

@@ -95,3 +95,45 @@ class Meta:
 
     def __str__(self):
         return self.title
+
+
+CONFERENCE = "CONFERENCE"
+TUTORIAL = "TUTORIAL"
+SPRINT = "SPRINT"
+
+
+class Program(models.Model):
+    id = models.UUIDField(primary_key=True)
+    host = models.CharField(max_length=100)  # TODO User로?
+    title = models.CharField(max_length=100)
+    short_desc = models.CharField(max_length=1000)
+    desc = models.CharField(max_length=4000)
+    room = models.CharField(
+        max_length=15,
+        null=True,
+        blank=True,
+        choices=(
+            ("101", "101"),
+            ("102", "102"),
+            ("103", "103"),
+            ("104", "104"),
+            ("105", "105"),
+            ("201", "201"),
+            ("202", "202"),
+            ("203", "203"),  # TODO 2층 호실 추가 필요
+        ),
+    )
+    capacity = models.IntegerField(null=True, blank=True, help_text="최대 참가 가능 인원 수")
+    start_at = models.DateTimeField(null=True, blank=True)
+    end_at = models.DateTimeField(null=True, blank=True)
+    program_type = models.CharField(
+        max_length=30,
+        choices=(
+            (CONFERENCE, "컨퍼런스"),
+            (TUTORIAL, "튜토리얼"),
+            (SPRINT, "스프린트"),
+        ),
+    )
+
+    def __str__(self):
+        return self.title

ticket/migrations/0004_alter_tickettype_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-05-24 13:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0003_ticket_remove_tickettype_code_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tickettype',
+            name='id',
+            field=models.UUIDField(primary_key=True, serialize=False),
+        ),
+    ]

ticket/migrations/0005_alter_tickettype_day.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-05-24 13:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ticket', '0004_alter_tickettype_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tickettype',
+            name='day',
+            field=models.CharField(choices=[('FRI', '금요일'), ('SAT', '토요일'), ('SUN', '일요일'), ('WEEKEND', '토/일요일')], max_length=10),
+        ),
+    ]

ticket/migrations/0006_tickettype_program.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.5 on 2023-05-24 13:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0003_program'),
+        ('ticket', '0005_alter_tickettype_day'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tickettype',
+            name='program',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='program.program'),
+        ),
+    ]

ticket/models.py

@@ -9,19 +9,21 @@
 
 
 class TicketType(models.Model):
+    id = models.UUIDField(primary_key=True)
     name = models.CharField(max_length=100)
     price = models.IntegerField()
     min_price = models.IntegerField(null=True, blank=True)
     desc = models.TextField(max_length=1000)
     day = models.CharField(
         max_length=10,
         choices=(
+            ("FRI", "금요일"),
             ("SAT", "토요일"),
             ("SUN", "일요일"),
             ("WEEKEND", "토/일요일"),
         ),
     )
-    # program = models.ForeignKey()     # TODO
+    program = models.ForeignKey("program.Program", on_delete=models.PROTECT, null=True)
     is_refundable = models.BooleanField(default=True)
 
     def __str__(self):
@@ -30,12 +32,18 @@ def __str__(self):
     @property
     def buyable(self) -> bool:
         """잔여 수량이 있는지"""
+        if self.day == "FRI":
+            ticket_count = Ticket.objects.filter(
+                models.Q(ticket_type=self) & models.Q(is_refunded=False)
+            ).count()
+            return ticket_count < self.program.capacity
+
         sat_ticket_count = Ticket.objects.filter(
-            models.Q(ticket_type__day="SAT") & models.Q(ticket_type__day="WEEKEND")
-        ).count()
+            models.Q(ticket_type__day="SAT") | models.Q(ticket_type__day="WEEKEND")
+        ).filter(is_refunded=False).count()
         sun_ticket_count = Ticket.objects.filter(
-            models.Q(ticket_type__day="SUN") & models.Q(ticket_type__day="WEEKEND")
-        ).count()
+            models.Q(ticket_type__day="SUN") | models.Q(ticket_type__day="WEEKEND")
+        ).filter(is_refunded=False).count()
 
         can_buy_sat_ticket = sat_ticket_count < config.CONFERENCE_PARTICIPANT_COUNT_SAT
         can_buy_sun_ticket = sun_ticket_count < config.CONFERENCE_PARTICIPANT_COUNT_SUN
@@ -54,6 +62,9 @@ def can_coexist(self, other: TicketType) -> bool:
             return True
         if self.day == "SUN" and other.day == "SAT":
             return True
+        if self.day == "FRI" or other.day == "FRI":
+            # TODO program의 시간이 겹치는지 확인?
+            return True
 
         return False
 

ticket/requests.py

@@ -57,14 +57,14 @@ def __init__(self, request: HttpRequest, **kwargs):
 
 
 @dataclass(init=False)
-class CheckConferenceTicketTypeBuyableRequest:
+class CheckTicketTypeBuyableRequest:
     @dataclass
     class Querystring:
         username: Optional[str] = None
 
     @dataclass
     class MatchInfo:
-        ticket_type_code: str
+        ticket_type_id: str
 
     @dataclass
     class Data:
@@ -74,14 +74,14 @@ def __init__(self, request: HttpRequest, **kwargs):
         try:
             self.querystring = jsons.load(
                 _extract_querystring(request),
-                CheckConferenceTicketTypeBuyableRequest.Querystring,
+                CheckTicketTypeBuyableRequest.Querystring,
             )
             self.match_info = jsons.load(
-                kwargs, CheckConferenceTicketTypeBuyableRequest.MatchInfo
+                kwargs, CheckTicketTypeBuyableRequest.MatchInfo
             )
             self.data = jsons.load(
                 json.loads(request.body) if request.body else dict(),
-                CheckConferenceTicketTypeBuyableRequest.Data,
+                CheckTicketTypeBuyableRequest.Data,
             )
         except Exception as e:
             raise RequestParsingException() from e

ticket/urls.py

@@ -3,12 +3,12 @@
 from . import views
 
 urlpatterns = [
-    path("conference-ticket-types", views.get__get_conference_ticket_types),
+    path("conference-ticket-types", views.get__get_ticket_types),
     re_path(
-        r"^conference-ticket-types/(?P<ticket_type_code>\w+)/check",
-        views.get__check_conference_ticket_type_buyable,
+        r"^conference-ticket-types/(?P<ticket_type_id>\w+)/check",
+        views.get__check_ticket_type_buyable,
     ),
-    path("conference-tickets", views.post__add_conference_ticket),
+    path("conference-tickets", views.post__add_ticket),
     path("list", views.get__ticket_list, name="ticket-list"),
     path("<int:item_id>", views.TicketDetailView.as_view(), name="ticket-detail"),
     path("success", views.ticket_success, name="page-ticket-success"),

ticket/view_models.py

@@ -1,25 +1,47 @@
 from dataclasses import asdict, dataclass
-from typing import Optional
+from datetime import datetime
+from typing import Optional, Union
 
+from program.models import CONFERENCE, TUTORIAL, SPRINT
 from .models import TicketType
 
 
 @dataclass(init=False)
-class ConferenceTicketTypeViewModel:
-    code: str
+class TicketTypeViewModel:
+    @dataclass
+    class Program:
+        title: str
+        short_desc: str
+        start_at: datetime
+        end_at: datetime
+        program_type: str  # type: Union[CONFERENCE, TUTORIAL, SPRINT]
+
+    id: str
     name: str
     price: int
     min_price: Optional[int]
     desc: str
-    day: str
+    day: str  # choice
+    program: Program
+    is_refundable: bool
+    is_buyable: property  # type: bool
 
     def __init__(self, model: TicketType):
-        self.code = model.code
+        self.id = model.id
         self.name = model.name
         self.price = model.price
         self.min_price = model.min_price
         self.desc = model.desc
         self.day = model.day
+        self.program = TicketTypeViewModel.Program(
+            title=model.program.title,
+            short_desc=model.program.short_desc,
+            start_at=model.program.start_at,
+            end_at=model.program.end_at,
+            program_type=model.program.program_type,
+        )
+        self.is_refundable = model.is_refundable
+        self.is_buyable = model.buyable
 
     def to_dict(self):
         return asdict(self)