Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

forking latest changes #208

Merged
merged 2 commits into from
Sep 20, 2023
Merged

forking latest changes #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3608c28
Merge pull request #205 from catenax-ng/support-pcf-part_3
adityagajbhiye9 Sep 20, 2023
084308a
Merge branch 'Download_support_History_Changes' into support_combine_…
adityagajbhiye9 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...s/sde-core/src/main/java/org/eclipse/tractusx/sde/core/controller/ConsumerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public ResponseEntity<Object> viewConsumerDownloadHistoryDetails(@PathVariable("
throws Exception {
log.info("Request received : /api/view-download-history-details");
return ok().body(consumerService.viewConsumerDownloadHistoryDetails(processId));

}

}
4 changes: 1 addition & 3 deletions modules/sde-core/src/main/resources/flyway/V22__add_new_role_for_download.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions .../edc/src/main/java/org/eclipse/tractusx/sde/edc/services/ConsumerControlPanelService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import org.springframework.stereotype.Service;

import com.fasterxml.jackson.databind.JsonNode;

import feign.FeignException;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
Expand Down Expand Up @@ -248,7 +247,6 @@ public void subscribeDataOffers(ConsumerRequest consumerRequest, String processI

public Map<String, Object> subscribeAndDownloadDataOffers(ConsumerRequest consumerRequest,
boolean flagToDownloadImidiate) {

HashMap<String, String> extensibleProperty = new HashMap<>();
Map<String, Object> response = new ConcurrentHashMap<>();

Expand Down Expand Up @@ -296,7 +294,6 @@ public Map<String, Object> subscribeAndDownloadDataOffers(ConsumerRequest consum
response.put(offer.getAssetId(), resultFields);
}
});

return response;
}

Expand Down