K1J-166: Add sjf to pdf logs if active user session with IntegrationP…

…arameters. (#1111)
sklintyg · Sep 10, 2024 · ebb7fbb · ebb7fbb
1 parent 391db9d
commit ebb7fbb
Show file tree

Hide file tree

Showing 5 changed files with 243 additions and 38 deletions.
diff --git a/web/src/main/java/se/inera/intyg/webcert/web/csintegration/util/PDLLogService.java b/web/src/main/java/se/inera/intyg/webcert/web/csintegration/util/PDLLogService.java
@@ -39,13 +39,13 @@ public class PDLLogService {
 
     public void logCreated(Certificate certificate) {
         logService.logCreateIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logCreatedWithIntygUser(Certificate certificate, IntygUser user) {
         logService.logCreateIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate),
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf()),
             new LogUser.Builder(user.getHsaId(), user.getValdVardenhet().getId(), user.getValdVardgivare().getId())
                 .userName(user.getNamn())
                 .userAssignment(user.getSelectedMedarbetarUppdragNamn())
@@ -58,58 +58,58 @@ public void logCreatedWithIntygUser(Certificate certificate, IntygUser user) {
 
     public void logRead(Certificate certificate) {
         logService.logReadIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logSaved(Certificate certificate) {
         logService.logUpdateIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logDeleted(Certificate certificate) {
         logService.logDeleteIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logSign(Certificate certificate) {
         logService.logSignIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logPrinted(Certificate certificate) {
         final var status = certificate.getMetadata().getStatus();
         if (status == CertificateStatus.UNSIGNED || status == CertificateStatus.LOCKED) {
             logService.logPrintIntygAsDraft(
-                logRequestFactory.createLogRequestFromCertificate(certificate)
+                logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
             );
         }
 
         if (status == CertificateStatus.REVOKED) {
             logService.logPrintRevokedIntygAsPDF(
-                logRequestFactory.createLogRequestFromCertificate(certificate)
+                logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
             );
         }
 
         if (status == CertificateStatus.SIGNED) {
             logService.logPrintIntygAsPDF(
-                logRequestFactory.createLogRequestFromCertificate(certificate)
+                logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
             );
         }
     }
 
     public void logSent(Certificate certificate) {
         logService.logSendIntygToRecipient(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
     public void logRevoke(Certificate certificate) {
         logService.logRevokeIntyg(
-            logRequestFactory.createLogRequestFromCertificate(certificate)
+            logRequestFactory.createLogRequestFromCertificate(certificate, sjf())
         );
     }
 
@@ -120,4 +120,12 @@ public void logCreateMessage(String personId, String certificateId) {
             certificateId
         );
     }
+
+    private boolean sjf() {
+        final var user = webCertUserService.getUser();
+        if (user == null) {
+            return false;
+        }
+        return user.getParameters() != null && user.getParameters().isSjf();
+    }
 }
diff --git a/web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactory.java b/web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactory.java
@@ -39,8 +39,6 @@ public interface LogRequestFactory {
     LogRequest createLogRequestFromUser(WebCertUser user, String patientId);
 
     LogRequest createLogRequestFromUser(WebCertUser user, String patientId, String intygsId);
-
-    LogRequest createLogRequestFromCertificate(Certificate certificate);
-
+
     LogRequest createLogRequestFromCertificate(Certificate certificate, boolean sjf);
 }
diff --git a/web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactoryImpl.java b/web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactoryImpl.java
@@ -118,11 +118,6 @@ public LogRequest createLogRequestFromUser(WebCertUser user, String patientId, S
         return logRequest.build();
     }
 
-    @Override
-    public LogRequest createLogRequestFromCertificate(Certificate certificate) {
-        return createLogRequestFromCertificate(certificate, false);
-    }
-
     @Override
     public LogRequest createLogRequestFromCertificate(Certificate certificate, boolean sjf) {
         final var personId = certificate.getMetadata().getPatient().getPersonId().getId();