From b9ab054a009eb22aacf97c445295a07f5f9b0887 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Sun, 21 Jul 2024 21:55:48 +0300 Subject: [PATCH] Fix oss backend --- .../apps/oss/serializers/data_access.py | 2 +- .../backend/apps/oss/tests/s_views/t_oss.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/rsconcept/backend/apps/oss/serializers/data_access.py b/rsconcept/backend/apps/oss/serializers/data_access.py index 2ebdaf6c..c187b0c3 100644 --- a/rsconcept/backend/apps/oss/serializers/data_access.py +++ b/rsconcept/backend/apps/oss/serializers/data_access.py @@ -42,7 +42,7 @@ class OperationCreateSerializer(serializers.Serializer): model = Operation fields = \ 'alias', 'operation_type', 'title', \ - 'comment', 'position_x', 'position_y' + 'comment', 'result', 'position_x', 'position_y' item_data = OperationData() arguments = PKField(many=True, queryset=Operation.objects.all(), required=False) diff --git a/rsconcept/backend/apps/oss/tests/s_views/t_oss.py b/rsconcept/backend/apps/oss/tests/s_views/t_oss.py index 21e60424..d28da570 100644 --- a/rsconcept/backend/apps/oss/tests/s_views/t_oss.py +++ b/rsconcept/backend/apps/oss/tests/s_views/t_oss.py @@ -158,6 +158,7 @@ class TestOssViewset(EndpointTester): self.assertEqual(new_operation['comment'], data['item_data']['comment']) self.assertEqual(new_operation['position_x'], data['item_data']['position_x']) self.assertEqual(new_operation['position_y'], data['item_data']['position_y']) + self.assertEqual(new_operation['result'], None) self.operation1.refresh_from_db() self.assertEqual(self.operation1.position_x, data['positions'][0]['position_x']) self.assertEqual(self.operation1.position_y, data['positions'][0]['position_y']) @@ -184,6 +185,23 @@ class TestOssViewset(EndpointTester): self.assertTrue(arguments.filter(operation__id=new_operation['id'], argument=self.operation1)) self.assertTrue(arguments.filter(operation__id=new_operation['id'], argument=self.operation3)) + @decl_endpoint('/api/oss/{item}/create-operation', method='post') + def test_create_operation_result(self): + self.populateData() + + data = { + 'item_data': { + 'alias': 'Test4', + 'operation_type': OperationType.INPUT, + 'result': self.ks1.item.pk + }, + 'positions': [], + } + response = self.executeCreated(data=data, item=self.owned_id) + self.owned.item.refresh_from_db() + new_operation = response.data['new_operation'] + self.assertEqual(new_operation['result'], self.ks1.item.pk) + @decl_endpoint('/api/oss/{item}/delete-operation', method='patch') def test_delete_operation(self):