Feature/visa view controller

src/main/java/org/example/visacasemanagementsystem/VisaCaseManagementSystemApplication.java

@@ -1,7 +1,12 @@
 package org.example.visacasemanagementsystem;
 
+import org.example.visacasemanagementsystem.user.UserAuthorization;
+import org.example.visacasemanagementsystem.user.entity.User;
+import org.example.visacasemanagementsystem.user.repository.UserRepository;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication
@@ -12,4 +17,39 @@ public static void main(String[] args) {
         SpringApplication.run(VisaCaseManagementSystemApplication.class, args);
     }
 
+    @Bean
+    public CommandLineRunner initData(UserRepository userRepository) {
+        return args -> {
+            // Skapa en vanlig användare (Applicant)
+            if (userRepository.findByEmail("user@test.com").isEmpty()) {
+                User user = new User();
+                user.setFullName("USER");
+                user.setEmail("user@test.com");
+                user.setPassword("password"); // Notera: Du behöver sätta lösenord om din entitet kräver det
+                user.setUserAuthorization(UserAuthorization.USER);
+                userRepository.save(user);
+                System.out.println("Testanvändare skapad med ID: " + user.getId());
+
+                User admin = new User();
+                admin.setFullName("ADMIN");
+                admin.setEmail("user@test.com2");
+                admin.setPassword("password"); // Notera: Du behöver sätta lösenord om din entitet kräver det
+                admin.setUserAuthorization(UserAuthorization.ADMIN);
+                userRepository.save(admin);
+                System.out.println("Test-admin skapad med ID: " + admin.getId());
+            }
+
+            // Skapa en admin (Handler)
+            if (userRepository.findByEmail("admin@test.com").isEmpty()) {
+                User sysadmin = new User();
+                sysadmin.setFullName("SYSTEM ADMIN");
+                sysadmin.setEmail("admin@test.com");
+                sysadmin.setPassword("password");
+                sysadmin.setUserAuthorization(UserAuthorization.SYSADMIN);
+                userRepository.save(sysadmin);
+                System.out.println("Test-sysadmin skapad med ID: " + sysadmin.getId());
+            }
+        };
+    }
+
 }

src/main/java/org/example/visacasemanagementsystem/config/SecurityConfig.java

@@ -0,0 +1,21 @@
+package org.example.visacasemanagementsystem.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .authorizeHttpRequests(auth -> auth
+                        .anyRequest().permitAll()
+                )
+                .csrf(csrf -> csrf.disable())
+                .headers(headers -> headers.frameOptions(frame -> frame.disable()));
+        return http.build();
+    }
+}

src/main/java/org/example/visacasemanagementsystem/exception/GlobalExceptionHandler.java

@@ -1,13 +1,15 @@
 package org.example.visacasemanagementsystem.exception;
 
 import jakarta.persistence.EntityNotFoundException;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
