Merge branch 'devdev' into feature/golony/payment

Author: golony6449

account/urls.py

@@ -22,4 +22,5 @@
     path("api/logout/", logout_api, name="logout-api"),
     # path("api/logout/", )
 
+    path("api/mypage/", MyPage.as_view(), name="mypage-api"),
 ]

account/view_models.py

@@ -0,0 +1,20 @@
+from dataclasses import dataclass, asdict
+
+from ticket.models import Ticket
+
+
+@dataclass(init=False)
+class UserTicketInfo:
+    ticket_type_name: str
+    date: str
+    price: int
+    payment_key: str
+
+    def __init__(self, ticket: Ticket):
+        self.ticket_type_name = ticket.ticket_type.name
+        self.date = ticket.ticket_type.day
+        self.price = ticket.payment.money
+        self.payment_key = ticket.payment.payment_key
+
+    def to_dict(self):
+        return asdict(self)

account/views.py

@@ -7,22 +7,27 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 from django.contrib.auth import login, logout, authenticate
+from functional import seq
 
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.decorators import api_view
 
+from account.view_models import UserTicketInfo
 from ticket.models import Ticket
 
 from allauth.account.views import LoginView, LogoutView
 
+
 class IdLogin(LoginView):
     template_name = "account/login.html"
     success_url = "/"
 
+
 class Logout(LogoutView):
     template_name = "account/logout.html"
 
+
 class GitHubLogin(SocialLoginView):
     adapter_class = GitHubOAuth2Adapter
     callback_url = settings.OAUTH_GITHUB_CALLBACK_URL
@@ -34,8 +39,27 @@ class GoogleLogin(SocialLoginView):
     callback_url = settings.OAUTH_GOOGLE_CALLBACK_URL
     client_class = OAuth2Client
 
+
 class MyPage(APIView):
-    pass
+    def get(self, request):
+        dto = {
+            "ticket": self.get_ticket_info(request)
+        }
+
+        return Response(dto)
+
+    def get_ticket_info(self, request) -> list:
+        all_tickets = Ticket.objects.filter(
+            user=request.user,
+            is_refunded=False
+        )
+
+        return list(
+            seq(all_tickets)
+            .map(UserTicketInfo)
+            .map(lambda info: info.to_dict())
+        )
+
 
 @login_required
 def mypage_payments(request):
@@ -46,7 +70,6 @@ def mypage_payments(request):
 
 @api_view(["POST"])
 def login_api(request):
-
     if request.user.is_authenticated:
         return Response({"msg": "already logged in"})
 
@@ -66,7 +89,6 @@ def login_api(request):
 
 @api_view(["POST"])
 def logout_api(request):
-
     if not request.user.is_authenticated:
         return Response({"msg": "not logged in"})
 

requirements.txt

@@ -22,4 +22,5 @@ drf-spectacular==0.25.1
 shortuuid==1.0.11
 jsons==1.6.3
 django-cors-headers==3.14.0
-requests==2.28.2
+requests==2.28.2
+PyFunctional==1.4.3

ticket/urls.py

@@ -3,15 +3,19 @@
 from . import views
 
 urlpatterns = [
-    path("conference-ticket-types", views.get__get_ticket_types),
+    path("ticket-types", views.get__get_ticket_types),
     re_path(
-        r"^conference-ticket-types/(?P<ticket_type_id>\w+)/check",
+        r"^ticket-types/(?P<ticket_type_id>\w+)/check",
         views.get__check_ticket_type_buyable,
     ),
-    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"),
-    path("failed", views.ticket_failed, name="page-ticket-failed"),
+    # path("conference-tickets", views.post__add_ticket),  # 티켓 생성은 payment에서
+    ####################################################################################
+    # 템플릿 기반 API 비활성화
+    ####################################################################################
+    # path("list", views.get__ticket_type_list, name="ticket-list"),
+    # path("<int:item_id>", views.TicketDetailView.as_view(), name="ticket-detail"),
+    # path("success", views.ticket_success, name="page-ticket-success"),
+    # path("failed", views.ticket_failed, name="page-ticket-failed"),
+    ####################################################################################
     path("<int:ticket_id>/refund", views.ticket_refund, name="page-ticket-refund-success"),
 ]

ticket/views.py

@@ -168,7 +168,7 @@ def post__add_ticket(request: HttpRequest, **kwargs) -> HttpResponse:
     return HttpResponse(ticket.id)
 
 
-def get__ticket_list(request):
+def get__ticket_type_list(request):
     all_types = TicketType.objects.all()
 
     dto = {
@@ -178,6 +178,7 @@ def get__ticket_list(request):
     return render(request, "ticket-list.html", dto)
 
 
+# Django Template 기반 코드
 class TicketDetailView(View):
     def get(self, request, item_id: int):
         ticket_type = TicketType.objects.get(id=item_id)