Skip to content

Commit a0db2aa

Browse files
committed
chore: 어드민 환불에서 TOTP 검증 제거
1 parent 96536b6 commit a0db2aa

4 files changed

Lines changed: 17 additions & 47 deletions

File tree

‎app/admin_api/test/helpers.py‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@
77
class OrdersAdminApi(ModelApiFixture):
88
name: ClassVar[str] = "v1:admin-shop-order"
99

10-
def refund(self, pk, *, totp: str | None = None):
11-
url = reverse(f"{self.name}-refund", kwargs={"pk": pk})
12-
if totp is not None:
13-
url += f"?totp={totp}"
14-
return self.http_client.post(url)
15-
16-
def refund_product(self, pk, rel_id, *, totp: str | None = None):
17-
url = reverse(f"{self.name}-refund-product", kwargs={"pk": pk, "rel_id": rel_id})
18-
if totp is not None:
19-
url += f"?totp={totp}"
20-
return self.http_client.post(url)
10+
def refund(self, pk):
11+
return self.http_client.post(reverse(f"{self.name}-refund", kwargs={"pk": pk}))
12+
13+
def refund_product(self, pk, rel_id):
14+
return self.http_client.post(reverse(f"{self.name}-refund-product", kwargs={"pk": pk, "rel_id": rel_id}))
2115

2216
def import_template(self, *, product_id: str | None = None):
2317
params = {"product_id": product_id} if product_id is not None else None

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

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
)
1919
from shop.order.models import CustomerInfo, Order, OrderProductRelation
2020
from shop.payment_history.models import PaymentHistory, PaymentHistoryStatus
21-
from shop.test.helpers import valid_refund_totp
2221

2322

2423
@pytest.mark.parametrize("client_fixture", ["anon_client", "customer_client"])
@@ -111,32 +110,16 @@ def test_admin_retrieve_returns_nested_payload(api_client, order_factory):
111110

112111

113112
@pytest.mark.django_db
114-
def test_admin_refund_action_refunds_order_with_valid_totp(api_client, mock_portone_req_cancel_payment, order_factory):
113+
def test_admin_refund_action_refunds_order(api_client, mock_portone_req_cancel_payment, order_factory):
115114
completed_order = order_factory(status="completed")
116-
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id, totp=valid_refund_totp())
115+
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id)
117116
assert response.status_code == HTTP_204_NO_CONTENT
118117
completed_order.refresh_from_db()
119118
statuses = list(completed_order.products.values_list("status", flat=True))
120119
assert statuses == [OrderProductRelation.OrderProductStatus.refunded]
121120
assert completed_order.payment_histories.filter(status=PaymentHistoryStatus.refunded).exists()
122121

123122

