Profile uzytkownikow

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/dto/project/UserProjectMembershipResponse.java

@@ -0,0 +1,49 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.controller.dto.project_group.GroupBasicResponse;
+import pl.edu.agh.project_manager.domain.entity.project.Project;
+import pl.edu.agh.project_manager.domain.entity.project.ProjectAssignment;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.UUID;
+
+public record UserProjectMembershipResponse(
+        UUID id,
+        String title,
+        String description,
+        LocalDate startDate,
+        LocalDate endDate,
+        Boolean isActive,
+        GroupBasicResponse group,
+        List<UserProjectRoleResponse> roles
+) {
+    public static UserProjectMembershipResponse from(Project project, List<ProjectAssignment> userAssignments) {
+        return new UserProjectMembershipResponse(
+                project.getId(),
+                project.getTitle(),
+                project.getDescription(),
+                project.getStartDate(),
+                project.getEndDate(),
+                project.getIsActive(),
+                GroupBasicResponse.from(project.getProjectGroup()),
+                userAssignments.stream().map(UserProjectRoleResponse::from).toList()
+        );
+    }
+
+    public record UserProjectRoleResponse(
+            String roleName,
+            LocalDate startDate,
+            LocalDate endDate,
+            Integer utilizationPercentage
+    ) {
+        public static UserProjectRoleResponse from(ProjectAssignment assignment) {
+            return new UserProjectRoleResponse(
+                    assignment.getRoleName(),
+                    assignment.getStartDate(),
+                    assignment.getEndDate(),
+                    assignment.getUtilizationPercentage()
+            );
+        }
+    }
+}

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/dto/project_group/OwnedGroupResponse.java

@@ -0,0 +1,32 @@
+package pl.edu.agh.project_manager.controller.dto.project_group;
+
+import pl.edu.agh.project_manager.domain.entity.projectgroup.ProjectGroup;
+import pl.edu.agh.project_manager.domain.enums.GroupType;
+
+import java.util.UUID;
+
+public record OwnedGroupResponse(
+        UUID id,
+        String name,
+        String description,
+        GroupType groupType,
+        int projectCount,
+        int activeProjectCount,
+        boolean isOwner
+) {
+    public static OwnedGroupResponse from(ProjectGroup group, boolean isOwner) {
+        int total = group.getProjects() != null ? group.getProjects().size() : 0;
+        int active = group.getProjects() != null
+                ? (int) group.getProjects().stream().filter(p -> Boolean.TRUE.equals(p.getIsActive())).count()
+                : 0;
+        return new OwnedGroupResponse(
+                group.getId(),
+                group.getName(),
+                group.getDescription(),
+                group.getGroupType(),
+                total,
+                active,
+                isOwner
+        );
+    }
+}

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/dto/user/UserResponse.java

