Fix admins view

cthit · Sep 17, 2024 · f303272 · f303272
1 parent 9f4855a
commit f303272
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/src/main/java/it/chalmers/gamma/adapter/primary/web/AdminController.java b/app/src/main/java/it/chalmers/gamma/adapter/primary/web/AdminController.java
@@ -69,13 +69,11 @@ public ModelAndView setAdmins(
             .map(UUID::fromString)
             .toList();
 
-    List<UUID> newAdmins =
-        formAdmins.stream().filter(userId -> !oldAdmins.contains(userId)).toList();
     List<UUID> noLongerAdmins =
         oldAdmins.stream().filter(userId -> !formAdmins.contains(userId)).toList();
 
     try {
-      this.adminFacade.updateAdmins(newAdmins, noLongerAdmins);
+      this.adminFacade.updateAdmins(formAdmins, noLongerAdmins);
     } catch (IllegalArgumentException e) {
       return this.getAdmins(htmxRequest);
     }

diff --git a/app/src/main/java/it/chalmers/gamma/app/admin/AdminFacade.java b/app/src/main/java/it/chalmers/gamma/app/admin/AdminFacade.java
@@ -20,14 +20,14 @@ public AdminFacade(AccessGuard accessGuard, AdminRepository adminRepository) {
     this.adminRepository = adminRepository;
   }
 
-  public void updateAdmins(List<UUID> adminsToAdd, List<UUID> adminsToRemove) {
+  public void updateAdmins(List<UUID> newAdmins, List<UUID> adminsToRemove) {
     accessGuard.require(isAdmin());
 
-    if (adminsToAdd.isEmpty()) {
+    if (newAdmins.isEmpty()) {
       throw new IllegalArgumentException("There must be at least one admin");
     }
 
-    for (UUID userId : adminsToAdd) {
+    for (UUID userId : newAdmins) {
       this.adminRepository.setAdmin(new UserId(userId), true);
     }