From ed846218367c72fa809465e092e4a981ac4a6fbc Mon Sep 17 00:00:00 2001
From: ThanKarab <tkarabatsis@hotmail.com>
Date: Mon, 4 May 2020 20:59:07 +0300
Subject: [PATCH] Logs added.
---
src/main/java/eu/hbp/mip/utils/ClaimUtils.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/utils/ClaimUtils.java b/src/main/java/eu/hbp/mip/utils/ClaimUtils.java
index b53d1d900..243b2c60e 100644
--- a/src/main/java/eu/hbp/mip/utils/ClaimUtils.java
+++ b/src/main/java/eu/hbp/mip/utils/ClaimUtils.java
@@ -50,13 +50,13 @@ public class ClaimUtils {
List<PathologyDTO> allPathologies) {
// --- Providing only the allowed pathologies/datasets to the user ---
UserActionLogging.LogUserAction(username,
- "Load all the pathologies", "Filter out the unauthorised datasets.");
+ "Load pathologies", "Filter out the unauthorised datasets.");
List<String> userClaims = Arrays.asList(authorities.toString().toLowerCase()
.replaceAll("[\\s+\\]\\[]", "").split(","));
UserActionLogging.LogUserAction(username,
- "Load all the pathologies", "User Claims: " + userClaims);
+ "Load pathologies", "User Claims: " + userClaims);
// If the "dataset_all" claim exists then return everything
if (userClaims.contains(ClaimUtils.allDatasetsAllowedClaim())) {
@@ -66,18 +66,26 @@ public class ClaimUtils {
List<PathologyDTO> userPathologies = new ArrayList<>();
for (PathologyDTO curPathology : allPathologies) {
UserActionLogging.LogUserAction(username,
- "Load all the pathologies", "Pathology: " + curPathology.getCode());
+ "Load pathologies", "Pathology: " + curPathology.getCode());
List<PathologyDTO.PathologyDatasetDTO> userPathologyDatasets = new ArrayList<PathologyDTO.PathologyDatasetDTO>();
for (PathologyDTO.PathologyDatasetDTO dataset : curPathology.getDatasets()) {
if (userClaims.contains(ClaimUtils.getDatasetClaim(dataset.getCode()))) {
+ UserActionLogging.LogUserAction(username, "Load pathologies",
+ "Added dataset: " + dataset.getCode());
userPathologyDatasets.add(dataset);
+ }else{
+ UserActionLogging.LogUserAction(username, "Load pathologies",
+ "Dataset not added: '" + dataset.getCode());
+ UserActionLogging.LogUserAction(username, "Load pathologies",
+ "Claim did not exist: '" + ClaimUtils.getDatasetClaim(dataset.getCode()));
}
}
if (userPathologyDatasets.size() > 0) {
- UserActionLogging.LogUserAction(username, "Load all the pathologies",
- "Added pathology '" + curPathology.getLabel() + " with datasets: '" + userPathologyDatasets + "'");
+ UserActionLogging.LogUserAction(username, "Load pathologies",
+ "Added pathology '" + curPathology.getLabel()
+ + " with datasets: '" + userPathologyDatasets + "'");
PathologyDTO userPathology = new PathologyDTO();
userPathology.setCode(curPathology.getCode());
--
GitLab