Merge pull request #184 from it-at-m/feature/lebenslage-id-in-backend

FabianWilms · web-flow · commit 8eb367439526 · 2025-09-26T07:35:25.000+02:00
feature/lebenslage-id-in-backend
diff --git a/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistRepository.java b/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistRepository.java
@@ -9,6 +9,6 @@
 @Repository
 public interface ChecklistRepository extends JpaRepository<Checklist, UUID> {
 
-    List<Checklist> findChecklistByLhmExtId(String lhmExtId);
+    List<Checklist> findChecklistByLhmExtIdOrderByLastUpdateDesc(String lhmExtId);
 
 }
diff --git a/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistService.java b/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/ChecklistService.java
@@ -29,13 +29,14 @@ public Checklist createChecklist(final Checklist checklist) {
         final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
         log.debug("Create Checklist {} for {}", checklist, lhmExtId);
         checklist.setLhmExtId(lhmExtId);
+        checklist.setLastUpdate(ZonedDateTime.now());
         return checklistRepository.save(checklist);
     }
 
     public List<Checklist> getChecklists() {
         final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();
         log.debug("Get all checklists of {}", lhmExtId);
-        return checklistRepository.findChecklistByLhmExtId(lhmExtId);
+        return checklistRepository.findChecklistByLhmExtIdOrderByLastUpdateDesc(lhmExtId);
     }
 
     public Checklist getChecklist(final UUID checklistId) {
diff --git a/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/Checklist.java b/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/Checklist.java
@@ -29,6 +29,9 @@ public class Checklist extends BaseEntity {
     @NotNull
     private String lhmExtId;
 
+    @Column(name = "situation_id", nullable = true)
+    private String situationId;
+
     @Column(name = "title")
     @NotNull
     private String title;
diff --git a/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistCreateDTO.java b/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistCreateDTO.java
@@ -3,6 +3,6 @@
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
-public record ChecklistCreateDTO(@NotNull String title, @NotNull List<ChecklistItemDTO> checklistItems) {
+public record ChecklistCreateDTO(@NotNull String title, String situationId, @NotNull List<ChecklistItemDTO> checklistItems) {
 
 }
diff --git a/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistReadDTO.java b/personalization-service/src/main/java/de/muenchen/dbs/personalization/checklist/domain/ChecklistReadDTO.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.UUID;
 
-public record ChecklistReadDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, @NotNull ZonedDateTime lastUpdate,
+public record ChecklistReadDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, String situationId, @NotNull ZonedDateTime lastUpdate,
         @NotNull List<ChecklistItemDTO> checklistItems) {
 
 }
diff --git a/personalization-service/src/main/resources/db/migration/schema/V002__1__issue-183__add_situation_id_to_checklist.sql b/personalization-service/src/main/resources/db/migration/schema/V002__1__issue-183__add_situation_id_to_checklist.sql
@@ -0,0 +1,2 @@
+ALTER TABLE checklist
+ADD situation_id varchar(255);
diff --git a/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistIntegrationTest.java b/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistIntegrationTest.java
@@ -98,6 +98,7 @@ void givenChecklist_thenChecklistIsSaved() throws Exception {
             checklistItem2.setServiceID("item2");
             checklistItem3.setServiceID("item3");
             final ChecklistCreateDTO requestDTO = new ChecklistCreateDTO("title",
+                    "situationd-id-sample",
                     checklistMapper.toChecklistItemDTOList(List.of(checklistItem1, checklistItem2, checklistItem3)));
             final String requestBody = objectMapper.writeValueAsString(requestDTO);
 
diff --git a/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistMapperTest.java b/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistMapperTest.java
@@ -47,6 +47,7 @@ void givenRequestDTO_thenReturnsCorrectEntity() {
             final UUID id = UUID.randomUUID();
             final Checklist checklist = createTestChecklist(id, "user-lhm-ext-id", null);
             final ChecklistCreateDTO checklistCreateDTO = new ChecklistCreateDTO(checklist.getTitle(),
+                    "situation-id-sample",
                     checklistMapper.toChecklistItemDTOList(checklist.getChecklistItems()));
 
             // When
@@ -71,7 +72,7 @@ void givenRequestDTO_thenReturnsCorrectEntity() {
             final Checklist result = checklistMapper.toUpdateChecklist(checklistUpdateDTO);
 
             // Then
-            assertThat(result).usingRecursiveComparison().ignoringFields("id", "lastUpdate").isEqualTo(checklistUpdateDTO);
+            assertThat(result).usingRecursiveComparison().ignoringFields("id", "situationId", "lastUpdate").isEqualTo(checklistUpdateDTO);
         }
     }
 }
diff --git a/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistServiceTest.java b/personalization-service/src/test/java/de/muenchen/dbs/personalization/checklist/ChecklistServiceTest.java
@@ -88,14 +88,14 @@ void givenLhmExtId_thenReturnChecklists() {
             final Checklist checklist1 = createTestChecklist(id1, USER_LHM_EXT_ID, null);
             final Checklist checklist2 = createTestChecklist(id2, USER_LHM_EXT_ID, null);
 
-            when(checklistRepository.findChecklistByLhmExtId(USER_LHM_EXT_ID)).thenReturn(List.of(checklist1, checklist2));
+            when(checklistRepository.findChecklistByLhmExtIdOrderByLastUpdateDesc(USER_LHM_EXT_ID)).thenReturn(List.of(checklist1, checklist2));
 
             // When
             final List<Checklist> result = checklistService.getChecklists();
 
             // Then
             Assertions.assertEquals(List.of(checklist1, checklist2), result);
-            verify(checklistRepository, times(1)).findChecklistByLhmExtId(USER_LHM_EXT_ID);
+            verify(checklistRepository, times(1)).findChecklistByLhmExtIdOrderByLastUpdateDesc(USER_LHM_EXT_ID);
         }
 
     }
diff --git a/personalization-service/src/test/java/de/muenchen/dbs/personalization/configuration/UnicodeConfigurationTest.java b/personalization-service/src/test/java/de/muenchen/dbs/personalization/configuration/UnicodeConfigurationTest.java
@@ -66,6 +66,7 @@ void testForNfcNormalization() throws Exception {
         checklistItem2.setServiceID("item2");
         checklistItem3.setServiceID("item3");
         final ChecklistCreateDTO checklistCreateDTO = new ChecklistCreateDTO(TEXT_ATTRIBUTE_DECOMPOSED,
+                "situation-id-sample",
                 checklistMapper.toChecklistItemDTOList(List.of(checklistItem1, checklistItem2, checklistItem3)));
 
         // When
diff --git a/personalization-webcomponents/src/ChecklistPreview.ce.vue b/personalization-webcomponents/src/ChecklistPreview.ce.vue
@@ -296,10 +296,9 @@ function _saveChecklistAcceptedDSE() {
   });
   const body = JSON.stringify({
     title: lebenslageTitle.value,
-    lebenslageId: lebenslageId.value,
+    situationId: lebenslageId.value,
     checklistItems: checklistItemsDtos,
   });
-
   fetch(url, {
     method: "POST",
     headers: {
diff --git a/personalization-webcomponents/src/api/persservice/Checklist.ts b/personalization-webcomponents/src/api/persservice/Checklist.ts
@@ -4,6 +4,7 @@ export default interface Checklist {
   id: string;
   title: string;
   lhmExtId: string;
+  situationId: string;
   checklistItems: ChecklistItem[];
   lastUpdate: Date;
 }
diff --git a/personalization-webcomponents/src/components/ChecklistCard.vue b/personalization-webcomponents/src/components/ChecklistCard.vue
@@ -9,7 +9,7 @@
         <img
           width="56px"
           height="56px"
-          :src="getChecklistIconByTitle(checklist.title)"
+          :src="getChecklistIconBySituationId(checklist.situationId)"
           alt="checklist-icon"
         />
       </div>
@@ -75,7 +75,7 @@ import { computed } from "vue";
 import ChecklistitemListitem from "@/components/ChecklistitemListitem.vue";
 import MucChip from "@/components/common/MucChip.vue";
 import {
-  getChecklistIconByTitle,
+  getChecklistIconBySituationId,
   QUERY_PARAM_CHECKLIST_ID,
 } from "@/util/Constants.ts";
 
diff --git a/personalization-webcomponents/src/components/ChecklistHeader.vue b/personalization-webcomponents/src/components/ChecklistHeader.vue
@@ -2,7 +2,7 @@
   <muc-intro
     tagline="Checkliste"
     :title="checklist.title"
-    :img="getChecklistIconByTitle(checklist.title)"
+    :img="getChecklistIconBySituationId(checklist.situationId)"
     imgAlt=""
   >
     <div
@@ -57,7 +57,7 @@ import { MucIntro } from "@muenchen/muc-patternlab-vue";
 import { computed, onMounted } from "vue";
 
 import MucChip from "@/components/common/MucChip.vue";
-import { getChecklistIconByTitle } from "@/util/Constants.ts";
+import { getChecklistIconBySituationId } from "@/util/Constants.ts";
 
 const props = defineProps<{
   checklist: Checklist;
diff --git a/personalization-webcomponents/src/util/Constants.ts b/personalization-webcomponents/src/util/Constants.ts
@@ -10,22 +10,8 @@ export const QUERY_PARAM_CHECKLIST_ID = "cl-id";
 
 let ACCESS_TOKEN: string | undefined = undefined;
 
-export function getChecklistIconByTitle(checklistTitle: string) {
-  return {
-    "Ich habe wenig Geld.":
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10482730.svg",
-    "Ich will umziehen.":
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10482700.svg",
-    "Ich manage eine Familie.":
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483310.svg",
-    Einwanderung:
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483311.svg",
-    Umzug:
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10482700.svg",
-    Test: "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483310.svg",
-    title3:
-      "https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/10483310.svg",
-  }[checklistTitle];
+export function getChecklistIconBySituationId(situationId: string) {
+  return `https://stadt.muenchen.de/dam/Home/lhm_common/service-navigator/${situationId}.svg`;
 }
 
 export function getAPIBaseURL(): string {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`@Repository`
`10`	`10`	`public interface ChecklistRepository extends JpaRepository<Checklist, UUID> {`
`11`	`11`
`12`		`- List<Checklist> findChecklistByLhmExtId(String lhmExtId);`
	`12`	`+ List<Checklist> findChecklistByLhmExtIdOrderByLastUpdateDesc(String lhmExtId);`
`13`	`13`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,14 @@ public Checklist createChecklist(final Checklist checklist) {`
`29`	`29`	`final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();`
`30`	`30`	`log.debug("Create Checklist {} for {}", checklist, lhmExtId);`
`31`	`31`	`checklist.setLhmExtId(lhmExtId);`
	`32`	`+ checklist.setLastUpdate(ZonedDateTime.now());`
`32`	`33`	`return checklistRepository.save(checklist);`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`public List<Checklist> getChecklists() {`
`36`	`37`	`final String lhmExtId = getLhmExtIdFromAuthenticationOrThrow();`
`37`	`38`	`log.debug("Get all checklists of {}", lhmExtId);`
`38`		`- return checklistRepository.findChecklistByLhmExtId(lhmExtId);`
	`39`	`+ return checklistRepository.findChecklistByLhmExtIdOrderByLastUpdateDesc(lhmExtId);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`public Checklist getChecklist(final UUID checklistId) {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`import jakarta.validation.constraints.NotNull;`
`4`	`4`	`import java.util.List;`
`5`	`5`
`6`		`-public record ChecklistCreateDTO(@NotNull String title, @NotNull List<ChecklistItemDTO> checklistItems) {`
	`6`	`+public record ChecklistCreateDTO(@NotNull String title, String situationId, @NotNull List<ChecklistItemDTO> checklistItems) {`
`7`	`7`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import java.util.List;`
`6`	`6`	`import java.util.UUID;`
`7`	`7`
`8`		`-public record ChecklistReadDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, @NotNull ZonedDateTime lastUpdate,`
	`8`	`+public record ChecklistReadDTO(@NotNull UUID id, @NotNull String lhmExtId, @NotNull String title, String situationId, @NotNull ZonedDateTime lastUpdate,`
`9`	`9`	`@NotNull List<ChecklistItemDTO> checklistItems) {`
`10`	`10`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTER TABLE checklist`
	`2`	`+ADD situation_id varchar(255);`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ void givenRequestDTO_thenReturnsCorrectEntity() {`
`47`	`47`	`final UUID id = UUID.randomUUID();`
`48`	`48`	`final Checklist checklist = createTestChecklist(id, "user-lhm-ext-id", null);`
`49`	`49`	`final ChecklistCreateDTO checklistCreateDTO = new ChecklistCreateDTO(checklist.getTitle(),`
	`50`	`+ "situation-id-sample",`
`50`	`51`	`checklistMapper.toChecklistItemDTOList(checklist.getChecklistItems()));`
`51`	`52`
`52`	`53`	`// When`
`@@ -71,7 +72,7 @@ void givenRequestDTO_thenReturnsCorrectEntity() {`
`71`	`72`	`final Checklist result = checklistMapper.toUpdateChecklist(checklistUpdateDTO);`
`72`	`73`
`73`	`74`	`// Then`
`74`		`- assertThat(result).usingRecursiveComparison().ignoringFields("id", "lastUpdate").isEqualTo(checklistUpdateDTO);`
	`75`	`+ assertThat(result).usingRecursiveComparison().ignoringFields("id", "situationId", "lastUpdate").isEqualTo(checklistUpdateDTO);`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,14 @@ void givenLhmExtId_thenReturnChecklists() {`
`88`	`88`	`final Checklist checklist1 = createTestChecklist(id1, USER_LHM_EXT_ID, null);`
`89`	`89`	`final Checklist checklist2 = createTestChecklist(id2, USER_LHM_EXT_ID, null);`
`90`	`90`
`91`		`- when(checklistRepository.findChecklistByLhmExtId(USER_LHM_EXT_ID)).thenReturn(List.of(checklist1, checklist2));`
	`91`	`+ when(checklistRepository.findChecklistByLhmExtIdOrderByLastUpdateDesc(USER_LHM_EXT_ID)).thenReturn(List.of(checklist1, checklist2));`
`92`	`92`
`93`	`93`	`// When`
`94`	`94`	`final List<Checklist> result = checklistService.getChecklists();`
`95`	`95`
`96`	`96`	`// Then`
`97`	`97`	`Assertions.assertEquals(List.of(checklist1, checklist2), result);`
`98`		`- verify(checklistRepository, times(1)).findChecklistByLhmExtId(USER_LHM_EXT_ID);`
	`98`	`+ verify(checklistRepository, times(1)).findChecklistByLhmExtIdOrderByLastUpdateDesc(USER_LHM_EXT_ID);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`}`