NRL-738 update model and add log for when skipping validation

Author: eesa456

api/producer/upsertDocumentReference/upsert_document_reference.py

@@ -109,7 +109,11 @@ def _get_document_ids_to_supersede(
         identifier = _validate_identifier(relates_to, idx)
         _validate_producer_id(identifier, metadata, idx)
         if can_ignore_delete_fail:
-            logger.log(LogReference.PROUPSERT006a, relatesTo=resource.relatesTo)
+            logger.log(
+                LogReference.PROUPSERT006a,
+                pointer_id=resource.id,
+                relatesTo=resource.relatesTo,
+            )
         else:
             existing_pointer = _check_existing_pointer(identifier, repository, idx)
             _validate_pointer_details(existing_pointer, core_model, identifier, idx)

layer/nrlf/producer/fhir/r4/model.py

@@ -385,7 +385,7 @@ class RequestQuerySubject(BaseModel):
 
 
 class RequestQueryType(BaseModel):
-    __root__: Annotated[str, Field(example=PointerTypes.MENTAL_HEALTH_PLAN)]
+    __root__: Annotated[str, Field(example=PointerTypes.MENTAL_HEALTH_PLAN.value)]
 
 
 class NextPageToken(BaseModel):

layer/nrlf/producer/fhir/r4/strict_model.py

@@ -331,7 +331,7 @@ class RequestQuerySubject(BaseModel):
 
 
 class RequestQueryType(BaseModel):
-    __root__: Annotated[StrictStr, Field(example=PointerTypes.MENTAL_HEALTH_PLAN)]
+    __root__: Annotated[StrictStr, Field(example=PointerTypes.MENTAL_HEALTH_PLAN.value)]
 
 
 class NextPageToken(BaseModel):