Merge pull request #80 from Y-Note-SAS/feature-36908

fix(invoice): add subject_type_filter and thirdparty_type_filter params

Author: zikani03

invoice/gql/invoice/query.py

@@ -17,7 +17,9 @@ class InvoiceQueryMixin:
         dateValidFrom__Gte=graphene.DateTime(),
         dateValidTo__Lte=graphene.DateTime(),
         applyDefaultValidityFilter=graphene.Boolean(),
-        client_mutation_id=graphene.String()
+        client_mutation_id=graphene.String(),
+        subject_type_filter=graphene.String(),
+        thirdparty_type_filter=graphene.String(),
     )
 
     def resolve_invoice(self, info, **kwargs):
@@ -29,11 +31,11 @@ def resolve_invoice(self, info, **kwargs):
         if client_mutation_id:
             filters.append(Q(mutations__mutation__client_mutation_id=client_mutation_id))
 
-        subject_type = kwargs.get("subject_type", None)
+        subject_type = kwargs.pop("subject_type_filter", None)
         if subject_type:
             filters.append(Q(subject_type__model=subject_type))
 
-        thirdparty_type = kwargs.get("thirdparty_type", None)
+        thirdparty_type = kwargs.pop("thirdparty_type_filter", None)
         if thirdparty_type:
             filters.append(Q(thirdparty_type__model=thirdparty_type))
 

invoice/tests/gql/invoice_schema.py

@@ -21,7 +21,11 @@ class InvoiceGQLTest(InvoiceGQLTestCase):
 
     search_for_invoice_query = F'''
 query {{ 
-	invoice(code_Iexact:"{DEFAULT_TEST_INVOICE_PAYLOAD['code']}"){{
+	invoice(
+        code_Iexact:"{DEFAULT_TEST_INVOICE_PAYLOAD['code']}",
+        subjectTypeFilter: "contract",
+        thirdpartyTypeFilter: "insuree"
+    ){{
     edges {{
       node {{
         isDeleted,
@@ -54,12 +58,11 @@ def test_mutation_invoice_generate_for_time_frame(self):
         mutation = self.create_invoice_mutation
         self.graph_client.execute(mutation, context=self.user_context.get_request())
         signal_receiver_mock.assert_called_once_with(**_expected_call_args)
-        pass
 
     def test_fetch_invoice_query(self):
         output = self.graph_client.execute(self.search_for_invoice_query, context=self.user_context.get_request())
-        expected = \
-            {'data': {
+        expected = {
+            'data': {
                 'invoice': {
                     'edges': [
                         {'node': {
@@ -71,7 +74,11 @@ def test_fetch_invoice_query(self):
                             'thirdpartyType': self.invoice.thirdparty_type.id,
                             'subjectId': F'{self.invoice.subject.id}',
                             'subjectType': self.invoice.subject_type.id
-        }}]}}}
+                        }}
+                    ]
+                }
+            }
+        }
 
         self.assertEqual(output, expected)
 
@@ -84,4 +91,4 @@ def setup_test_signal(self, receiver_mock):
             'invoice_creation_from_calculation',
             receiver_mock,
             bind_type=ServiceSignalBindType.AFTER
-        )
+        )