K1J-165-1: All certificates from CS should be decorated with informat…

…ion from WC

web/src/main/java/se/inera/intyg/webcert/web/csintegration/certificate/ComplementCertificateFromCertificateService.java

@@ -44,6 +44,7 @@ public class ComplementCertificateFromCertificateService implements ComplementCe
     private final IntegratedUnitRegistryHelper integratedUnitRegistryHelper;
     private final PublishCertificateStatusUpdateService publishCertificateStatusUpdateService;
     private final PDLLogService pdlLogService;
+    private final DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
 
     @Override
     public Certificate complement(String certificateId, String message) {
@@ -68,6 +69,7 @@ public Certificate complement(String certificateId, String message) {
         );
 
         integratedUnitRegistryHelper.addUnitForCopy(certificateToComplement, certificate);
+        decorateCertificateFromCSWithInformationFromWC.decorate(certificate);
 
         log.debug("Complemented certificate '{}' from Certificate Service", certificateId);
         monitoringLogService.logIntygCopiedCompletion(
@@ -93,6 +95,7 @@ public Certificate answerComplement(String certificateId, String message) {
             certificateId,
             csIntegrationRequestFactory.answerComplementOnCertificateRequest(message)
         );
+        decorateCertificateFromCSWithInformationFromWC.decorate(certificate);
 
         monitoringLogService.logArendeCreated(
             certificate.getMetadata().getId(),

web/src/main/java/se/inera/intyg/webcert/web/csintegration/certificate/ForwardCertificateFromCertificateService.java

@@ -34,6 +34,7 @@ public class ForwardCertificateFromCertificateService implements ForwardCertific
 
     private final CSIntegrationService csIntegrationService;
     private final CSIntegrationRequestFactory csIntegrationRequestFactory;
+    private final DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
 
     @Override
     public Certificate forwardCertificate(String certificateId, boolean forwarded) {
@@ -48,6 +49,8 @@ public Certificate forwardCertificate(String certificateId, boolean forwarded) {
             certificateId, csIntegrationRequestFactory.forwardCertificateRequest()
         );
 
+        decorateCertificateFromCSWithInformationFromWC.decorate(certificate);
+
         log.debug("Forwarded certificate '{}' from Certificate Service", certificateId);
 
         return certificate;

web/src/main/java/se/inera/intyg/webcert/web/csintegration/certificate/ReadyForSignForCertificateService.java

@@ -38,6 +38,7 @@ public class ReadyForSignForCertificateService implements ReadyForSignFacadeServ
     private final CSIntegrationRequestFactory csIntegrationRequestFactory;
     private final PublishCertificateStatusUpdateService publishCertificateStatusUpdateService;
     private final MonitoringLogService monitoringLogService;
+    private final DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
 
     @Override
     public Certificate readyForSign(String certificateId) {
@@ -53,6 +54,8 @@ public Certificate readyForSign(String certificateId) {
             csIntegrationRequestFactory.readyForSignRequest()
         );
 
+        decorateCertificateFromCSWithInformationFromWC.decorate(certificate);
+
         publishCertificateStatusUpdateService.publish(certificate, HandelsekodEnum.KFSIGN);
         monitoringLogService.logUtkastMarkedAsReadyToSignNotificationSent(
             certificateId, certificate.getMetadata().getType()

web/src/main/java/se/inera/intyg/webcert/web/csintegration/certificate/RevokeCertificateFromCertificateService.java

@@ -41,6 +41,7 @@ public class RevokeCertificateFromCertificateService implements RevokeCertificat
     private final PDLLogService pdlLogService;
     private final MonitoringLogService monitoringLogService;
     private final PublishCertificateStatusUpdateService publishCertificateStatusUpdateService;
+    private final DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
 
     @Override
     public Certificate revokeCertificate(String certificateId, String reason, String message) {
@@ -60,6 +61,8 @@ public Certificate revokeCertificate(String certificateId, String reason, String
             throw new IllegalStateException("Received null when trying to revoke certificate from Certificate Service");
         }
 
+        decorateCertificateFromCSWithInformationFromWC.decorate(certificate);
+
         log.debug("Certificate with id '{}' was revoked using certificate service", certificateId);
         pdlLogService.logRevoke(certificate);
         monitorLog(certificate, reason, message);

web/src/test/java/se/inera/intyg/webcert/web/csintegration/certificate/ComplementCertificateFromCertificateServiceTest.java

@@ -100,6 +100,9 @@ class ComplementCertificateFromCertificateServiceTest {
     @Mock
     PublishCertificateStatusUpdateService publishCertificateStatusUpdateService;
 
+    @Mock
+    DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
+
     @InjectMocks
     ComplementCertificateFromCertificateService complementCertificateFromCertificateService;
 

web/src/test/java/se/inera/intyg/webcert/web/csintegration/certificate/ForwardCertificateFromCertificateServiceTest.java

@@ -55,6 +55,9 @@ class ForwardCertificateFromCertificateServiceTest {
     @Mock
     CSIntegrationRequestFactory csIntegrationRequestFactory;
 
+    @Mock
+    DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
+
 
     @InjectMocks
     ForwardCertificateFromCertificateService forwardCertificateFromCertificateService;

web/src/test/java/se/inera/intyg/webcert/web/csintegration/certificate/ReadyForSignForCertificateServiceTest.java

@@ -51,6 +51,8 @@ class ReadyForSignForCertificateServiceTest {
     PublishCertificateStatusUpdateService publishCertificateStatusUpdateService;
     @Mock
     MonitoringLogService monitoringLogService;
+    @Mock
+    DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
     @InjectMocks
     ReadyForSignForCertificateService readyForSignForCertificateService;
 
@@ -86,7 +88,7 @@ void shallPublishStatusUpdateForCertificate() {
 
         verify(publishCertificateStatusUpdateService, times(1)).publish(certificate, HandelsekodEnum.KFSIGN);
     }
-    
+
     @Test
     void shallMonitorLogUtkastMarkedAsSigned() {
         final var certificate = getCertificate();

web/src/test/java/se/inera/intyg/webcert/web/csintegration/certificate/RevokeCertificateFromCertificateServiceTest.java

@@ -69,6 +69,9 @@ class RevokeCertificateFromCertificateServiceTest {
     @Mock
     MonitoringLogService monitoringLogService;
 
+    @Mock
+    DecorateCertificateFromCSWithInformationFromWC decorateCertificateFromCSWithInformationFromWC;
+
     @InjectMocks
     RevokeCertificateFromCertificateService revokeCertificateFromCertificateService;
 
@@ -157,4 +160,4 @@ void shouldThrowExceptionIfReturnedCertificateIsNull() {
             assertThrows(IllegalStateException.class, () -> revokeCertificateFromCertificateService.revokeCertificate(ID, REASON, MESSAGE));
         }
     }
-}
+}