Merge pull request #6 from softwareone-platform/bugfix/MPT-9001/extension-fails-when-organization-was-created

MPT-9001 Extension fails when organization was created

Author: d3rky

ffc/client.py

@@ -106,7 +106,7 @@ def create_organization(
         return response.json()
 
     @wrap_http_error
-    def get_organization_by_external_id(self, agreement_id):
+    def get_organizations_by_external_id(self, agreement_id):
         headers = self._get_headers()
 
         rql_filter = f"eq(operations_external_id,{agreement_id})"
@@ -120,7 +120,7 @@ def get_organization_by_external_id(self, agreement_id):
 
         response.raise_for_status()
 
-        return response.json()["items"][0]
+        return response.json()["items"]
 
     def _get_headers(self):
         return {

ffc/flows/steps/finops.py

@@ -48,9 +48,10 @@ def __call__(self, client, context, next_step):
         order = context.order
         agreement_id = order["agreement"]["id"]
 
-        organization = ffc_client.get_organization_by_external_id(
+        organizations = ffc_client.get_organizations_by_external_id(
             agreement_id,
         )
+        organization = organizations and organizations[0]
         if not organization:
             organization = ffc_client.create_organization(
                 get_ordering_parameter(order, PARAM_ORGANIZATION_NAME)["value"],

tests/ffc/flows/steps/test_finops.py

@@ -80,7 +80,7 @@ def test_create_organization(
 ):
     mocked_ffc_client = mocker.MagicMock()
     mocked_ffc_client.create_organization.return_value = ffc_organization
-    mocked_ffc_client.get_organization_by_external_id.return_value = []
+    mocked_ffc_client.get_organizations_by_external_id.return_value = []
     mocker.patch(
         "ffc.flows.steps.finops.get_ffc_client", return_value=mocked_ffc_client
     )
@@ -120,7 +120,7 @@ def test_create_organization_exists(
     ffc_organization,
 ):
     mocked_ffc_client = mocker.MagicMock()
-    mocked_ffc_client.get_organization_by_external_id.return_value = ffc_organization
+    mocked_ffc_client.get_organizations_by_external_id.return_value = [ffc_organization]
     mocker.patch(
         "ffc.flows.steps.finops.get_ffc_client", return_value=mocked_ffc_client
     )
@@ -133,7 +133,7 @@ def test_create_organization_exists(
 
     assert ctx.organization == ffc_organization
     mocked_next_step.assert_called_once()
-    mocked_ffc_client.get_organization_by_external_id.assert_called_once_with(
+    mocked_ffc_client.get_organizations_by_external_id.assert_called_once_with(
         processing_purchase_order["agreement"]["id"],
     )
     mocked_ffc_client.create_organization.assert_not_called()

tests/ffc/flows/test_fulfillment.py

@@ -33,7 +33,7 @@ def test_purchase_order(
 
     mocked_ffc_client = mocker.MagicMock()
     mocked_ffc_client.get_employee.return_value = ffc_employee
-    mocked_ffc_client.get_organization_by_external_id.return_value = ffc_organization
+    mocked_ffc_client.get_organizations_by_external_id.return_value = [ffc_organization]
     mocker.patch(
         "ffc.flows.steps.finops.get_ffc_client", return_value=mocked_ffc_client
     )

tests/ffc/test_client.py

@@ -232,6 +232,6 @@ def test_get_organization(mocker, mock_jwt_encoder, ffc_client_settings):
     )
 
     client = get_ffc_client()
-    organization = client.get_organization_by_external_id(agreement_id)
+    organizations = client.get_organizations_by_external_id(agreement_id)
 
-    assert organization == {"id": "test-organization"}
+    assert organizations == [{"id": "test-organization"}]