704 benutzerverwaltung

.gitignore

@@ -31,3 +31,4 @@ sonar-project.properties
 /frontend/cypress/downloads/
 /frontend/cypress/screenshots/
 /toolchains.xml
+/backend/src/main/resources/db/okr_schema.sql

README.md

@@ -8,6 +8,7 @@ This project contains two parts:
 
 [Frontend description](frontend/README.md)
 
+
 ## Backend
 [Backend description](backend/README.md)
 

backend/src/main/java/ch/puzzle/okr/Constants.java

@@ -16,4 +16,5 @@ private Constants() {
     public static final String QUARTER = "Quarter";
     public static final String TEAM = "Team";
     public static final String USER = "User";
+    public static final String USER_TEAM = "UserTeam";
 }

backend/src/main/java/ch/puzzle/okr/SpringCachingConfig.java

@@ -15,6 +15,6 @@ public class SpringCachingConfig {
 
     @Bean
     public CacheManager cacheManager() {
-        return new ConcurrentMapCacheManager(AUTHORIZATION_USER_CACHE, USER_CACHE);
+        return new ConcurrentMapCacheManager(AUTHORIZATION_USER_CACHE);
     }
 }

backend/src/main/java/ch/puzzle/okr/controller/CacheController.java

@@ -24,13 +24,6 @@ public void emptyAuthorizationUsersCache() {
         cacheService.emptyAuthorizationUsersCache();
     }
 
-    @Operation(summary = "Delete users cache", description = "Delete users cache")
-    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Users cache deleted") })
-    @PostMapping("emptyUsersCache")
-    public void emptyUsersCache() {
-        cacheService.emptyUsersCache();
-    }
-
     @Operation(summary = "Delete all caches", description = "Delete all caches")
     @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "All caches deleted") })
     @PostMapping("emptyAllCaches")

backend/src/main/java/ch/puzzle/okr/controller/OverviewController.java

@@ -1,8 +1,6 @@
 package ch.puzzle.okr.controller;
 
-import ch.puzzle.okr.dto.overview.DashboardDto;
 import ch.puzzle.okr.dto.overview.OverviewDto;
-import ch.puzzle.okr.mapper.DashboardMapper;
 import ch.puzzle.okr.mapper.OverviewMapper;
 import ch.puzzle.okr.service.authorization.OverviewAuthorizationService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,14 +21,12 @@
 @RequestMapping("api/v2/overview")
 public class OverviewController {
     private final OverviewMapper overviewMapper;
-    private final DashboardMapper dashboardMapper;
     private final OverviewAuthorizationService overviewAuthorizationService;
 
-    public OverviewController(OverviewMapper overviewMapper, OverviewAuthorizationService overviewAuthorizationService,
-            DashboardMapper dashboardMapper) {
+    public OverviewController(OverviewMapper overviewMapper,
+            OverviewAuthorizationService overviewAuthorizationService) {
         this.overviewMapper = overviewMapper;
         this.overviewAuthorizationService = overviewAuthorizationService;
-        this.dashboardMapper = dashboardMapper;
     }
 
     @Operation(summary = "Get all teams and their objectives", description = "Get a List of teams with their objectives")
@@ -41,14 +37,11 @@ public OverviewController(OverviewMapper overviewMapper, OverviewAuthorizationSe
             @ApiResponse(responseCode = "401", description = "Not authorized to read teams with their objectives", content = @Content),
             @ApiResponse(responseCode = "404", description = "The quarter or one of the teams were not found", content = @Content) })
     @GetMapping("")
-    public ResponseEntity<DashboardDto> getOverview(
+    public ResponseEntity<List<OverviewDto>> getOverview(
             @RequestParam(required = false, defaultValue = "", name = "team") List<Long> teamFilter,
             @RequestParam(required = false, defaultValue = "", name = "quarter") Long quarterFilter,
             @RequestParam(required = false, defaultValue = "", name = "objectiveQuery") String objectiveQuery) {
-        boolean hasWriteAllAccess = overviewAuthorizationService.hasWriteAllAccess();
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(dashboardMapper.toDto(overviewMapper.toDto(
-                        overviewAuthorizationService.getFilteredOverview(quarterFilter, teamFilter, objectiveQuery)),
-                        hasWriteAllAccess));
+        return ResponseEntity.status(HttpStatus.OK).body(overviewMapper
+                .toDto(overviewAuthorizationService.getFilteredOverview(quarterFilter, teamFilter, objectiveQuery)));
     }
 }

backend/src/main/java/ch/puzzle/okr/controller/TeamController.java

@@ -1,6 +1,7 @@
 package ch.puzzle.okr.controller;
 
 import ch.puzzle.okr.dto.TeamDto;
+import ch.puzzle.okr.dto.UserDto;
 import ch.puzzle.okr.mapper.TeamMapper;
 import ch.puzzle.okr.models.Team;
 import ch.puzzle.okr.service.authorization.TeamAuthorizationService;
@@ -34,9 +35,7 @@ public TeamController(TeamAuthorizationService teamAuthorizationService, TeamMap
             @Content(mediaType = "application/json", schema = @Schema(implementation = TeamDto.class)) }), })
     @GetMapping
     public List<TeamDto> getAllTeams() {
-        List<Long> userTeamIds = teamAuthorizationService.getUserTeamIds();
-        return teamAuthorizationService.getAllTeams().stream().map(team -> teamMapper.toDto(team, userTeamIds))
-                .toList();
+        return teamAuthorizationService.getAllTeams().stream().map(teamMapper::toDto).toList();
     }
 
     @Operation(summary = "Create Team", description = "Create a new Team")
