Merge branch 'devdev' into feature/golony/ticket

golony6449 · golony6449 · commit e3126368195f · 2023-05-27T01:49:48.000+09:00
# Conflicts:
#	payment/urls.py
#	payment/views.py
diff --git a/payment/enum.py b/payment/enum.py
@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class PaymentStatus(Enum):
+    BEFORE_PAYMENT = 1
+    PAYMENT_FAILED = 2
+    PAYMENT_SUCCESS = 3
+    REFUND_FAILED = 4
+    REFUND_SUCCESS = 5
diff --git a/payment/logic.py b/payment/logic.py
@@ -0,0 +1,46 @@
+from django.contrib.auth import get_user_model
+from django.db import transaction
+
+from payment.enum import PaymentStatus
+from payment.models import Payment, PaymentHistory
+from ticket.models import TicketType, Ticket
+
+import shortuuid
+
+User = get_user_model()
+
+
+@transaction.atomic
+def generate_payment_key(user: User, ticket_type: TicketType):
+    new_payment = Payment(
+        payment_key=shortuuid.uuid(),
+        user=user,
+        ticket_type=ticket_type,
+        money=ticket_type.price,
+        status=PaymentStatus.BEFORE_PAYMENT.value
+    )
+
+    new_payment.save()
+
+    _save_history(new_payment.payment_key, PaymentStatus.BEFORE_PAYMENT.value)
+    return new_payment.payment_key
+
+
+@transaction.atomic
+def proceed_payment(payment_key: str, is_succeed: bool):
+    status_value = PaymentStatus.PAYMENT_SUCCESS.value if is_succeed else PaymentStatus.PAYMENT_FAILED.value
+
+    target_payment = Payment.objects.get(payment_key=payment_key)
+    target_payment.status = status_value
+    target_payment.save()
+
+    _save_history(payment_key, status_value)
+
+
+def _save_history(payment_key: str, status: int):
+    new_payment_history = PaymentHistory(
+        payment_key=payment_key,
+        status=status
+    )
+
+    new_payment_history.save()
diff --git a/payment/migrations/0003_paymenthistory_is_webhook.py b/payment/migrations/0003_paymenthistory_is_webhook.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-05-25 13:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("payment", "0002_rename_user_id_payment_user_payment_status_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="paymenthistory",
+            name="is_webhook",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/payment/models.py b/payment/models.py
@@ -33,5 +33,6 @@ class PaymentHistory(models.Model):
             (5, "환불 완료"),
         )
     )
+    is_webhook = models.BooleanField(default=False)
     create_at = models.DateTimeField(auto_now_add=True)
     update_at = models.DateTimeField(auto_now=True)
diff --git a/payment/urls.py b/payment/urls.py
@@ -1,8 +1,10 @@
 from django.contrib import admin
 from django.urls import include, path
 
-from payment.views import get__generate_payment_key
+from payment.views import PortoneWebhookApi, post__generate_payment_key, PaymentSuccessApi
 
 urlpatterns = [
-    path("payment-key/", get__generate_payment_key, name="generate-payment-key"),
+    path("portone/webhook/", PortoneWebhookApi.as_view(), name="portone-webhook"),
+    path("key/", post__generate_payment_key, name="get-payment-key"),
+    path("success/", PaymentSuccessApi.as_view(), name="payment-success"),
 ]
diff --git a/payment/views.py b/payment/views.py
@@ -1,22 +1,85 @@
+import datetime
+
+from django.db import transaction
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from ticket.models import TicketType
-from payment.utils import generate_payment_key
+from payment import enum
+from ticket.models import TicketType, Ticket
+from payment.logic import generate_payment_key
+from payment.models import Payment, PaymentHistory
+
+from django.conf import settings
 
 
-class PortoneWebhookAPI(APIView):
+class PortoneWebhookApi(APIView):
+    @transaction.atomic
     def post(self, request):
