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

RED-8339: rolled back signature changes in old component log endpoints #524

Merged
ali.oezyetimoglu1 merged 1 commits from RED-8339-6 into master 2024-06-06 12:30:57 +02:00
Conversation 8 Commits 1 Files Changed 4 +13 -16
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import lombok.experimental.FieldDefaults;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@Deprecated(forRemoval = true)
public class ComponentLogController implements ComponentLogResource { public class ComponentLogController implements ComponentLogResource {
ComponentLogService componentLogService; ComponentLogService componentLogService;
@ -42,7 +41,6 @@ public class ComponentLogController implements ComponentLogResource {
@Override @Override
@Deprecated(forRemoval = true)
@PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')") @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
public ComponentLog getComponentLog(String dossierId, String fileId, boolean includeOverrides) { public ComponentLog getComponentLog(String dossierId, String fileId, boolean includeOverrides) {
@ -53,10 +51,10 @@ public class ComponentLogController implements ComponentLogResource {
} }
@Deprecated(forRemoval = true)
@PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
@PreAuthorize("hasAuthority('" + GET_RSS + "')") @PreAuthorize("hasAuthority('" + GET_RSS + "')")
public void addOverride(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, public void addOverride(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId, @PathVariable(FILE_ID) String fileId,
@RequestBody ComponentsOverrides componentsOverrides) { @RequestBody ComponentsOverrides componentsOverrides) {
@ -77,10 +75,10 @@ public class ComponentLogController implements ComponentLogResource {
} }
@Deprecated(forRemoval = true)
@GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
@PreAuthorize("hasAuthority('" + GET_RSS + "')") @PreAuthorize("hasAuthority('" + GET_RSS + "')")
public ComponentsOverrides getOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, public ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId) { @PathVariable(FILE_ID) String fileId) {
accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId); accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
@ -99,10 +97,10 @@ public class ComponentLogController implements ComponentLogResource {
} }
@Deprecated(forRemoval = true)
@PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
@PreAuthorize("hasAuthority('" + GET_RSS + "')") @PreAuthorize("hasAuthority('" + GET_RSS + "')")
public void revertOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, public void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId, @PathVariable(FILE_ID) String fileId,
@RequestBody RevertOverrideRequest revertOverrideRequest) { @RequestBody RevertOverrideRequest revertOverrideRequest) {

9
persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java vendored
View File

@ -49,8 +49,7 @@ public interface ComponentLogResource {
@PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Adds overrides for components", description = "None") @Operation(summary = "Adds overrides for components", description = "None")
@ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")}) @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
void addOverride(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, void addOverride(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId, @PathVariable(FILE_ID) String fileId,
@RequestBody ComponentsOverrides componentsOverrides); @RequestBody ComponentsOverrides componentsOverrides);
@ -60,8 +59,7 @@ public interface ComponentLogResource {
@GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Gets overrides for components", description = "None") @Operation(summary = "Gets overrides for components", description = "None")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found")}) @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found")})
ComponentsOverrides getOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId); @PathVariable(FILE_ID) String fileId);
@ -70,8 +68,7 @@ public interface ComponentLogResource {
@PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
@Operation(summary = "Reverts overrides for components", description = "None") @Operation(summary = "Reverts overrides for components", description = "None")
@ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")}) @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
void revertOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId, void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(DOSSIER_ID) String dossierId,
@PathVariable(FILE_ID) String fileId, @PathVariable(FILE_ID) String fileId,
@RequestBody RevertOverrideRequest revertOverrideRequest); @RequestBody RevertOverrideRequest revertOverrideRequest);

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

@ -176,7 +176,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
.get().isOverridden()); .get().isOverridden());
revertOverrideRequest = RevertOverrideRequest.builder().components(Set.of("Study_Title")).build(); revertOverrideRequest = RevertOverrideRequest.builder().components(Set.of("Study_Title")).build();
componentLogClient.revertOverrides(dossierTemplate.getId(), dossier.getId(), file.getId(), revertOverrideRequest); componentLogClient.revertOverrides(dossier.getId(), file.getId(), revertOverrideRequest);
overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true); overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true);
assertFalse(overridesFromOldEndpoint.getComponentLogEntries() assertFalse(overridesFromOldEndpoint.getComponentLogEntries()
@ -188,7 +188,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
Map<String, String> componentOverrides = new HashMap<>(); Map<String, String> componentOverrides = new HashMap<>();
componentOverrides.put("Study_Title", "BBBB Strange Chemical Name And the rest of a title – With a dash and some more text"); componentOverrides.put("Study_Title", "BBBB Strange Chemical Name And the rest of a title – With a dash and some more text");
ComponentsOverrides componentOverrideModel4 = ComponentsOverrides.builder().componentOverrides(componentOverrides).build(); ComponentsOverrides componentOverrideModel4 = ComponentsOverrides.builder().componentOverrides(componentOverrides).build();
componentLogClient.addOverride(dossierTemplate.getId(), dossier.getId(), file.getId(), componentOverrideModel4); componentLogClient.addOverride(dossier.getId(), file.getId(), componentOverrideModel4);
overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true); overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true);
assertTrue(overridesFromOldEndpoint.getComponentLogEntries() assertTrue(overridesFromOldEndpoint.getComponentLogEntries()

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java
View File

@ -17,6 +17,8 @@ import lombok.experimental.FieldDefaults;
public class ComponentLogEntryValue { public class ComponentLogEntryValue {
String value; String value;
@Deprecated
String originalValue;
String valueDescription; String valueDescription;
String componentRuleId; String componentRuleId;