#413: Properly populate PurposeOfUse attribute in audit records of so…

…me HL7v3-based transactions
oehf · May 9, 2023 · 27b98c6 · 27b98c6
1 parent b639ff5
commit 27b98c6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/...src/main/java/org/openehealth/ipf/commons/ihe/core/atna/event/IHEAuditMessageBuilder.java b/...src/main/java/org/openehealth/ipf/commons/ihe/core/atna/event/IHEAuditMessageBuilder.java
@@ -157,10 +157,10 @@ public List<TypeValuePairType> dicomDetails(String repositoryId,
         return details(DOCUMENT_UNIQUE_ID, documentInstanceId, seriesInstanceId, repositoryId, homeCommunityId, isXcaHomeCommunityId);
     }
 
-    private List<TypeValuePairType> details(String insranceKey, String instanceId, String seriesInstanceId, String repositoryId, String homeCommunityId, boolean xcaHomeCommunityId) {
+    private List<TypeValuePairType> details(String instanceKey, String instanceId, String seriesInstanceId, String repositoryId, String homeCommunityId, boolean xcaHomeCommunityId) {
         var tvp = new ArrayList<TypeValuePairType>(0);
         if (instanceId != null) {
-            tvp.add(getTypeValuePair(insranceKey, instanceId));
+            tvp.add(getTypeValuePair(instanceKey, instanceId));
         }
         if (seriesInstanceId != null) {
             tvp.add(getTypeValuePair(SERIES_INSTANCE_UNIQUE_ID, seriesInstanceId));

diff --git a/...7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/iti55/Iti55AuditStrategy.groovy b/...7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/iti55/Iti55AuditStrategy.groovy
@@ -54,7 +54,7 @@ class Iti55AuditStrategy extends Iti47AuditStrategy {
 
     @Override
     AuditMessage[] makeAuditMessage(AuditContext auditContext, Hl7v3AuditDataset auditDataset) {
-        QueryInformationBuilder builder = new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.CrossGatewayPatientDiscovery)
+        QueryInformationBuilder builder = new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.CrossGatewayPatientDiscovery, auditDataset.getPurposesOfUse())
         // No patient identifiers are included for the Initiating Gateway
         if (isServerSide()) {
             builder.addPatients(auditDataset.patientIds)

diff --git a/...7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/iti56/Iti56AuditStrategy.groovy b/...7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/iti56/Iti56AuditStrategy.groovy
@@ -71,7 +71,7 @@ class Iti56AuditStrategy extends Hl7v3AuditStrategy {
 
     @Override
     AuditMessage[] makeAuditMessage(AuditContext auditContext, Hl7v3AuditDataset auditDataset) {
-        new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.PatientLocationQuery)
+        new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.PatientLocationQuery, auditDataset.getPurposesOfUse())
                 .addPatients(auditDataset.patientIds)
                 .setQueryParameters("PatientLocationQueryRequest", PatientLocationQuery, auditDataset.requestPayload)
                 .getMessages()

diff --git a/...hl7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/pcc1/Pcc1AuditStrategy.groovy b/...hl7v3/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v3/pcc1/Pcc1AuditStrategy.groovy
@@ -58,7 +58,7 @@ class Pcc1AuditStrategy extends Hl7v3AuditStrategy {
 
     @Override
     AuditMessage[] makeAuditMessage(AuditContext auditContext, Hl7v3AuditDataset auditDataset) {
-        new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.QueryExistingData)
+        new QueryInformationBuilder<>(auditContext, auditDataset, Hl7v3EventTypeCode.QueryExistingData, auditDataset.getPurposesOfUse())
                 .setQueryParameters(auditDataset.messageId, QueryExistingData, auditDataset.requestPayload)
                 .addPatients(auditDataset.patientIds)
                 .getMessages()

diff --git a/src/site/changes.xml b/src/site/changes.xml
@@ -23,6 +23,11 @@
         <author email="christian.ohr@gmail.com">Christian Ohr</author>
     </properties>
     <body>
+        <release version="tbd" description="IPF tbd" date="tbd">
+            <action issue="413" dev="zortx233" type="fix">
+                Properly populate PurposeOfUse attribute in audit records of some HL7v3-based transactions
+            </action>
+        </release>
         <release version="4.6.0" description="IPF 4.6.0" date="21 Apr 2023">
             <action issue="412" dev="ohr" type="fix">
                 Don't log in HL7v3 continuation webservice when returning zero results