FE#90: Einkaufslistenwidget implementiert

backend/src/main/java/com/dhbw/get2gether/backend/widget/adapter/in/ShoppingListWidgetController.java

@@ -2,10 +2,7 @@
 
 import com.dhbw.get2gether.backend.event.model.Event;
 import com.dhbw.get2gether.backend.widget.application.ShoppingListWidgetService;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.EntryAddCommand;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.EntryCheckCommand;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.ShoppingListCreateCommand;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.ShoppingListWidget;
+import com.dhbw.get2gether.backend.widget.model.shoppinglist.*;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.*;
@@ -60,4 +57,15 @@
         return service.checkEntry(principal, eventId, widgetId, entryId, checkCommand);
     }
 
+    @PutMapping("/{widgetId}/entries/update/{entryId}")
+    public ShoppingListWidget updateEntry(
+            @AuthenticationPrincipal OAuth2User principal,
+            @PathVariable String eventId,
+            @PathVariable String widgetId,
+            @PathVariable String entryId,
+            @RequestBody EntryUpdateCommand updateCommand
+    ) {
+        return service.updateEntry(principal, eventId, widgetId, entryId, updateCommand);
+    }
+
 }

backend/src/main/java/com/dhbw/get2gether/backend/widget/application/ShoppingListWidgetService.java

@@ -68,11 +68,25 @@ public ShoppingListWidget removeEntry(AuthenticatedPrincipal principal, String e
     public ShoppingListWidget checkEntry(AuthenticatedPrincipal principal, String eventId, String widgetId, String entryId, EntryCheckCommand checkCommand) {
         Event event = getEventById(principal, eventId);
         ShoppingListWidget widget = getWidgetFromEvent(event, widgetId);
-        Entry entry = widget.getEntries().stream()
-                .filter(l -> Objects.equals(l.getId(), entryId)).findFirst()
-                .orElseThrow(() -> new EntityNotFoundException("Entry not found"));
+        Entry entry = getEntry(widget, entryId);
         entry.check(userService.getUserByPrincipal(principal).getId(), mapper.mapEntryCheckCommandToEntryCheck(checkCommand));
         return updateAndGetWidget(principal, event, widget);
     }
 
+    @PreAuthorize("hasRole('USER')")
+    public ShoppingListWidget updateEntry(AuthenticatedPrincipal principal, String eventId, String widgetId, String entryId, EntryUpdateCommand updateCommand) {
+        Event event = getEventById(principal, eventId);
+        ShoppingListWidget widget = getWidgetFromEvent(event, widgetId);
+        Entry entry = getEntry(widget, entryId);
+        entry.update(updateCommand);
+        return updateAndGetWidget(principal, event, widget);
+    }
+
+    private Entry getEntry(ShoppingListWidget widget, String entryId) {
+        return widget.getEntries().stream()
+                .filter(l -> Objects.equals(l.getId(), entryId)).findFirst()
+                .orElseThrow(() -> new EntityNotFoundException("Entry not found"));
+    }
+
+
 }

backend/src/main/java/com/dhbw/get2gether/backend/widget/model/shoppinglist/Entry.java

@@ -24,4 +24,9 @@ public void check(String buyerId, EntryCheck entryCheck) {
             // BuyerID soll nicht gelöscht werden, wenn der Eintrag nicht mehr gecheckt ist, aber überschrieben werden können
         }
     }
+
+    public void update(EntryUpdateCommand updateEntry) {
+        this.description = updateEntry.getDescription();
+        this.amount = updateEntry.getAmount();
+    }
 }

backend/src/main/java/com/dhbw/get2gether/backend/widget/model/shoppinglist/EntryUpdateCommand.java

@@ -0,0 +1,13 @@
+package com.dhbw.get2gether.backend.widget.model.shoppinglist;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder(toBuilder = true)
+@Getter
+@AllArgsConstructor
+public class EntryUpdateCommand {
+    private String description;
+    private String amount;
+}

backend/src/test/java/com/dhbw/get2gether/backend/widget/application/ShoppingListWidgetServiceTest.java

@@ -336,4 +336,61 @@ void shouldUnCheckEntry() {
                 .isEqualTo(entryAfterCheck);
         assertThat(returnedWidget.getEntries().get(0).getId()).isNotBlank();
     }
+
+    @Test
+    @WithMockOAuth2User
+    void shouldUpdateEntry() {
+        // given
+        AuthenticatedPrincipal principal = (AuthenticatedPrincipal)
+                SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        Entry entry = Entry.builder()
+                .description("Test")
+                .amount("1")
+                .checked(false)
+                .creatorId("creator-id")
+                .id("123")
+                .build();
+        ShoppingListWidget widget = ShoppingListWidget.builder()
+                .id("wi-123")
+                .entries(new ArrayList<>(List.of(entry)))
+                .build();
+        Event event = Event.builder()
+                .id("ev-123")
+                .widgets(new ArrayList<>(List.of(widget)))
+                .build();
+        EntryUpdateCommand updateCommand = EntryUpdateCommand.builder()
+                .description("Edited")
+                .amount("2")
+                .build();
+        Entry entryAfterUpdate = Entry.builder()
+                .description("Edited")
+                .amount("2")
+                .checked(false)
+                .creatorId("creator-id")
+                .id("123")
+                .build();
+
+        when(eventService.getSingleEvent(any(), eq(event.getId()))).thenReturn(event);
+        when(eventService.updateEventWidgets(any(), eq(event.getId()), any()))
+                .thenAnswer(i -> event.toBuilder()
+                        .widgets(
+                                i.getArgument(2, EventWidgetUpdateCommand.class).getWidgets()
+                        )
+                        .build()
+                );
+        when(userService.getUserByPrincipal(principal)).thenReturn(User.builder()
+                .id("test")
+                .email("[email protected]").build());
+
+        // when
+        ShoppingListWidget returnedWidget = shoppingListWidgetService.updateEntry(principal, event.getId(), widget.getId(), entry.getId(), updateCommand);
+
+        // then
+        assertThat(returnedWidget).isNotNull();
+        assertThat(returnedWidget.getEntries()).hasSize(1);
+        assertThat(returnedWidget.getEntries().get(0)).usingRecursiveComparison()
+                .ignoringFields("id")
+                .isEqualTo(entryAfterUpdate);
+        assertThat(returnedWidget.getEntries().get(0).getId()).isNotBlank();
+    }
 }