Skip to content

Commit 55a9a17

Browse files
committed
feat: 결제 완료된 시점에 따라 결제 내역을 정렬하도록 추가
1 parent 118fa08 commit 55a9a17

3 files changed

Lines changed: 32 additions & 2 deletions

File tree

‎app/shop/order/models.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@ def filter_has_no_payment_histories(self) -> models.QuerySet[Order]:
130130
~models.Exists(PaymentHistory.objects.filter_active().filter(order=models.OuterRef("id")))
131131
)
132132

133+
def order_by_first_paid_at(self) -> models.QuerySet[Order]:
134+
"""첫 결제(최초 active payment_history) 시각이 최근인 주문이 먼저 오도록 정렬."""
135+
return self.annotate(
136+
_first_paid_at=PaymentHistory.objects.filter_active()
137+
.filter(order_id=models.OuterRef("id"))
138+
.order_by("created_at")
139+
.values("created_at")[:1]
140+
).order_by(models.F("_first_paid_at").desc(nulls_last=True), "-created_at")
141+
133142
def for_dto_response(self) -> models.QuerySet[Order]:
134143
return self.select_related("customer_info").with_dto_prefetches()
135144

‎app/shop/order/test/orders_api_test.py‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
from datetime import timedelta
12
from unittest.mock import patch
23

34
import pytest
45
from core.const.shop_error_messages import CartNotOrderableErrorMessages
56
from core.external_apis.portone.client import PortOneException
67
from core.util.testutil import to_json
8+
from django.utils import timezone
79
from rest_framework.status import (
810
HTTP_200_OK,
911
HTTP_201_CREATED,
@@ -15,7 +17,7 @@
1517
from shop.conftest import VALID_TICKET_INFO
1618
from shop.order.models import CustomerInfo, Order, OrderProductRelation, SingleProductCart, TicketInfo
1719
from shop.order.serializers.dto import OrderDto, SingleProductCartDto
18-
from shop.payment_history.models import PaymentHistoryStatus
20+
from shop.payment_history.models import PaymentHistory, PaymentHistoryStatus
1921
from shop.test.helpers import OrdersApi
2022

2123

@@ -43,6 +45,22 @@ def test_order_list_excludes_other_users_orders(other_client, order_factory):
4345
assert response.json() == []
4446

4547

48+
@pytest.mark.django_db
49+
def test_order_list_orders_by_first_paid_at_desc(customer_client, order_factory):
50+
# 먼저 생성된 주문(= Order.created_at 이 더 과거)이 더 최근에 결제되도록 구성.
51+
# 이렇게 해야 created_at 기본 정렬과 first_paid_at 정렬의 결과가 달라져 검증이 유효하다.
52+
older_order = order_factory(status="completed")
53+
newer_order = order_factory(status="completed")
54+
now = timezone.now()
55+
PaymentHistory.objects.filter(order=older_order).update(created_at=now)
56+
PaymentHistory.objects.filter(order=newer_order).update(created_at=now - timedelta(days=1))
57+
58+
response = OrdersApi(http_client=customer_client).list()
59+
60+
assert response.status_code == HTTP_200_OK
61+
assert [order["id"] for order in response.json()] == [str(older_order.id), str(newer_order.id)]
62+
63+
4664
@pytest.mark.django_db
4765
def test_order_retrieve_returns_full_order_dto(customer_client, order_factory):
4866
completed_order = order_factory(status="completed")

‎app/shop/order/views/orders.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ def get_queryset(self) -> models.QuerySet[Order]:
8383
if self.action == "retrieve_receipt":
8484
user_filter = {} if self.request.user.is_staff else {"user": self.request.user}
8585
return base_qs.filter_has_payment_histories().filter(**user_filter).distinct()
86-
return base_qs.with_dto_prefetches().filter_has_payment_histories().filter(user=self.request.user).distinct()
86+
qs = base_qs.with_dto_prefetches().filter_has_payment_histories().filter(user=self.request.user).distinct()
87+
if self.action == "list":
88+
qs = qs.order_by_first_paid_at()
89+
return qs
8790

8891
@extend_schema(
8992
summary="단건 주문 프로세스 시작",

0 commit comments

Comments
 (0)