develop into main pr

.gitignore

@@ -63,3 +63,6 @@ logs/
 # =========================
 coverage/
 
+# Claude Code local settings
+.claude/settings.local.json
+

backend/project-manager/build.gradle

@@ -39,12 +39,18 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2'
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
     // JSON Web Token (JWT)
     implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.5'
 
+	// CSV & PDF
+	implementation 'com.opencsv:opencsv:5.9'
+    implementation 'com.openhtmltopdf:openhtmltopdf-core:1.0.10'
+    implementation 'com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10'
+
 	// TOOLS
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'
@@ -68,4 +74,4 @@ tasks.named('test') {
 
 jar {
 	enabled = false
-}
+}

backend/project-manager/gradle.properties

@@ -0,0 +1 @@
+org.gradle.java.installations.auto-download=true

backend/project-manager/settings.gradle

@@ -1 +1,5 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 rootProject.name = 'project-manager'

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/advice/GlobalExceptionHandler.java

@@ -5,11 +5,15 @@
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authorization.AuthorizationDeniedException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import pl.edu.agh.project_manager.domain.exception.ApiErrorCode;
 import pl.edu.agh.project_manager.domain.exception.ApplicationException;
 
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
 @Slf4j
 @RestControllerAdvice
 public class GlobalExceptionHandler {
@@ -63,4 +67,19 @@ public ResponseEntity<ApiErrorResponse> handleGeneralException(Exception ex) {
                 .status(error.getHttpStatus())
                 .body(body);
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ApiErrorResponse> handleValidationException(MethodArgumentNotValidException ex) {
+        String message = ex.getBindingResult().getFieldErrors().stream()
+                .map(error -> error.getField() + ": " + error.getDefaultMessage())
+                .collect(Collectors.joining(", "));
+
+        var error = ApiErrorCode.VALIDATION_FAILED;
+
+        var body = new ApiErrorResponse(error.getCode(), message);
+
+        return ResponseEntity
+                .status(error.getHttpStatus())
+                .body(body);
+    }
 }

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/approval/ApprovalsController.java

@@ -29,7 +29,7 @@ public class ApprovalsController {
     private final QualificationManagementService qualificationService;
 
     @GetMapping("/assignments/pending")
-    @PreAuthorize("hasRole('LINEAR_MANAGER')")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY')")
     public ResponseEntity<List<AssignmentResponse>> getPendingAssignments(
             @AuthenticationPrincipal UserPrincipal principal
     ) {
@@ -38,7 +38,7 @@ public ResponseEntity<List<AssignmentResponse>> getPendingAssignments(
     }
 
     @PostMapping("/assignments/{assignmentId}/accept")
-    @PreAuthorize("hasRole('LINEAR_MANAGER') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
     public ResponseEntity<Void> acceptAssignment(
             @PathVariable UUID assignmentId,
             @AuthenticationPrincipal UserPrincipal principal
@@ -48,7 +48,7 @@ public ResponseEntity<Void> acceptAssignment(
     }
 
     @PostMapping("/assignments/{assignmentId}/reject")
-    @PreAuthorize("hasRole('LINEAR_MANAGER') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
     public ResponseEntity<Void> rejectAssignment(
             @PathVariable UUID assignmentId,
             @AuthenticationPrincipal UserPrincipal principal
@@ -58,7 +58,7 @@ public ResponseEntity<Void> rejectAssignment(
     }
 
     @GetMapping("/assignments/{assignmentId}/details")
-    @PreAuthorize("hasRole('LINEAR_MANAGER') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY') and @assignmentAccess.canManageAssignment(#assignmentId, authentication.principal)")
     public ResponseEntity<EmployeeAssignmentDetailsResponse> getAssignmentDetails(
             @PathVariable UUID assignmentId,
             @AuthenticationPrincipal UserPrincipal principal
@@ -68,19 +68,19 @@ public ResponseEntity<EmployeeAssignmentDetailsResponse> getAssignmentDetails(
     }
 
     @GetMapping("/qualifications")
-    @PreAuthorize("hasRole('LINEAR_MANAGER')")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY')")
     public ResponseEntity<List<QualificationRequestResponse>> getUsersWithWaitingQualifications(@AuthenticationPrincipal UserPrincipal principal) {
         return ResponseEntity.ok(qualificationService.getRecordsForManager(principal.userId()));
     }
 
     @GetMapping("/qualifications/details")
-    @PreAuthorize("hasRole('LINEAR_MANAGER') and @qualificationSecurity.isManagerForUser(principal.userId(), #userId)")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY') and @qualificationSecurity.isManagerForUser(principal.userId(), #userId)")
     public ResponseEntity<List<QualificationDetailsResponse>> getQualificationRequestDetails(@RequestParam UUID userId) {
         return ResponseEntity.ok(qualificationService.getPendingForUser(userId));
     }
 
     @PostMapping("/qualifications/bulk-update")
-    @PreAuthorize("hasRole('LINEAR_MANAGER')")
+    @PreAuthorize("hasAnyRole('LINEAR_MANAGER', 'AUTHORITY')")
     public ResponseEntity<Void> updateQualificationRequests(
             @Valid @RequestBody List<QualificationUpdateRequest> requests,
             @AuthenticationPrincipal UserPrincipal principal

backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/dto/employee_requests/ChartIntervalResponse.java → backend/project-manager/src/main/java/pl/edu/agh/project_manager/controller/dto/common/ChartIntervalResponse.java

@@ -1,4 +1,4 @@
-package pl.edu.agh.project_manager.controller.dto.employee_requests;
+package pl.edu.agh.project_manager.controller.dto.common;
 
 import java.time.LocalDate;
 

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

@@ -1,5 +1,7 @@
 package pl.edu.agh.project_manager.controller.dto.employee_requests;
 
+import pl.edu.agh.project_manager.controller.dto.common.ChartIntervalResponse;
+
 import java.util.List;
 
 public record EmployeeAssignmentDetailsResponse(

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

@@ -6,11 +6,8 @@
 
 public record MilestoneResponse (
         UUID id,
-
         String name,
-
         String description,
-
         LocalDate date
 ) {
     public static MilestoneResponse from(ProjectMilestone milestone) {

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

@@ -10,24 +10,22 @@
 public record AssignmentResponse(
         UUID id,
         UUID projectId,
-        UUID userId,
+        String projectName,
         String roleName,
-        LocalDate startDate,
-        LocalDate endDate,
-        Integer utilizationPercentage,
-        AssignmentStatus status,
+        String employeeName,
+        String employeeSurname,
+        AssignmentStatusResponse status,
         LocalDateTime createdAt
 ) {
     public static AssignmentResponse from(ProjectAssignment assignment) {
         return new AssignmentResponse(
                 assignment.getId(),
                 assignment.getProject().getId(),
-                assignment.getUser().getId(),
+                assignment.getProject().getTitle(),
                 assignment.getRoleName(),
-                assignment.getStartDate(),
-                assignment.getEndDate(),
-                assignment.getUtilizationPercentage(),
-                assignment.getStatus(),
+                assignment.getUser().getName(),
+                assignment.getUser().getSurname(),
+                AssignmentStatusResponse.from(assignment.getStatus()),
                 assignment.getCreatedAt()
         );
     }

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

@@ -0,0 +1,17 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.domain.enums.AssignmentStatus;
+
+public enum AssignmentStatusResponse {
+    PENDING,
+    ACCEPTED,
+    REJECTED;
+
+    public static AssignmentStatusResponse from(AssignmentStatus status) {
+        return switch (status) {
+            case PENDING -> PENDING;
+            case ACCEPTED -> ACCEPTED;
+            case REJECTED -> REJECTED;
+        };
+    }
+}

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

@@ -0,0 +1,27 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.domain.entity.project.ProjectAssignment;
+import pl.edu.agh.project_manager.domain.entity.user.User;
+
+import java.util.List;
+import java.util.UUID;
+
+public record AssignmentsByEmployeeResponse(
+        UUID userId,
+        String name,
+        String surname,
+        String email,
+        List<ProjectAssignmentResponse> assignments
+) {
+    public static AssignmentsByEmployeeResponse from(User user, List<ProjectAssignment> userAssignments) {
+        return new AssignmentsByEmployeeResponse(
+                user.getId(),
+                user.getName(),
+                user.getSurname(),
+                user.getEmail(),
+                userAssignments.stream()
+                        .map(ProjectAssignmentResponse::from)
+                        .toList()
+        );
+    }
+}

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

@@ -0,0 +1,26 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.domain.entity.project.ProjectAssignment;
+
+import java.time.LocalDate;
+import java.util.UUID;
+
+public record ProjectAssignmentResponse(
+        UUID id,
+        LocalDate startDate,
+        LocalDate endDate,
+        AssignmentStatusResponse status,
+        String roleName,
+        int utilizationPercentage
+) {
+    public static ProjectAssignmentResponse from(ProjectAssignment assignment) {
+        return new ProjectAssignmentResponse(
+                assignment.getId(),
+                assignment.getStartDate(),
+                assignment.getEndDate(),
+                AssignmentStatusResponse.from(assignment.getStatus()),
+                assignment.getRoleName(),
+                assignment.getUtilizationPercentage()
+        );
+    }
+}

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

@@ -0,0 +1,10 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.controller.dto.common.ChartIntervalResponse;
+
+import java.util.List;
+
+public record ProjectAssignmentUserWorkloadResponse(
+        List<ChartIntervalResponse> workload
+) {
+}

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

@@ -2,9 +2,9 @@
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import pl.edu.agh.project_manager.controller.dto.milestone.MilestoneRequest;
+import pl.edu.agh.project_manager.controller.dto.project_risk.ProjectRiskRequest;
 import pl.edu.agh.project_manager.service.command.project.ProjectCreationCommand;
 
 import java.time.LocalDate;
@@ -26,20 +26,20 @@ public record ProjectCreationRequest(
 
         UUID projectGroupId,
 
-        @NotEmpty(message = "Lista sponsorów nie może być pusta")
         List<UUID> sponsors,
 
-        @NotEmpty(message = "Lista członków komitetu sterującego nie może być pusta")
         List<UUID> committee,
 
         @Valid
-        List<RiskRequest> risks,
+        List<ProjectRiskRequest> risks,
 
         @Valid
         List<MilestoneRequest> milestones
 ) {
     public ProjectCreationRequest {
         if (risks == null || risks.isEmpty()) risks = List.of();
+        if (sponsors == null) sponsors = List.of();
+        if (committee == null) committee = List.of();
     }
 
     public ProjectCreationCommand toCommand(UUID creatorId) {
@@ -50,7 +50,7 @@ public ProjectCreationCommand toCommand(UUID creatorId) {
                 this.startDate,
                 this.endDate,
                 this.projectGroupId,
-                this.risks.stream().map(RiskRequest::toCommand).toList(),
+                this.risks.stream().map(ProjectRiskRequest::toCommand).toList(),
                 this.milestones.stream().map(MilestoneRequest::toCommand).toList(),
                 this.sponsors,
                 this.committee

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

@@ -2,6 +2,7 @@
 
 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.controller.dto.project_group.GroupBasicResponse;
 
 import java.time.LocalDate;
 import java.util.UUID;
@@ -13,7 +14,8 @@ public record ProjectResponse(
         LocalDate startDate,
         LocalDate endDate,
         Boolean isActive,
-        UserResponse manager
+        UserResponse manager,
+        GroupBasicResponse group
 ) {
     public static ProjectResponse from(Project project) {
         return new ProjectResponse(
@@ -23,7 +25,8 @@ public static ProjectResponse from(Project project) {
                 project.getStartDate(),
                 project.getEndDate(),
                 project.getIsActive(),
-                UserResponse.from(project.getProjectManager())
+                UserResponse.from(project.getProjectManager()),
+                GroupBasicResponse.from(project.getProjectGroup())
         );
     }
 }

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

@@ -0,0 +1,11 @@
+package pl.edu.agh.project_manager.controller.dto.project;
+
+import pl.edu.agh.project_manager.controller.dto.milestone.MilestoneResponse;
+
+import java.util.List;
+
+public record ProjectTimelineResponse(
+        List<MilestoneResponse> milestones,
+        List<AssignmentsByEmployeeResponse> assignments
+) {
+}