-        # TODO: IP Filtering
-        # 52.78.100.19
-        # 52.78.48.223
-        # 52.78.5.241 (Webhook Test Only)
+        portone_ips = [
+            "52.78.100.19",
+            "52.78.48.223",
+            "52.78.5.241"   # (Webhook Test Only)
+        ]
+
+        if settings.DEBUG is False and request.META.get("REMOTE_ADDR") not in portone_ips:
+            raise ValueError("Not Allowed IP")
+
+        if request.data["status"] != "paid":
+            raise ValueError("결제 승인건 이외의 요청")
+
+        payment_key = request.data["merchant_uid"]
+
+        target_payment = Payment.objects.get(payment_key=payment_key)
+        target_payment.status = enum.PaymentStatus.PAYMENT_SUCCESS.value
+        target_payment.save()
+
+        payment_history = PaymentHistory(
+            payment_key=payment_key,
+            status=enum.PaymentStatus.PAYMENT_SUCCESS.value,
+            is_webhook=True
+        )
+        payment_history.save()
+
+        ticket = Ticket.objects.create(
+            ticket_type=target_payment.ticket_type,
+            bought_at=datetime.datetime.now(),
+            user=target_payment.user,
+        )
+        ticket.save()
+
+        dto = {
+            "msg": "ok",
+            "merchant_uid": request.data["merchant_uid"]
+        }
+
+        return Response(dto)
+
+
+class PaymentSuccessApi(APIView):
+    def post(self, request):
+        if not request.is_authenticated:
+            return Response({"msg": "not logged in user"}, status=400)
+
+        payment_key = request.data["merchant_uid"]
+
+        payment_history = PaymentHistory(
+            payment_key=payment_key,
+            status=enum.PaymentStatus.PAYMENT_SUCCESS.value,
+            is_webhook=False
+        )
+        payment_history.save()
+
+        dto = {
+            "msg": "ok",
+            "merchant_uid": request.data["merchant_uid"]
+        }
+
+        return Response(dto)
 
-        pass
 
-@api_view(["GET"])
-def get__generate_payment_key(request):
+@api_view(["POST"])
+def post__generate_payment_key(request):
 
     request_ticket_type = TicketType.objects.get(id=request.data["ticket_type"])
 
@@ -27,7 +90,8 @@ def get__generate_payment_key(request):
 
     response_data = {
         "msg": "ok",
-        "payment_key": payment_key
+        "payment_key": payment_key,
+        "price": request_ticket_type.price
     }
 
-    return Response()
+    return Response(response_data)
diff --git a/program/migrations/0003_program.py b/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)),
+            ],
+        ),
+    ]
diff --git a/program/migrations/0004_rename_capacity_program_slot.py b/program/migrations/0004_rename_capacity_program_slot.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.5 on 2023-05-25 13:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0003_program'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='program',
+            old_name='capacity',
+            new_name='slot',
+        ),
+    ]
diff --git a/program/models.py b/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층 호실 추가 필요
+        ),
+    )
+    slot = 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
diff --git a/pyconkr/settings.py b/pyconkr/settings.py
@@ -207,6 +207,8 @@
     # YOUR SETTINGS
     "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
     "DEFAULT_AUTHENTICATION_CLASSES": (
+        'rest_framework.authentication.BasicAuthentication',
+        # 'rest_framework.authentication.SessionAuthentication',
         "rest_framework_simplejwt.authentication.JWTAuthentication",
         "dj_rest_auth.jwt_auth.JWTCookieAuthentication",
     ),
@@ -243,6 +245,10 @@
 )
 CORS_ALLOW_CREDENTIALS = True
 
+# CSRF WHITE LIST
+CSRF_TRUSTED_ORIGINS = tuple(CORS_ORIGIN_WHITELIST)
+
+# OAUTH
 OAUTH_GITHUB_CALLBACK_URL = "http://localhost:8000/accounts/github/login/callback/"
 OAUTH_GOOGLE_CALLBACK_URL = "http://localhost:8000/accounts/google/login/callback/"
 
diff --git a/ticket/migrations/0004_alter_tickettype_id.py b/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),
+        ),
+    ]
diff --git a/ticket/migrations/0005_alter_tickettype_day.py b/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),
+        ),
+    ]
diff --git a/ticket/migrations/0006_tickettype_program.py b/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'),
+        ),
+    ]
diff --git a/ticket/models.py b/ticket/models.py
diff --git a/ticket/requests.py b/ticket/requests.py
diff --git a/ticket/urls.py b/ticket/urls.py
diff --git a/ticket/view_models.py b/ticket/view_models.py
diff --git a/ticket/views.py b/ticket/views.py

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ class PaymentHistory(models.Model):`
`33`	`33`	`(5, "환불 완료"),`
`34`	`34`	`)`
`35`	`35`	`)`
	`36`	`+ is_webhook = models.BooleanField(default=False)`
`36`	`37`	`create_at = models.DateTimeField(auto_now_add=True)`
`37`	`38`	`update_at = models.DateTimeField(auto_now=True)`