fix: Add invalid status response in case evse on connector add or upd…

…ate is nor exist
extrawest · Aug 31, 2023 · 5f488e2 · 5f488e2
1 parent 1a2daf2
commit 5f488e2
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/py_ocpi/modules/locations/v_2_1_1/api/emsp.py b/py_ocpi/modules/locations/v_2_1_1/api/emsp.py
@@ -255,36 +255,38 @@ async def add_or_update_connector(
         version=VersionNumber.v_2_1_1,
     )
     old_location = adapter.location_adapter(old_data)
+    new_location = copy.deepcopy(old_location)
 
-    is_new_connector = True
     for old_evse in old_location.evses:
         if old_evse.uid == evse_uid:
+            new_location.evses.remove(old_evse)
+            new_evse = copy.deepcopy(old_evse)
             for old_connector in old_evse.connectors:
                 if old_connector.id == connector_id:
-                    is_new_connector = False
+                    new_evse.connectors.remove(old_connector)
                     break
-    new_location = old_location
-    new_location.evses.remove(old_evse)
-    if not is_new_connector:
-        old_evse.connectors.remove(old_connector)
-    new_evse = old_evse
-    new_evse.connectors.append(connector)
-    new_location.evses.append(new_evse)
+            new_evse.connectors.append(connector)
+            new_location.evses.append(new_evse)
 
-    await crud.update(
-        ModuleID.locations,
-        RoleEnum.emsp,
-        new_location.dict(),
-        location_id,
-        auth_token=auth_token,
-        country_code=country_code,
-        party_id=party_id,
-        version=VersionNumber.v_2_1_1,
-    )
+            await crud.update(
+                ModuleID.locations,
+                RoleEnum.emsp,
+                new_location.dict(),
+                location_id,
+                auth_token=auth_token,
+                country_code=country_code,
+                party_id=party_id,
+                version=VersionNumber.v_2_1_1,
+            )
+
+            return OCPIResponse(
+                data=[connector.dict()],
+                **status.OCPI_1000_GENERIC_SUCESS_CODE,
+            )
 
     return OCPIResponse(
-        data=[connector.dict()],
-        **status.OCPI_1000_GENERIC_SUCESS_CODE,
+        data=[],
+        **status.OCPI_2001_INVALID_OR_MISSING_PARAMETERS,
     )