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

Pull request #38: RED-1810: improvement in test for undeleting dossier

Browse Source 
Merge in RED/persistence-service from RED-1810-ps1 to master

* commit '171cc1e298c10b992cfbae8ff4ba7434227c6b3c':
  RED-1810: improvement in test for undeleting dossier
This commit is contained in:
Ali Oezyetimoglu 2021-10-06 15:50:28 +02:00
commit ea336a3896
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ public class DossierPersistenceService {
public void undelete(String dossierId) {
dossierRepository.findById(dossierId).ifPresent(dossier -> {
if (dossier.getHardDeletedTime() != null) {
throw new BadRequestException("Cannot undelete a hard-dossier file!");
throw new BadRequestException("Cannot undelete a hard-deleted dossier!");
}
dossier.setStatus(DossierStatus.ACTIVE);
dossier.setSoftDeletedTime(null);

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

@ -251,7 +251,7 @@ public class FileStatusPersistenceService {
fileRepository.findById(fileId).ifPresentOrElse((file) -> {
if (file.getHardDeletedTime() != null) {
throw new BadRequestException("Cannot undelete a hard-dossier file!");
throw new BadRequestException("Cannot undelete a hard-deleted file!");
}
file.setStatus(statusBefore != null ? statusBefore : FileStatus.UNASSIGNED);
file.setDeleted(null);

13
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java
View File

@ -1,15 +1,19 @@
package com.iqser.red.service.peristence.v1.server.integration.tests;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Test;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.google.common.collect.Sets;
import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient;
import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
import org.junit.Test;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import static org.assertj.core.api.Assertions.assertThat;
import feign.FeignException;
public class DossierTest extends AbstractPersistenceServerServiceTest {
@ -58,5 +62,6 @@ public class DossierTest extends AbstractPersistenceServerServiceTest {
assertThat(dossierClient.getAllDossiers()).isEmpty();
assertThat(dossierClient.getSoftDeletedDossiers()).isEmpty();
assertThatThrownBy(() -> dossierClient.undeleteDossiers(Sets.newHashSet(dossier.getId()))).isInstanceOf(FeignException.class);
}
}