Feature/profile

src/main/java/org/example/crimearchive/cases/CaseService.java

@@ -1,11 +1,19 @@
 package org.example.crimearchive.cases;
 
+import org.example.crimearchive.permissions.NullAuthzDeniedHandler;
 import org.example.crimearchive.polis.Account;
 import org.example.crimearchive.polis.UserRepository;
+import org.example.crimearchive.reports.Report;
 import org.example.crimearchive.reports.ReportRepository;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authorization.method.HandleAuthorizationDenied;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service("permittedFilesChecker")
 public class CaseService {
@@ -19,6 +27,8 @@ public CaseService(ReportRepository reportRepository, CasesRepository casesRepos
         this.userRepository = userRepository;
     }
 
+    @PreAuthorize("hasRole('admin')")
+    @HandleAuthorizationDenied(handlerClass = NullAuthzDeniedHandler.class)
     public void addAccountToCase(Long accountId, String caseNumber){
         Optional<Account> account = userRepository.findById(accountId);
         if (account.isEmpty()) throw new RuntimeException("account not found");
@@ -30,6 +40,21 @@ public void addAccountToCase(Long accountId, String caseNumber){
         }
     }
 
+    public List<Cases> getAuthzCases(long accountId) {
+        return casesRepository.findByAccountsId(accountId);
+    }
+
+    public Report getReports(Cases caseId) {
+        return reportRepository.getReportByCaseEntity(caseId);
+    }
+
+    public Map<String, Set<Report>> getReportsWithCaseNumber(List<Cases> grantedCases) {
+        Map<String, Set<Report>> repos = grantedCases.stream().collect(Collectors.toMap(
+                cases -> cases.getCaseNumber(), c2 -> c2.getReports()
+        ));
+        return repos;
+    }
+
 //
 //    public List<Report> hasPermission(Long accountId){
 //    List<String> permittedCaseNumbers = permissionRepository.findAllPermittedReports(accountId);

src/main/java/org/example/crimearchive/cases/Cases.java

@@ -20,7 +20,7 @@ public class Cases {
     @ManyToMany
     @JoinTable(
             name = "account_cases",
-            joinColumns = @JoinColumn(name = "report_id"),
+            joinColumns = @JoinColumn(name = "case_id"),
             inverseJoinColumns = @JoinColumn(name = "account_id")
     )
     private Set<Account> accounts = new HashSet<>();

src/main/java/org/example/crimearchive/config/SecurityConfiguration.java

@@ -21,13 +21,13 @@ SecurityFilterChain securityFilterChain(HttpSecurity http) {
         return http
                 .authorizeHttpRequests(auth -> {
                     auth.requestMatchers("/").permitAll();
-                    auth.requestMatchers("/static/**").permitAll();
+                    auth.requestMatchers("/*.css", "/images/**").permitAll();
                     auth.requestMatchers("/favicon.ico").permitAll();
                     auth.requestMatchers("/index").permitAll();
                     auth.requestMatchers("/error").permitAll();
-                    auth.requestMatchers("/cases/add").hasRole("ADMIN");
 
-                    auth.requestMatchers("/cases").hasRole("ADMIN");
+                    //auth.requestMatchers("/cases/add").hasRole("ADMIN");
+                    //auth.requestMatchers("/cases").hasRole("ADMIN");
 
                     auth.requestMatchers("/private").hasRole("ADMIN");
                     auth.requestMatchers("/userpage").hasRole("USER");

src/main/java/org/example/crimearchive/controllers/HomeController.java

@@ -3,6 +3,7 @@
 import jakarta.validation.Valid;
 import org.example.crimearchive.DTO.CreateReport;
 import org.example.crimearchive.cases.CaseService;
+import org.example.crimearchive.cases.Cases;
 import org.example.crimearchive.cases.CasesRepository;
 import org.example.crimearchive.polis.Account;
 import org.example.crimearchive.reports.ReportService;
@@ -15,6 +16,7 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.UUID;
 
 @Controller
@@ -59,7 +61,8 @@ public String casesPage(@RequestParam(required = false) Long accountId, Model mo
 
     @PostMapping("/cases/add")
     public String casesPage(@RequestParam Long addAccountId,
-                            @RequestParam String case_number){
+                            @RequestParam String case_number,
+                            @AuthenticationPrincipal Account user) {
         caseService.addAccountToCase(addAccountId, case_number);
         return "redirect:/cases";
     }
@@ -78,6 +81,15 @@ public String saveReport(
         return "redirect:/userpage";
     }
 
+    @GetMapping("/profile")
+    public String profilePage(@AuthenticationPrincipal Account user, Model model) {
+        List<Cases> caseList = caseService.getAuthzCases(user.getId());
+        model.addAttribute("currentUser", user);
+        model.addAttribute("cases", caseService.getReportsWithCaseNumber(caseList));
+        model.addAttribute("user", user);
+        return "profile";
+    }
+
     @GetMapping("/reports/{uuid}/download/pdf")
     public ResponseEntity<byte[]> downloadPdf(@PathVariable UUID uuid) {
         return reportService.downloadPdf(uuid);

src/main/java/org/example/crimearchive/permissions/NullAuthzDeniedHandler.java

@@ -0,0 +1,16 @@
+package org.example.crimearchive.permissions;
+
+import org.aopalliance.intercept.MethodInvocation;
+import org.jspecify.annotations.Nullable;
+import org.springframework.security.authorization.AuthorizationResult;
+import org.springframework.security.authorization.method.MethodAuthorizationDeniedHandler;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NullAuthzDeniedHandler implements MethodAuthorizationDeniedHandler {
+    @Override
+    public @Nullable Object handleDeniedInvocation(MethodInvocation methodInvocation, AuthorizationResult authorizationResult) {
+        // when authz fails, return null
+        return null;
+    }
+}

src/main/java/org/example/crimearchive/polis/Account.java

@@ -21,6 +21,9 @@ public class Account implements UserDetails {
     private Collection<? extends GrantedAuthority> authorities;
     @ManyToMany(mappedBy = "accounts")
     private Set<Cases> permittedCases = new HashSet<>();
+    private String fullName;
+    private String profession;
+    private String department;
 
 
     public Long getId() {
@@ -31,10 +34,42 @@ public Account() {
         this.username = "";
     }
 
-    public Account(String username, String password, List<String> roles) {
+    public Account(String username, String password, List<String> roles,
+                   String fullname, String profession, String department) {
         this.username = username;
         this.password = password;
         this.authorities = setAuthoritesList(roles);
+        this.fullName = fullname;
+        this.profession = profession;
+        this.department = department;
+    }
+
+    public Account(String username, String password, List<String> roles) {
+        this(username, password, roles, null, null, null);
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getProfession() {
+        return profession;
+    }
+
+    public void setProfession(String profession) {
+        this.profession = profession;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
     }
 
     public void setId(Long id) {
@@ -70,4 +105,12 @@ public List<SimpleGrantedAuthority> setAuthoritesList(List<String> roles) {
                         r -> r.startsWith("ROLE_") ? new SimpleGrantedAuthority(r.toUpperCase()) : new SimpleGrantedAuthority("ROLE_" + r.toUpperCase()))
                 .toList();
     }
+
+    public Set<Cases> getPermittedCases() {
+        return permittedCases;
+    }
+
+    public void setPermittedCases(Set<Cases> permittedCases) {
+        this.permittedCases = permittedCases;
+    }
 }

src/main/java/org/example/crimearchive/reports/Report.java

@@ -19,7 +19,7 @@ public class Report {
     private String s3KeyPdf;
     private String s3KeyFile;
     @ManyToOne
-    @JoinColumn(name = "reports")
+    @JoinColumn(name = "case_id")
     private Cases caseEntity;
 
     public Cases getCaseEntity() {

src/main/java/org/example/crimearchive/reports/ReportRepository.java

@@ -1,7 +1,9 @@
 package org.example.crimearchive.reports;
 
+import org.example.crimearchive.cases.Cases;
 import org.springframework.data.repository.ListCrudRepository;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface ReportRepository extends ListCrudRepository<Report, UUID> {
@@ -14,6 +16,8 @@ public interface ReportRepository extends ListCrudRepository<Report, UUID> {
 
     long count();
 
-//    List<Report> findAllByCaseNumberIn(List<String> permittedCaseNumbers);
+    List<Report> findAllByCaseEntity(Cases caseEntity);
+
+    Report getReportByCaseEntity(Cases caseEntity);
 
 }

src/main/java/org/example/crimearchive/repository/AccountInitilizer.java

@@ -23,17 +23,18 @@ public AccountInitilizer(UserRepository repo, CaseService caseService, PasswordE
     @Override
     public void run(String... args) throws Exception {
         if(userRepository.count() == 0){
-            userRepository.save(createAccount("admin", "password", List.of("user", "admin")));
-            userRepository.save(createAccount("demouser", "password", List.of("user")));
-            userRepository.save(createAccount("officer", "password", List.of("user")));
+            userRepository.save(createAccount("admin", "password", List.of("user", "admin"), "Lars Åkesson", "Polischef", "Västra Götaland"));
+            userRepository.save(createAccount("demouser", "password", List.of("user"), "Nils Jonsson", "Polis", "Skåne"));
+            userRepository.save(createAccount("officer", "password", List.of("user"), "Jimmy Johansson", "Polis", "Lappland"));
 
             caseService.addAccountToCase(1L, "K-2026-000001");
             caseService.addAccountToCase(1L, "K-2026-000002");
             caseService.addAccountToCase(1L, "K-2026-000003");
         }
     }
-    private Account createAccount(String username, String rawPassword, List<String> roles){
-        return new Account(username, passwordEncoder.encode(rawPassword), roles);
+
+    private Account createAccount(String username, String rawPassword, List<String> roles, String fullname, String profession, String department) {
+        return new Account(username, passwordEncoder.encode(rawPassword), roles, fullname, profession, department);
     }
 
 }