Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'new-audit' of https://gitlab.knecon.com/redactmanager/persistence-service into new-audit

Browse Source
This commit is contained in:
Hanelore.Ianoseck 2023-11-08 17:54:00 +02:00
commit aeb5d2c940
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java vendored
View File

@ -36,7 +36,7 @@
import static com.knecon.fforesight.auditor.model.Detail.d;
@Slf4j
@Slf4j
@RestController
@RequiredArgsConstructor
public class DictionaryController implements DictionaryResource {

2
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java vendored
View File

@ -143,8 +143,6 @@ public class DossierTemplateController implements DossierTemplateResource {
@RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest,
Auditor auditor) {
String userId = KeycloakSecurity.getUserId();
try {
DossierTemplateModel response = convert(dossierTemplateManagementService.cloneDossierTemplate(dossierTemplateId, cloneDossierTemplateRequest));

6
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java vendored
View File

@ -195,7 +195,7 @@ public class DownloadController implements DownloadResource {
TenantContext.setTenantId(tenantId);
var downloadStatus = getDownloadStatus(storageId, userId);
var fileDownloadStream = getFileForDownload(storageId, userId, auditor);
var fileDownloadStream = getFileForDownload(storageId, auditor);
return getResponseEntity(inline, fileDownloadStream, downloadStatus.getFilename(), MediaType.parseMediaType("application/zip"), downloadStatus.getFileSize());
});
@ -211,7 +211,7 @@ public class DownloadController implements DownloadResource {
}
private InputStreamResource getFileForDownload(String storageId, String userId, Auditor auditor) {
private InputStreamResource getFileForDownload(String storageId, Auditor auditor) {
try {
var response = storageService.getObject(TenantContext.getTenantId(), storageId);
@ -259,7 +259,7 @@ public class DownloadController implements DownloadResource {
log.debug("downloadFileUsingOTT {}", oneTimeToken);
var token = oneTimeTokenDownloadService.getToken(oneTimeToken);
var downloadStatus = getDownloadStatus(token.getStorageId(), token.getUserId());
var fileDownloadStream = getFileForDownload(token.getStorageId(), token.getUserId(), auditor);
var fileDownloadStream = getFileForDownload(token.getStorageId(), auditor);
TenantContext.clear();

3
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java vendored
View File

@ -64,9 +64,6 @@ public class RSSController implements RSSResource {
@PreAuthorize("hasAuthority('" + GET_RSS + "')")
public void addOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody ComponentsOverrides componentsOverrides, Auditor auditor) {
var rssReport = rssReportClient.getDetailedRSS(dossierId, fileId);
var components = rssReport.getFiles().get(0).getResult();
componentOverrideService.addOverrides(dossierId, fileId, componentsOverrides);
componentsOverrides.getComponentOverrides()

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationEmailService.java
View File

@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@RequiredArgsConstructor
@SuppressWarnings("PMD")
public class NotificationEmailService {
public void sendNotificationEmail(String userId, EmailNotificationType emailNotificationType, List<NotificationEntity> notifications) {
@ -32,21 +31,21 @@ public class NotificationEmailService {
private void sendDailyEmail(String userId, List<NotificationEntity> notifications) {
log.info("Should send daily notification email for {}", userId);
log.info("Should send daily notification emails {} for {}", notifications, userId);
// TODO
}
private void sendDailySummaryEmail(String userId, List<NotificationEntity> notifications) {
log.info("Should send daily notification summary email for {}", userId);
log.info("Should send daily notification summary email {} for {}", notifications, userId);
// TODO
}
private void sendWeeklySummaryEmail(String userId, List<NotificationEntity> notifications) {
log.info("Should send weekly notification summary email for {}", userId);
log.info("Should send weekly notification summary email {} for {}", notifications, userId);
// TODO
}