Merge branch 'feature/affinity-domain2.6' into develop

Author: vincenzo-ingenito

src/main/java/it/finanze/sanita/fse2/ms/iniclient/dto/JWTPayloadDTO.java

@@ -132,4 +132,12 @@ public static JWTPayloadDTO getMocked() {
 		out.setIss("MOCK-ISS#ABCDEF");
 		return out;
 	}
+
+	public String mergedSubjectIdVendorVersion(){
+		return String.join("^",
+				subject_application_id,
+				subject_application_vendor,
+				subject_application_version
+		);
+	}
 }

src/main/java/it/finanze/sanita/fse2/ms/iniclient/utility/create/DocumentEntryBuilderUtility.java

@@ -64,9 +64,8 @@ public static JAXBElement<ExtrinsicObjectType> buildExtrinsicObjectDocumentEntry
 	}
 
 	/**
-	 *
-	 * @param extrinsicObject
 	 * @param documentEntryDTO
+	 * @param jwtPayloadDTO
 	 */
 	private static List<SlotType1> buildExtrinsicObjectSlotsDocEntry(DocumentEntryDTO documentEntryDTO, JWTPayloadDTO jwtPayloadDTO) {
 		List<SlotType1> slotType1 = new ArrayList<>();
@@ -84,6 +83,7 @@ private static List<SlotType1> buildExtrinsicObjectSlotsDocEntry(DocumentEntryDT
 		slotType1.add(buildSlotObject("serviceStartTime", documentEntryDTO.getServiceStartTime()));
 		slotType1.add(buildSlotObject("serviceStopTime", documentEntryDTO.getServiceStopTime()));
 		slotType1.add(buildSlotObject("urn:ihe:iti:xds:2013:referenceIdList",null, documentEntryDTO.getReferenceIdList()));
+		slotType1.add(buildSlotObject("urn:ihe:iti:xds:2024:SubjectApplication", jwtPayloadDTO.mergedSubjectIdVendorVersion()));
 		return slotType1;
 	}
 

src/main/resources/application-dev.properties

@@ -26,7 +26,7 @@ ini.client.auth-cert.alias=
 ini.client.ds-cert.path=sign/S1#GTW-INI.p12
 ini.client.ds-cert.password=123456
 ini.client.ds-cert.alias=
-ini.client.mock-enable=false
+ini.client.mock-enable=true
 
 ####### LOGGING OUTPUT FORMAT ############
 # Must be one of console, json