From 43d2b18515b6dfa505c756602d763fdd873e65f5 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Wed, 23 Jun 2021 14:21:53 -0700 Subject: [PATCH] SHIBUI-1788 correcting check for create --- .../CustomEntityAttributesDefinitionsController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java index f80c582b2..bd683de22 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/CustomEntityAttributesDefinitionsController.java @@ -28,7 +28,7 @@ public class CustomEntityAttributesDefinitionsController { @Transactional public ResponseEntity create(@RequestBody CustomEntityAttributeDefinition definition) { // If already defined, we can't create a new one, nor will this call update the definition - CustomEntityAttributeDefinition cad = caService.find(definition.getName()); + CustomEntityAttributeDefinition cad = caService.find(definition.getResourceId()); if (cad != null) { HttpHeaders headers = new HttpHeaders(); @@ -36,7 +36,7 @@ public ResponseEntity create(@RequestBody CustomEntityAttributeDefinition def return ResponseEntity.status(HttpStatus.CONFLICT).headers(headers) .body(new ErrorResponse(String.valueOf(HttpStatus.CONFLICT.value()), - String.format("The custom attribute definition with name: [%s] already exists.", definition.getName()))); + String.format("The custom attribute definition already exists - unable to create a new definition"))); } CustomEntityAttributeDefinition result = caService.createOrUpdateDefinition(definition);