ticket 모델명 변경 및 MyPage에서 티켓을 참조하도록 수정

Author: golony6449

account/templates/account_mypage_payments.html

@@ -11,12 +11,11 @@
             </tr>
         </thead>
         <tbody>
-            {% for payment in payment_list %}
+            {% for ticket in ticket_list %}
                 <tr>
-                    <td>{{ payment.id }}</td>
-                    <td>{{ payment.user_id }}</td>
-                    <td>{{ payment.money }}</td>
-                    <td>{{ payment.create_at }}</td>
+                    <td>{{ ticket.id }}</td>
+                    <td>{{ ticket.payment.money }}</td>
+                    <td>{{ ticket.create_at }}</td>
                     <td>
                         <button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
                             Button

account/views.py

@@ -7,7 +7,7 @@
 from django.shortcuts import render
 from rest_framework.views import APIView
 
-import payment
+from ticket.models import Ticket
 
 from allauth.account.views import LoginView, LogoutView
 
@@ -34,6 +34,6 @@ class MyPage(APIView):
 
 @login_required
 def mypage_payments(request):
-    payment_list = payment.models.Payment.objects.filter(user_id=request.user)
+    ticket_list = Ticket.objects.filter(user=request.user)
     return render(request, 'account_mypage_payments.html',
-                  context={'payment_list': payment_list})
+                  context={'ticket_list': ticket_list})

payment/models.py

@@ -9,6 +9,7 @@
 class Payment(models.Model):
     payment_key = models.CharField(max_length=32)  # TODO: uuid 처리
     user_id = models.ForeignKey(User, on_delete=models.PROTECT)
+    ticket_type = models.ForeignKey(TicketType, on_delete=models.PROTECT)
     money = models.IntegerField()
     create_at = models.DateTimeField(auto_now_add=True)
     update_at = models.DateTimeField(auto_now=True)

payment/utils.py

@@ -14,7 +14,7 @@ def generate_payment_key(user: User, ticket_type: TicketType):
     new_payment = Payment(
         payment_key=shortuuid.uuid(),
         user_id=user,
-        # ticket_type=ticket_type,      # TODO
+        ticket_type=ticket_type,
         money=ticket_type.price
     )
 

ticket/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import ConferenceTicket, TicketType
+from .models import Ticket, TicketType
 
 
 class ConferenceTicketAdmin(admin.ModelAdmin):
@@ -13,7 +13,7 @@ class ConferenceTicketAdmin(admin.ModelAdmin):
     list_filter = ("ticket_type",)
 
 
-admin.site.register(ConferenceTicket, ConferenceTicketAdmin)
+admin.site.register(Ticket, ConferenceTicketAdmin)
 
 
 class ConferenceTicketTypeAdmin(admin.ModelAdmin):

ticket/models.py

@@ -5,6 +5,8 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 
+from payment.models import Payment
+
 User = get_user_model()
 
 
@@ -29,10 +31,10 @@ def __str__(self):
     @property
     def buyable(self) -> bool:
         """잔여 수량이 있는지"""
-        sat_ticket_count = ConferenceTicket.objects.filter(
+        sat_ticket_count = Ticket.objects.filter(
             models.Q(ticket_type__day="SAT") & models.Q(ticket_type__day="WEEKEND")
         ).count()
-        sun_ticket_count = ConferenceTicket.objects.filter(
+        sun_ticket_count = Ticket.objects.filter(
             models.Q(ticket_type__day="SUN") & models.Q(ticket_type__day="WEEKEND")
         ).count()
 
@@ -61,7 +63,7 @@ def make_ticket_code() -> str:
     return shortuuid.uuid()
 
 
-class ConferenceTicket(models.Model):
+class Ticket(models.Model):
     # 구분
     ticket_type = models.ForeignKey(
         TicketType, on_delete=models.RESTRICT, db_index=True
@@ -74,6 +76,8 @@ class ConferenceTicket(models.Model):
     ticket_code = models.CharField(
         max_length=25, default=make_ticket_code, unique=True, db_index=True
     )
+    # 결제 정보
+    payment = models.ForeignKey(Payment, on_delete=models.PROTECT)
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

ticket/views.py

@@ -9,7 +9,7 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views import View
 
-from .models import ConferenceTicket, TicketType
+from .models import Ticket, TicketType
 from .requests import (
     AddConferenceTicketRequest,
     CheckConferenceTicketTypeBuyableRequest,
@@ -94,7 +94,7 @@ def get__check_conference_ticket_type_buyable(
     except User.DoesNotExist:
         return HttpResponse(json.dumps(ticket_type.buyable))
 
-    bought_tickets = ConferenceTicket.objects.filter(user=user)
+    bought_tickets = Ticket.objects.filter(user=user)
 
     return HttpResponse(
         json.dumps(
@@ -141,7 +141,7 @@ def post__add_conference_ticket(request: HttpRequest, **kwargs) -> HttpResponse:
     except User.DoesNotExist:
         return HttpResponse("Cannot find user with user_id", status=400)
 
-    bought_tickets = ConferenceTicket.objects.filter(user=user)
+    bought_tickets = Ticket.objects.filter(user=user)
     if any(
         (
             not bought_ticket.ticket_type.can_coexist(ticket_type)
@@ -150,7 +150,7 @@ def post__add_conference_ticket(request: HttpRequest, **kwargs) -> HttpResponse:
     ):
         return HttpResponse("Duplicate day", status=400)
 
-    ticket = ConferenceTicket.objects.create(
+    ticket = Ticket.objects.create(
         ticket_type=ticket_type,
         bought_at=bought_at,
         user=user,