Update

cthit · Jun 27, 2024 · 7534182 · 7534182
1 parent d4056b4
commit 7534182
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/GroupsController.java
@@ -410,7 +410,15 @@ public ModelAndView updateGroup(
     checkForDuplicateEntries(form, bindingResult);
 
     if (!bindingResult.hasErrors() && this.groupFacade.groupWithNameAlreadyExists(id, form.name)) {
-      bindingResult.addError(new FieldError("form", "name", "Group with name already exists"));
+      bindingResult.addError(
+              new FieldError(
+                      "form",
+                      "name",
+                      form.name,
+                      true,
+                      null,
+                      null,
+                      "Group with name already exists"));
     }
 
     if (bindingResult.hasErrors()) {

diff --git a/app/src/main/java/it/chalmers/gamma/app/group/GroupFacade.java b/app/src/main/java/it/chalmers/gamma/app/group/GroupFacade.java
@@ -164,7 +164,7 @@ public boolean groupWithNameAlreadyExists(UUID id, String name) {
 
     Optional<Group> maybeGroup = this.groupRepository.get(new Name(name));
 
-    return maybeGroup.isEmpty() || !maybeGroup.get().id().value().equals(id);
+    return maybeGroup.filter(group -> !group.id().value().equals(id)).isPresent();
   }
 
   public Optional<GroupWithMembersDTO> getWithMembers(UUID groupId) {