cherry-picked mr 5868

Author: kateryna-mironova

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/5867-golden-resource-tags-being-overwritten.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 5867
+backport: 6.8.8
+title: "Previously, when adding multiple resources and defining a golden resource using MDM, the golden resource's tags were removed. This has been fixed"

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java

@@ -2,7 +2,7 @@
  * #%L
  * HAPI FHIR JPA Server
  * %%
- * Copyright (C) 2014 - 2023 Smile CDR, Inc.
+ * Copyright (C) 2014 - 2024 Smile CDR, Inc.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.i18n.Msg;
+import ca.uhn.fhir.interceptor.model.RequestPartitionId;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.api.dao.IDao;
 import ca.uhn.fhir.jpa.dao.data.IResourceHistoryTableDao;
@@ -55,6 +56,7 @@
 import ca.uhn.fhir.parser.LenientErrorHandler;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.MetaUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
@@ -241,7 +243,7 @@ private <R extends IBaseResource> void populateResourcePartitionInformation(
 						myPartitionLookupSvc.getPartitionById(partitionId.getPartitionId());
 				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, persistedPartition.toRequestPartitionId());
 			} else {
-				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, null);
+				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, RequestPartitionId.defaultPartition());
 			}
 		}
 	}
@@ -394,11 +396,14 @@ private <R extends IResource> R populateResourceMetadataHapi(
 							secLabel.setSystem(nextTag.getSystem());
 							secLabel.setCode(nextTag.getCode());
 							secLabel.setDisplay(nextTag.getDisplay());
-							// wipmb these technically support userSelected and version
+							secLabel.setVersion(nextTag.getVersion());
+							Boolean userSelected = nextTag.getUserSelected();
+							if (userSelected != null) {
+								secLabel.setUserSelected(userSelected);
+							}
 							securityLabels.add(secLabel);
 							break;
 						case TAG:
-							// wipmb check xml, etc.
 							Tag e = new Tag(nextTag.getSystem(), nextTag.getCode(), nextTag.getDisplay());
 							e.setVersion(nextTag.getVersion());
 							// careful! These are Boolean, not boolean.
@@ -459,7 +464,7 @@ private <R extends IBaseResource> R populateResourceMetadataRi(
 		res.getMeta().setLastUpdated(theEntity.getUpdatedDate());
 		IDao.RESOURCE_PID.put(res, theEntity.getResourceId());
 
-		if (theTagList != null) {
+		if (CollectionUtils.isNotEmpty(theTagList)) {
 			res.getMeta().getTag().clear();
 			res.getMeta().getProfile().clear();
 			res.getMeta().getSecurity().clear();

hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParserTest.java

@@ -0,0 +1,56 @@
+package ca.uhn.fhir.jpa.dao;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.jpa.entity.ResourceSearchView;
+import ca.uhn.fhir.jpa.model.entity.BaseTag;
+import ca.uhn.fhir.jpa.model.entity.ResourceTable;
+import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.rest.api.Constants;
+import org.hl7.fhir.r4.hapi.ctx.FhirR4;
+import org.hl7.fhir.r4.model.Coding;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(MockitoExtension.class)
+public class JpaStorageResourceParserTest {
+
+    @Mock
+    private FhirContext myFhirContext;
+
+    @Mock
+    private ResourceSearchView patientSearchView;
+    @InjectMocks
+    private final JpaStorageResourceParser jpaStorageResourceParser = new JpaStorageResourceParser();
+
+   @Test
+    public void testPopulateResourceMeta_doesNotRemoveTags_whenTagListIsEmpty() {
+       Mockito.when(myFhirContext.getVersion()).thenReturn(new FhirR4());
+       Mockito.when(patientSearchView.getIdDt()).thenReturn(new IdDt("Patient/test-patient/_history/1"));
+
+       Coding coding = new Coding("system", "code", "display");
+       List<BaseTag> tagList = Collections.emptyList();
+       boolean forHistoryOperation = false;
+       long version = 1L;
+       Patient resourceTarget = new Patient();
+       resourceTarget.getMeta().addTag(coding);
+
+       Patient actualResult = jpaStorageResourceParser
+               .populateResourceMetadata(patientSearchView, forHistoryOperation, tagList, version, resourceTarget);
+
+       List<Coding> actualTagList = actualResult.getMeta().getTag();
+       assertFalse(actualTagList.isEmpty());
+       assertEquals(actualTagList.size(), 1);
+       assertTrue(actualTagList.get(0).equals(coding));
+    }
+}