@@ -49,7 +48,7 @@ public List<TeamDto> getAllTeams() {
     public ResponseEntity<TeamDto> createTeam(
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "The Team as json to create a new Team.", required = true) @RequestBody TeamDto teamDto) {
         Team createdTeam = teamAuthorizationService.createEntity(teamMapper.toTeam(teamDto));
-        return ResponseEntity.status(HttpStatus.CREATED).body(teamMapper.toDto(createdTeam, List.of()));
+        return ResponseEntity.status(HttpStatus.CREATED).body(teamMapper.toDto(createdTeam));
     }
 
     @Operation(summary = "Update Team", description = "Update a Team by ID.")
@@ -64,7 +63,7 @@ public ResponseEntity<TeamDto> updateTeam(
             @Parameter(description = "The ID for updating a Team.", required = true) @PathVariable long id,
             @RequestBody TeamDto teamDto) {
         Team updatedTeam = teamAuthorizationService.updateEntity(teamMapper.toTeam(teamDto), id);
-        return ResponseEntity.status(OK).body(teamMapper.toDto(updatedTeam, List.of()));
+        return ResponseEntity.status(OK).body(teamMapper.toDto(updatedTeam));
     }
 
     @Operation(summary = "Delete Team by ID", description = "Delete Team by ID")
@@ -76,4 +75,40 @@ public void deleteTeamById(
             @Parameter(description = "The ID of an Team to delete it.", required = true) @PathVariable long id) {
         teamAuthorizationService.deleteEntity(id);
     }
+
+    @Operation(summary = "Add users to a team", description = "Add users to a team")
+    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Added users to team"),
+            @ApiResponse(responseCode = "401", description = "Not authorized to add users to the team", content = @Content),
+            @ApiResponse(responseCode = "404", description = "Did not find the Team with requested ID") })
+    @PutMapping("/{id}/addusers")
+    public void addUsersToTeam(
+            @Parameter(description = "The ID of an Team to add to users to it.", required = true) @PathVariable long id,
+            @RequestBody List<UserDto> userDtoList) {
+        var userIds = userDtoList.stream().map(UserDto::id).toList();
+        teamAuthorizationService.addUsersToTeam(id, userIds);
+    }
+
+    @Operation(summary = "Remove User from Team", description = "Remove User with given UserID from Team")
+    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Removed User from Team"),
+            @ApiResponse(responseCode = "401", description = "Not authorized to remove user from team", content = @Content),
+            @ApiResponse(responseCode = "404", description = "Did not find the Team with requested ID") })
+    @PutMapping("/{id}/user/{userId}/removeuser")
+    public void removeUserFromTeam(
+            @Parameter(description = "The ID of an team to remove the user from it.", required = true) @PathVariable long id,
+            @Parameter(description = "The User ID to remove from the team.", required = true) @PathVariable long userId) {
+        teamAuthorizationService.removeUserFromTeam(id, userId);
+    }
+
+    @Operation(summary = "Update or add team membership", description = "If user is already member of this team, isAdmin is set. otherwise new team membership "
+            + "is added with isAdmin true or false")
+    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Update or add team membership"),
+            @ApiResponse(responseCode = "401", description = "Not authorized to update or add team membership", content = @Content),
+            @ApiResponse(responseCode = "404", description = "Did not find the Team with requested ID") })
+    @PutMapping("/{id}/user/{userId}/updateaddteammembership/{isAdmin}")
+    public void updateOrAddTeamMembership(
+            @Parameter(description = "The ID of an team to update or add membership", required = true) @PathVariable long id,
+            @Parameter(description = "The User ID to update or add membership", required = true) @PathVariable long userId,
+            @Parameter(description = "The parameter if user should be admin or not", required = true) @PathVariable boolean isAdmin) {
+        teamAuthorizationService.updateOrAddTeamMembership(id, userId, isAdmin);
+    }
 }

backend/src/main/java/ch/puzzle/okr/controller/UserController.java

@@ -2,13 +2,16 @@
 
 import ch.puzzle.okr.dto.UserDto;
 import ch.puzzle.okr.mapper.UserMapper;
