Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K1J-166: Add sjf to pdf logs if active user session with sjf in IntegrationParameters. #1111

Merged
merged 1 commit into from
Sep 10, 2024
+243 −38
Merged

K1J-166: Add sjf to pdf logs if active user session with sjf in IntegrationParameters. #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions web/src/main/java/se/inera/intyg/webcert/web/csintegration/util/PDLLogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())
);
}

Expand All @@ -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();
}
}
4 changes: 1 addition & 3 deletions web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
5 changes: 0 additions & 5 deletions web/src/main/java/se/inera/intyg/webcert/web/service/log/factory/LogRequestFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading
Loading