Pull request #483: RED-4622: Formatted and organized imports
Merge in RED/persistence-service from RED-4622 to master * commit '608192c6f0b60106186b17a43a58977f922f162f': RED-4622: Formatted and organized imports
This commit is contained in:
Ali Oezyetimoglu
Philipp Schramm
commit
6e77da5d64
@ -27,4 +27,5 @@ public class ResizeRedactionRequest {
|
||||
|
||||
private String textBefore;
|
||||
private String textAfter;
|
||||
|
||||
}
|
||||
|
||||
@ -1,12 +1,32 @@
|
||||
package com.iqser.red.service.persistence.service.v1.api.resources;
|
||||
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseStatus;
|
||||
|
||||
import java.util.List;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualAddResponse;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.UpdateRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
|
||||
|
||||
@ResponseStatus(value = HttpStatus.OK)
|
||||
public interface ManualRedactionResource {
|
||||
@ -30,67 +50,57 @@ public interface ManualRedactionResource {
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<AddRedactionRequest> addRedactionRequests);
|
||||
@RequestBody List<AddRedactionRequest> addRedactionRequests);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<RemoveRedactionRequest> removeRedactionRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ForceRedactionRequest> forceRedactionRequests);
|
||||
List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ForceRedactionRequest> forceRedactionRequests);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests);
|
||||
List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests);
|
||||
List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/comment" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
Comment addComment(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId, @RequestBody CommentRequest comment);
|
||||
Comment addComment(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId,
|
||||
@RequestBody CommentRequest comment);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ResizeRedactionRequest> resizeRedactionRequests);
|
||||
List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ResizeRedactionRequest> resizeRedactionRequests);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/add" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualRedactionEntry getAddRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
ManualRedactionEntry getAddRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/remove" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
IdRemoval getRemoveRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
IdRemoval getRemoveRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/force" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualForceRedaction getForceRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
ManualForceRedaction getForceRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/legalBasis" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualLegalBasisChange getLegalBasisChange(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
ManualLegalBasisChange getLegalBasisChange(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/recategorize" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualImageRecategorization getImageRecategorization(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
ManualImageRecategorization getImageRecategorization(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/comment" + COMMENT_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@ -98,33 +108,27 @@ public interface ManualRedactionResource {
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + "/resize" + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualResizeRedaction getResizeRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId);
|
||||
ManualResizeRedaction getResizeRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/comment" + FILE_ID_PATH_VARIABLE)
|
||||
@ -132,42 +136,35 @@ public interface ManualRedactionResource {
|
||||
|
||||
|
||||
@PostMapping(MANUAL_REDACTION_REST_PATH + DELETE_PATH + "/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE)
|
||||
void deleteResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds);
|
||||
void deleteResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateAddRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
void updateAddRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateRemoveRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
void updateRemoveRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateForceRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
void updateForceRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateLegalBasisChangeStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
void updateLegalBasisChangeStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
void updateResizeRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
void updateResizeRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody UpdateRedactionRequest updateStatusRequest);
|
||||
|
||||
|
||||
@GetMapping(value = MANUAL_REDACTION_REST_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId);
|
||||
ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId);
|
||||
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ public class ResizeRedactionPersistenceService {
|
||||
manualResizeRedaction.setPositions(convert(resizeRedactionRequest.getPositions(), RectangleEntity.class));
|
||||
manualResizeRedaction.setRequestDate(OffsetDateTime.now());
|
||||
|
||||
if(manualResizeRedaction.getStatus().equals(AnnotationStatus.APPROVED)) {
|
||||
if (manualResizeRedaction.getStatus().equals(AnnotationStatus.APPROVED)) {
|
||||
manualResizeRedaction.setProcessedDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
|
||||
}
|
||||
|
||||
@ -46,7 +46,8 @@ public class ResizeRedactionPersistenceService {
|
||||
|
||||
|
||||
@Transactional
|
||||
public void updateSurroundingText(AnnotationEntityId id, String textBefore, String textAfter){
|
||||
public void updateSurroundingText(AnnotationEntityId id, String textBefore, String textAfter) {
|
||||
|
||||
resizeRedactionRepository.updateSurroundingText(id, textBefore, textAfter);
|
||||
}
|
||||
|
||||
@ -92,7 +93,8 @@ public class ResizeRedactionPersistenceService {
|
||||
}
|
||||
|
||||
|
||||
public List<ManualResizeRedactionEntity> findByAnnotationStatusAndValue(AnnotationStatus status, String value){
|
||||
public List<ManualResizeRedactionEntity> findByAnnotationStatusAndValue(AnnotationStatus status, String value) {
|
||||
|
||||
return resizeRedactionRepository.findByStatusAndValue(status, value);
|
||||
}
|
||||
|
||||
|
||||
@ -1,20 +1,37 @@
|
||||
package com.iqser.red.service.peristence.v1.server.controller;
|
||||
|
||||
import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.iqser.red.service.peristence.v1.server.service.ManualRedactionService;
|
||||
import com.iqser.red.service.peristence.v1.server.utils.ManualImageRecategorizationMapper;
|
||||
import com.iqser.red.service.peristence.v1.server.utils.ManualRedactionMapper;
|
||||
import com.iqser.red.service.peristence.v1.server.utils.ManualResizeRedactionMapper;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualAddResponse;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.UpdateRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
|
||||
import com.iqser.red.service.persistence.service.v1.api.resources.ManualRedactionResource;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@ -24,53 +41,47 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<AddRedactionRequest> addRedactionRequests) {
|
||||
public List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<AddRedactionRequest> addRedactionRequests) {
|
||||
|
||||
return manualRedactionService.addAddRedaction(dossierId, fileId, addRedactionRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<RemoveRedactionRequest> removeRedactionRequests) {
|
||||
public List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<RemoveRedactionRequest> removeRedactionRequests) {
|
||||
|
||||
return manualRedactionService.addRemoveRedaction(dossierId, fileId, removeRedactionRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ForceRedactionRequest> forceRedactionRequests) {
|
||||
public List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ForceRedactionRequest> forceRedactionRequests) {
|
||||
|
||||
return manualRedactionService.addForceRedaction(dossierId, fileId, forceRedactionRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests) {
|
||||
public List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests) {
|
||||
|
||||
return manualRedactionService.addLegalBasisChange(dossierId, fileId, legalBasisChangeRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests) {
|
||||
public List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests) {
|
||||
|
||||
return manualRedactionService.addImageRecategorization(dossierId, fileId, imageRecategorizationRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Comment addComment(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId,
|
||||
public Comment addComment(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId,
|
||||
@RequestBody CommentRequest comment) {
|
||||
|
||||
return convert(manualRedactionService.addComment(fileId, annotationId, comment), Comment.class);
|
||||
@ -78,47 +89,41 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ResizeRedactionRequest> resizeRedactionRequests) {
|
||||
public List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<ResizeRedactionRequest> resizeRedactionRequests) {
|
||||
|
||||
return manualRedactionService.addResizeRedaction(dossierId, fileId, resizeRedactionRequests);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ManualRedactionEntry getAddRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public ManualRedactionEntry getAddRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getAddRedaction(fileId, annotationId), ManualRedactionEntry.class, new ManualRedactionMapper());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public IdRemoval getRemoveRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public IdRemoval getRemoveRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getRemoveRedaction(fileId, annotationId), IdRemoval.class);
|
||||
}
|
||||
|
||||
|
||||
public ManualForceRedaction getForceRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public ManualForceRedaction getForceRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getForceRedaction(fileId, annotationId), ManualForceRedaction.class);
|
||||
}
|
||||
|
||||
|
||||
public ManualLegalBasisChange getLegalBasisChange(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public ManualLegalBasisChange getLegalBasisChange(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getLegalBasisChange(fileId, annotationId), ManualLegalBasisChange.class);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ManualImageRecategorization getImageRecategorization(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public ManualImageRecategorization getImageRecategorization(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getImageRecategorization(fileId, annotationId), ManualImageRecategorization.class, new ManualImageRecategorizationMapper());
|
||||
}
|
||||
@ -131,49 +136,42 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
}
|
||||
|
||||
|
||||
public ManualResizeRedaction getResizeRedaction(@PathVariable(FILE_ID) String fileId,
|
||||
@PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
public ManualResizeRedaction getResizeRedaction(@PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId) {
|
||||
|
||||
return convert(manualRedactionService.getResizeRedaction(fileId, annotationId), ManualResizeRedaction.class, new ManualResizeRedactionMapper());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteAddRedaction(dossierId, fileId, annotationIds);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteRemoveRedaction(dossierId, fileId, annotationIds);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteForceRedaction(dossierId, fileId, annotationIds);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteLegalBasisChange(dossierId, fileId, annotationIds);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteImageRecategorization(dossierId, fileId, annotationIds);
|
||||
}
|
||||
@ -187,16 +185,14 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public void deleteResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody List<String> annotationIds) {
|
||||
public void deleteResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody List<String> annotationIds) {
|
||||
|
||||
manualRedactionService.deleteResizeRedaction(dossierId, fileId, annotationIds);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void updateAddRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateAddRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateAddRedactionStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
@ -204,8 +200,7 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public void updateRemoveRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateRemoveRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateRemoveRedactionStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
@ -213,16 +208,14 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public void updateForceRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateForceRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateForceRedactionStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
}
|
||||
|
||||
|
||||
public void updateLegalBasisChangeStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateLegalBasisChangeStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateLegalBasisChangeStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
@ -230,8 +223,7 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateImageRecategorizationStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
@ -239,8 +231,7 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public void updateResizeRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId,
|
||||
public void updateResizeRedactionStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
|
||||
@RequestBody UpdateRedactionRequest updateStatusRequest) {
|
||||
|
||||
manualRedactionService.updateResizeRedactionStatus(dossierId, fileId, updateStatusRequest.getAnnotationIds(), updateStatusRequest.getAnnotationStatus());
|
||||
@ -248,8 +239,7 @@ public class ManualRedactionController implements ManualRedactionResource {
|
||||
|
||||
|
||||
@Override
|
||||
public ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId,
|
||||
@PathVariable(FILE_ID) String fileId) {
|
||||
public ManualRedactions getManualRedactions(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId) {
|
||||
|
||||
return manualRedactionService.getManualRedactions(fileId);
|
||||
}
|
||||
|
||||
@ -1,5 +1,18 @@
|
||||
package com.iqser.red.service.peristence.v1.server.integration.tests;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mockito;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
|
||||
import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
|
||||
@ -10,9 +23,18 @@ import com.iqser.red.service.peristence.v1.server.integration.service.FileTester
|
||||
import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
|
||||
import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
|
||||
import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService;
|
||||
import com.iqser.red.service.peristence.v1.server.service.RedactionLogService;
|
||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.AddRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.CommentRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ForceRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImageRecategorizationRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.LegalBasisChangeRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.annotations.UpdateRedactionRequest;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
|
||||
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
|
||||
@ -20,23 +42,9 @@ import com.iqser.red.service.redaction.v1.model.ManualChange;
|
||||
import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
|
||||
import com.iqser.red.service.redaction.v1.model.RedactionLog;
|
||||
import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
|
||||
|
||||
import feign.FeignException;
|
||||
import lombok.SneakyThrows;
|
||||
import org.junit.Test;
|
||||
import org.mockito.Mockito;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
|
||||
@ -102,8 +110,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
var loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedAddRedaction.isRectangle()).isEqualTo(true);
|
||||
|
||||
var change = ManualChange.from(loadedAddRedaction)
|
||||
.withManualRedactionType(ManualRedactionType.ADD_LOCALLY);
|
||||
var change = ManualChange.from(loadedAddRedaction).withManualRedactionType(ManualRedactionType.ADD_LOCALLY);
|
||||
List<ManualChange> changeList = new ArrayList<>();
|
||||
changeList.add(change);
|
||||
|
||||
@ -122,8 +129,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.rectangle(loadedAddRedaction.isRectangle())
|
||||
.manualChanges(changeList)
|
||||
.build();
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, 1,
|
||||
List.of(entry), null, 0, 0, 0, 0));
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, 1, List.of(entry), null, 0, 0, 0, 0));
|
||||
|
||||
fileClient.setStatusUnderApproval(dossier.getId(), file.getId(), "1");
|
||||
var fileStatus = fileClient.getFileStatus(dossier.getId(), file.getId());
|
||||
@ -132,13 +138,12 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
|
||||
changeList.get(0).setAnnotationStatus(AnnotationStatus.DECLINED);
|
||||
entry.setManualChanges(changeList);
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, 1,
|
||||
List.of(entry), null, 0, 0, 0, 0));
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(new RedactionLog(1, 1, List.of(entry), null, 0, 0, 0, 0));
|
||||
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedAddRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -163,13 +168,11 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
|
||||
var type = typeProvider.testAndProvideType(dossierTemplate, null, "PII");
|
||||
|
||||
|
||||
|
||||
// assume file is already proccessed once, test that add to dict triggers reanalysis
|
||||
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.TEXT, "dummy".getBytes(StandardCharsets.UTF_8));
|
||||
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.NER_ENTITIES, "dummy".getBytes(StandardCharsets.UTF_8));
|
||||
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.IMAGE_INFO, "dummy".getBytes(StandardCharsets.UTF_8));
|
||||
fileStatusPersistenceService.updateProcessingStatus(file.getId(),ProcessingStatus.PROCESSED);
|
||||
fileStatusPersistenceService.updateProcessingStatus(file.getId(), ProcessingStatus.PROCESSED);
|
||||
|
||||
var addRedaction = manualRedactionClient.addAddRedaction(dossier.getId(), file.getId(), Collections.singletonList(AddRedactionRequest.builder()
|
||||
.positions(List.of(Rectangle.builder().topLeftY(1).topLeftX(1).height(1).width(1).build()))
|
||||
@ -188,11 +191,11 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.sourceId("SourceId")
|
||||
.build())).iterator().next();
|
||||
|
||||
|
||||
var loadedFile = fileClient.getFileStatus(dossier.getId(), file.getId());
|
||||
assertThat(loadedFile.getProcessingStatus()).isEqualTo(ProcessingStatus.PROCESSING);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
@SneakyThrows
|
||||
public void testManualRedaction() {
|
||||
@ -205,10 +208,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
|
||||
var type = typeProvider.testAndProvideType(dossierTemplate, null, "manual");
|
||||
|
||||
var comment = manualRedactionClient.addComment(dossier.getId(), file.getId(), "1", CommentRequest.builder()
|
||||
.text("test")
|
||||
.user("1")
|
||||
.build());
|
||||
var comment = manualRedactionClient.addComment(dossier.getId(), file.getId(), "1", CommentRequest.builder().text("test").user("1").build());
|
||||
var loadedComment = manualRedactionClient.getComment(comment.getId());
|
||||
assertThat(loadedComment.getText()).isEqualTo("test");
|
||||
|
||||
@ -258,17 +258,17 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedAddRedaction.getTextBefore()).isEqualTo("Text Before");
|
||||
assertThat(loadedAddRedaction.getSourceId()).isEqualTo("SourceId");
|
||||
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedAddRedaction.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedAddRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -285,10 +285,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.section("section2")
|
||||
.build())).iterator().next();
|
||||
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(addRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
var loadedAddRedaction2 = manualRedactionClient.getAddRedaction(file.getId(), addRedaction2.getAnnotationId());
|
||||
assertThat(loadedAddRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
assertThat(loadedAddRedaction2.isAddToDossierDictionary()).isEqualTo(false);
|
||||
@ -303,37 +303,37 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.removeFromDictionary(false)
|
||||
.build())).get(0);
|
||||
|
||||
var redactionLog = new RedactionLog(1, 1,
|
||||
List.of(RedactionLogEntry.builder().id(addRedaction.getAnnotationId()).type("manual").value("value entry").build()),
|
||||
null, 0, 0, 0, 0);
|
||||
var redactionLog = new RedactionLog(1, 1, List.of(RedactionLogEntry.builder()
|
||||
.id(addRedaction.getAnnotationId())
|
||||
.type("manual")
|
||||
.value("value entry")
|
||||
.build()), null, 0, 0, 0, 0);
|
||||
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.REDACTION_LOG, objectMapper.writeValueAsBytes(redactionLog));
|
||||
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(redactionLog);
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
var loadedRemoveRedaction = manualRedactionClient.getRemoveRedaction(file.getId(), removeRedaction.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction.isRemoveFromDictionary()).isEqualTo(false);
|
||||
assertThat(loadedRemoveRedaction.getSoftDeletedTime()).isNull();
|
||||
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedRemoveRedaction = manualRedactionClient.getRemoveRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedRemoveRedaction = manualRedactionClient.getRemoveRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
var redLog = new RedactionLog(1, 1,
|
||||
List.of(RedactionLogEntry.builder().id("annotationId").type("manual").value("value entry").build()),
|
||||
null, 0, 0, 0, 0);
|
||||
var redLog = new RedactionLog(1, 1, List.of(RedactionLogEntry.builder().id("annotationId").type("manual").value("value entry").build()), null, 0, 0, 0, 0);
|
||||
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.REDACTION_LOG, objectMapper.writeValueAsBytes(redLog));
|
||||
|
||||
when(redactionClient.getRedactionLog(Mockito.any())).thenReturn(redLog);
|
||||
@ -344,26 +344,26 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
.user("test")
|
||||
.removeFromDictionary(true)
|
||||
.build())).get(0);
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
var loadedRemoveRedaction2 = manualRedactionClient.getRemoveRedaction(file.getId(), removeRedaction2.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
assertThat(dictionaryClient.getDictionaryForType(type.getId(), null).getEntries().isEmpty());
|
||||
assertThat(loadedRemoveRedaction2.isRemoveFromDictionary()).isEqualTo(true);
|
||||
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedRemoveRedaction2 = manualRedactionClient.getRemoveRedaction(file.getId(), removeRedaction2.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateRemoveRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(removeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
loadedRemoveRedaction2 = manualRedactionClient.getRemoveRedaction(file.getId(), removeRedaction2.getAnnotationId());
|
||||
assertThat(loadedRemoveRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
|
||||
@ -380,17 +380,17 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedForceRedaction.getAnnotationId()).isEqualTo(loadedForceRedaction.getAnnotationId());
|
||||
assertThat(loadedForceRedaction.getFileId()).isEqualTo(loadedForceRedaction.getFileId());
|
||||
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedForceRedaction = manualRedactionClient.getForceRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedForceRedaction.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedForceRedaction = manualRedactionClient.getForceRedaction(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedForceRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -406,17 +406,17 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedLegalBasisChange.getUser()).isEqualTo("test");
|
||||
assertThat(loadedLegalBasisChange.getLegalBasis()).isEqualTo("1");
|
||||
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedLegalBasisChange = manualRedactionClient.getLegalBasisChange(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedLegalBasisChange.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedLegalBasisChange = manualRedactionClient.getLegalBasisChange(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedLegalBasisChange.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -430,17 +430,17 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
var loadedImageRecategorization = manualRedactionClient.getImageRecategorization(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedImageRecategorization.getAnnotationId()).isEqualTo(imageRecategorization.getAnnotationId());
|
||||
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedImageRecategorization = manualRedactionClient.getImageRecategorization(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedImageRecategorization.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedImageRecategorization = manualRedactionClient.getImageRecategorization(file.getId(), addRedaction.getAnnotationId());
|
||||
assertThat(loadedImageRecategorization.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -454,10 +454,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
var loadedImageRecategorization2 = manualRedactionClient.getImageRecategorization(file.getId(), imageRecategorization2.getAnnotationId());
|
||||
assertThat(loadedImageRecategorization2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateImageRecategorizationStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(imageRecategorization2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
loadedImageRecategorization2 = manualRedactionClient.getImageRecategorization(file.getId(), imageRecategorization2.getAnnotationId());
|
||||
assertThat(loadedImageRecategorization2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
|
||||
@ -480,17 +480,17 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedResizeRedaction.getTextAfter()).isEqualTo("Text After");
|
||||
assertThat(loadedResizeRedaction.getTextBefore()).isEqualTo("Text Before");
|
||||
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED).build());
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.APPROVED)
|
||||
.build());
|
||||
loadedResizeRedaction = manualRedactionClient.getResizeRedaction(file.getId(), resizeRedaction.getAnnotationId());
|
||||
assertThat(loadedResizeRedaction.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED).build());
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.DECLINED)
|
||||
.build());
|
||||
loadedResizeRedaction = manualRedactionClient.getResizeRedaction(file.getId(), resizeRedaction.getAnnotationId());
|
||||
assertThat(loadedResizeRedaction.getStatus()).isEqualTo(AnnotationStatus.DECLINED);
|
||||
|
||||
@ -507,19 +507,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), annotationIds);
|
||||
// manualRedactions.getForceRedactions()
|
||||
// .forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getLegalBasisChanges()
|
||||
.forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getEntriesToAdd()
|
||||
.forEach(e -> manualRedactionClient.deleteAddRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getIdsToRemove()
|
||||
.forEach(e -> manualRedactionClient.deleteRemoveRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getImageRecategorization()
|
||||
.forEach(e -> manualRedactionClient.deleteImageRecategorization(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getResizeRedactions()
|
||||
.forEach(e -> manualRedactionClient.deleteResizeRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getEntriesToAdd().forEach(e -> manualRedactionClient.deleteAddRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getIdsToRemove().forEach(e -> manualRedactionClient.deleteRemoveRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getImageRecategorization().forEach(e -> manualRedactionClient.deleteImageRecategorization(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getResizeRedactions().forEach(e -> manualRedactionClient.deleteResizeRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
|
||||
manualRedactions.getComments()
|
||||
.forEach((key, value) -> value.forEach(c -> manualRedactionClient.deleteComment(file.getId(), List.of(c.getId()))));
|
||||
manualRedactions.getComments().forEach((key, value) -> value.forEach(c -> manualRedactionClient.deleteComment(file.getId(), List.of(c.getId()))));
|
||||
|
||||
var forceRedaction2 = manualRedactionClient.addForceRedaction(dossier.getId(), file.getId(), List.of(ForceRedactionRequest.builder()
|
||||
.annotationId(addRedaction2.getAnnotationId())
|
||||
@ -532,16 +526,15 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedForceRedaction2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
assertThat(loadedForceRedaction2.getProcessedDate()).isNull();
|
||||
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(forceRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId());
|
||||
assertThat(loadedForceRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
|
||||
manualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId());
|
||||
manualRedactions.getForceRedactions()
|
||||
.forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getForceRedactions().forEach(e -> manualRedactionClient.deleteForceRedaction(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
|
||||
var legalBasisChange2 = manualRedactionClient.addLegalBasisChange(dossier.getId(), file.getId(), List.of(LegalBasisChangeRequest.builder()
|
||||
.annotationId(addRedaction2.getAnnotationId())
|
||||
@ -553,16 +546,15 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
var loadedLegalBasisChange2 = manualRedactionClient.getLegalBasisChange(file.getId(), legalBasisChange2.getAnnotationId());
|
||||
assertThat(loadedLegalBasisChange2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
|
||||
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateLegalBasisChangeStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(legalBasisChange2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
loadedLegalBasisChange2 = manualRedactionClient.getLegalBasisChange(file.getId(), legalBasisChange2.getAnnotationId());
|
||||
assertThat(loadedLegalBasisChange2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
|
||||
manualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId());
|
||||
manualRedactions.getLegalBasisChanges()
|
||||
.forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
manualRedactions.getLegalBasisChanges().forEach(e -> manualRedactionClient.deleteLegalBasisChange(dossier.getId(), file.getId(), List.of(e.getAnnotationId())));
|
||||
|
||||
var resizeRedaction2 = manualRedactionClient.addResizeRedaction(dossier.getId(), file.getId(), List.of(ResizeRedactionRequest.builder()
|
||||
.annotationId(addRedaction.getAnnotationId())
|
||||
@ -579,10 +571,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
|
||||
assertThat(loadedResizeRedaction2.getPositions()).isNotEmpty();
|
||||
assertThat(loadedResizeRedaction2.getValue()).isEqualTo("some value");
|
||||
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(),
|
||||
UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED).build());
|
||||
manualRedactionClient.updateResizeRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()
|
||||
.annotationIds(List.of(resizeRedaction2.getAnnotationId()))
|
||||
.annotationStatus(AnnotationStatus.REQUESTED)
|
||||
.build());
|
||||
loadedResizeRedaction2 = manualRedactionClient.getResizeRedaction(file.getId(), resizeRedaction2.getAnnotationId());
|
||||
assertThat(loadedResizeRedaction2.getStatus()).isEqualTo(AnnotationStatus.REQUESTED);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user