Feature/meeting protocol generation

docker-compose.yaml

@@ -10,6 +10,7 @@ services:
       - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
+      - ./init-postgres.sql:/docker-entrypoint-initdb.d/init-postgres.sql:ro
 
   localstack:
     image: localstack/localstack:3.8.1

init-postgres.sql

@@ -0,0 +1 @@
+CREATE DATABASE team4you_test;

src/main/java/backendlab/team4you/casefile/CaseFileService.java

@@ -180,16 +180,17 @@ public void deleteFile(Long caseRecordId, Long fileId, UserEntity actor) {
         }
 
         String s3Key = caseFile.getS3Key();
+
         if (meetingAgendaDocumentRepository.existsByCaseFileId(fileId)) {
             throw new FileInUseException("Filen kan inte tas bort eftersom den används som mötesunderlag.");
         }
 
         caseFileRepository.delete(caseFile);
+
         try {
             s3Service.deleteFile(s3Key);
-        } catch (Exception e) {
-            log.error("Failed to delete S3 object after DB deletion: {}", s3Key, e);
-            throw e;
+        } catch (Exception exception) {
+            log.error("Failed to delete S3 object after DB deletion: {}", s3Key, exception);
         }
     }
 

src/main/java/backendlab/team4you/exceptions/GlobalRestExceptionHandler.java

@@ -22,7 +22,8 @@
         "backendlab.team4you.caserecord",
         "backendlab.team4you.registry",
         "backendlab.team4you.user",
-        "backendlab.team4you.controller"
+        "backendlab.team4you.controller",
+        "backendlab.team4you.protocol"
 })
 public class GlobalRestExceptionHandler {
 
@@ -46,7 +47,9 @@ public ResponseEntity<ErrorResponseDto> handleAccessDenied(AccessDeniedException
             UserNotFoundException.class,
             MeetingNotFoundException.class,
             MeetingAgendaItemNotFoundException.class,
-            MeetingAgendaDocumentNotFoundException.class
+            MeetingAgendaDocumentNotFoundException.class,
+            ProtocolNotFoundException.class,
+            ProtocolParagraphNotFoundException.class
     })
     public ResponseEntity<ErrorResponseDto> handleNotFound(RuntimeException ex) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND)
