Merge pull request #86 from golony6449/feature/golony/ticket

golony6449 · web-flow · commit f33d8bad3e84 · 2023-05-15T22:41:48.000+09:00
티켓-결제 관련 모듈 수정
diff --git a/account/templates/account_mypage_payments.html b/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
diff --git a/account/views.py b/account/views.py
@@ -12,7 +12,7 @@
 from rest_framework.views import APIView
 from rest_framework.decorators import api_view
 
-import payment
+from ticket.models import Ticket
 
 from allauth.account.views import LoginView, LogoutView
 
@@ -39,9 +39,9 @@ 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})
 
 
 @api_view(["POST"])
@@ -63,6 +63,7 @@ def login_api(request):
     }
     return Response(response_data)
 
+
 @api_view(["POST"])
 def logout_api(request):
 
@@ -75,4 +76,3 @@ def logout_api(request):
         "msg": "ok"
     }
     return Response(response_data)
-
diff --git a/payment/migrations/0002_rename_user_id_payment_user_payment_status_and_more.py b/payment/migrations/0002_rename_user_id_payment_user_payment_status_and_more.py
@@ -0,0 +1,58 @@
+# Generated by Django 4.1.5 on 2023-05-15 13:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ticket", "0002_rename_conferencetickettype_tickettype"),
+        ("payment", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="payment",
+            old_name="user_id",
+            new_name="user",
+        ),
+        migrations.AddField(
+            model_name="payment",
+            name="status",
+            field=models.IntegerField(
+                choices=[
+                    (1, "결제 전"),
+                    (2, "결제 실패"),
+                    (3, "결제 성공"),
+                    (4, "환불 실패"),
+                    (5, "환불 완료"),
+                ],
+                default=0,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="payment",
+            name="ticket_type",
+            field=models.ForeignKey(
+                default=1,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="ticket.tickettype",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="paymenthistory",
+            name="status",
+            field=models.IntegerField(
+                choices=[
+                    (1, "결제 전"),
+                    (2, "결제 실패"),
+                    (3, "결제 성공"),
+                    (4, "환불 실패"),
+                    (5, "환불 완료"),
+                ]
+            ),
+        ),
+    ]
diff --git a/payment/models.py b/payment/models.py
@@ -1,21 +1,37 @@
 from django.db import models
 from django.contrib.auth import get_user_model
 
-from ticket.models import TicketType
-
 User = get_user_model()
 
 
 class Payment(models.Model):
     payment_key = models.CharField(max_length=32)  # TODO: uuid 처리
-    user_id = models.ForeignKey(User, on_delete=models.PROTECT)
+    user = models.ForeignKey(User, on_delete=models.PROTECT)
+    ticket_type = models.ForeignKey("ticket.TicketType", on_delete=models.PROTECT)
     money = models.IntegerField()
+    status = models.IntegerField(
+        choices=(
+            (1, "결제 전"),
+            (2, "결제 실패"),
+            (3, "결제 성공"),
+            (4, "환불 실패"),
+            (5, "환불 완료"),
+        )
+    )
     create_at = models.DateTimeField(auto_now_add=True)
     update_at = models.DateTimeField(auto_now=True)
 
 
 class PaymentHistory(models.Model):
     payment_key = models.CharField(max_length=32)
-    status = models.IntegerField()
+    status = models.IntegerField(
+        choices=(
+            (1, "결제 전"),
+            (2, "결제 실패"),
+            (3, "결제 성공"),
+            (4, "환불 실패"),
+            (5, "환불 완료"),
+        )
+    )
     create_at = models.DateTimeField(auto_now_add=True)
     update_at = models.DateTimeField(auto_now=True)
diff --git a/payment/utils.py b/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
     )
 
diff --git a/sponsor/migrations/0004_alter_sponsor_options_alter_sponsorlevel_options.py b/sponsor/migrations/0004_alter_sponsor_options_alter_sponsorlevel_options.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.1.5 on 2023-05-15 13:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sponsor", "0003_alter_sponsor_bank_book_file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="sponsor",
+            options={
+                "ordering": ["paid_at", "id"],
+                "verbose_name": "후원사",
+                "verbose_name_plural": "후원사 목록",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="sponsorlevel",
+            options={"verbose_name": "후원사 등급", "verbose_name_plural": "후원사 등급"},
+        ),
+    ]
diff --git a/ticket/admin.py b/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):
diff --git a/ticket/migrations/0003_ticket_remove_tickettype_code_and_more.py b/ticket/migrations/0003_ticket_remove_tickettype_code_and_more.py
@@ -0,0 +1,81 @@
+# Generated by Django 4.1.5 on 2023-05-15 13:40
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import ticket.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("payment", "0002_rename_user_id_payment_user_payment_status_and_more"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("ticket", "0002_rename_conferencetickettype_tickettype"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Ticket",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("bought_at", models.DateTimeField()),
+                (
+                    "ticket_code",
+                    models.CharField(
+                        db_index=True,
+                        default=ticket.models.make_ticket_code,
+                        max_length=25,
+                        unique=True,
+                    ),
+                ),
+                ("is_refunded", models.BooleanField(default=False)),
+                ("refunded_at", models.DateTimeField(null=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "payment",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="payment.payment",
+                    ),
+                ),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name="tickettype",
+            name="code",
+        ),
+        migrations.AddField(
+            model_name="tickettype",
+            name="is_refundable",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.DeleteModel(
+            name="ConferenceTicket",
+        ),
+        migrations.AddField(
+            model_name="ticket",
+            name="ticket_type",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.RESTRICT, to="ticket.tickettype"
+            ),
+        ),
+        migrations.AddField(
+            model_name="ticket",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.RESTRICT,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/ticket/models.py b/ticket/models.py
@@ -9,7 +9,6 @@
 
 
 class TicketType(models.Model):
-    code = models.CharField(max_length=50)
     name = models.CharField(max_length=100)
     price = models.IntegerField()
     min_price = models.IntegerField(null=True, blank=True)
@@ -22,17 +21,19 @@ class TicketType(models.Model):
             ("WEEKEND", "토/일요일"),
         ),
     )
+    # program = models.ForeignKey()     # TODO
+    is_refundable = models.BooleanField(default=True)
 
     def __str__(self):
         return self.name
 
     @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 +62,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,7 +75,10 @@ class ConferenceTicket(models.Model):
     ticket_code = models.CharField(
         max_length=25, default=make_ticket_code, unique=True, db_index=True
     )
-
+    # 결제 정보
+    payment = models.ForeignKey("payment.Payment", on_delete=models.PROTECT, null=True)
+    is_refunded = models.BooleanField(default=False)
+    refunded_at = models.DateTimeField(null=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
diff --git a/ticket/views.py b/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,

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ def generate_payment_key(user: User, ticket_type: TicketType):`
`14`	`14`	`new_payment = Payment(`
`15`	`15`	`payment_key=shortuuid.uuid(),`
`16`	`16`	`user_id=user,`
`17`		`- # ticket_type=ticket_type, # TODO`
	`17`	`+ ticket_type=ticket_type,`
`18`	`18`	`money=ticket_type.price`
`19`	`19`	`)`
`20`	`20`