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

# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java

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

@@ -5,7 +5,6 @@ import mops.gruppen2.config.Gruppen2Config;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
-import mops.gruppen2.domain.Visibility;
 import mops.gruppen2.domain.exception.EventException;
 import mops.gruppen2.domain.exception.GroupNotFoundException;
 import mops.gruppen2.domain.exception.WrongFileException;
@@ -45,17 +44,19 @@ public class Gruppen2Controller {
     private final UserService userService;
     private final ControllerService controllerService;
     private final InviteLinkRepositoryService inviteLinkRepositoryService;
+    private final Gruppen2Config gruppen2Config;
     private final Logger logger;
     @Autowired
     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;
         logger = Logger.getLogger("Gruppen2ControllerLogger");
+        this.gruppen2Config = gruppen2Config;
     }
 
     /**
@@ -101,6 +102,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) {
                 logger.warning("File konnte nicht gelesen werden");
                 throw new WrongFileException(file.getOriginalFilename());
@@ -179,6 +183,9 @@ public class Gruppen2Controller {
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
         Long parentId = group.getParent();
         Group parent = new Group();
+        if(group.getTitle() == null){
+            throw new GroupNotFoundException(this.getClass().toString());
+        }
         if (!group.getMembers().contains(user)){
             if (group.getVisibility() == Visibility.PRIVATE){
                 return "privateGroupNoMember";
@@ -261,6 +268,22 @@ public class Gruppen2Controller {
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
         controllerService.passIfLastAdmin(account, groupId);
         controllerService.deleteUser(user.getId(), groupId);
+        if(userService.getGroupById(groupId).getMembers().size() == 0){
+            controllerService.deleteGroupEvent(user.getId(), groupId);
+        }
+        return "redirect:/gruppen2/";
+    }
+
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator"})
+    @PostMapping("/deleteGroup")
+    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/";
     }
 
@@ -305,9 +328,12 @@ public class Gruppen2Controller {
 
     @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
     @PostMapping("/details/members/deleteUser")
-    public String deleteUser(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId,
+    public String deleteUser(@RequestParam("group_id") Long groupId,
                              @RequestParam("user_id") String userId) throws EventException {
         controllerService.deleteUser(userId, groupId);
+        if(userService.getGroupById(groupId).getMembers().size() == 0){
+            controllerService.deleteGroupEvent(userId ,groupId);
+        }
         return "redirect:/gruppen2/details/members/" + groupId;
     }
 }

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/java/mops/gruppen2/domain/event/Event.java

@@ -21,6 +21,7 @@ import mops.gruppen2.domain.exception.GroupIdMismatchException;
                       @JsonSubTypes.Type(value = UpdateGroupDescriptionEvent.class, name = "UpdateGroupDescriptionEvent"),
                       @JsonSubTypes.Type(value = UpdateGroupTitleEvent.class, name = "UpdateGroupTitleEvent"),
                       @JsonSubTypes.Type(value = UpdateRoleEvent.class, name = "UpdateRoleEvent"),
+                      @JsonSubTypes.Type(value = DeleteGroupEvent.class, name = "DeleteGroupEvent")
               })
 @Getter
 @NoArgsConstructor

src/main/java/mops/gruppen2/service/ControllerService.java

@@ -167,8 +167,8 @@ public class ControllerService {
         eventService.saveEvent(deleteUserEvent);
     }
 
-    public void deleteGroupEvent(User user, Long groupId) {
+    public void deleteGroupEvent(String user_id, Long groupId) {
-        DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, user.getId());
+        DeleteGroupEvent deleteGroupEvent = new DeleteGroupEvent(groupId, user_id);
         eventService.saveEvent(deleteGroupEvent);
     }
 

src/main/java/mops/gruppen2/service/GroupService.java

@@ -89,7 +89,7 @@ public class GroupService {
         List<Event> eventsUser = getGroupEvents(eventRepository.findGroup_idsWhereUser_id(userId));
         List<Group> groups = projectEventList(eventsUser);
         List<Group> newGroups = new ArrayList<>();
-        for (Group group : groups) {
+        for (Group group : visibleGroups) {
             if (group.getMembers().contains(user)) {
                 newGroups.add(group);
             }
@@ -102,6 +102,9 @@ public class GroupService {
         List<Group> visibleGroups = projectEventList(eventsVisible);
         List<Group> visibleLectures = new ArrayList<>();
         for (Group group : visibleGroups) {
+            if(group.getType() == null){
+                continue;
+            }
             if (group.getType().equals(GroupType.LECTURE)) {
                 visibleLectures.add(group);
             }
@@ -121,6 +124,9 @@ public class GroupService {
     public List<Group> findGroupWith(String search, Account account) throws EventException {
         List<Group> groups = new ArrayList<>();
         for (Group group : getAllGroupWithVisibilityPublic(account.getName())) {
+            if(group.getType() == null){
+                continue;
+            }
             if (group.getTitle().toLowerCase().contains(search.toLowerCase()) || group.getDescription().toLowerCase().contains(search.toLowerCase())) {
                 groups.add(group);
             }

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

@@ -59,6 +59,12 @@
                                 type="submit">Gruppe verlassen
                         </button>
                     </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:if="${group.getRoles().get(user.getId()) == admin}"
+                                type="submit">Gruppe löschen
+                        </button>
+                    </form>
                 </div>
             </div>
             <div class="col-3" style="white-space: nowrap">

src/main/resources/templates/editMembers.html

@@ -99,7 +99,7 @@
                                                type="hidden">
                                         <input th:name="user_id" th:value="${member.getId()}"
                                                type="hidden">
-                                        <button class="btn btn-danger btn-sm" style="margin: 5px">Mitglied entfernen</button>
+                                        <button class="btn btn-danger btn-sm" style="margin: 5px" th:if='!${account.getName().equals(member.getId())}'>Mitglied entfernen</button>
                                     </form>
                                 </div>
                             </td>