add validation for duplicate usage limit metric in one tenant

backend/core/src/main/java/org/opencdmp/errorcode/ErrorThesaurusProperties.java

@@ -398,4 +398,14 @@ public class ErrorThesaurusProperties {
     public void setUsageLimitException(ErrorDescription usageLimitException) {
         this.usageLimitException = usageLimitException;
     }
+
+    private ErrorDescription usageLimitMetricAlreadyExists;
+
+    public ErrorDescription getUsageLimitMetricAlreadyExists() {
+        return usageLimitMetricAlreadyExists;
+    }
+
+    public void setUsageLimitMetricAlreadyExists(ErrorDescription usageLimitMetricAlreadyExists) {
+        this.usageLimitMetricAlreadyExists = usageLimitMetricAlreadyExists;
+    }
 }

backend/core/src/main/java/org/opencdmp/service/usagelimit/UsageLimitServiceImpl.java

@@ -95,6 +95,18 @@ public class UsageLimitServiceImpl implements UsageLimitService {
 
         this.authorizationService.authorizeForce(Permission.EditUsageLimit);
 
+        try {
+            this.tenantEntityManager.loadExplicitTenantFilters();
+            UsageLimitQuery query = this.queryFactory.query(UsageLimitQuery.class).disableTracking().usageLimitTargetMetrics(model.getTargetMetric()).isActive(IsActive.Active);
+            if (query != null && query.count() > 0) throw new MyValidationException(this.errors.getUsageLimitMetricAlreadyExists().getCode(), this.errors.getUsageLimitMetricAlreadyExists().getMessage());
+
+        } catch (InvalidApplicationException e) {
+            log.error(e.getMessage(), e);
+            throw new MyApplicationException(e.getMessage());
+        } finally {
+            this.tenantEntityManager.reloadTenantFilters();
+        }
+
         Boolean isUpdate = this.conventionService.isValidGuid(model.getId());
 
         UsageLimitEntity data;

backend/web/src/main/resources/config/errors.yml

@@ -124,4 +124,7 @@ error-thesaurus:
     message: Max descriptions exceeded for this plan
   usageLimitException:
     code: 145
-    message: Usage limit exception for this target metric
+    message: Usage limit exception for this target metric
+  usageLimitMetricAlreadyExists:
+    code: 146
+    message: Usage limit metric is already selected as target

frontend/src/app/core/common/enum/respone-error-code.ts

@@ -41,6 +41,7 @@ export enum ResponseErrorCode {
   RequestHasExpired = 143,
   MaxDescriptionsExceeded = 144,
   UsageLimitException = 145,
+  UsageLimitMetricAlreadyExists = 146,
 
   // Notification & Annotation Errors
   InvalidApiKey = 200,
@@ -157,6 +158,8 @@ export class ResponseErrorCodeHelper {
 		return language.instant("GENERAL.BACKEND-ERRORS.MAX-DESCRIPTION-EXCEEDED");
 	  case ResponseErrorCode.UsageLimitException:
 		return language.instant("GENERAL.BACKEND-ERRORS.USAGE-LIMIT-EXCEPTION");
+	  case ResponseErrorCode.UsageLimitMetricAlreadyExists:
+		return language.instant("GENERAL.BACKEND-ERRORS.USAGE-LIMIT-METRIC-ALLREADY-EXISTS");
   	  default:
   	  	return language.instant("GENERAL.SNACK-BAR.NOT-FOUND");
   	}

frontend/src/assets/i18n/baq.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Kontuz!",

frontend/src/assets/i18n/de.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Warnung!",

frontend/src/assets/i18n/en.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Warning!",

frontend/src/assets/i18n/es.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Atención!",

frontend/src/assets/i18n/gr.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Προσοχή!",

frontend/src/assets/i18n/hr.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Oprez!",

frontend/src/assets/i18n/pl.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Ostrzeżenie!",

frontend/src/assets/i18n/pt.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Atenção!",

frontend/src/assets/i18n/sk.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Upozornenie!",

frontend/src/assets/i18n/sr.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Oprez!",

frontend/src/assets/i18n/tr.json

@@ -80,7 +80,8 @@
 			"INVITE-USER-ALREADY-CONFIRMED": "Ιnvitation has already confirmed",
 			"REQUEST-HAS-EXPIRED": "Request has expired",
 			"MAX-DESCRIPTION-EXCEEDED": "This plan has reached the maximun descriptions for this description template",
-			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator."
+			"USAGE-LIMIT-EXCEPTION": "Υou have exceeded the {{usageLimitLabel}} usage limit. Please contact your administrator.",
+			"USAGE-LIMIT-METRIC-ALLREADY-EXISTS": "This usage limit metric is already defined in this tenant. Change metric or select other tenant."
 		},
 		"FORM-VALIDATION-DISPLAY-DIALOG": {
 			"WARNING": "Uyarı!",