@@ -61,7 +64,6 @@ public ResponseEntity<ErrorResponseDto> handleNotFound(RuntimeException ex) {
     @ExceptionHandler({
             InvalidFileNameException.class,
             IllegalArgumentException.class,
-            IllegalStateException.class,
             InvalidMeetingStateException.class
     })
     public ResponseEntity<ErrorResponseDto> handleBadRequest(RuntimeException ex) {
@@ -91,7 +93,8 @@ public ResponseEntity<ErrorResponseDto> handleFileTooLarge(FileTooLargeException
             DuplicateEmailException.class,
             FileKeyConflictException.class,
             DuplicateMeetingAgendaItemException.class,
-            DuplicateMeetingAgendaDocumentException.class
+            DuplicateMeetingAgendaDocumentException.class,
+            ProtocolAlreadyExistsException.class
     })
     public ResponseEntity<ErrorResponseDto> handleConflict(RuntimeException ex) {
         return ResponseEntity.status(HttpStatus.CONFLICT)

src/main/java/backendlab/team4you/exceptions/GlobalViewExceptionHandler.java

@@ -9,7 +9,11 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-@ControllerAdvice(basePackages = { "backendlab.team4you.casefile.ui","backendlab.team4you.meeting"})
+@ControllerAdvice(basePackages = {
+        "backendlab.team4you.casefile.ui",
+        "backendlab.team4you.meeting",
+        "backendlab.team4you.protocol"
+})
 public class GlobalViewExceptionHandler {
 
     private static final Logger log = LoggerFactory.getLogger(GlobalViewExceptionHandler.class);
@@ -34,6 +38,8 @@ public String handleDuplicateEmail(DuplicateEmailException ex, Model model) {
             CaseFileNotFoundException.class,
             MeetingNotFoundException.class,
             MeetingAgendaDocumentNotFoundException.class,
+            ProtocolNotFoundException.class,
+            ProtocolParagraphNotFoundException.class,
     })
     @ResponseStatus(HttpStatus.NOT_FOUND)
     public String handleNotFound(RuntimeException ex, Model model) {
@@ -63,4 +69,11 @@ public String handleUnexpected(Exception ex, Model model) {
         model.addAttribute("errorMessage", "Något gick fel. Försök igen.");
         return "error";
     }
+
+    @ExceptionHandler(ProtocolAlreadyExistsException.class)
+    @ResponseStatus(HttpStatus.CONFLICT)
+    public String handleProtocolAlreadyExists(ProtocolAlreadyExistsException ex, Model model) {
+        model.addAttribute("errorMessage", "Ett protokoll finns redan för det här sammanträdet.");
+        return "error";
+    }
 }

src/main/java/backendlab/team4you/exceptions/MeetingNotFoundException.java

@@ -1,7 +1,14 @@
 package backendlab.team4you.exceptions;
 
 public class MeetingNotFoundException extends RuntimeException {
-    public MeetingNotFoundException(String message) {
-        super(message);
+    private final Long meetingId;
+
+    public MeetingNotFoundException(Long meetingId) {
+        super("Sammanträdet hittades inte.");
+        this.meetingId = meetingId;
+    }
+
+    public Long getMeetingId() {
+        return meetingId;
     }
 }

src/main/java/backendlab/team4you/exceptions/ProtocolAlreadyExistsException.java

@@ -0,0 +1,8 @@
+package backendlab.team4you.exceptions;
+
+public class ProtocolAlreadyExistsException extends RuntimeException {
+
+    public ProtocolAlreadyExistsException(Long meetingId) {
+        super("Protocol already exists for meeting. meetingId=" + meetingId);
+    }
+}

src/main/java/backendlab/team4you/exceptions/ProtocolNotFoundException.java

@@ -0,0 +1,8 @@
+package backendlab.team4you.exceptions;
+
+public class ProtocolNotFoundException extends RuntimeException {
+
+    public ProtocolNotFoundException(Long protocolId) {
+        super("Protocol not found. protocolId=" + protocolId);
+    }
+}

src/main/java/backendlab/team4you/exceptions/ProtocolParagraphNotFoundException.java

@@ -0,0 +1,14 @@
+package backendlab.team4you.exceptions;
+
+public class ProtocolParagraphNotFoundException extends RuntimeException {
+    private final Long paragraphId;
+
+    public ProtocolParagraphNotFoundException(Long paragraphId) {
+        super("Protokollparagrafen hittades inte.");
+        this.paragraphId = paragraphId;
+    }
+
+    public Long getParagraphId() {
+        return paragraphId;
+    }
+}

src/main/java/backendlab/team4you/meeting/MeetingController.java

@@ -37,10 +37,11 @@ public MeetingController(
     public String meetingsPage(
             @RequestParam(required = false) Long registryId,
             @RequestParam(required = false) Long selectedMeetingId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         populateMeetingsPage(model, registryId, selectedMeetingId);
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @PostMapping
@@ -69,7 +70,7 @@ public String createMeeting(
                     notes
             );
 
-            model.addAttribute("successMessage", "sammanträdet skapades.");
+            model.addAttribute("successMessage", "Sammanträdet skapades.");
             populateMeetingsPage(model, registryId, meeting.getId());
 
         } catch (InvalidMeetingStateException | MeetingNotFoundException | RegistryNotFoundException exception) {
@@ -81,11 +82,7 @@ public String createMeeting(
             populateMeetingsPage(model, safeRegistryId, null);
         }
 
-        if (htmx != null) {
-            return "fragments/admin-meetings :: content";
-        }
-
-        return "admin/meetings";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/update")
@@ -97,6 +94,7 @@ public String updateMeeting(
             @RequestParam(required = false) String location,
             @RequestParam(required = false) String notes,
             @RequestParam MeetingStatus status,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -115,7 +113,7 @@ public String updateMeeting(
                     status
             );
 
-            model.addAttribute("successMessage", "sammanträdet uppdaterades.");
+            model.addAttribute("successMessage", "Sammanträdet uppdaterades.");
             populateMeetingsPage(model, updatedMeeting.getRegistry().getId(), updatedMeeting.getId());
 
         } catch (InvalidMeetingStateException | MeetingNotFoundException | RegistryNotFoundException exception) {
@@ -129,12 +127,13 @@ public String updateMeeting(
             populateMeetingsPage(model, registryId, registryId == null ? null : meetingId);
             }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/delete")
     public String deleteMeeting(
             @PathVariable Long meetingId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -143,15 +142,15 @@ public String deleteMeeting(
 
             meetingService.deleteMeeting(meetingId);
 
-            model.addAttribute("successMessage", "sammanträdet togs bort.");
+            model.addAttribute("successMessage", "Sammanträdet togs bort.");
             populateMeetingsPage(model, registryId, null);
 
         } catch (Exception exception) {
             model.addAttribute("errorMessage", exception.getMessage());
             populateMeetingsPage(model, null, null);
         }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @GetMapping("/{meetingId}")
@@ -167,7 +166,7 @@ public String showMeeting(
             return "fragments/admin-meetings :: content";
         }
 
-        return "admin/meetings";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/agenda-items")
@@ -192,17 +191,14 @@ public String addAgendaItem(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        if (htmx != null) {
-            return "fragments/admin-meetings :: content";
-        }
-
-        return "admin/meetings";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/agenda-items/{agendaItemId}/move-up")
     public String moveAgendaItemUp(
             @PathVariable Long meetingId,
             @PathVariable Long agendaItemId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -218,13 +214,14 @@ public String moveAgendaItemUp(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/agenda-items/{agendaItemId}/move-down")
     public String moveAgendaItemDown(
             @PathVariable Long meetingId,
             @PathVariable Long agendaItemId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -240,7 +237,7 @@ public String moveAgendaItemDown(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @DeleteMapping("/{meetingId}/agenda-items/{agendaItemId}")
@@ -265,18 +262,15 @@ public String removeAgendaItem(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        if (htmx != null) {
-            return "fragments/admin-meetings :: content";
-        }
-
-        return "admin/meetings";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/agenda-items/{agendaItemId}/documents")
     public String addAgendaDocument(
             @PathVariable Long meetingId,
             @PathVariable Long agendaItemId,
             @RequestParam Long caseFileId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -292,14 +286,15 @@ public String addAgendaDocument(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     @PostMapping("/{meetingId}/agenda-items/{agendaItemId}/documents/{documentId}/remove")
     public String removeAgendaDocument(
             @PathVariable Long meetingId,
             @PathVariable Long agendaItemId,
             @PathVariable Long documentId,
+            @RequestHeader(value = "HX-Request", required = false) String htmx,
             Model model
     ) {
         try {
@@ -315,7 +310,7 @@ public String removeAgendaDocument(
             populateMeetingsPageAfterMeetingAction(model, null, null);
         }
 
-        return "fragments/admin-meetings :: content";
+        return meetingsView(htmx);
     }
 
     private void populateMeetingsPageAfterMeetingAction(Model model, Long registryId, Long meetingId) {
@@ -371,4 +366,13 @@ private void populateMeetingsPage(Model model, Long registryId, Long selectedMee
         model.addAttribute("documentsByAgendaItemId", documentsByAgendaItemId);
         model.addAttribute("availableFilesByAgendaItemId", availableFilesByAgendaItemId);
     }
+
+    private String meetingsView(String htmx) {
+        if (htmx != null) {
+            return "fragments/admin-meetings :: content";
+        }
+
+        return "admin/meetings";
+    }
+
 }

src/main/java/backendlab/team4you/meeting/MeetingRepository.java

@@ -2,6 +2,7 @@
 
 import backendlab.team4you.registry.Registry;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -10,4 +11,17 @@ public interface MeetingRepository extends JpaRepository<Meeting, Long> {
     List<Meeting> findByRegistryOrderByStartsAtAsc(Registry registry);
     List<Meeting> findByRegistryOrderByStartsAtDesc(Registry registry);
     List<Meeting> findAllByOrderByStartsAtDesc();
+
+    @Query("""
+            select m
+            from Meeting m
+            where m.status = backendlab.team4you.meeting.MeetingStatus.COMPLETED
+            and not exists (
+                select p.id
+                from Protocol p
+                where p.meeting = m
+            )
+            order by m.startsAt desc
+            """)
+    List<Meeting> findCompletedMeetingsWithoutProtocol();
 }