Merge branch 'main' into MUXDBS-104-move-tasks

Author: FabianWilms

docs/package-lock.json

@@ -15,7 +15,7 @@
   "devDependencies": {
     "@muenchen/prettier-codeformat": "1.0.2",
     "markdownlint-cli": "0.45.0",
-    "mermaid": "11.10.1",
+    "mermaid": "11.11.0",
     "vitepress": "1.6.4",
     "vitepress-plugin-mermaid": "2.0.17"
   }

docs/package.json

@@ -1,5 +1,5 @@
 # For documentation see https://jboss-container-images.github.io/openjdk/
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.22-1.1753981256@sha256:06d60e73be11d96b4cedc4bd1807e503a6196e9b01be9e4405b6b6d3b816202d
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.23-6.1756793420@sha256:381e4f75c654b4e60b6a39147e803480f85bd3af7db291c0c522811c94f31848
 
 # Copy runnable jar to deployments
 COPY target/*.jar /deployments/application.jar

personalization-service/Dockerfile

@@ -33,7 +33,7 @@
         <spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
         <itm-java-codeformat.version>1.0.10</itm-java-codeformat.version>
         <pmd-maven-plugin.version>3.27.0</pmd-maven-plugin.version>
-        <spotbugs-maven-plugin.version>4.9.4.0</spotbugs-maven-plugin.version>
+        <spotbugs-maven-plugin.version>4.9.4.2</spotbugs-maven-plugin.version>
         <spotbugs-annotations.version>4.9.4</spotbugs-annotations.version> <!-- must match the patch version of spotbugs-maven-plugin -->
         <findsecbugs-plugin.version>1.14.0</findsecbugs-plugin.version>
 
@@ -53,7 +53,7 @@
 
         <!-- Additional required dependencies -->
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version> <!-- Needed to make MapStruct and Lombok work together -->
-        <springdoc-openapi-starter-webmvc-ui.version>2.8.11</springdoc-openapi-starter-webmvc-ui.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.8.13</springdoc-openapi-starter-webmvc-ui.version>
         <springdoc-openapi-maven-plugin.version>1.5</springdoc-openapi-maven-plugin.version>
         <therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
 

personalization-service/pom.xml

@@ -9,6 +9,6 @@
 @Repository
 public interface ChecklistRepository extends JpaRepository<Checklist, UUID> {
 
-    List<Checklist> findChecklistByEmail(String email);
+    List<Checklist> findChecklistByLhmExtId(String lhmExtId);
 
 }

personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistRepository.java

@@ -25,34 +25,34 @@ public class ChecklistService {
     private final ChecklistRepository checklistRepository;
 
     public Checklist createChecklist(final Checklist checklist) {
-        final String userMail = getUserMailFromAuthenticationOrThrow();
-        log.debug("Create Checklist {} for {}", checklist, userMail);
-        checklist.setEmail(userMail);
+        final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
+        log.debug("Create Checklist {} for {}", checklist, lhmExtId);
+        checklist.setLhmExtId(lhmExtId);
         return checklistRepository.save(checklist);
     }
 
     public List<Checklist> getChecklists() {
-        final String userMail = getUserMailFromAuthenticationOrThrow();
-        log.debug("Get all checklists of {}", userMail);
-        return checklistRepository.findChecklistByEmail(userMail);
+        final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
+        log.debug("Get all checklists of {}", lhmExtId);
+        return checklistRepository.findChecklistByLhmExtId(lhmExtId);
     }
 
     public Checklist getChecklist(final UUID checklistId) {
-        final String userMail = getUserMailFromAuthenticationOrThrow();
-        log.debug("Get checklist with ID {} for {}", checklistId, userMail);
+        final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
+        log.debug("Get checklist with ID {} for {}", checklistId, lhmExtId);
         final Checklist checklistOrThrowException = getChecklistOrThrowException(checklistId);
 
-        isChecklistOwnerOrThrow(checklistOrThrowException, userMail);
+        isChecklistOwnerOrThrow(checklistOrThrowException, lhmExtId);
 
         return checklistOrThrowException;
     }
 
     public Checklist updateChecklist(final Checklist checklist, final UUID checklistId) {
-        final String userMail = getUserMailFromAuthenticationOrThrow();
-        log.debug("Update checklist with ID {} for {}", checklistId, userMail);
+        final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
+        log.debug("Update checklist with ID {} for {}", checklistId, lhmExtId);
         final Checklist foundChecklist = getChecklistOrThrowException(checklistId);
 
-        isChecklistOwnerOrThrow(foundChecklist, userMail);
+        isChecklistOwnerOrThrow(foundChecklist, lhmExtId);
 
         foundChecklist.setChecklistItems(checklist.getChecklistItems());
         foundChecklist.setLastUpdate(ZonedDateTime.now());
@@ -61,11 +61,11 @@ public Checklist updateChecklist(final Checklist checklist, final UUID checklist
     }
 
     public void deleteChecklist(final UUID checklistId) {
-        final String userMail = getUserMailFromAuthenticationOrThrow();
-        log.debug("Delete Checklist with ID {} for {}", checklistId, userMail);
+        final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
+        log.debug("Delete Checklist with ID {} for {}", checklistId, lhmExtId);
 
         final Checklist foundChecklist = getChecklistOrThrowException(checklistId);
-        isChecklistOwnerOrThrow(foundChecklist, userMail);
+        isChecklistOwnerOrThrow(foundChecklist, lhmExtId);
 
         checklistRepository.deleteById(checklistId);
     }
@@ -76,19 +76,19 @@ private Checklist getChecklistOrThrowException(final UUID checklistId) {
                 .orElseThrow(() -> new NotFoundException(String.format(MSG_NOT_FOUND, checklistId)));
     }
 
-    private String getUserMailFromAuthenticationOrThrow() {
+    private String getLhmExtIdFromAuthenticationOrThrow() {
         final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication.getPrincipal() instanceof Jwt jwt) {
-            final Object emailClaim = jwt.getClaims().get("email");
-            if (emailClaim != null && !StringUtils.isBlank(emailClaim.toString())) {
-                return emailClaim.toString();
+            final Object lhmExtIdClaim = jwt.getClaims().get("lhmExtId");
+            if (lhmExtIdClaim != null && !StringUtils.isBlank(lhmExtIdClaim.toString())) {
+                return lhmExtIdClaim.toString();
             }
         }
         throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
     }
 
-    private void isChecklistOwnerOrThrow(final Checklist checklist, final String userMail) {
-        if (!checklist.getEmail().equals(userMail)) {
+    private void isChecklistOwnerOrThrow(final Checklist checklist, final String lhmExtId) {
+        if (!checklist.getLhmExtId().equals(lhmExtId)) {
             throw new ResponseStatusException(HttpStatus.FORBIDDEN, "User does not own the checklist");
         }
     }

personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistService.java

@@ -25,9 +25,9 @@ public class Checklist extends BaseEntity {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    @Column(name = "email", nullable = false)
+    @Column(name = "lhm_ext_id", nullable = false)
     @NotNull
-    private String email;
+    private String lhmExtId;
 
     @Column(name = "title")
     @NotNull

personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/Checklist.java

@@ -10,7 +10,7 @@ public interface ChecklistMapper {
     ChecklistReadDTO toReadDTO(Checklist checklist);
 
     @Mapping(target = "id", ignore = true)
-    @Mapping(target = "email", ignore = true)
+    @Mapping(target = "lhmExtId", ignore = true)
     Checklist toCreateChecklist(ChecklistCreateDTO checklistUpdateDTO);
 
     @Mapping(target = "id", ignore = true)

personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistMapper.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.UUID;
 
-public record ChecklistReadDTO(@NotNull UUID id, @NotNull String email, @NotNull String title, @NotNull ZonedDateTime lastUpdate,
+public record ChecklistReadDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, @NotNull ZonedDateTime lastUpdate,
         @NotNull List<ChecklistItemDTO> checklistItems) {
 
 }

personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistReadDTO.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.UUID;
 
-public record ChecklistUpdateDTO(@NotNull UUID id, @NotNull String email, @NotNull String title, @NotNull List<ChecklistItemDTO> checklistItems) {
+public record ChecklistUpdateDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, @NotNull List<ChecklistItemDTO> checklistItems) {
 
 }