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

RED-6467: Removed debugging code

Browse Source
This commit is contained in:
Viktor Seifert 2023-04-20 15:13:58 +02:00
parent d7fa9e12ca
commit d4656dc15e
2 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,6 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
import com.iqser.red.service.persistence.management.v1.processor.settings.FileManagementServiceSettings; import com.iqser.red.service.persistence.management.v1.processor.settings.FileManagementServiceSettings;
import com.iqser.red.service.persistence.management.v1.processor.utils.FileUtils; import com.iqser.red.service.persistence.management.v1.processor.utils.FileUtils;
import com.iqser.red.service.persistence.management.v1.processor.utils.TransactionDebugPrinter;
import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext; import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext;
import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkModel;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
@ -112,12 +111,8 @@ public class DossierTemplateImportService {
@Transactional @Transactional
public String importDossierTemplate(ImportDossierTemplateRequest request) { public String importDossierTemplate(ImportDossierTemplateRequest request) {
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Starting dossier template import");
ImportTemplateResult archiveResult = this.handleArchive(request); ImportTemplateResult archiveResult = this.handleArchive(request);
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Extracted dossier template archive");
return this.importDossierTemplate(archiveResult); return this.importDossierTemplate(archiveResult);
} }
@ -302,27 +297,20 @@ public class DossierTemplateImportService {
} }
if (existingDossierTemplate != null) { if (existingDossierTemplate != null) {
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Existing dossier found, importing into it");
dossierTemplateId = existingDossierTemplate.getId(); dossierTemplateId = existingDossierTemplate.getId();
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Updating dossier template entity");
// override the existing dossier template // override the existing dossier template
updateDossierTemplateMeta(existingDossierTemplate, dossierTemplateMeta, request.getUserId()); updateDossierTemplateMeta(existingDossierTemplate, dossierTemplateMeta, request.getUserId());
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing rules");
// set rules // set rules
rulesPersistenceService.setRules(request.getRuleSet(), dossierTemplateId); rulesPersistenceService.setRules(request.getRuleSet(), dossierTemplateId);
existingDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(existingDossierTemplate) existingDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(existingDossierTemplate)
.name())); .name()));
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing colors");
// set colors // set colors
this.setColors(dossierTemplateId, request.getColors()); this.setColors(dossierTemplateId, request.getColors());
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing watermarks");
// set watermarks // set watermarks
if (CollectionUtils.isNotEmpty(request.getWatermarks())) { if (CollectionUtils.isNotEmpty(request.getWatermarks())) {
Set<String> toSetWatermarks = request.getWatermarks().stream().map(WatermarkModel::getName).filter(Objects::nonNull).collect(Collectors.toSet()); Set<String> toSetWatermarks = request.getWatermarks().stream().map(WatermarkModel::getName).filter(Objects::nonNull).collect(Collectors.toSet());
@ -344,8 +332,6 @@ public class DossierTemplateImportService {
configsToRemove.forEach(watermark -> watermarkService.deleteWatermark(watermark.getId())); configsToRemove.forEach(watermark -> watermarkService.deleteWatermark(watermark.getId()));
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing dossier status");
// dossier status // dossier status
if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) { if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) {
this.updateDossierStates(request, dossierTemplateId); this.updateDossierStates(request, dossierTemplateId);
@ -354,8 +340,6 @@ public class DossierTemplateImportService {
currentStates.forEach(state -> dossierStatusPersistenceService.deleteDossierStatus(state.getId(), null)); currentStates.forEach(state -> dossierStatusPersistenceService.deleteDossierStatus(state.getId(), null));
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing dossier attributes");
// update dossier attributes // update dossier attributes
if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) { if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) {
this.updateDossierAttributes(request, dossierTemplateId); this.updateDossierAttributes(request, dossierTemplateId);
@ -364,8 +348,6 @@ public class DossierTemplateImportService {
currentConfigs.forEach(da -> dossierAttributeConfigPersistenceService.deleteDossierAttribute(da.getId())); currentConfigs.forEach(da -> dossierAttributeConfigPersistenceService.deleteDossierAttribute(da.getId()));
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing file attributes");
//update file attributes //update file attributes
if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) { if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) {
this.updateFileAttributes(request, dossierTemplateId); this.updateFileAttributes(request, dossierTemplateId);
@ -374,8 +356,6 @@ public class DossierTemplateImportService {
currentConfigs.forEach(fa -> fileAttributeConfigPersistenceService.deleteFileAttribute(fa.getId())); currentConfigs.forEach(fa -> fileAttributeConfigPersistenceService.deleteFileAttribute(fa.getId()));
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing types");
// update the types // update the types
if (CollectionUtils.isNotEmpty(request.getTypes())) { if (CollectionUtils.isNotEmpty(request.getTypes())) {
this.updateTypes(request, dossierTemplateId); this.updateTypes(request, dossierTemplateId);
@ -388,8 +368,6 @@ public class DossierTemplateImportService {
this.deleteTypes(currentTypes, new HashSet<>()); this.deleteTypes(currentTypes, new HashSet<>());
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing report templates");
//set report templates //set report templates
var existingReports = reportTemplatePersistenceService.findByDossierTemplateId(dossierTemplateId); var existingReports = reportTemplatePersistenceService.findByDossierTemplateId(dossierTemplateId);
@ -402,8 +380,6 @@ public class DossierTemplateImportService {
}); });
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Delete reports");
// delete the reports that were not in the import // delete the reports that were not in the import
existingReports.forEach(r -> { existingReports.forEach(r -> {
String storageId = r.getStorageId(); String storageId = r.getStorageId();
@ -413,8 +389,6 @@ public class DossierTemplateImportService {
} }
}); });
TransactionDebugPrinter.printTransactionRollbackStatus(log, "Importing legal basis");
// set legal basis // set legal basis
if (CollectionUtils.isNotEmpty(request.getLegalBases())) { if (CollectionUtils.isNotEmpty(request.getLegalBases())) {
legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases()); legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases());
@ -427,7 +401,6 @@ public class DossierTemplateImportService {
} }
} else { } else {
TransactionDebugPrinter.printTransactionRollbackStatus(log, "No existing dossier found, importing into new dossier");
// creates new dossier template // creates new dossier template
if (StringUtils.isEmpty(dossierTemplateMeta.getName())) { if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
throw new ConflictException("DossierTemplate name must be set"); throw new ConflictException("DossierTemplate name must be set");
@ -548,13 +521,9 @@ public class DossierTemplateImportService {
private void updateDossierTemplateMeta(DossierTemplateEntity dossierTemplateEntity, DossierTemplate dossierTemplate, String userId) { private void updateDossierTemplateMeta(DossierTemplateEntity dossierTemplateEntity, DossierTemplate dossierTemplate, String userId) {
if (!dossierTemplateEntity.getName().equalsIgnoreCase(dossierTemplate.getName())) { if (!dossierTemplateEntity.getName().equalsIgnoreCase(dossierTemplate.getName())) {
TransactionDebugPrinter.printTransactionRollbackStatus(log, "validating dossier template name");
this.validateDossierTemplateName(dossierTemplate); this.validateDossierTemplateName(dossierTemplate);
} }
TransactionDebugPrinter.printTransactionRollbackStatus(log, "template name validated, updating other properties");
OffsetDateTime now = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS); OffsetDateTime now = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
dossierTemplateEntity.setName(dossierTemplate.getName()); dossierTemplateEntity.setName(dossierTemplate.getName());
dossierTemplateEntity.setDescription(dossierTemplate.getDescription()); dossierTemplateEntity.setDescription(dossierTemplate.getDescription());

21
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/TransactionDebugPrinter.java
View File

@ -1,21 +0,0 @@
package com.iqser.red.service.persistence.management.v1.processor.utils;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import lombok.experimental.UtilityClass;
@UtilityClass
public class TransactionDebugPrinter {
public void printTransactionRollbackStatus(org.slf4j.Logger log, String message) {
if (TransactionSynchronizationManager.isActualTransactionActive()) {
TransactionStatus status = TransactionAspectSupport.currentTransactionStatus();
log.info(message + " -- transaction isRollbackOnly {}", status.isRollbackOnly());
}
}
}