Merge branch 'master' into change_DTO

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

@@ -1,26 +1,25 @@
 package mops.gruppen2.controller;
 
 
-import com.github.javafaker.Faker;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
-import mops.gruppen2.domain.ProductSwaggerExample;
+import mops.gruppen2.domain.apiWrapper.UpdatedGroupRequestMapper;
 import mops.gruppen2.domain.event.Event;
+import mops.gruppen2.service.APIFormatterService;
 import mops.gruppen2.service.EventService;
 import mops.gruppen2.service.GroupService;
 import mops.gruppen2.service.SerializationService;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Ein Beispiel für eine API mit Swagger.
  */
 @RestController
-@RequestMapping("/gruppen2")
+@RequestMapping("/gruppen2/api")
 public class APIController {
 
     private final SerializationService serializationService;
@@ -33,12 +32,27 @@ public class APIController {
         this.groupService = groupService;
     }
 
-    @GetMapping("/updatedGroups/{status}")
+    @GetMapping("/updateGroups/{status}")
     @ApiOperation(value = "Gibt alle Gruppen zurück in denen sich etwas geändert hat")
-    public List<Group> updateGroup(@ApiParam("Status des Anfragestellers")  @PathVariable Long status) throws EventException {
+    public UpdatedGroupRequestMapper updateGroup(@ApiParam("Letzter Status des Anfragestellers")  @PathVariable Long status) throws EventException {
         List<Event> events = eventService.getNewEvents(status);
-        return groupService.projectEventList(events);
+        UpdatedGroupRequestMapper updatedGroupRequestMapper = APIFormatterService.wrapp(eventService.getMaxEvent_id(), groupService.projectEventList(events));
+
+        return updatedGroupRequestMapper;
     }
 
+    @GetMapping("/getGroupIdsOfUser/{teilnehmer}")
+    @ApiOperation(value = "Gibt alle Gruppen zurück in denen sich ein Teilnehmer befindet")
+    public List<Long> getGroupsOfUser(@ApiParam("Teilnehmer dessen groupIds zurückgegeben werden sollen")  @PathVariable String teilnehmer) throws EventException {
+        return eventService.getGroupsOfUser(teilnehmer);
+    }
 
+    @GetMapping("/getGroup/{groupId}")
+    @ApiOperation(value = "Gibt die Gruppe mit der als Parameter mitgegebenden groupId zurück")
+    public Group getGroupFromId(@ApiParam("GruppenId der gefordeten Gruppe") @PathVariable Long groupId) throws EventException{
+        List<Event> eventList = eventService.getEventsOfGroup(groupId);
+
+        List<Group> groups = groupService.projectEventList(eventList);
+        return groups.get(0);
+    }
 }

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

@@ -4,23 +4,22 @@ import mops.gruppen2.config.Gruppen2Config;
 import mops.gruppen2.domain.Exceptions.EventException;
 import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.GroupType;
+import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
-import mops.gruppen2.domain.Visibility;
-import mops.gruppen2.domain.event.AddUserEvent;
-import mops.gruppen2.domain.event.CreateGroupEvent;
-import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent;
-import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
 import mops.gruppen2.security.Account;
 import mops.gruppen2.service.*;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
 
 import javax.annotation.security.RolesAllowed;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 @Controller
 @RequestMapping("/gruppen2")
@@ -96,4 +95,20 @@ public class Gruppen2Controller {
         return "redirect:/gruppen2/";
     }
 
+    @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
+    @GetMapping("/details")
+    public String showGroupDetails(KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException, ResponseStatusException {
+        model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
+        Group group = userService.getGroupById(id);
+        Account account = keyCloakService.createAccountFromPrincipal (token);
+        User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
+        Role role = group.getRoles().get(user);
+        if(group!= null) {
+            model.addAttribute("group", group);
+            model.addAttribute("role",role);
+            return "detailsMember";
+        }
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found");
+    }
+
 }

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

@@ -3,6 +3,8 @@ package mops.gruppen2.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Controller
 public class MopsController {
 
@@ -10,4 +12,10 @@ public class MopsController {
     public String redirect(){
         return "redirect:/gruppen2/";
     }
+
+    @GetMapping("/logout")
+    public String logout(HttpServletRequest request) throws Exception {
+        request.logout();
+        return "redirect:/gruppen2/";
+    }
 }