From 70d37cead1339945fcb33e3d23f2e296d3075af0 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Thu, 27 Jan 2022 11:05:40 +0200 Subject: [PATCH] Fix wrong metrics count for Dataset Template --- .../web/src/main/java/eu/eudat/controllers/Admin.java | 3 ++- .../java/eu/eudat/logic/managers/DatasetProfileManager.java | 3 +-- .../main/java/eu/eudat/logic/managers/MetricsManager.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index e27a21053..b3a16dc91 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -73,7 +73,8 @@ public class Admin extends BaseController { userDatasetProfile.setRole(0); getApiContext().getOperationsContext().getDatabaseRepository().getUserDatasetProfileDao().createOrUpdate(userDatasetProfile); datasetProfileManager.storeDatasetProfileUsers(datasetProfile, profile); - metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.TOTAL); + + metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricsManager.datasetTemplateStatus.get(datasetProfile.getStatus()) ); return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId()); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java index dd3fa9a59..cc2b30f3f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java @@ -97,7 +97,6 @@ public class DatasetProfileManager { DatasetProfile profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id)); apiContext.getOperationsContext().getDatabaseRepository().detachEntity(profile); profile.setId(null); - metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.TOTAL); return profile; } @@ -253,7 +252,7 @@ public class DatasetProfileManager { File localFile = convert(multiPartFile); eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.DatasetProfile profile = xmlBuilder.build(localFile); Files.deleteIfExists(localFile.toPath()); - metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.TOTAL); + metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.DRAFT); return profile; } catch (IOException e) { logger.error(e.getMessage(), e); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java index aa356d1a0..589e58538 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java @@ -32,6 +32,11 @@ public class MetricsManager { private final static Logger logger = LoggerFactory.getLogger(MetricsManager.class); private final Map gauges; + public static final Map datasetTemplateStatus = Stream.of(new Object[][] { + { DatasetProfile.Status.SAVED.getValue(), MetricNames.DRAFT }, + { DatasetProfile.Status.FINALIZED.getValue(), MetricNames.ACTIVE }, + }).collect(Collectors.toMap(data -> (Short) data[0], data -> (String) data[1])); + public void increaseValue(String name, int amount, String label) { if(label != null) {