Merge remote-tracking branch 'origin/master' into showInviteLink

src/main/java/mops/gruppen2/config/Gruppen2Config.java

@@ -8,8 +8,11 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class Gruppen2Config {
 
-    @Autowired
+    final GroupService groupService;
-    GroupService groupService;
+    final EventService eventService;
-    @Autowired
+
-    EventService eventService;
+    public Gruppen2Config(GroupService groupService, EventService eventService) {
+        this.groupService = groupService;
+        this.eventService = eventService;
+    }
 }

src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

@@ -44,15 +44,15 @@ public class Gruppen2Controller {
     private final UserService userService;
     private final ControllerService controllerService;
     private final InviteLinkRepositoryService inviteLinkRepositoryService;
-    @Autowired
+    private final Gruppen2Config gruppen2Config;
-    Gruppen2Config gruppen2Config;
 
-    public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService) {
+    public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) {
         this.keyCloakService = keyCloakService;
         this.groupService = groupService;
         this.userService = userService;
         this.controllerService = controllerService;
         this.inviteLinkRepositoryService = inviteLinkRepositoryService;
+        this.gruppen2Config = gruppen2Config;
     }
 
     /**
@@ -98,6 +98,9 @@ public class Gruppen2Controller {
         if (!file.isEmpty()) {
             try {
                 userList = CsvService.read(file.getInputStream());
+                if(userList.size() > userMaximum){
+                    userMaximum =  Long.valueOf(userList.size()) + userMaximum;
+                }
             } catch (UnrecognizedPropertyException | CharConversionException ex) {
                 throw new WrongFileException(file.getOriginalFilename());
             }
@@ -265,6 +268,10 @@ public class Gruppen2Controller {
     public String pDeleteGroup(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId){
         Account account = keyCloakService.createAccountFromPrincipal(token);
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
+        Group group = userService.getGroupById(groupId);
+        if(group.getRoles().get(user.getId()) != Role.ADMIN ){
+            return "error";
+        }
         controllerService.deleteGroupEvent(user.getId(), groupId);
         return "redirect:/gruppen2/";
     }

src/main/java/mops/gruppen2/domain/event/AddUserEvent.java

@@ -36,7 +36,7 @@ public class AddUserEvent extends Event {
         if (group.getMembers().contains(user)) {
             throw new UserAlreadyExistsException(this.getClass().toString());
         }
-        //andere exception
+
         if (group.getMembers().size() == group.getUserMaximum()){
             throw new GroupFullException(this.getClass().toString());
         }

src/main/resources/templates/createOrga.html

@@ -54,7 +54,7 @@
                         <div class="form-group mt-3">
                             <label for="userMaximum">Teilnehmeranzahl</label>
                             <input class="form-control" id="userMaximum" required th:name="userMaximum"
-                                   type="number" min="1">
+                                   type="number" min="1" max="10000">
                         </div>
                         <div class="custom-control custom-checkbox">
                             <input class="custom-control-input" id="visibility" th:name="visibility"

src/main/resources/templates/detailsMember.html

@@ -61,7 +61,7 @@
                     </form>
                     <form action="/gruppen2/deleteGroup" method="post">
                         <button class="btn btn-danger" style="border-style: none; margin: 5px"
-                                th:name="group_id" th:value="${group.getId()}"
+                                th:name="group_id" th:value="${group.getId()}" th:if="${group.getRoles().get(user.getId()) == admin}"
                                 type="submit">Gruppe löschen
                         </button>
                     </form>