+@Slf4j
 public class GlobalExceptionHandler {
 
     @ResponseStatus(value = HttpStatus.FORBIDDEN)
@@ -30,4 +32,12 @@ public String handleNotFoundException(RuntimeException exception) {
     public String handleIllegalArgumentException(IllegalArgumentException exception) {
         return "Invalid Request: " + exception.getMessage();
     }
+
+    @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(Exception.class)
+    @ResponseBody
+    public String handleAllUncaughtErrors(Exception exception) {
+        log.error("Unexpected Error: ", exception);
+        return "Unexpected server error.";
+    }
 }

src/main/java/org/example/visacasemanagementsystem/visa/VisaStatus.java

@@ -2,7 +2,6 @@
 
 public enum VisaStatus {
     SUBMITTED,
-    UNASSIGNED,
     ASSIGNED,
     INCOMPLETE,
     GRANTED,

src/main/java/org/example/visacasemanagementsystem/visa/controller/VisaViewController.java

@@ -0,0 +1,230 @@
+package org.example.visacasemanagementsystem.visa.controller;
+
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.validation.Valid;
+import org.example.visacasemanagementsystem.comment.service.CommentService;
+import org.example.visacasemanagementsystem.exception.UnauthorizedException;
+import org.example.visacasemanagementsystem.user.UserAuthorization;
+import org.example.visacasemanagementsystem.user.dto.UserDTO;
+import org.example.visacasemanagementsystem.user.service.UserService;
+import org.example.visacasemanagementsystem.visa.VisaType;
+import org.example.visacasemanagementsystem.visa.dto.CreateVisaDTO;
+import org.example.visacasemanagementsystem.visa.dto.UpdateVisaDTO;
+import org.example.visacasemanagementsystem.visa.dto.VisaDTO;
+import org.example.visacasemanagementsystem.visa.service.VisaService;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/visas")
+public class VisaViewController {
+
+    private final VisaService visaService;
+    private final CommentService commentService;
+    private final UserService userService;
+
+    public VisaViewController(VisaService visaService, CommentService commentService, UserService userService) {
+        this.visaService = visaService;
+        this.commentService = commentService;
+        this.userService = userService;
+    }
+
+    @GetMapping("/dashboard")
+    public String showDashboard(@RequestParam Long currentUserId, Model model) {
+        // Find current user
+        UserDTO user = userService.findById(currentUserId)
+                .orElseThrow(() -> new EntityNotFoundException("User not found."));
+
+        List<VisaDTO> visas;
+
+        // If the current user = ADMIN/SYSADMIN show everything
+        if (user.userAuthorization() == UserAuthorization.ADMIN ||
+                user.userAuthorization() == UserAuthorization.SYSADMIN) {
+            visas = visaService.findAll();
+        } else {
+            // Normal user/applicant can only se their own visa applications
+            visas = visaService.findVisasByApplicant(currentUserId);
+        }
+
+        // Send data to Thymeleaf
+        model.addAttribute("visas", visas);
+        model.addAttribute("currentUser", user);
+
+        return "visa/dashboard";
+    }
+
+    @GetMapping("/apply")
+    public String showApplyForm(@RequestParam Long currentUserId, Model model) {
+        UserDTO user = userService.findById(currentUserId)
+                .orElseThrow(() -> new EntityNotFoundException("User not found."));
+
+        model.addAttribute("currentUser", user);
+        model.addAttribute("visaTypes", VisaType.values());
+
+        if (!model.containsAttribute("createVisaDTO")) {
+            model.addAttribute("createVisaDTO", new CreateVisaDTO(null, "", "", null, currentUserId));
+        }
+
+        return "visa/apply-form";
+    }
+
+    @PostMapping("/apply")
+    public String submitApplication(
+            @Valid @ModelAttribute("createVisaDTO") CreateVisaDTO createVisaDTO,
+            BindingResult bindingResult,
+            @RequestParam Long currentUserId,
+            RedirectAttributes redirectAttributes,
+            Model model) {
+
+        if (bindingResult.hasErrors()) {
+            prepareApplyModel(currentUserId, model);
+            return "visa/apply-form";
+        }
+
+        try {
+            visaService.applyForVisa(createVisaDTO, currentUserId);
+        } catch (IllegalArgumentException e) {
+            bindingResult.rejectValue("travelDate", "error.travelDate", e.getMessage());
+            prepareApplyModel(currentUserId, model);
+            return "visa/apply-form";
+        }
+
+        return "redirect:/visas/dashboard?currentUserId=" + currentUserId;
+    }
+
+    @GetMapping("/{id}/edit")
+    public String showEditForm(@PathVariable Long id, @RequestParam Long currentUserId, Model model) {
+        UserDTO userDTO  = userService.findById(currentUserId)
+                .orElseThrow(() -> new EntityNotFoundException("User not found."));
+
+        VisaDTO visa = visaService.findVisaDtoById(id);
+
+        if (!visa.applicantId().equals(currentUserId)) {
+            throw  new UnauthorizedException("You can only edit your own applications.");
+        }
+
+        UpdateVisaDTO updateDto = new UpdateVisaDTO(
+                visa.id(),
+                visa.visaType(),
+                visa.visaStatus(),
+                visa.nationality(),
+                visa.passportNumber(),
+                visa.travelDate(),
+                visa.handlerId()
+        );
+
+        model.addAttribute("updateVisaDto", updateDto);
+        model.addAttribute("currentUser", userDTO);
+        model.addAttribute("visaTypes", VisaType.values());
+        model.addAttribute("isEdit", true);
+        model.addAttribute("statusInformation", visa.statusInformation());
+
+        return "visa/edit-form";
+    }
+
+    @PostMapping("/{id}/edit")
+    public String processUpdate(
+            @PathVariable Long id,
+            @Valid @ModelAttribute ("updateVisaDto") UpdateVisaDTO updateVisaDTO,
+            BindingResult bindingResult,
+            @RequestParam Long currentUserId,
+            Model model) {
+
+        if (bindingResult.hasErrors()) {
+            prepareApplyModel(currentUserId, model);
+            model.addAttribute("isEdit", true);
+            VisaDTO visa = visaService.findVisaDtoById(id);
+            model.addAttribute("statusInformation", visa.statusInformation());
+            return "visa/edit-form";
+        }
+
+        try {
+            visaService.updateVisa(id, updateVisaDTO, currentUserId);
+        } catch (IllegalArgumentException e) {
+            if (e.getMessage().contains("date")) {
+                bindingResult.rejectValue("travelDate", "error.travelDate", e.getMessage());
+            } else {
+                bindingResult.reject("globalError",e.getMessage());
+            }
+
+            prepareApplyModel(currentUserId, model);
+            model.addAttribute("isEdit", true);
+            VisaDTO visa = visaService.findVisaDtoById(id);
+            model.addAttribute("statusInformation", visa.statusInformation());
+
+            return "visa/edit-form";
+        }
+        return "redirect:/visas/" + id + "?currentUserId=" + currentUserId;
+    }
+
+    @PostMapping("/{id}/approve")
+    public String approveVisa(@PathVariable Long id, @RequestParam Long currentUserId) {
+        visaService.approveVisa(id, currentUserId);
+        return "redirect:/visas/" + id + "?currentUserId=" + currentUserId;
+    }
+
+    @PostMapping("/{id}/request-info")
+    public String requestMoreInformation(@PathVariable Long id,
+                                         @RequestParam Long currentUserId,
+                                         @RequestParam String reason) {
+
+        visaService.requestMoreInformation(id, currentUserId, reason);
+
+        return "redirect:/visas/" + id + "?currentUserId=" + currentUserId;
+    }
+
+
+    @PostMapping("/{id}/reject")
+    public String rejectVisa(@PathVariable Long id,
+                             @RequestParam Long currentUserId,
+                             @RequestParam String reason) {
+        visaService.rejectVisa(id, currentUserId, reason);
+        return "redirect:/visas/" + id + "?currentUserId=" + currentUserId;
+    }
+
+
+    @PostMapping("/{id}/assign")
+    public String assignCaseToHandler(@PathVariable Long id, @RequestParam Long currentUserId) {
+        visaService.assignHandler(id, currentUserId);
+        return "redirect:/visas/" + id + "?currentUserId=" + currentUserId;
+    }
+
+    @GetMapping("/{id}")
+    public String viewDetails(@PathVariable Long id, @RequestParam Long currentUserId, Model model) {
+        // Get visa
+        VisaDTO visa = visaService.findVisaDtoById(id);
+
+        // Get user
+        UserDTO user = userService.findById(currentUserId)
+                .orElseThrow(() -> new EntityNotFoundException("User not found."));
+
+        // Authorization check: regular users can only view their own applications
+        if (user.userAuthorization() == UserAuthorization.USER && !visa.applicantId().equals(currentUserId)) {
+            throw new UnauthorizedException("You can only view your own applications.");
+        }
+
+        // Get comments
+        var comments = commentService.getCommentsByVisaId(id);
+
+
+        model.addAttribute("visa", visa);
+        model.addAttribute("comments", comments);
+        model.addAttribute("currentUser", user);
+
+        return "visa/details";
+    }
+
+    // Helper methods
+
+    public void prepareApplyModel(Long currentUserId, Model model) {
+        UserDTO user = userService.findById(currentUserId)
+                .orElseThrow(() -> new EntityNotFoundException("User not found."));
+        model.addAttribute("currentUser", user);
+        model.addAttribute("visaTypes", VisaType.values());
+    }
+}

src/main/java/org/example/visacasemanagementsystem/visa/dto/CreateVisaDTO.java

@@ -3,10 +3,15 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import org.example.visacasemanagementsystem.visa.VisaType;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 public record CreateVisaDTO(
         @NotNull(message = "Visa type must be specified") VisaType visaType,
         @NotBlank(message = "Nationality must be specified") String nationality,
-        @NotNull Long applicantId // Användaren som ansöker om visa
+        @NotBlank(message = "Passport number must be provided") String passportNumber,
+        @NotNull(message = "Travel date must be provided") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate travelDate,
+        Long applicantId
 ) {
 }

src/main/java/org/example/visacasemanagementsystem/visa/dto/UpdateVisaDTO.java

@@ -4,12 +4,17 @@
 import jakarta.validation.constraints.NotNull;
 import org.example.visacasemanagementsystem.visa.VisaStatus;
 import org.example.visacasemanagementsystem.visa.VisaType;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 public record UpdateVisaDTO(
         @NotNull Long id,
-        @NotBlank(message = "Visa type must be specified") VisaType visaType,
+        @NotNull(message = "Visa type must be specified") VisaType visaType,
         @NotNull(message = "Application must have a status") VisaStatus visaStatus,
         @NotBlank(message = "Nationality must be specified") String nationality,
-        Long handlerId //  Handläggaren som uppdaterar visat eller om användaren gör en komplettering?
+        @NotBlank(message = "Passport number must be provided") String passportNumber,
+        @NotNull (message = "Travel date must be provided") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate travelDate,
+        Long handlerId
 ) {
 }