NRL-791 fix tests

Author: eesa456

api/producer/createDocumentReference/create_document_reference.py

@@ -135,7 +135,7 @@ def _validate_producer_id(identifier, metadata, idx):
     Validate that there is an ODS code in the relatesTo target identifier
     """
     producer_id = identifier.split("-", 1)[0]
-    if metadata.ods_code != tuple(producer_id.split("|")):
+    if metadata.ods_code != producer_id:
         logger.log(
             LogReference.PROCREATE007b,
             related_identifier=identifier,
@@ -226,8 +226,7 @@ def handler(
     logger.log(LogReference.PROCREATE000)
     logger.log(LogReference.PROCREATE001, resource=body)
 
-    id_prefix = f"|{metadata.ods_code}"
-    body.id = f"{id_prefix}-{uuid4()}"
+    body.id = f"{metadata.ods_code}-{uuid4()}"
 
     validator = DocumentReferenceValidator()
     result = validator.validate(body)

api/producer/deleteDocumentReference/delete_document_reference.py

@@ -28,7 +28,7 @@ def handler(
     pointer_id = urllib.parse.unquote(path.id)
     producer_id, _ = pointer_id.split("-", 1)
 
-    if metadata.ods_code != tuple(producer_id.split(".")):
+    if metadata.ods_code != producer_id:
         logger.log(
             LogReference.PRODELETE001,
             ods_code=metadata.ods_code,

api/producer/readDocumentReference/read_document_reference.py

@@ -38,7 +38,7 @@ def handler(
     parsed_id = urllib.parse.unquote(path.id)
 
     producer_id = parsed_id.split("-", maxsplit=1)[0]
-    if metadata.ods_code != tuple(producer_id.split(".")):
+    if metadata.ods_code != producer_id:
         logger.log(
             LogReference.PROREAD001,
             ods_code=metadata.ods_code,

api/producer/updateDocumentReference/tests/test_update_document_reference.py

@@ -30,7 +30,6 @@ def test_update_document_reference_happy_path(repository: DocumentPointerReposit
 
     existing_doc_pointer = repository.get_by_id("Y05868-99999-99999-999999")
     assert existing_doc_pointer is not None
-
     existing_doc_ref = DocumentReference.model_validate_json(
         existing_doc_pointer.document
     )

api/producer/updateDocumentReference/update_document_reference.py

@@ -61,7 +61,7 @@ def handler(
 
     core_model = DocumentPointer.from_document_reference(document_reference)
 
-    if metadata.ods_code != tuple(core_model.producer_id.split("|")):
+    if metadata.ods_code != core_model.producer_id:
         logger.log(
             LogReference.PROUPDATE004,
             metadata_ods_code=metadata.ods_code,

api/producer/upsertDocumentReference/upsert_document_reference.py

@@ -138,7 +138,7 @@ def _validate_producer_id(identifier, metadata, idx):
     Validate that there is an ODS code in the relatesTo target identifier
     """
     producer_id = identifier.split("-", 1)[0]
-    if metadata.ods_code != tuple(producer_id.split("|")):
+    if metadata.ods_code != producer_id:
         logger.log(
             LogReference.PROUPSERT007b,
             related_identifier=identifier,
@@ -230,7 +230,7 @@ def handler(
 
     core_model = _create_core_model(result.resource, metadata)
 
-    if metadata.ods_code != tuple(core_model.producer_id.split("|")):
+    if metadata.ods_code != core_model.producer_id:
         logger.log(
             LogReference.PROUPSERT003,
             ods_code=metadata.ods_code,

layer/nrlf/core/tests/test_model.py

@@ -31,7 +31,6 @@ def test_connection_metadata():
     assert metadata.nrl_app_id == "test-nrl"
     assert metadata.client_rp_details.developer_app_name == "test"
     assert metadata.client_rp_details.developer_app_id == "test"
-    assert metadata.ods_code_parts == ("test", "test")
 
 
 def test_producer_request_params():