@@ -16,6 +16,7 @@ public record UserResponse(
         UserRole role,
         UserStatus status,
         String supervisorEmail,
+        SimpleUserResponse supervisor,
         List<QualificationResponse> qualifications
 ) {
     public static UserResponse from(User user) {
@@ -27,6 +28,7 @@ public static UserResponse from(User user) {
                 user.getUserRole(),
                 user.getUserStatus(),
                 user.getSupervisor() != null ? user.getSupervisor().getEmail() : null,
+                user.getSupervisor() != null ? SimpleUserResponse.fromUser(user.getSupervisor()) : null,
 
                 user.getQualifications() != null ?
                         user.getQualifications().stream()

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/user/ProfileController.java

@@ -7,6 +7,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import pl.edu.agh.project_manager.controller.dto.auth.ChangePasswordRequest;
+import pl.edu.agh.project_manager.controller.dto.user.UserResponse;
 import pl.edu.agh.project_manager.security.UserPrincipal;
 import pl.edu.agh.project_manager.service.user.UserService;
 
@@ -17,6 +18,12 @@ public class ProfileController {
 
     private final UserService userService;
 
+    @GetMapping
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<UserResponse> getMyProfile(@AuthenticationPrincipal UserPrincipal principal) {
+        return ResponseEntity.ok(userService.getUser(principal.userId()));
+    }
+
     @PostMapping("/password")
     @PreAuthorize("isAuthenticated()")
     public ResponseEntity<Void> changePassword(

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/user/UserController.java

@@ -10,11 +10,16 @@
 import pl.edu.agh.project_manager.controller.dto.invitation.AdminUserInvitationRequest;
 import pl.edu.agh.project_manager.controller.dto.invitation.ResendInvitationRequest;
 import pl.edu.agh.project_manager.controller.dto.project.ProjectAssignmentUserWorkloadResponse;
+import pl.edu.agh.project_manager.controller.dto.project.ProjectResponse;
+import pl.edu.agh.project_manager.controller.dto.project.UserProjectMembershipResponse;
+import pl.edu.agh.project_manager.controller.dto.project_group.OwnedGroupResponse;
+import pl.edu.agh.project_manager.controller.dto.qualification.QualificationResponse;
 import pl.edu.agh.project_manager.controller.dto.user.SimpleUserResponse;
 import pl.edu.agh.project_manager.controller.dto.user.UserResponse;
 import pl.edu.agh.project_manager.domain.enums.UserRole;
 import pl.edu.agh.project_manager.domain.enums.UserStatus;
 import pl.edu.agh.project_manager.service.approval.AssignmentManagementService;
+import pl.edu.agh.project_manager.service.user.QualificationService;
 import pl.edu.agh.project_manager.service.user.UserInvitationService;
 import pl.edu.agh.project_manager.service.user.UserService;
 import pl.edu.agh.project_manager.service.command.invitation.AdminInviteUserCommand;
@@ -30,6 +35,7 @@ class UserController {
     private final UserInvitationService invitationService;
     private final UserService userService;
     private final AssignmentManagementService assignmentManagementService;
+    private final QualificationService qualificationService;
 
     @GetMapping("/users")
     @PreAuthorize("isAuthenticated()")
@@ -95,4 +101,40 @@ public ResponseEntity<List<SimpleUserResponse>> searchUsers(
     public ResponseEntity<ProjectAssignmentUserWorkloadResponse> getUserWorkload(@PathVariable UUID userId) {
         return ResponseEntity.ok(assignmentManagementService.getUserWorkload(userId));
     }
+
+    @GetMapping("/users/{userId}")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<UserResponse> getUser(@PathVariable UUID userId) {
+        return ResponseEntity.ok(userService.getUser(userId));
+    }
+
+    @GetMapping("/users/{userId}/qualifications")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<List<QualificationResponse>> getUserQualifications(@PathVariable UUID userId) {
+        return ResponseEntity.ok(qualificationService.getUserQualifications(userId));
+    }
+
+    @GetMapping("/users/{userId}/subordinates")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<List<UserResponse>> getSubordinates(@PathVariable UUID userId) {
+        return ResponseEntity.ok(userService.getSubordinates(userId));
+    }
+
+    @GetMapping("/users/{userId}/projects")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<List<ProjectResponse>> getManagedProjects(@PathVariable UUID userId) {
+        return ResponseEntity.ok(userService.getManagedProjects(userId));
+    }
+
+    @GetMapping("/users/{userId}/memberships")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<List<UserProjectMembershipResponse>> getProjectMemberships(@PathVariable UUID userId) {
+        return ResponseEntity.ok(userService.getProjectMemberships(userId));
+    }
+
+    @GetMapping("/users/{userId}/groups")
+    @PreAuthorize("isAuthenticated()")
+    public ResponseEntity<List<OwnedGroupResponse>> getRelatedGroups(@PathVariable UUID userId) {
+        return ResponseEntity.ok(userService.getRelatedProjectGroups(userId));
+    }
 }

backend/project-manager/src/main/java/pl/edu/agh/project_manager/repository/projectgroup/ProjectGroupRepository.java

@@ -10,4 +10,6 @@
 public interface ProjectGroupRepository extends JpaRepository<ProjectGroup, UUID> {
 
     List<ProjectGroup> getSingleGroupByGroupType(GroupType groupType);
+
+    List<ProjectGroup> findAllByOwner_IdOrderByNameAsc(UUID ownerId);
 }

backend/project-manager/src/main/java/pl/edu/agh/project_manager/repository/user/UserRepository.java

@@ -30,4 +30,6 @@ public interface UserRepository extends JpaRepository<User, UUID>, JpaSpecificat
 
     @Query("SELECT u FROM User u WHERE LOWER(CONCAT(u.name, ' ', u.surname)) LIKE LOWER(CONCAT('%', :query, '%')) AND u.userRole = :role")
     List<User> searchUserByFullNameAndRole(@Param("query") String query, @Param("role") UserRole role);
+
+    List<User> findAllBySupervisor_Id(UUID supervisorId);
 }

backend/project-manager/src/main/java/pl/edu/agh/project_manager/service/user/UserService.java

@@ -11,28 +11,42 @@
 import org.springframework.transaction.annotation.Transactional;
 import pl.edu.agh.project_manager.controller.dto.PagedResponse;
 import pl.edu.agh.project_manager.controller.dto.project.ProjectAssignmentUserWorkloadResponse;
+import pl.edu.agh.project_manager.controller.dto.project.ProjectResponse;
+import pl.edu.agh.project_manager.controller.dto.project.UserProjectMembershipResponse;
+import pl.edu.agh.project_manager.controller.dto.project_group.OwnedGroupResponse;
 import pl.edu.agh.project_manager.controller.dto.user.SimpleUserResponse;
 import pl.edu.agh.project_manager.controller.dto.user.UserResponse;
+import pl.edu.agh.project_manager.domain.entity.project.Project;
 import pl.edu.agh.project_manager.domain.entity.project.ProjectAssignment;
 import pl.edu.agh.project_manager.domain.entity.user.User;
+import pl.edu.agh.project_manager.domain.enums.AssignmentStatus;
 import pl.edu.agh.project_manager.domain.enums.UserRole;
 import pl.edu.agh.project_manager.domain.enums.UserStatus;
 import pl.edu.agh.project_manager.domain.exception.ApiErrorCode;
 import pl.edu.agh.project_manager.domain.exception.ApplicationException;
+import pl.edu.agh.project_manager.repository.project.ProjectAssignmentRepository;
 import pl.edu.agh.project_manager.repository.project.ProjectRepository;
+import pl.edu.agh.project_manager.repository.projectgroup.ProjectGroupRepository;
 import pl.edu.agh.project_manager.repository.user.UserRepository;
 import pl.edu.agh.project_manager.util.assignments.AssignmentsUtil;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class UserService {
 
     private final UserRepository userRepository;
     private final ProjectRepository projectRepository;
+    private final ProjectAssignmentRepository projectAssignmentRepository;
+    private final ProjectGroupRepository projectGroupRepository;
     private final PasswordEncoder passwordEncoder;
 
     @Transactional
@@ -111,6 +125,77 @@ public User getUserEntityOrThrow(UUID userId) {
                 .orElseThrow(() -> new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + userId));
     }
 
+    @Transactional(readOnly = true)
+    public UserResponse getUser(UUID userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + userId));
+        return UserResponse.from(user);
+    }
+
+    @Transactional(readOnly = true)
+    public List<UserResponse> getSubordinates(UUID supervisorId) {
+        if (!userRepository.existsById(supervisorId)) {
+            throw new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + supervisorId);
+        }
+        return userRepository.findAllBySupervisor_Id(supervisorId).stream()
+                .map(UserResponse::from)
+                .toList();
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProjectResponse> getManagedProjects(UUID managerId) {
+        if (!userRepository.existsById(managerId)) {
+            throw new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + managerId);
+        }
+        return projectRepository.findAllByProjectManagerId(managerId).stream()
+                .map(ProjectResponse::from)
+                .toList();
+    }
+
+    @Transactional(readOnly = true)
+    public List<OwnedGroupResponse> getRelatedProjectGroups(UUID userId) {
+        if (!userRepository.existsById(userId)) {
+            throw new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + userId);
+        }
+
+        List<pl.edu.agh.project_manager.domain.entity.projectgroup.ProjectGroup> owned =
+                projectGroupRepository.findAllByOwner_IdOrderByNameAsc(userId);
+
+        Map<UUID, pl.edu.agh.project_manager.domain.entity.projectgroup.ProjectGroup> related =
+                new LinkedHashMap<>();
+        owned.forEach(g -> related.put(g.getId(), g));
+
+        projectRepository.findAllByProjectManagerId(userId).stream()
+                .map(p -> p.getProjectGroup())
+                .filter(g -> g != null)
+                .forEach(g -> related.putIfAbsent(g.getId(), g));
+
+        Set<UUID> ownedIds = owned.stream().map(g -> g.getId()).collect(Collectors.toSet());
+
+        return related.values().stream()
+                .map(g -> OwnedGroupResponse.from(g, ownedIds.contains(g.getId())))
+                .sorted(Comparator
+                        .comparing(OwnedGroupResponse::isOwner).reversed()
+                        .thenComparing(OwnedGroupResponse::name))
+                .toList();
+    }
+
+    @Transactional(readOnly = true)
+    public List<UserProjectMembershipResponse> getProjectMemberships(UUID userId) {
+        if (!userRepository.existsById(userId)) {
+            throw new ApplicationException(ApiErrorCode.USER_NOT_FOUND, "Cannot find user: " + userId);
+        }
+        List<ProjectAssignment> assignments = projectAssignmentRepository
+                .findAllByUserIdAndStatus(userId, AssignmentStatus.ACCEPTED);
+
+        Map<Project, List<ProjectAssignment>> byProject = assignments.stream()
+                .collect(Collectors.groupingBy(ProjectAssignment::getProject, LinkedHashMap::new, Collectors.toList()));
+
+        return byProject.entrySet().stream()
+                .map(e -> UserProjectMembershipResponse.from(e.getKey(), e.getValue()))
+                .toList();
+    }
+
     public List<User> getUsersByIdsOrThrow(List<UUID> userIds, String errorMessage) {
         long uniqueCount = userIds.stream().distinct().count();
         List<User> users = userRepository.findAllById(userIds);

backend/project-manager/src/test/java/pl/edu/agh/project_manager/service/report/ProjectPdfGeneratorTest.java

@@ -34,7 +34,16 @@ class ProjectPdfGeneratorTest {
 
     @BeforeEach
     void setUp() {
-        UserResponse manager = new UserResponse(UUID.randomUUID(),"john.doe@example.com", "John",  "Doe", null,null, null, List.of()
+        UserResponse manager = new UserResponse(
+                UUID.randomUUID(),
+                "john.doe@example.com",
+                "John",
+                "Doe",
+                null,
+                null,
+                null,
+                null,
+                List.of()
         );
         projectData = new ProjectResponse(UUID.randomUUID(), "Test Project", "Description", LocalDate.now(), LocalDate.now().plusMonths(6), true, manager, null);
     }

frontend/src/api/endpoints.ts

@@ -10,9 +10,15 @@ export const ENDPOINTS = {
         DETAIL: (id: string) => `/users/${id}`,
         RESEND_INVITATION: '/users/invitation',
         WORKLOAD: (id?: string) => `/users/${id}/workload`,
-        SEARCH_USERS: '/users/search'
+        SEARCH_USERS: '/users/search',
+        QUALIFICATIONS: (id: string) => `/users/${id}/qualifications`,
+        SUBORDINATES: (id: string) => `/users/${id}/subordinates`,
+        PROJECTS: (id: string) => `/users/${id}/projects`,
+        MEMBERSHIPS: (id: string) => `/users/${id}/memberships`,
+        GROUPS: (id: string) => `/users/${id}/groups`,
     },
     ME: {
+        PROFILE: '/me',
         QUALIFICATIONS: '/me/qualifications',
         QUALIFICATION: (id: string) => `/me/qualifications/${id}`,
         PASSWORD: '/me/password',

frontend/src/api/index.ts

@@ -6,7 +6,8 @@ export const employeeAssignmentsKeys = createQueryKeys('employee-assignments', {
 })
 
 export const qualificationsKeys = createQueryKeys('qualifications', {
-  mine: null, // me/qualifications
+  mine: null,
+  byUser: (userId: string) => [userId],
   suggestions: (query: string) => [query],
 });
 

frontend/src/features/notification/notification.utils.ts

@@ -7,7 +7,6 @@ export const getNotificationUrl = (type: NotificationType, referenceId: string):
       return `${PATHS.PROJECT_REQUESTS}?${QUERY_PARAMS.REQUEST_ID}=${referenceId}`;
 
     case 'ASSIGNMENT_ACCEPTED':
-      return PATHS.PROJECT(referenceId);
     case 'ASSIGNMENT_REJECTED':
       return PATHS.PROJECT(referenceId);
 
@@ -19,7 +18,7 @@ export const getNotificationUrl = (type: NotificationType, referenceId: string):
       return PATHS.PROFILE;
 
     case 'SYSTEM_NEW_EMPLOYEE':
-      return PATHS.PROFILE; // TODO: Powinno przenosic na profil pracownika, ale nie ma obecnie takiej mozliwosci
+      return PATHS.EMPLOYEE_DETAILS(referenceId);
 
     default:
       return PATHS.ROOT;