diff --git a/modules/sde-core/src/main/java/org/eclipse/tractusx/sde/core/controller/ConsumerController.java b/modules/sde-core/src/main/java/org/eclipse/tractusx/sde/core/controller/ConsumerController.java index 89cb2378f..c52166a9b 100644 --- a/modules/sde-core/src/main/java/org/eclipse/tractusx/sde/core/controller/ConsumerController.java +++ b/modules/sde-core/src/main/java/org/eclipse/tractusx/sde/core/controller/ConsumerController.java @@ -113,6 +113,7 @@ public ResponseEntity viewConsumerDownloadHistoryDetails(@PathVariable(" throws Exception { log.info("Request received : /api/view-download-history-details"); return ok().body(consumerService.viewConsumerDownloadHistoryDetails(processId)); + } } diff --git a/modules/sde-core/src/main/resources/flyway/V22__add_new_role_for_download.sql b/modules/sde-core/src/main/resources/flyway/V22__add_new_role_for_download.sql index c0add3e93..efb4b5cd9 100644 --- a/modules/sde-core/src/main/resources/flyway/V22__add_new_role_for_download.sql +++ b/modules/sde-core/src/main/resources/flyway/V22__add_new_role_for_download.sql @@ -22,15 +22,13 @@ INSERT INTO sde_permission (sde_permission,description) INSERT INTO sde_permission (sde_permission,description) VALUES ('consumer_download_data_offer','Allows consumer user to download data again'); INSERT INTO sde_permission (sde_permission,description) - VALUES ('consumer_view_download_history','Allows consumer user to view download data history'); - + VALUES ('consumer_view_download_history','Allows consumer user to view download data history'); INSERT INTO sde_role_permission_mapping (sde_permission,sde_role) VALUES ('consumer_subscribe_download_data_offers','Creator'); INSERT INTO sde_role_permission_mapping (sde_permission,sde_role) VALUES ('consumer_download_data_offer','Creator'); INSERT INTO sde_role_permission_mapping (sde_permission,sde_role) VALUES ('consumer_view_download_history','Creator'); - INSERT INTO sde_role_permission_mapping (sde_permission,sde_role) VALUES ('consumer_download_data_offer','User'); INSERT INTO sde_role_permission_mapping (sde_permission,sde_role) diff --git a/modules/sde-external-services/edc/src/main/java/org/eclipse/tractusx/sde/edc/services/ConsumerControlPanelService.java b/modules/sde-external-services/edc/src/main/java/org/eclipse/tractusx/sde/edc/services/ConsumerControlPanelService.java index 224595d18..bb944a9e6 100644 --- a/modules/sde-external-services/edc/src/main/java/org/eclipse/tractusx/sde/edc/services/ConsumerControlPanelService.java +++ b/modules/sde-external-services/edc/src/main/java/org/eclipse/tractusx/sde/edc/services/ConsumerControlPanelService.java @@ -56,7 +56,6 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.JsonNode; - import feign.FeignException; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -248,7 +247,6 @@ public void subscribeDataOffers(ConsumerRequest consumerRequest, String processI public Map subscribeAndDownloadDataOffers(ConsumerRequest consumerRequest, boolean flagToDownloadImidiate) { - HashMap extensibleProperty = new HashMap<>(); Map response = new ConcurrentHashMap<>(); @@ -296,7 +294,6 @@ public Map subscribeAndDownloadDataOffers(ConsumerRequest consum response.put(offer.getAssetId(), resultFields); } }); - return response; }