Edit names, view model

Author: emscb

ticket/models.py

@@ -62,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

@@ -5,10 +5,10 @@
 urlpatterns = [
     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,19 +1,30 @@
 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 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  # choice
-    # program: ...
+    program: Program
     is_refundable: bool
+    is_buyable: property  # type: bool
 
     def __init__(self, model: TicketType):
         self.id = model.id
@@ -22,7 +33,15 @@ def __init__(self, model: TicketType):
         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)

ticket/views.py

@@ -14,7 +14,7 @@
 from .models import Ticket, TicketType
 from .requests import (
     AddConferenceTicketRequest,
-    CheckConferenceTicketTypeBuyableRequest,
+    CheckTicketTypeBuyableRequest,
     GetConferenceTicketTypesRequest,
     RequestParsingException,
 )
@@ -83,14 +83,14 @@ def get__get_ticket_types(request: HttpRequest, **kwargs) -> HttpResponse:
 
 @request_method("GET")
 @exception_wrapper
-def get__check_conference_ticket_type_buyable(
+def get__check_ticket_type_buyable(
         request: HttpRequest, **kwargs
 ) -> HttpResponse:
     """특정 티켓 종류 구매 가능 여부 조회"""
-    request = CheckConferenceTicketTypeBuyableRequest(request, **kwargs)
+    request = CheckTicketTypeBuyableRequest(request, **kwargs)
 
     ticket_type = get_object_or_404(
-        TicketType, code=request.match_info.ticket_type_code
+        TicketType, id=request.match_info.ticket_type_id
     )
 
     if request.querystring.username is None:
@@ -118,7 +118,7 @@ def get__check_conference_ticket_type_buyable(
 
 @request_method("POST")
 @exception_wrapper
-def post__add_conference_ticket(request: HttpRequest, **kwargs) -> HttpResponse:
+def post__add_ticket(request: HttpRequest, **kwargs) -> HttpResponse:
     """티켓 결제 완료, 추가 요청"""
     request = AddConferenceTicketRequest(request)