+import ch.puzzle.okr.service.authorization.AuthorizationService;
 import ch.puzzle.okr.service.authorization.UserAuthorizationService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,10 +22,13 @@
 public class UserController {
 
     private final UserAuthorizationService userAuthorizationService;
+    private final AuthorizationService authorizationService;
     private final UserMapper userMapper;
 
-    public UserController(UserAuthorizationService userAuthorizationService, UserMapper userMapper) {
+    public UserController(UserAuthorizationService userAuthorizationService, AuthorizationService authorizationService,
+            UserMapper userMapper) {
         this.userAuthorizationService = userAuthorizationService;
+        this.authorizationService = authorizationService;
         this.userMapper = userMapper;
     }
 
@@ -34,4 +40,24 @@ public List<UserDto> getAllUsers() {
         return userAuthorizationService.getAllUsers().stream().map(userMapper::toDto).toList();
     }
 
+    @Operation(summary = "Get Current User", description = "Get all current logged in user.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Returned current logged in user.", content = {
+                    @Content(mediaType = "application/json", schema = @Schema(implementation = UserDto.class)) }), })
+    @GetMapping(path = "/current")
+    public UserDto getCurrentUser() {
+        var currentUser = this.authorizationService.updateOrAddAuthorizationUser().user();
+        return userMapper.toDto(currentUser);
+    }
+
+    @Operation(summary = "Get User by ID", description = "Get user by given ID.")
+    @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Returned user", content = {
+            @Content(mediaType = "application/json", schema = @Schema(implementation = UserDto.class)) }), })
+    @GetMapping(path = "/{id}")
+    public UserDto getUserById(
+            @Parameter(description = "The ID for requested user.", required = true) @PathVariable long id) {
+        var user = this.userAuthorizationService.getById(id);
+        return userMapper.toDto(user);
+    }
+
 }

backend/src/main/java/ch/puzzle/okr/converter/JwtConverterFactory.java

@@ -19,14 +19,6 @@ public JwtConverterFactory(ApplicationContext appContext) {
         this.appContext = appContext;
     }
 
-    public synchronized Converter<Jwt, List<String>> getJwtOrganisationConverter() {
-        if (jwtOrganisationConverter == null) {
-            // place to load configured converter instead of default converter
-            jwtOrganisationConverter = appContext.getBean(JwtOrganisationConverter.class);
-        }
-        return jwtOrganisationConverter;
-    }
-
     public synchronized Converter<Jwt, User> getJwtUserConverter() {
         if (jwtUserConverter == null) {
             // place to load configured converter instead of default converter

backend/src/main/java/ch/puzzle/okr/converter/JwtUserConverter.java

@@ -10,6 +10,7 @@
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 import static ch.puzzle.okr.Constants.USER;
@@ -20,8 +21,6 @@ public class JwtUserConverter implements Converter<Jwt, User> {
 
     private static final Logger logger = LoggerFactory.getLogger(JwtUserConverter.class);
 
-    @Value("${okr.jwt.user.username}")
-    private String username;
     @Value("${okr.jwt.user.firstname}")
     private String firstname;
     @Value("${okr.jwt.user.lastname}")
@@ -35,9 +34,9 @@ public User convert(Jwt token) {
         logger.debug("claims {}", claims);
 
         try {
-            return User.Builder.builder().withUsername(claims.get(username).toString())
-                    .withFirstname(claims.get(firstname).toString()).withLastname(claims.get(lastname).toString())
-                    .withEmail(claims.get(email).toString()).build();
+            return User.Builder.builder().withFirstname(claims.get(firstname).toString())
+                    .withLastname(claims.get(lastname).toString()).withEmail(claims.get(email).toString())
+                    .withUserTeamList(new ArrayList<>()).build();
         } catch (Exception e) {
             logger.warn("can not convert user from claims {}", claims);
             throw new OkrResponseStatusException(BAD_REQUEST, ErrorKey.CONVERT_TOKEN, USER);

backend/src/main/java/ch/puzzle/okr/dto/TeamDto.java

@@ -1,6 +1,4 @@
 package ch.puzzle.okr.dto;
 
-import java.util.List;
-
-public record TeamDto(Long id, int version, String name, List<OrganisationDto> organisations, boolean filterIsActive) {
+public record TeamDto(Long id, int version, String name, boolean writeable) {
 }

backend/src/main/java/ch/puzzle/okr/dto/UserDto.java

@@ -1,5 +1,7 @@
 package ch.puzzle.okr.dto;
 
-public record UserDto(Long id, int version, String username, String firstname, String lastname, String email,
-        boolean isWriteable) {
+import java.util.List;
+
+public record UserDto(Long id, int version, String firstname, String lastname, String email,
+        List<UserTeamDto> userTeamList, boolean isOkrChampion) {
 }

backend/src/main/java/ch/puzzle/okr/dto/UserTeamDto.java

@@ -0,0 +1,4 @@
+package ch.puzzle.okr.dto;
+
+public record UserTeamDto(Long id, int version, TeamDto team, boolean isTeamAdmin) {
+}

backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewTeamDto.java

@@ -1,4 +1,4 @@
 package ch.puzzle.okr.dto.overview;
 
-public record OverviewTeamDto(Long id, int version, String name, boolean writable, boolean hasInActiveOrganisations) {
+public record OverviewTeamDto(Long id, int version, String name, boolean writeable) {
 }