124-
@pytest.mark.django_db
125-
def test_admin_refund_action_rejects_invalid_totp(api_client, mock_portone_req_cancel_payment, order_factory):
126-
completed_order = order_factory(status="completed")
127-
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id, totp="000000")
128-
assert response.status_code == HTTP_400_BAD_REQUEST
129-
mock_portone_req_cancel_payment.assert_not_called()
130-
131-
132-
@pytest.mark.django_db
133-
def test_admin_refund_action_rejects_missing_totp(api_client, mock_portone_req_cancel_payment, order_factory):
134-
completed_order = order_factory(status="completed")
135-
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id)
136-
assert response.status_code == HTTP_400_BAD_REQUEST
137-
mock_portone_req_cancel_payment.assert_not_called()
138-
139-
140123
@pytest.mark.django_db
141124
def test_admin_refund_product_action_does_partial_refund(
142125
api_client, ticket_product, mock_portone_req_cancel_payment, order_factory
@@ -149,9 +132,7 @@ def test_admin_refund_product_action_does_partial_refund(
149132
price=ticket_product.price,
150133
status=OrderProductRelation.OrderProductStatus.paid,
151134
)
152-
response = OrdersAdminApi(http_client=api_client).refund_product(
153-
completed_order.id, target_opr.id, totp=valid_refund_totp()
154-
)
135+
response = OrdersAdminApi(http_client=api_client).refund_product(completed_order.id, target_opr.id)
155136
assert response.status_code == HTTP_204_NO_CONTENT
156137
target_opr.refresh_from_db()
157138
assert target_opr.status == OrderProductRelation.OrderProductStatus.refunded
@@ -163,7 +144,7 @@ def test_admin_refund_product_action_does_partial_refund(
163144
def test_admin_refund_product_action_returns_404_for_unknown_rel(api_client, order_factory):
164145
completed_order = order_factory(status="completed")
165146
response = OrdersAdminApi(http_client=api_client).refund_product(
166-
completed_order.id, "00000000-0000-0000-0000-000000000000", totp=valid_refund_totp()
147+
completed_order.id, "00000000-0000-0000-0000-000000000000"
167148
)
168149
assert response.status_code == HTTP_404_NOT_FOUND
169150

@@ -175,7 +156,7 @@ def test_admin_refund_allows_expired_window(api_client, mock_portone_req_cancel_
175156
ticket_product.refundable_ends_at = datetime(2020, 1, 1, tzinfo=timezone.utc)
176157
ticket_product.save()
177158

178-
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id, totp=valid_refund_totp())
159+
response = OrdersAdminApi(http_client=api_client).refund(completed_order.id)
179160
assert response.status_code == HTTP_204_NO_CONTENT
180161

181162

‎app/admin_api/test/shop/soft_delete_filtering_test.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from shop.order.models import Order, OrderProductRelation
1212
from shop.payment_history.models import PaymentHistory, PaymentHistoryStatus
1313
from shop.product.models import Product
14-
from shop.test.helpers import valid_refund_totp
1514

1615

1716
@pytest.mark.django_db
@@ -26,9 +25,7 @@ def test_admin_refund_product_404_for_soft_deleted_opr(api_client, order_factory
2625
)
2726
stale_opr.delete()
2827

29-
response = OrdersAdminApi(http_client=api_client).refund_product(
30-
completed.id, stale_opr.id, totp=valid_refund_totp()
31-
)
28+
response = OrdersAdminApi(http_client=api_client).refund_product(completed.id, stale_opr.id)
3229
assert response.status_code == HTTP_404_NOT_FOUND
3330

3431

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,25 @@ class OrderAdminViewSet(
8888
)
8989

9090
@extend_schema(
91-
summary="주문 전체 환불 (환불 승인자 TOTP 필수)",
91+
summary="주문 전체 환불",
9292
tags=[OpenAPITag.ADMIN_SHOP_ORDER_REFUND],
93-
parameters=[OpenApiParameter(name="totp", location=OpenApiParameter.QUERY, required=True)],
9493
responses={status.HTTP_204_NO_CONTENT: None},
9594
)
9695
@action(detail=True, methods=["post"], url_path="refund")
9796
@transaction.atomic
9897
def refund(self, request: request.Request, pk: typing.Any = None) -> response.Response:
9998
serializer = OrderTotalRefundSerializer(
10099
instance=self.get_object(),
101-
data={"totp": request.query_params.get("totp")},
102-
context={"check_refundable_date": False},
100+
data={},
101+
context={"check_refundable_date": False, "check_totp": False},
103102
)
104103
serializer.is_valid(raise_exception=True)
105104
serializer.refund()
106105
return response.Response(status=status.HTTP_204_NO_CONTENT)
107106

108107
@extend_schema(
109-
summary="주문 부분 환불 (환불 승인자 TOTP 필수)",
108+
summary="주문 부분 환불",
110109
tags=[OpenAPITag.ADMIN_SHOP_ORDER_REFUND],
111-
parameters=[OpenApiParameter(name="totp", location=OpenApiParameter.QUERY, required=True)],
112110
responses={status.HTTP_204_NO_CONTENT: None},
113111
)
114112
@action(detail=True, methods=["post"], url_path=r"products/(?P<rel_id>[^/.]+)/refund")
@@ -125,8 +123,8 @@ def refund_product(
125123

126124
serializer = OrderProductRefundSerializer(
127125
instance=order_product_rel,
128-
data={"totp": request.query_params.get("totp")},
129-
context={"check_refundable_date": False},
126+
data={},
127+
context={"check_refundable_date": False, "check_totp": False},
130128
)
131129
serializer.is_valid(raise_exception=True)
132130
serializer.refund()

0 commit comments

Comments
 (0)