Enforce gradle check in workflow (#948)

Author: Portals

.github/workflows/workflow.yml

@@ -25,6 +25,9 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@v4
 
+      - name: Check
+        run: ./gradlew check
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

.gitignore

@@ -4,5 +4,6 @@
 .DS_Store
 uploads/
 .run
+build
 
 .pnpm-store

app/src/main/java/it/chalmers/gamma/adapter/primary/web/ThymeleafAdvice.java

@@ -6,7 +6,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -33,9 +32,12 @@ public boolean isAdmin() {
     }
   }
 
-@ExceptionHandler(IllegalArgumentException.class)
-public ModelAndView handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException ex) {
-    LOGGER.error("Caught IllegalArgumentException. This shouldn't happen as validators should catch these issues:", ex);
+  @ExceptionHandler(IllegalArgumentException.class)
+  public ModelAndView handleIllegalArgumentException(
+      HttpServletRequest request, IllegalArgumentException ex) {
+    LOGGER.error(
+        "Caught IllegalArgumentException. This shouldn't happen as validators should catch these issues:",
+        ex);
     return new ModelAndView("redirect:/error");
   }
 

app/src/main/java/it/chalmers/gamma/adapter/secondary/jpa/apikey/settings/ApiKeySettingsRepositoryAdapter.java

@@ -138,7 +138,8 @@ public void setAccountScaffoldSettings(
 
     for (var row : settings.superGroupTypes()) {
       var pk = new AccountScaffoldRequiresManagedPK(apiKeySettingsEntity.id, row.type().value());
-      var superGroupTypeRequiresManagedOptional = accountScaffoldRequiresManagedJpaRepository.findById(pk);
+      var superGroupTypeRequiresManagedOptional =
+          accountScaffoldRequiresManagedJpaRepository.findById(pk);
       if (row.requiresManaged() && superGroupTypeRequiresManagedOptional.isEmpty()) {
         accountScaffoldRequiresManagedJpaRepository.save(
             new AccountScaffoldRequiresManagedEntity(apiKeySettingsEntity.id, row.type().value()));

app/src/main/java/it/chalmers/gamma/app/accountscaffold/AccountScaffoldFacade.java

@@ -41,7 +41,8 @@ public AccountScaffoldFacade(
 
   /**
    * Get all super groups that have the provided types and their "sub" groups with their members.
-   * For groups that require managed accounts, only users that have participated in gdpr training are included.
+   * For groups that require managed accounts, only users that have participated in gdpr training
+   * are included.
    */
   public List<AccountScaffoldSuperGroupDTO> getActiveSuperGroups() {
     this.accessGuard.require(isApi(ApiKeyType.ACCOUNT_SCAFFOLD));
@@ -63,9 +64,10 @@ public List<AccountScaffoldSuperGroupDTO> getActiveSuperGroups() {
             group -> {
               List<AccountScaffoldUserPostDTO> activeGroupMember =
                   group.groupMembers().stream()
-                      .filter(groupMember ->
-                              gdprTrained.contains(groupMember.user().id()) ||
-                              !isGroupWithManagedAccounts(group, settings))
+                      .filter(
+                          groupMember ->
+                              gdprTrained.contains(groupMember.user().id())
+                                  || !isGroupWithManagedAccounts(group, settings))
                       .map(AccountScaffoldUserPostDTO::new)
                       .toList();
 
@@ -74,9 +76,15 @@ public List<AccountScaffoldSuperGroupDTO> getActiveSuperGroups() {
                 superGroupMap.put(
                     superGroupId,
                     new SuperGroupWithGroups(
-                        group.superGroup(), new ArrayList<>(List.of(new GroupWithMembers(group, new HashSet<>(activeGroupMember))))));
+                        group.superGroup(),
+                        new ArrayList<>(
+                            List.of(
+                                new GroupWithMembers(group, new HashSet<>(activeGroupMember))))));
               } else {
-                superGroupMap.get(superGroupId).groups.add(new GroupWithMembers(group, new HashSet<>(activeGroupMember)));
+                superGroupMap
+                    .get(superGroupId)
+                    .groups
+                    .add(new GroupWithMembers(group, new HashSet<>(activeGroupMember)));
               }
             });
 
@@ -85,7 +93,12 @@ public List<AccountScaffoldSuperGroupDTO> getActiveSuperGroups() {
             superGroupWithGroups ->
                 new AccountScaffoldSuperGroupDTO(
                     superGroupWithGroups.superGroup,
-                    superGroupWithGroups.groups.stream().map(group -> new AccountScaffoldGroupDTO(group.group, new ArrayList<>(group.members))).toList(),
+                    superGroupWithGroups.groups.stream()
+                        .map(
+                            group ->
+                                new AccountScaffoldGroupDTO(
+                                    group.group, new ArrayList<>(group.members)))
+                        .toList(),
                     settings.superGroupTypes().stream()
                         .anyMatch(
                             row ->
@@ -96,8 +109,8 @@ public List<AccountScaffoldSuperGroupDTO> getActiveSuperGroups() {
 
   /**
    * Returns the users that are active right now. Takes in a list of super group types to help
-   * determine what kinds of groups that are deemed active. User must have
-   * participated in gdpr training.
+   * determine what kinds of groups that are deemed active. User must have participated in gdpr
+   * training.
    */
   public List<AccountScaffoldUserDTO> getActiveUsers() {
     this.accessGuard.require(isApi(ApiKeyType.ACCOUNT_SCAFFOLD));
@@ -152,19 +165,9 @@ public AccountScaffoldUserDTO(GammaUser user) {
   }
 
   public record AccountScaffoldGroupDTO(
-          String name,
-          String prettyName,
-          List<AccountScaffoldUserPostDTO> members
-  ) {
-    public AccountScaffoldGroupDTO(
-            Group group,
-            List<AccountScaffoldUserPostDTO> members
-    ) {
-      this(
-              group.name().value(),
-              group.prettyName().value(),
-              members
-      );
+      String name, String prettyName, List<AccountScaffoldUserPostDTO> members) {
+    public AccountScaffoldGroupDTO(Group group, List<AccountScaffoldUserPostDTO> members) {
+      this(group.name().value(), group.prettyName().value(), members);
     }
   }
 
@@ -175,9 +178,7 @@ public record AccountScaffoldSuperGroupDTO(
       List<AccountScaffoldGroupDTO> groups,
       boolean useManagedAccount) {
     public AccountScaffoldSuperGroupDTO(
-        SuperGroup superGroup,
-        List<AccountScaffoldGroupDTO> groups,
-        boolean useManagedAccount) {
+        SuperGroup superGroup, List<AccountScaffoldGroupDTO> groups, boolean useManagedAccount) {
       this(
           superGroup.name().value(),
           superGroup.prettyName().value(),
@@ -187,7 +188,6 @@ public AccountScaffoldSuperGroupDTO(
     }
   }
 
-
   private static class GroupWithMembers {
     private final Group group;
     private final Set<AccountScaffoldUserPostDTO> members;
@@ -210,11 +210,6 @@ private SuperGroupWithGroups(SuperGroup superGroup, List<GroupWithMembers> group
 
   private boolean isGroupWithManagedAccounts(Group group, ApiKeyAccountScaffoldSettings settings) {
     return settings.superGroupTypes().stream()
-        .anyMatch(
-            row ->
-                row.type().equals(group.superGroup().type())
-                    && row.requiresManaged());
+        .anyMatch(row -> row.type().equals(group.superGroup().type()) && row.requiresManaged());
   }
-
-
 }

app/src/main/java/it/chalmers/gamma/app/authentication/UserAccessGuard.java

@@ -133,7 +133,7 @@ private boolean haveAcceptedClient(UserId userId) {
     }
 
     if (SecurityContextHolder.getContext().getAuthentication()
-      instanceof OAuth2ClientAuthenticationToken token) {
+        instanceof OAuth2ClientAuthenticationToken token) {
       var client = token.getRegisteredClient();
 
       if (client == null) {

app/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
     open-in-view: false
   servlet:
     multipart:
-      max-file-size: 50MB
+      max-file-size: "50MB"
   data:
     redis:
       host: "${REDIS_HOST:redis}"