BE-#92: Added uncheck and tests

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

@@ -3,6 +3,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 org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -53,9 +54,10 @@ public ShoppingListWidget checkEntry(
             @AuthenticationPrincipal OAuth2User principal,
             @PathVariable String eventId,
             @PathVariable String widgetId,
-            @PathVariable String entryId
-    ) {
-        return service.checkEntry(principal, eventId, widgetId, entryId);
+            @PathVariable String entryId,
+            @RequestBody EntryCheckCommand checkCommand
+            ) {
+        return service.checkEntry(principal, eventId, widgetId, entryId, checkCommand);
     }
 
 }

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

@@ -5,10 +5,7 @@
 import com.dhbw.get2gether.backend.exceptions.EntityNotFoundException;
 import com.dhbw.get2gether.backend.user.application.UserService;
 import com.dhbw.get2gether.backend.widget.application.mapper.ShoppingListMapper;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.Entry;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.EntryAddCommand;
-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.access.prepost.PreAuthorize;
 import org.springframework.security.core.AuthenticatedPrincipal;
 import org.springframework.stereotype.Service;
@@ -68,13 +65,13 @@ public ShoppingListWidget removeEntry(AuthenticatedPrincipal principal, String e
     }
 
     @PreAuthorize("hasRole('USER')")
-    public ShoppingListWidget checkEntry(AuthenticatedPrincipal principal, String eventId, String widgetId, String entryId) {
+    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.check(userService.getUserByPrincipal(principal).getId());
+        entry.check(userService.getUserByPrincipal(principal).getId(), mapper.mapEntryCheckCommandToEntryCheck(checkCommand));
         return updateAndGetWidget(principal, event, widget);
     }
 

backend/src/main/java/com/dhbw/get2gether/backend/widget/application/mapper/ShoppingListMapper.java

@@ -1,14 +1,13 @@
 package com.dhbw.get2gether.backend.widget.application.mapper;
 
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.Entry;
-import com.dhbw.get2gether.backend.widget.model.shoppinglist.EntryAddCommand;
-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.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
 
 @Mapper(componentModel = "spring")
 public interface ShoppingListMapper {
+    ShoppingListMapper MAPPER = Mappers.getMapper(ShoppingListMapper.class);
 
     @Mapping(target = "id", ignore = true)
     @Mapping(target = "entries", ignore = true)
@@ -20,4 +19,8 @@ public interface ShoppingListMapper {
     @Mapping(target = "buyerId", ignore = true)
     Entry mapToEntry(EntryAddCommand command);
 
+    // Verstehe nicht, warum hier source checked ist unt nicht isChecked
+    @Mapping(target = "isChecked", source = "checked")
+    EntryCheck mapEntryCheckCommandToEntryCheck(EntryCheckCommand command);
+
 }

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

@@ -15,8 +15,13 @@ public class Entry {
     private String amount;
     private String buyerId;
 
-    public void check(String buyerId) {
-        this.checked = true;
-        this.buyerId = buyerId;
+    public void check(String buyerId, EntryCheck entryCheck) {
+        if(entryCheck.isChecked()) {
+            this.checked = true;
+            this.buyerId = buyerId;
+        } else {
+            this.checked = false;
+            // BuyerID soll nicht gelöscht werden, wenn der Eintrag nicht mehr gecheckt ist, aber überschrieben werden können
+        }
     }
 }

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

@@ -0,0 +1,14 @@
+package com.dhbw.get2gether.backend.widget.model.shoppinglist;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Builder(toBuilder = true)
+@Getter
+@Setter
+@AllArgsConstructor
+public class EntryCheck {
+    private boolean isChecked;
+}

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

@@ -0,0 +1,12 @@
+package com.dhbw.get2gether.backend.widget.model.shoppinglist;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder(toBuilder = true)
+@Getter
+@AllArgsConstructor
+public class EntryCheckCommand {
+    private boolean isChecked;
+}