Start moving forced-id inline to ResourceTable

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_3_0/4260-inline-forcedid.yaml

@@ -0,0 +1,5 @@
+---
+type: change
+issue: 4260
+title: "Client assigned resource ids are now stored in a new FORCED_ID column in HFR_RESOURCE.
+   This is parallel storage to allow gradual upgrade away from the current HFJ_FORCED_ID join table."

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

@@ -320,6 +320,7 @@ private DaoMethodOutcome doCreateForPostOrPut(T theResource, String theIfNoneExi
 		String resourceIdBeforeStorage = theResource.getIdElement().getIdPart();
 		boolean resourceHadIdBeforeStorage = isNotBlank(resourceIdBeforeStorage);
 		boolean resourceIdWasServerAssigned = theResource.getUserData(JpaConstants.RESOURCE_ID_SERVER_ASSIGNED) == Boolean.TRUE;
+		entity.setForcedIdValue(resourceIdBeforeStorage);
 
 		HookParams hookParams;
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java

@@ -86,6 +86,20 @@ public HapiFhirJpaMigrationTasks(Set<String> theFlags) {
 		init600(); // 20211102 -
 		init610();
 		init620();
+		init630();
+	}
+
+	private void init630() {
+		Builder version = forVersion(VersionEnum.V6_3_0);
+
+		// start forced_id inline migration
+		version
+			.onTable("HFJ_RESOURCE")
+			.addColumn("20221108.1", "FORCED_ID")
+			.nullable()
+			// FHIR ids are ascii subset, limited to 64 chars.
+			.type(ColumnTypeEnum.STRING, 64);
+
 	}
 
 	private void init620() {

hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java

@@ -277,6 +277,9 @@ public class ResourceTable extends BaseHasResource implements Serializable, IBas
 	@Column(name = "RES_VER")
 	private long myVersion;
 
+	@Column(name= "FORCED_ID", length = 64)
+	private String myForcedIdValue;
+
 	@OneToMany(mappedBy = "myResourceTable", fetch = FetchType.LAZY)
 	private Collection<ResourceHistoryProvenanceEntity> myProvenance;
 
@@ -782,4 +785,12 @@ public Collection<SearchParamPresentEntity> getSearchParamPresents() {
 		}
 		return mySearchParamPresents;
 	}
+
+	public String getForcedIdValue() {
+		return myForcedIdValue;
+	}
+
+	public void setForcedIdValue(String theForcedIdValue) {
+		myForcedIdValue = theForcedIdValue;
+	}
 }

hapi-fhir-jpaserver-test-dstu3/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java

@@ -6,7 +6,9 @@
 import ca.uhn.fhir.jpa.api.model.HistoryCountModeEnum;
 import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao;
 import ca.uhn.fhir.jpa.dao.DaoTestUtils;
+import ca.uhn.fhir.jpa.dao.data.IForcedIdDao;
 import ca.uhn.fhir.jpa.model.entity.ResourceIndexedSearchParamString;
+import ca.uhn.fhir.jpa.model.entity.ResourceTable;
 import ca.uhn.fhir.jpa.model.entity.TagTypeEnum;
 import ca.uhn.fhir.jpa.searchparam.SearchParamConstants;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
@@ -544,6 +546,29 @@ public void testCreateDifferentTypesWithSameForcedId() {
 		obs = myObservationDao.read(obsId.toUnqualifiedVersionless(), mySrd);
 	}
 
+	/**
+	 * fixme changelog
+	 * fixme migration
+	 * We are starting a migration to inline forced_id into RESOURCE_TABLE.
+	 * Verify we are populating the new field AND the old join table for a couple of releases to allow smooth upgrades.
+	 */
+	@Test
+	public void testCreateResourceWithForcedId_populatesResourceTableFieldAndJoinTable() {
+		String idName = "forcedId";
+
+		Patient pat = new Patient();
+		pat.setId(idName);
+		IIdType patId = myPatientDao.update(pat, mySrd).getId();
+		assertEquals("Patient/" + idName, patId.toUnqualifiedVersionless().getValue());
+
+		ResourceTable readBackResource = myEntityManager
+			.createQuery("select rt from ResourceTable rt where rt.myForcedId.myForcedId = 'forcedId'", ResourceTable.class)
+			.getSingleResult();
+
+		assertEquals(idName, readBackResource.getForcedId().getForcedId(), "legacy join populated");
+		assertEquals(idName, readBackResource.getForcedIdValue(), "inline field poplulated");
+	}
+
 	@Test
 	public void testCreateDuplicateTagsDoesNotCauseDuplicates() {
 		Patient p = new Patient();