diff --git a/order/serializers/order_retrieve_serializer.py b/order/serializers/order_retrieve_serializer.py index dec180d..fadf832 100644 --- a/order/serializers/order_retrieve_serializer.py +++ b/order/serializers/order_retrieve_serializer.py @@ -26,8 +26,7 @@ class OrderRetrieveSerializer(serializers.ModelSerializer): - service = ServiceRetrieveSerializer(read_only=True) - reformer = serializers.SerializerMethodField(read_only=True) + service_info = serializers.SerializerMethodField(read_only=True) materials = ServiceMaterialRetrieveSerializer(many=True, read_only=True) additional_options = ServiceOptionRetrieveSerializer(many=True, read_only=True) order_status = OrderStatusSerailzier(many=True, read_only=True) @@ -36,11 +35,8 @@ class OrderRetrieveSerializer(serializers.ModelSerializer): delivery_status = serializers.SerializerMethodField(read_only=True) images = OrderImageSerializer(source="order_image", many=True, read_only=True) - def get_reformer(self, obj): - reformer = obj.service.market.reformer - if reformer: - return ReformerProfileSerializer(reformer).data - return None + def get_service_info(self, obj): + return ServiceRetrieveSerializer(obj.service).data def get_orderer_information(self, obj): # 만약, 기본 사용자 정보가 아닌, 새로운 사용자 정보를 기입하여 주문한 경우는, User 정보가 아니라, OrdererInformation 정보를 반환 @@ -57,8 +53,7 @@ def get_delivery_status(self, obj): class Meta: model = Order fields = [ - "service", - "reformer", + "service_info", "order_uuid", "order_date", "orderer_information", diff --git a/order/tests.py b/order/tests.py index ba56df1..0315597 100644 --- a/order/tests.py +++ b/order/tests.py @@ -369,7 +369,7 @@ def test_get_order_list(self, _): # Then self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertIn("service", response.data[0]) + self.assertIn("service_info", response.data[0]) self.assertIn("order_uuid", response.data[0]) self.assertIn("order_date", response.data[0]) self.assertIn("orderer_information", response.data[0])