티켓-결제 관련 모듈 수정

Author: golony6449

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, "환불 완료"),
+                ]
+            ),
+        ),
+    ]

payment/models.py

@@ -1,22 +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)
-    ticket_type = models.ForeignKey(TicketType, 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)

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": "후원사 등급"},
+        ),
+    ]

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,
+            ),
+        ),
+    ]

ticket/models.py

@@ -5,13 +5,10 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 
-from payment.models import Payment
-
 User = get_user_model()
 
 
 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)
@@ -24,6 +21,8 @@ class TicketType(models.Model):
             ("WEEKEND", "토/일요일"),
         ),
     )
+    # program = models.ForeignKey()     # TODO
+    is_refundable = models.BooleanField(default=True)
 
     def __str__(self):
         return self.name
@@ -77,8 +76,9 @@ class Ticket(models.Model):
         max_length=25, default=make_ticket_code, unique=True, db_index=True
     )
     # 결제 정보
-    payment = models.ForeignKey(Payment, on_delete=models.PROTECT)
-
+    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)