From bc558be02dcfaefb464f03cfa1b34c39740c8546 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Fri, 2 Oct 2026 15:45:50 +0200 Subject: [PATCH 01/82] =?UTF-8?q?models=20und=20repositories=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Models/ShoppingElement.java | 15 +++++++++++++++ .../Models/ShoppingListCategory.java | 16 ++++++++++++++++ .../einkaufsliste/Models/ShoppingListItem.java | 13 +++++++++++++ .../ShoppingListCategoryRepository.java | 9 +++++++++ .../Repository/ShoppingListItemRepository.java | 10 ++++++++++ 5 files changed, 63 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java new file mode 100644 index 0000000..5bf9fb8 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java @@ -0,0 +1,15 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; + +import java.util.UUID; + +@MappedSuperclass +public abstract class ShoppingElement{ + @Id @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java new file mode 100644 index 0000000..4bdb4a2 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java @@ -0,0 +1,16 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; + +import java.util.List; + +@Entity +public class ShoppingListCategory extends ShoppingElement{ + + @NotBlank + private String categoryName; + @OneToMany + private ShoppingListItem itemsInCategory; + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java new file mode 100644 index 0000000..4c2a6a3 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java @@ -0,0 +1,13 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.Entity; +import jakarta.validation.constraints.NotBlank; + +@Entity +public class ShoppingListItem extends ShoppingElement { + + @NotBlank + private String itemName; + private String itemAmount; + private boolean isDone; +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java new file mode 100644 index 0000000..d7105eb --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java @@ -0,0 +1,9 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface ShoppingListCategoryRepository extends JpaRepository{ +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java new file mode 100644 index 0000000..5314d95 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java @@ -0,0 +1,10 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingElement; +import de.timaldinger.einkaufsliste.Models.ShoppingListItem; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface ShoppingListItemRepository extends JpaRepository { +} From c2f413329d6ce4fb27a51906ed8f34b98e23a52c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 3 Oct 2026 11:06:43 +0200 Subject: [PATCH 02/82] =?UTF-8?q?pagecontroller,=20shoppingList=20und=20re?= =?UTF-8?q?po=20hinzugef=C3=BCt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PageController.java | 36 ++++++++++++++++++ .../einkaufsliste/Models/ShoppingList.java | 20 ++++++++++ .../Repository/ShoppingListRepository.java | 9 +++++ src/main/resources/templates/index.html | 24 ++++++++++++ src/main/resources/templates/list.html | 38 +++++++++++++++++++ 5 files changed, 127 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java create mode 100644 src/main/resources/templates/index.html create mode 100644 src/main/resources/templates/list.html diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java new file mode 100644 index 0000000..a16e142 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -0,0 +1,36 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@Controller +@RequestMapping("/") +public class PageController { + @Autowired + private ShoppingListRepository repository; + + @PostMapping("/list") + public String addList(@Valid @ModelAttribute ShoppingList newList){ + repository.save(newList); + return "redirect:/"; + } + + @GetMapping + public String index(Model model){ + model.addAttribute("lists", repository.findAll()); + return "index"; + } + + @GetMapping("/list/{id}") + public String list(Model model, @PathVariable UUID id){ + model.addAttribute("list", repository.findById(id)); + return "list"; + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java new file mode 100644 index 0000000..61597b1 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingList.java @@ -0,0 +1,20 @@ +package de.timaldinger.einkaufsliste.Models; + +import jakarta.persistence.Entity; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +import java.sql.Date; + +@Getter +@Setter +@Entity +public class ShoppingList extends ShoppingElement { + @NotBlank + private String listName; + private Date dateCreated; + private Date lastChanged; + private int numberItems; + private int numberCategory; +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java new file mode 100644 index 0000000..0e3377f --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java @@ -0,0 +1,9 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface ShoppingListRepository extends JpaRepository{ +} diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..de83c5e --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,24 @@ + + + + + + + + + + +
+
+ + +
+
+
+ +
+ + + diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html new file mode 100644 index 0000000..085d2da --- /dev/null +++ b/src/main/resources/templates/list.html @@ -0,0 +1,38 @@ + + + + + niggas + + +
+

Einkaufsliste

+
+ +
+
+ Neue Kategorie hinzufügen: + + +
+ +
+ +
+ Neuen Gegenstand hinzufügen: + + + + +
+ + + + +
    + < +
+
+ + \ No newline at end of file From c535e7d22dfffb43ba855678ec93ce5e1c9b62d3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 3 Oct 2026 11:06:58 +0200 Subject: [PATCH 03/82] =?UTF-8?q?getter=20und=20setter=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timaldinger/einkaufsliste/Models/ShoppingElement.java | 4 ++++ .../einkaufsliste/Models/ShoppingListCategory.java | 6 +++++- .../timaldinger/einkaufsliste/Models/ShoppingListItem.java | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java index 5bf9fb8..0bc8deb 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingElement.java @@ -4,9 +4,13 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import lombok.Setter; import java.util.UUID; +@Getter +@Setter @MappedSuperclass public abstract class ShoppingElement{ @Id @GeneratedValue(strategy = GenerationType.UUID) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java index 4bdb4a2..af589a2 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java @@ -2,15 +2,19 @@ package de.timaldinger.einkaufsliste.Models; import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; import java.util.List; +@Getter +@Setter @Entity public class ShoppingListCategory extends ShoppingElement{ @NotBlank private String categoryName; @OneToMany - private ShoppingListItem itemsInCategory; + private List itemsInCategory; } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java index 4c2a6a3..0f59e34 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java @@ -2,7 +2,11 @@ package de.timaldinger.einkaufsliste.Models; import jakarta.persistence.Entity; import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter @Entity public class ShoppingListItem extends ShoppingElement { From f873174eb211490a99aefb846b81c2ee0ffc6c6d Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sat, 3 Oct 2026 11:08:16 +0200 Subject: [PATCH 04/82] index.html verschoben, es werden nun alle erstellen listen angezeigt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Listen können angelegt werden und verweisen mit einem href auf sich --- src/main/resources/static/index.html | 39 ------------------- .../resources/templates/einkaufsliste.html | 10 ----- src/main/resources/templates/index.html | 8 +++- 3 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 src/main/resources/static/index.html delete mode 100644 src/main/resources/templates/einkaufsliste.html diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html deleted file mode 100644 index addd006..0000000 --- a/src/main/resources/static/index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - Einkaufsliste - - - - -
-

Einkaufsliste

-
- -
-
- Neue Kategorie hinzufügen: - - -
- -
- -
- Neuen Gegenstand hinzufügen: - - - - -
- - -
    -
- -
- - diff --git a/src/main/resources/templates/einkaufsliste.html b/src/main/resources/templates/einkaufsliste.html deleted file mode 100644 index 305a19a..0000000 --- a/src/main/resources/templates/einkaufsliste.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - niggas - - - - - \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index de83c5e..32bd414 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -6,7 +6,7 @@ xmlns:th="http://www.thymeleaf.org"> - + @@ -17,7 +17,11 @@ xmlns:th="http://www.thymeleaf.org">
- +
    +
  • + +
  • +
From e7c7ec8deb385096574b49e2b523df34a4fc2d95 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:45:40 +0200 Subject: [PATCH 05/82] refactor --- .../einkaufsliste/Controller/PageController.java | 6 +++--- src/main/resources/static/js/{ => list}/ShoppingCategory.js | 0 src/main/resources/static/js/{ => list}/ShoppingListItem.js | 0 src/main/resources/static/js/{ => list}/main.js | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/static/js/{ => list}/ShoppingCategory.js (100%) rename src/main/resources/static/js/{ => list}/ShoppingListItem.js (100%) rename src/main/resources/static/js/{ => list}/main.js (100%) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index a16e142..d9c966e 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -18,13 +18,13 @@ public class PageController { @PostMapping("/list") public String addList(@Valid @ModelAttribute ShoppingList newList){ - repository.save(newList); + shoppingListRepository.save(newList); return "redirect:/"; } - @GetMapping + @GetMapping("/") public String index(Model model){ - model.addAttribute("lists", repository.findAll()); + model.addAttribute("lists", shoppingListRepository.findAll()); return "index"; } diff --git a/src/main/resources/static/js/ShoppingCategory.js b/src/main/resources/static/js/list/ShoppingCategory.js similarity index 100% rename from src/main/resources/static/js/ShoppingCategory.js rename to src/main/resources/static/js/list/ShoppingCategory.js diff --git a/src/main/resources/static/js/ShoppingListItem.js b/src/main/resources/static/js/list/ShoppingListItem.js similarity index 100% rename from src/main/resources/static/js/ShoppingListItem.js rename to src/main/resources/static/js/list/ShoppingListItem.js diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/list/main.js similarity index 100% rename from src/main/resources/static/js/main.js rename to src/main/resources/static/js/list/main.js From 4b6348a8f5e74750df9262650e6e9bbaee08fba0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:45:47 +0200 Subject: [PATCH 06/82] =?UTF-8?q?listen=20k=C3=B6nnen=20gel=C3=B6sccht=20w?= =?UTF-8?q?erden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Controller/PageController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index d9c966e..a2f0703 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -28,6 +28,12 @@ public class PageController { return "index"; } + @DeleteMapping("/list/{id}") + public String deleteList(Model model, @PathVariable UUID id){ + shoppingListRepository.deleteById(id); + return "redirect:/"; + } + @GetMapping("/list/{id}") public String list(Model model, @PathVariable UUID id){ model.addAttribute("list", repository.findById(id)); From b71cf3ee42c6fb1b1e3efd563e6a15ec3af5c8c4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:46:24 +0200 Subject: [PATCH 07/82] Modelle verweisen auf sich und sind joinbar --- .../einkaufsliste/Models/ShoppingListCategory.java | 3 +++ .../einkaufsliste/Models/ShoppingListItem.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java index af589a2..623f9e2 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java @@ -16,5 +16,8 @@ public class ShoppingListCategory extends ShoppingElement{ private String categoryName; @OneToMany private List itemsInCategory; + @ManyToOne + @JoinColumn(name="list_id", nullable = false) + private ShoppingList shoppingList; } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java index 0f59e34..52af8cd 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java @@ -1,6 +1,8 @@ package de.timaldinger.einkaufsliste.Models; import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; @@ -14,4 +16,12 @@ public class ShoppingListItem extends ShoppingElement { private String itemName; private String itemAmount; private boolean isDone; + + @ManyToOne + @JoinColumn(name = "category_id", nullable = true) + private ShoppingListCategory category; + + @ManyToOne + @JoinColumn(name = "list_id", nullable = false) + private ShoppingList list; } From e36f4cc0b73e8df8120a4bc48c2673738ad54101 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:51:41 +0200 Subject: [PATCH 08/82] =?UTF-8?q?Methoden=20hinzugef=C3=BCgt=20um=20alle?= =?UTF-8?q?=20Kategorien=20und=20Gegenst=C3=A4nde=20in=20einer=20Liste=20z?= =?UTF-8?q?u=20finden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repository/ShoppingListCategoryRepository.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java index d7105eb..27366bd 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java @@ -1,9 +1,15 @@ package de.timaldinger.einkaufsliste.Repository; +import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; +import java.util.Optional; import java.util.UUID; public interface ShoppingListCategoryRepository extends JpaRepository{ + List findByList(Optional list); + List findByListAndCategoryIsNull(ShoppingList list); } From fae479ae572ecd5a918cf9f2429fa40028921a38 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:52:24 +0200 Subject: [PATCH 09/82] =?UTF-8?q?Knopf=20f=C3=BCr=20L=C3=B6schen=20einer?= =?UTF-8?q?=20Listen=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 32bd414..90d478c 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -6,7 +6,8 @@ xmlns:th="http://www.thymeleaf.org"> - + + @@ -17,9 +18,10 @@ xmlns:th="http://www.thymeleaf.org">
-
    -
  • +
      +
    • +
From c2762d80114266468867cc743c71073c38de1f69 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 15:54:03 +0200 Subject: [PATCH 10/82] =?UTF-8?q?einr=C3=BCckungen=20nud=20meta=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ich weis es nimmer ganz --- src/main/resources/templates/list.html | 57 +++++++++++++------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 085d2da..93c6fda 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -1,38 +1,39 @@ - + - + - niggas - - + + Einkaufsliste + + + +
-

Einkaufsliste

+

Einkaufsliste

-
-
- Neue Kategorie hinzufügen: - - -
+
+
+ Neue Kategorie hinzufügen: + + +
-
+
-
- Neuen Gegenstand hinzufügen: - - - - -
+
+ Neuen Gegenstand hinzufügen: + + + + +
- + +
    +
- -
    - < -
- - \ No newline at end of file + + From 02a5139e29afadb9527924cb6d79157d16e5a5d0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:06:05 +0200 Subject: [PATCH 11/82] =?UTF-8?q?API=20Endpunkt=20umbenannt,=20Repositorie?= =?UTF-8?q?s=20von=20Item=20und=20Category=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PageController.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index a2f0703..2e4820a 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -1,6 +1,8 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -8,15 +10,23 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.Optional; import java.util.UUID; @Controller @RequestMapping("/") public class PageController { - @Autowired - private ShoppingListRepository repository; - @PostMapping("/list") + @Autowired + private ShoppingListRepository shoppingListRepository; + + @Autowired + private ShoppingListCategoryRepository shoppingListCategoryRepository; + + @Autowired + private ShoppingListItemRepository shoppingListItemRepository; + + @PostMapping("api/list") public String addList(@Valid @ModelAttribute ShoppingList newList){ shoppingListRepository.save(newList); return "redirect:/"; @@ -28,15 +38,24 @@ public class PageController { return "index"; } - @DeleteMapping("/list/{id}") + @DeleteMapping("/api/list/{id}") public String deleteList(Model model, @PathVariable UUID id){ shoppingListRepository.deleteById(id); return "redirect:/"; } + /** + * Gibt die list.html Seite einer Liste zurück mit den Attributen list, categories und items + * @param model + * @param id + * @return + */ @GetMapping("/list/{id}") public String list(Model model, @PathVariable UUID id){ - model.addAttribute("list", repository.findById(id)); + ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); + model.addAttribute("list", list); + model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list)); + model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list)); return "list"; } } From b65b58aa394f38545a5663ac7ed9adba39d54733 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:06:27 +0200 Subject: [PATCH 12/82] =?UTF-8?q?shoppinglistcontroller=20hinzugef=C3=BCgt?= =?UTF-8?q?=20und=20das=20hinzuf=C3=BCgen=20einer=20Kategorie=20implementi?= =?UTF-8?q?ert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ShoppingListController.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java new file mode 100644 index 0000000..e4ec864 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -0,0 +1,40 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingListItem; +import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.thymeleaf.expression.Lists; + +import java.util.List; +import java.util.UUID; + +@RestController +public class ShoppingListController { + + @Autowired + private ShoppingListCategoryRepository shoppingListCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + + @PostMapping("/api/list/{listID}/category/") + public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + + String name = newCategory.categoryName(); + ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); + + ShoppingListCategory category = new ShoppingListCategory(name, List.of(),list); + + shoppingListCategoryRepository.save(category); + + return category; + } +} From cc132a1341c50519add59d791ff5769555107592 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:06:40 +0200 Subject: [PATCH 13/82] =?UTF-8?q?DTO=20erstellt=20f=C3=BCr=20Kategorie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java new file mode 100644 index 0000000..6671ca9 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java @@ -0,0 +1,4 @@ +package de.timaldinger.einkaufsliste.Dto; + +public record ShoppingCategoryDTO(String categoryName) { +} From 1db3b6a3975f67848480ba38b245f5bccabd521e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:06:56 +0200 Subject: [PATCH 14/82] =?UTF-8?q?Konstruktoren=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Models/ShoppingListCategory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java index 623f9e2..05fddd3 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java @@ -2,7 +2,9 @@ package de.timaldinger.einkaufsliste.Models; import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.util.List; @@ -10,6 +12,8 @@ import java.util.List; @Getter @Setter @Entity +@AllArgsConstructor +@NoArgsConstructor public class ShoppingListCategory extends ShoppingElement{ @NotBlank From c0ad79188bb3f8b97460ad48aed53ba147b54a65 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:07:20 +0200 Subject: [PATCH 15/82] find Methoden implementiert und verschoben --- .../Repository/ShoppingListCategoryRepository.java | 6 ++---- .../Repository/ShoppingListItemRepository.java | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java index 27366bd..54e4a9f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java @@ -2,14 +2,12 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -import java.util.Optional; import java.util.UUID; public interface ShoppingListCategoryRepository extends JpaRepository{ - List findByList(Optional list); - List findByListAndCategoryIsNull(ShoppingList list); + List findByShoppingList(ShoppingList list); + } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java index 5314d95..6193528 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java @@ -4,7 +4,10 @@ import de.timaldinger.einkaufsliste.Models.ShoppingElement; import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.UUID; public interface ShoppingListItemRepository extends JpaRepository { + + List findByListAndCategoryIsNull(Object list); } From 47815e073dd432aa9cd95da7cf72b76f1824f25c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:07:35 +0200 Subject: [PATCH 16/82] imports --- .../einkaufsliste/Repository/ShoppingListRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java index 0e3377f..8d3140d 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java @@ -1,9 +1,12 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.UUID; public interface ShoppingListRepository extends JpaRepository{ + } From ae5c28dc8fd4a436080f1a7b1dd1c78a0bf95479 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:08:34 +0200 Subject: [PATCH 17/82] erstellen einer neuen kategorie per fetch() implementiert --- src/main/resources/static/js/list/main.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/main.js b/src/main/resources/static/js/list/main.js index 678ee5d..b7e340d 100644 --- a/src/main/resources/static/js/list/main.js +++ b/src/main/resources/static/js/list/main.js @@ -6,10 +6,18 @@ const addCategoryForm = document.querySelector(".addCategoryForm") const itemListElement = document.querySelector(".displayedList"); const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); +const currentList = document.querySelector(".list"); + let listElements = []; // Liste der erstellten Items und Kategorien function addNewCategory(categoryName) { - + let id = currentList.id; + fetch(`/api/list/${id}/category/`, + { + method: "POST" + , body: JSON.stringify({ "categoryName": categoryName }) + , headers: { "Content-Type": "application/json" } + }).then(r => console.log("Add new category")); listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); renderItemList(); return 0; From 782344494c3fc4f489831a35a6cfc752aa5e079e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:09:19 +0200 Subject: [PATCH 18/82] =?UTF-8?q?l=C3=B6schen=20einer=20lsite=20implementi?= =?UTF-8?q?ert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/index.js | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/main/resources/static/js/index.js diff --git a/src/main/resources/static/js/index.js b/src/main/resources/static/js/index.js new file mode 100644 index 0000000..60e1eec --- /dev/null +++ b/src/main/resources/static/js/index.js @@ -0,0 +1,32 @@ +import { ShoppingList } from "./ShoppingList.js"; + + +const deleteListButtons = document.querySelectorAll('.shoppingListOverview__deleteListButton'); +const shoppingLists = []; + + +function fillList() { + document.querySelectorAll('.shoppingListOverview__shoppingList') + .forEach(list => { + shoppingLists.push(new ShoppingList(list.id)); + console.log(list.id); + }); + +} + +function deleteList(id) { + fetch(`/api/list/${id}`, { method: "DELETE" }).then(r => console.log("Liste entfernt")) +} + + +function init() { + deleteListButtons.forEach(button => { + button.addEventListener("click", () => { + const id = button.dataset.id; // liest data-id + deleteList(id); + }); + }); + fillList(); +} + +document.addEventListener('DOMContentLoaded', init); From 22e8606a0f3c2115772206743f77a074bbaedf70 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Sun, 4 Oct 2026 17:09:51 +0200 Subject: [PATCH 19/82] data/ wegen H2 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b6fe1e1..7037dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ target *.njsproj *.sln *.sw? + +# H2 +data \ No newline at end of file From c371cf00df1dc3091cf2afb08321579c12bc148a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:07:41 +0200 Subject: [PATCH 20/82] refactor von css und js Dateinamen und location --- .../static/css/{style.css => base.css} | 0 src/main/resources/static/css/index.css | 0 src/main/resources/static/css/list.css | 0 src/main/resources/static/js/list/main.js | 107 ------------------ .../static/js/shared/ShoppingList.js | 11 ++ src/main/resources/templates/index.html | 1 + src/main/resources/templates/list.html | 5 +- 7 files changed, 15 insertions(+), 109 deletions(-) rename src/main/resources/static/css/{style.css => base.css} (100%) create mode 100644 src/main/resources/static/css/index.css create mode 100644 src/main/resources/static/css/list.css delete mode 100644 src/main/resources/static/js/list/main.js create mode 100644 src/main/resources/static/js/shared/ShoppingList.js diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/base.css similarity index 100% rename from src/main/resources/static/css/style.css rename to src/main/resources/static/css/base.css diff --git a/src/main/resources/static/css/index.css b/src/main/resources/static/css/index.css new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/css/list.css b/src/main/resources/static/css/list.css new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/js/list/main.js b/src/main/resources/static/js/list/main.js deleted file mode 100644 index b7e340d..0000000 --- a/src/main/resources/static/js/list/main.js +++ /dev/null @@ -1,107 +0,0 @@ -import { ShoppingListItem } from "./ShoppingListItem.js"; -import { ShoppingCategory } from "./ShoppingCategory.js"; - -const addItemForm = document.querySelector(".addItemForm"); -const addCategoryForm = document.querySelector(".addCategoryForm") -const itemListElement = document.querySelector(".displayedList"); -const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); - -const currentList = document.querySelector(".list"); - -let listElements = []; // Liste der erstellten Items und Kategorien - -function addNewCategory(categoryName) { - let id = currentList.id; - fetch(`/api/list/${id}/category/`, - { - method: "POST" - , body: JSON.stringify({ "categoryName": categoryName }) - , headers: { "Content-Type": "application/json" } - }).then(r => console.log("Add new category")); - listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); - renderItemList(); - return 0; -} - - -export function addNewItem(itemName, itemAmount, category) { - if (category) { - category = listElements.find((element) => element instanceof ShoppingCategory && element.categoryName == category) - category.addItem(new ShoppingListItem(itemName, itemAmount, renderItemList)); - } else { - listElements.push(new ShoppingListItem(itemName, itemAmount, renderItemList)); - } - renderItemList(); - - return 0; -} - -function renderItemList() { - listElements = listElements.filter(item => !item.remove) - itemListElement.innerHTML = ""; //reset innerItemList - - listElements.forEach((element, index) => { - itemListElement.appendChild(element.render(index)); - }); - -} - -function deleteAllDoneItems() { - listElements.forEach((category, index) => { - if (category instanceof ShoppingCategory) { - category.itemsInCategory = category.itemsInCategory.filter((item) => !item.isDone); - } - }); - listElements = listElements.filter((element) => !element.isDone); - renderItemList(); -} - -function renderAddItemPrompt() { - const selectMenu = document.querySelector(".addItemForm__categorySelect"); - let categories = listElements.filter(element => element instanceof ShoppingCategory); - const emptySelection = document.createElement("option"); - - - emptySelection.setAttribute("value", ""); - emptySelection.selected = true; - emptySelection.textContent = "Keine" - - selectMenu.innerHTML = ""; - selectMenu.appendChild(emptySelection); - - categories.forEach(category => { - const option = document.createElement("option"); - option.setAttribute("value", category.categoryName); - option.textContent = category.categoryName; - - selectMenu.appendChild(option); - }); - -} - -function init() { - - renderAddItemPrompt(); - - addItemForm.addEventListener("submit", (event) => { - if (!addItemForm.checkValidity()) return; - event.preventDefault(); - const addItemFormData = Object.fromEntries(new FormData(addItemForm)); - addNewItem(addItemFormData.itemName, addItemFormData.itemAmount, addItemFormData.itemCategory); - }); - - - addCategoryForm.addEventListener("submit", (event) => { - if (!addCategoryForm.checkValidity()) return; - event.preventDefault(); - const addCategoryFormData = Object.fromEntries(new FormData(addCategoryForm)); - addNewCategory(addCategoryFormData.categoryName); - renderAddItemPrompt(); - }); - - deleteAllDoneItemsButton.addEventListener("click", (event) => { - deleteAllDoneItems(); - }) -} - -init(); diff --git a/src/main/resources/static/js/shared/ShoppingList.js b/src/main/resources/static/js/shared/ShoppingList.js new file mode 100644 index 0000000..08f3eee --- /dev/null +++ b/src/main/resources/static/js/shared/ShoppingList.js @@ -0,0 +1,11 @@ + + +export class ShoppingList{ + constructor(id){ + this.shoppingListName; + this.lastModified = ""; + this.created = ""; + this.id = id; + this.remove = false; + } +} \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 90d478c..c8e7ecf 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -6,6 +6,7 @@ xmlns:th="http://www.thymeleaf.org"> + diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 93c6fda..8d6b0f5 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -4,8 +4,9 @@ Einkaufsliste - - + + +
From de864daf3d2ca2bde85973e3768020063c686660 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:08:18 +0200 Subject: [PATCH 21/82] main.js -> list.js, Frontend rendering komplett entfernt --- src/main/resources/static/js/list/list.js | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/resources/static/js/list/list.js diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js new file mode 100644 index 0000000..17de9be --- /dev/null +++ b/src/main/resources/static/js/list/list.js @@ -0,0 +1,49 @@ +import { ShoppingListItem } from "../shared/ShoppingList.js"; +import { ShoppingCategory } from "./ShoppingCategory.js"; + +const addItemForm = document.querySelector(".addItemForm"); +const addCategoryForm = document.querySelector(".addCategoryForm") +const itemListElement = document.querySelector(".displayedList"); +const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); + +const currentList = document.querySelector(".list"); + +let listElements = []; // Liste der erstellten Items und Kategorien + +function addNewCategory(categoryName) { + let id = currentList.id; + fetch(`/api/list/${id}/category/`, + { + method: "POST" + , body: JSON.stringify({ "categoryName": categoryName }) + , headers: { "Content-Type": "application/json" } + }).then(r => console.log("Add new category")); + listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); + renderItemList(); + return 0; +} + + +export function addNewItem(itemName, itemAmount, categoryID) { + let id = currentList.id; + fetch(`/api/list/${id}/item`, + { + method: "POST", + body: JSON.stringify({ + "itemName": itemName, + "itemAmount": itemAmount, + "categoryID": categoryID + }), + headers: { "Content-Type": "application/json" } + }).then(r => console.log("added new item")); + + + return 0; +} + +function init() { + +} + + +document.addEventListener('DOMContentLoaded', init); From 2bed4c24a4f351d577f5a4049c57cf49d3feff99 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:24:06 +0200 Subject: [PATCH 22/82] api und frontend funktionen ausgelagert in unterschiedliche dateien --- src/main/resources/static/js/list/list.js | 40 ++----------------- src/main/resources/static/js/list/listAPI.js | 40 +++++++++++++++++++ .../resources/static/js/list/listFrontend.js | 16 ++++++++ 3 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 src/main/resources/static/js/list/listAPI.js create mode 100644 src/main/resources/static/js/list/listFrontend.js diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 17de9be..902ccbb 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -1,45 +1,11 @@ -import { ShoppingListItem } from "../shared/ShoppingList.js"; +import { ShoppingListItem } from "../shared/"; import { ShoppingCategory } from "./ShoppingCategory.js"; - -const addItemForm = document.querySelector(".addItemForm"); -const addCategoryForm = document.querySelector(".addCategoryForm") -const itemListElement = document.querySelector(".displayedList"); -const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); +import * as api from "./listAPI.js" +import * as ui from "./listFrontend.js" const currentList = document.querySelector(".list"); -let listElements = []; // Liste der erstellten Items und Kategorien -function addNewCategory(categoryName) { - let id = currentList.id; - fetch(`/api/list/${id}/category/`, - { - method: "POST" - , body: JSON.stringify({ "categoryName": categoryName }) - , headers: { "Content-Type": "application/json" } - }).then(r => console.log("Add new category")); - listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); - renderItemList(); - return 0; -} - - -export function addNewItem(itemName, itemAmount, categoryID) { - let id = currentList.id; - fetch(`/api/list/${id}/item`, - { - method: "POST", - body: JSON.stringify({ - "itemName": itemName, - "itemAmount": itemAmount, - "categoryID": categoryID - }), - headers: { "Content-Type": "application/json" } - }).then(r => console.log("added new item")); - - - return 0; -} function init() { diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js new file mode 100644 index 0000000..de60656 --- /dev/null +++ b/src/main/resources/static/js/list/listAPI.js @@ -0,0 +1,40 @@ + +export function addItem(currentList, itemName, itemAmount, categoryID) { + let id = currentList.id; + fetch(`/api/list/${id}/item`, + { + method: "POST", + body: JSON.stringify({ + "itemName": itemName, + "itemAmount": itemAmount, + "categoryID": categoryID + }), + headers: { "Content-Type": "application/json" } + }).then(r => console.log("added new item")); + + + return 0; +} + + +export function deleteItem() { + +} + +export function addCategory() { + let id = currentList.id; + fetch(`/api/list/${id}/category/`, + { + method: "POST" + , body: JSON.stringify({ "categoryName": categoryName }) + , headers: { "Content-Type": "application/json" } + }).then(r => console.log("Add new category")); + listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); + renderItemList(); + return 0; +} + + +export function deleteCategory() { + +} diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js new file mode 100644 index 0000000..6cc6ebb --- /dev/null +++ b/src/main/resources/static/js/list/listFrontend.js @@ -0,0 +1,16 @@ + +export function addItem() { + +} + +export function deleteItem() { + +} + +export function addCategory() { + +} + +export function deleteCategory() { + +} From 19c2647cf6923a046307b34fb1330a17f199af5c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:24:20 +0200 Subject: [PATCH 23/82] =?UTF-8?q?Konstruktor=20annotation=20hinzugef=C3=BC?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/timaldinger/einkaufsliste/Models/ShoppingListItem.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java index 52af8cd..84db48e 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java @@ -4,12 +4,16 @@ import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter @Entity +@AllArgsConstructor +@NoArgsConstructor public class ShoppingListItem extends ShoppingElement { @NotBlank From be7b752ce765d1658c3e2d6198d814ef12616228 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:24:34 +0200 Subject: [PATCH 24/82] =?UTF-8?q?DTO=20f=C3=BCr=20Item=20erstellt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java new file mode 100644 index 0000000..5eea650 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingListItemDTO (String itemName, String itemAmount, UUID category){ +} From 09fa991077961cc3ece5e202d6fd33eb26c81c7a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:24:56 +0200 Subject: [PATCH 25/82] item wird via post erstellt --- .../Controller/ShoppingListController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index e4ec864..94b0b20 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -1,10 +1,12 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingListItemDTO; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ui.Model; @@ -24,6 +26,8 @@ public class ShoppingListController { private ShoppingListCategoryRepository shoppingListCategoryRepository; @Autowired private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingListItemRepository shoppingListItemRepository; @PostMapping("/api/list/{listID}/category/") public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ @@ -37,4 +41,15 @@ public class ShoppingListController { return category; } + + @PostMapping("/api/list/{listID}/item/") + public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ + String name = newItem.itemName(); + String amount = newItem.itemAmount(); + ShoppingListCategory c = shoppingListCategoryRepository.findById(newItem.category()).orElseThrow(); + ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); + ShoppingListItem item = new ShoppingListItem(name, amount, false, c, list); + shoppingListItemRepository.save(item); + return item; + } } From 8307e50d2418d15b8278371952352f1a2e37a78e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:25:16 +0200 Subject: [PATCH 26/82] darstellung kategorie und dessen items --- src/main/resources/templates/list.html | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 8d6b0f5..681a832 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -10,10 +10,10 @@
-

Einkaufsliste

+

-
+
Neue Kategorie hinzufügen: @@ -32,8 +32,20 @@
-
    -
+ + +
    +
  • +
      +
    • + +
    • +
    +
  • +
From ca6c4bdf9e7efc0fbac6a6135af44d108dabc915 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 14:25:44 +0200 Subject: [PATCH 27/82] refactor von name zu listName und apiCall URI --- src/main/resources/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index c8e7ecf..a94e9f0 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -13,14 +13,14 @@ xmlns:th="http://www.thymeleaf.org">
-
+
    -
  • +
  • From f5add6b59024570318903ea80515c846a10b8a52 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:48:56 +0200 Subject: [PATCH 28/82] refactor --- .../de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java index 5eea650..970a34f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java @@ -2,5 +2,5 @@ package de.timaldinger.einkaufsliste.Dto; import java.util.UUID; -public record ShoppingListItemDTO (String itemName, String itemAmount, UUID category){ +public record ShoppingListItemDTO (String itemName, String itemAmount, UUID categoryID){ } From afda716a66246975811c643435a873ae470387d1 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:50:33 +0200 Subject: [PATCH 29/82] eine category wird auf viele Items gemapped durch das Feld category in ShoppingListItem --- .../timaldinger/einkaufsliste/Models/ShoppingListCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java index 05fddd3..c9d8e87 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java @@ -18,7 +18,7 @@ public class ShoppingListCategory extends ShoppingElement{ @NotBlank private String categoryName; - @OneToMany + @OneToMany(mappedBy = "category") private List itemsInCategory; @ManyToOne @JoinColumn(name="list_id", nullable = false) From 5b313a4364dc3854373a56b1d29fc5d9f035ef71 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:50:50 +0200 Subject: [PATCH 30/82] =?UTF-8?q?l=C3=B6schen=20von=20items=20M=C3=B6glich?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../einkaufsliste/Controller/ShoppingListController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 94b0b20..a11fdfb 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -52,4 +52,13 @@ public class ShoppingListController { shoppingListItemRepository.save(item); return item; } + + @DeleteMapping("/api/item/{itemID}") + public ResponseEntity deleteItem(@PathVariable UUID itemID){ + if(!shoppingListItemRepository.existsById(itemID)){ + return ResponseEntity.notFound().build(); + } + shoppingListItemRepository.deleteById(itemID); + return ResponseEntity.noContent().build(); + } } From 49377a98a8416b4db75bd3492cb421b5933ba644 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:51:02 +0200 Subject: [PATCH 31/82] trailing / vom Pfad entfernt --- .../einkaufsliste/Controller/ShoppingListController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index a11fdfb..0479d41 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -42,7 +42,7 @@ public class ShoppingListController { return category; } - @PostMapping("/api/list/{listID}/item/") + @PostMapping("/api/list/{listID}/item") public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); From 33964f2a307421586837d8c628749ebf69cf97c4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:51:19 +0200 Subject: [PATCH 32/82] category kann optional sein --- .../Controller/ShoppingListController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 0479d41..eee6d1b 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -9,11 +9,11 @@ import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.thymeleaf.expression.Lists; import java.util.List; @@ -46,7 +46,12 @@ public class ShoppingListController { public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); - ShoppingListCategory c = shoppingListCategoryRepository.findById(newItem.category()).orElseThrow(); + ShoppingListCategory c; + if(newItem.categoryID() != null){ + c = shoppingListCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + }else{ + c = null; + } ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); ShoppingListItem item = new ShoppingListItem(name, amount, false, c, list); shoppingListItemRepository.save(item); From ea3b07ed0ffb7866e24e63272db5992d3a617c0b Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:51:28 +0200 Subject: [PATCH 33/82] =?UTF-8?q?styles=20f=C3=BCr=20Kategorien=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/css/list.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/static/css/list.css b/src/main/resources/static/css/list.css index e69de29..12145ce 100644 --- a/src/main/resources/static/css/list.css +++ b/src/main/resources/static/css/list.css @@ -0,0 +1,6 @@ +.displayedList__categoryName--bold { + font-weight: bold; +} +.displayedList__categoryName--big { + font-size = 3rem; +} From 6175817db28de3a139594bed09e1185c85b70e5c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:52:10 +0200 Subject: [PATCH 34/82] addItem ruft api und ui addItem auf mit richtigen parameter + logging --- src/main/resources/static/js/list/list.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 902ccbb..42ebb8e 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -5,6 +5,11 @@ import * as ui from "./listFrontend.js" const currentList = document.querySelector(".list"); +function addItem(itemName, itemAmount, categoryID) { + console.log(`${currentList.id}, ${itemName}, ${itemAmount}, ${categoryID}`) + api.addItem(currentList.id, itemName, itemAmount, categoryID); + ui.addItem(); +} function init() { From 77b5ed5991caac7e761ea37c3370637a21a4b9f2 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:52:31 +0200 Subject: [PATCH 35/82] =?UTF-8?q?import=20entfernt=20weil=20nicht=20n?= =?UTF-8?q?=C3=B6tig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 42ebb8e..2396ff9 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -1,5 +1,3 @@ -import { ShoppingListItem } from "../shared/"; -import { ShoppingCategory } from "./ShoppingCategory.js"; import * as api from "./listAPI.js" import * as ui from "./listFrontend.js" From 821f5c7216995c9956287a249cd9fec784a85bb3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:53:08 +0200 Subject: [PATCH 36/82] =?UTF-8?q?Kategorie=20kann=20hinzugef=C3=BCgt=20wer?= =?UTF-8?q?en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 2396ff9..4ec0cc5 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -9,6 +9,12 @@ function addItem(itemName, itemAmount, categoryID) { ui.addItem(); } +function addCategory(categoryName) { + console.log(`adding category ${categoryName}`) + api.addCategory(currentList.id, categoryName); + ui.addCategory(categoryName); + return 0; +} function init() { From 409469e09835d736731fa044b9dc89b6355c72b9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:53:14 +0200 Subject: [PATCH 37/82] =?UTF-8?q?Item=20kann=20gel=C3=B6scht=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 4ec0cc5..c7ca5b7 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -16,6 +16,10 @@ function addCategory(categoryName) { return 0; } +function deleteItem(li) { + api.deleteItem(li.id); + ui.deleteItem(li); +} function init() { } From 4f453c0263d3d8ef00953cdcc611bec92126822e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:54:11 +0200 Subject: [PATCH 38/82] =?UTF-8?q?event=20listener=20f=C3=BCr=20Forms=20hin?= =?UTF-8?q?zugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index c7ca5b7..bc57a0d 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -1,6 +1,9 @@ import * as api from "./listAPI.js" import * as ui from "./listFrontend.js" + +const addCategoryForm = document.querySelector(".addCategoryForm"); +const addItemForm = document.querySelector(".addItemForm"); const currentList = document.querySelector(".list"); function addItem(itemName, itemAmount, categoryID) { @@ -20,8 +23,23 @@ function deleteItem(li) { api.deleteItem(li.id); ui.deleteItem(li); } -function init() { +function init() { + addCategoryForm.addEventListener("submit", (event) => { + event.preventDefault(); + let formData = Object.fromEntries(new FormData(addCategoryForm)); + addCategory(formData.categoryName); + }); + + addItemForm.addEventListener("submit", event => { + event.preventDefault(); + let formData = Object.fromEntries(new FormData(addItemForm)); + addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); + }) + + + console.log("javascript initialized!"); + return 0; } From a49ceea35582a147652ced700cb1beb242141605 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:55:13 +0200 Subject: [PATCH 39/82] =?UTF-8?q?evenListener=20f=C3=BCr=20das=20l=C3=B6sc?= =?UTF-8?q?hen=20von=20Items=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit es wird das jeweilige
  • Element übergeben, dies vereinfacht die Handhabung für API und UI Handling --- src/main/resources/static/js/list/list.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index bc57a0d..89b2131 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -37,6 +37,12 @@ function init() { addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); }) + document.querySelectorAll(".item__buttonDelete").forEach(button => { + button.addEventListener("click", event => { + const li = button.closest("li"); + deleteItem(li); + }) + }) console.log("javascript initialized!"); return 0; From 02eac10d9aef34f20cb2678256539fdcb39abbee Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:55:32 +0200 Subject: [PATCH 40/82] deleteItem() implementier --- src/main/resources/static/js/list/listFrontend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 6cc6ebb..dfa6751 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -3,8 +3,8 @@ export function addItem() { } -export function deleteItem() { - +export function deleteItem(li) { + li.remove(); } export function addCategory() { From a635d7c374042b29cf1d3f0d367fcf1514049813 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:56:10 +0200 Subject: [PATCH 41/82] =?UTF-8?q?bugfix:=20currentList=20iwrd=20bei=20list?= =?UTF-8?q?.js=20schon=20als=20die=20ID=20der=20liste=20=C3=BCbergeben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/listAPI.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index de60656..d668a18 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -1,7 +1,6 @@ -export function addItem(currentList, itemName, itemAmount, categoryID) { - let id = currentList.id; - fetch(`/api/list/${id}/item`, +export function addItem(listID, itemName, itemAmount, categoryID) { + fetch(`/api/list/${listID}/item`, { method: "POST", body: JSON.stringify({ From 6bedcb183619cf95f1a90e7bc2aa639d522ae84d Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:56:17 +0200 Subject: [PATCH 42/82] delete Item IMpolementeier --- src/main/resources/static/js/list/listAPI.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index d668a18..3fee7dc 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -16,7 +16,12 @@ export function addItem(listID, itemName, itemAmount, categoryID) { } -export function deleteItem() { +export function deleteItem(itemID) { + + fetch(`/api/item/${itemID}`, { method: "DELETE" }) + .then(r => console.log("item deleted")); + + return 0; } From 2b2889cb63512de9528808d7c791ace3c07f6e3e Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 21:56:53 +0200 Subject: [PATCH 43/82] =?UTF-8?q?bugfix:=20listID=20schon=20im=20schei?= =?UTF-8?q?=C3=9F=20parameter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/listAPI.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index 3fee7dc..fc48881 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -25,9 +25,8 @@ export function deleteItem(itemID) { } -export function addCategory() { - let id = currentList.id; - fetch(`/api/list/${id}/category/`, +export function addCategory(listID, categoryName) { + fetch(`/api/list/${listID}/category/`, { method: "POST" , body: JSON.stringify({ "categoryName": categoryName }) From 7428c7db2532663d5dc07ee9ab04800545ae7e41 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 22:00:30 +0200 Subject: [PATCH 44/82] =?UTF-8?q?Kategorien=20sind=20nun=20ausw=C3=A4hlbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit die value entspricht der categoryID um sie genau zuordnen zu können --- src/main/resources/templates/list.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 681a832..c740f93 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -26,7 +26,9 @@ Neuen Gegenstand hinzufügen: - + + From ea34010c8d2b39ca64bfbc0059419f8e90bf0bc0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 22:01:45 +0200 Subject: [PATCH 45/82] richtiges erstellen von verschachtelten listen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit es wird ein
  • erstellt, welches die Kategorie repräsentiert, in diesem li gibt es eine
      , wo für jedes item in der Kategorie ein neues
    • angelegt wird --- src/main/resources/templates/list.html | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index c740f93..c1253ec 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -37,14 +37,17 @@
        -
      • -
          -
        • - -
        • + +
        • + + +
            +
          • + + + + +
        From d5df05f87ad9a74682bd3ea5f05f54b11ada92b9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Mon, 5 Oct 2026 22:01:56 +0200 Subject: [PATCH 46/82] auflisten von items ohne Kategorie --- src/main/resources/templates/list.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index c1253ec..20748b2 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -50,6 +50,13 @@
    • + +
    • + + + + +
From f4822ceb4d6e562c1cd50ff6311858d502a4a741 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 13:56:01 +0200 Subject: [PATCH 47/82] =?UTF-8?q?refactor,=20Pr=C3=A4fix=20ShoppingList=20?= =?UTF-8?q?->=20Shopping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PageController.java | 13 ++++---- .../Controller/ShoppingListController.java | 33 +++++++++---------- .../einkaufsliste/Dto/ShoppingItemDTO.java | 6 ++++ .../Dto/ShoppingListItemDTO.java | 6 ---- ...istCategory.java => ShoppingCategory.java} | 4 +-- ...hoppingListItem.java => ShoppingItem.java} | 4 +-- .../ShoppingCategoryRepository.java | 13 ++++++++ .../Repository/ShoppingItemRepository.java | 12 +++++++ .../ShoppingListCategoryRepository.java | 13 -------- .../ShoppingListItemRepository.java | 13 -------- 10 files changed, 56 insertions(+), 61 deletions(-) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java rename src/main/java/de/timaldinger/einkaufsliste/Models/{ShoppingListCategory.java => ShoppingCategory.java} (82%) rename src/main/java/de/timaldinger/einkaufsliste/Models/{ShoppingListItem.java => ShoppingItem.java} (86%) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java delete mode 100644 src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index 2e4820a..7105e56 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -1,8 +1,8 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; -import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +10,6 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import java.util.Optional; import java.util.UUID; @Controller @@ -21,10 +20,10 @@ public class PageController { private ShoppingListRepository shoppingListRepository; @Autowired - private ShoppingListCategoryRepository shoppingListCategoryRepository; + private ShoppingCategoryRepository shoppingCategoryRepository; @Autowired - private ShoppingListItemRepository shoppingListItemRepository; + private ShoppingItemRepository shoppingItemRepository; @PostMapping("api/list") public String addList(@Valid @ModelAttribute ShoppingList newList){ @@ -54,8 +53,8 @@ public class PageController { public String list(Model model, @PathVariable UUID id){ ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); model.addAttribute("list", list); - model.addAttribute("categories", shoppingListCategoryRepository.findByShoppingList(list)); - model.addAttribute("items", shoppingListItemRepository.findByListAndCategoryIsNull(list)); + model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list)); + model.addAttribute("items", shoppingItemRepository.findByListAndCategoryIsNull(list)); return "list"; } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index eee6d1b..ab8004c 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -1,20 +1,17 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; -import de.timaldinger.einkaufsliste.Dto.ShoppingListItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; -import de.timaldinger.einkaufsliste.Repository.ShoppingListCategoryRepository; -import de.timaldinger.einkaufsliste.Repository.ShoppingListItemRepository; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import org.thymeleaf.expression.Lists; import java.util.List; import java.util.UUID; @@ -23,21 +20,21 @@ import java.util.UUID; public class ShoppingListController { @Autowired - private ShoppingListCategoryRepository shoppingListCategoryRepository; + private ShoppingCategoryRepository shoppingCategoryRepository; @Autowired private ShoppingListRepository shoppingListRepository; @Autowired - private ShoppingListItemRepository shoppingListItemRepository; + private ShoppingItemRepository shoppingItemRepository; @PostMapping("/api/list/{listID}/category/") - public ShoppingListCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ String name = newCategory.categoryName(); ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); - ShoppingListCategory category = new ShoppingListCategory(name, List.of(),list); + ShoppingCategory category = new ShoppingCategory(name, List.of(),list); - shoppingListCategoryRepository.save(category); + shoppingCategoryRepository.save(category); return category; } @@ -46,9 +43,9 @@ public class ShoppingListController { public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); - ShoppingListCategory c; + ShoppingCategory c; if(newItem.categoryID() != null){ - c = shoppingListCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); }else{ c = null; } @@ -60,10 +57,10 @@ public class ShoppingListController { @DeleteMapping("/api/item/{itemID}") public ResponseEntity deleteItem(@PathVariable UUID itemID){ - if(!shoppingListItemRepository.existsById(itemID)){ + if(!shoppingItemRepository.existsById(itemID)){ return ResponseEntity.notFound().build(); } - shoppingListItemRepository.deleteById(itemID); + shoppingItemRepository.deleteById(itemID); return ResponseEntity.noContent().build(); } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java new file mode 100644 index 0000000..3626d9a --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemDTO(String itemName, String itemAmount, UUID categoryID, UUID listID){ +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java deleted file mode 100644 index 970a34f..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingListItemDTO.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.timaldinger.einkaufsliste.Dto; - -import java.util.UUID; - -public record ShoppingListItemDTO (String itemName, String itemAmount, UUID categoryID){ -} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java similarity index 82% rename from src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java rename to src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java index c9d8e87..2141ddb 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -14,12 +14,12 @@ import java.util.List; @Entity @AllArgsConstructor @NoArgsConstructor -public class ShoppingListCategory extends ShoppingElement{ +public class ShoppingCategory extends ShoppingElement{ @NotBlank private String categoryName; @OneToMany(mappedBy = "category") - private List itemsInCategory; + private List itemsInCategory; @ManyToOne @JoinColumn(name="list_id", nullable = false) private ShoppingList shoppingList; diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java similarity index 86% rename from src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java rename to src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java index 84db48e..67567c7 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingListItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java @@ -14,7 +14,7 @@ import lombok.Setter; @Entity @AllArgsConstructor @NoArgsConstructor -public class ShoppingListItem extends ShoppingElement { +public class ShoppingItem extends ShoppingElement { @NotBlank private String itemName; @@ -23,7 +23,7 @@ public class ShoppingListItem extends ShoppingElement { @ManyToOne @JoinColumn(name = "category_id", nullable = true) - private ShoppingListCategory category; + private ShoppingCategory category; @ManyToOne @JoinColumn(name = "list_id", nullable = false) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java new file mode 100644 index 0000000..ad361f8 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingCategoryRepository.java @@ -0,0 +1,13 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface ShoppingCategoryRepository extends JpaRepository{ + List findByShoppingList(ShoppingList list); + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java new file mode 100644 index 0000000..4c17a06 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -0,0 +1,12 @@ +package de.timaldinger.einkaufsliste.Repository; + +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.UUID; + +public interface ShoppingItemRepository extends JpaRepository { + + List findByListAndCategoryIsNull(Object list); +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java deleted file mode 100644 index 54e4a9f..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListCategoryRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.timaldinger.einkaufsliste.Repository; - -import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Models.ShoppingListCategory; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.UUID; - -public interface ShoppingListCategoryRepository extends JpaRepository{ - List findByShoppingList(ShoppingList list); - -} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java deleted file mode 100644 index 6193528..0000000 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListItemRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.timaldinger.einkaufsliste.Repository; - -import de.timaldinger.einkaufsliste.Models.ShoppingElement; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; -import java.util.UUID; - -public interface ShoppingListItemRepository extends JpaRepository { - - List findByListAndCategoryIsNull(Object list); -} From 002d09955a085238f6590d3a05ed86913697037a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 13:59:06 +0200 Subject: [PATCH 48/82] =?UTF-8?q?ShoppingItemResponseDTO=20hinzugef=C3=BCg?= =?UTF-8?q?t=20um=20rekursives=20JSON=20zu=20vermeiden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Würde man das normale ShoppingItem zurückgeben so ergäbe sich ein riesiges JSON weil die Felder category und item auf sich selbst verweisen. Genommen wurde ein DTO, da es zur vorherigen Rangehenweise passt, alternatvi wäre auch eine Jackson annotation möglich gewesen (@JsonIgnore) bei bei itemsIncategory in ShoppingCategory.java --- .../Controller/ShoppingListController.java | 13 +++++++------ .../einkaufsliste/Dto/ShoppingItemResponseDTO.java | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index ab8004c..142a0e2 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -39,8 +39,8 @@ public class ShoppingListController { return category; } - @PostMapping("/api/list/{listID}/item") - public ShoppingListItem addItem(@PathVariable UUID listID, @RequestBody ShoppingListItemDTO newItem){ + @PostMapping("/api/item") + public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ String name = newItem.itemName(); String amount = newItem.itemAmount(); ShoppingCategory c; @@ -49,10 +49,11 @@ public class ShoppingListController { }else{ c = null; } - ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); - ShoppingListItem item = new ShoppingListItem(name, amount, false, c, list); - shoppingListItemRepository.save(item); - return item; + ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); + ShoppingItem item = new ShoppingItem(name, amount, false, c, list); + shoppingItemRepository.save(item); + + return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); } @DeleteMapping("/api/item/{itemID}") diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java new file mode 100644 index 0000000..3f1a8ac --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemResponseDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemResponseDTO(String itemName, String itemAmount, UUID itemID, UUID categoryID) { +} From dd5308b4953d6eab47b2591493012980ed1fd46c Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 13:59:48 +0200 Subject: [PATCH 49/82] import entfernts --- .../einkaufsliste/Repository/ShoppingListRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java index 8d3140d..01aef05 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingListRepository.java @@ -1,10 +1,8 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingList; -import de.timaldinger.einkaufsliste.Models.ShoppingListItem; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; import java.util.UUID; public interface ShoppingListRepository extends JpaRepository{ From d731c46c9c49ae791304597345cfc25eb0a2bbd3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:02:51 +0200 Subject: [PATCH 50/82] refactor BEM displayedList__category... zu category__... --- src/main/resources/static/css/list.css | 6 +++--- src/main/resources/templates/list.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/css/list.css b/src/main/resources/static/css/list.css index 12145ce..4a0ac6d 100644 --- a/src/main/resources/static/css/list.css +++ b/src/main/resources/static/css/list.css @@ -1,6 +1,6 @@ -.displayedList__categoryName--bold { +.category__name--bold { font-weight: bold; } -.displayedList__categoryName--big { - font-size = 3rem; +.category__name--big { + font-size : 1.5rem; } diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 20748b2..e7cf925 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -39,7 +39,7 @@
  • - +
    • From 62953ffa616dda167c6a3afd13eb27d8c54204b0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:03:36 +0200 Subject: [PATCH 51/82] refactor buttonDelete zu deleteButton weil ich es zu oft verwechselet hab --- src/main/resources/templates/list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index e7cf925..abc8105 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -46,7 +46,7 @@ - +
  • @@ -55,7 +55,7 @@ - +
From 18cf37f7c9eb27005148fbb0fa384fe04ad175db Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:04:05 +0200 Subject: [PATCH 52/82] li haben jetzt die class category wenn sie eine KAtegorie sind --- src/main/resources/templates/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index abc8105..924cd8e 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -38,7 +38,7 @@
    -
  • +
    • From 6cfe4d35101924f339812684ef82edc4df12f339 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:04:17 +0200 Subject: [PATCH 53/82] =?UTF-8?q?knopf=20f=C3=BCr=20l=C3=B6schen=20und=20c?= =?UTF-8?q?heckbox=20f=C3=BCr=20alle=20items=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 924cd8e..0b5ff4a 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -40,6 +40,8 @@
    • + +
      • From fd0a3959a5375f79d10a0242cdb5df3d2f3c04fa Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:13:58 +0200 Subject: [PATCH 54/82] =?UTF-8?q?kategorie=20hinzuf=C3=BCgen=20aktualisert?= =?UTF-8?q?=20im=20frontend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit addCategory ist async, damit wir das zurückgegebene JSON Objekt vom backend auch richtig entpacken können. Das JSON wandeln wir in eine ShoppingCategory um, was dann in einer eigenen Klasse die HTML Elemente in render() erstellt und es zurück gibt, was dann in ui.addCategory() an die vorhandene Liste dranhängen kann. Es wurden außerdem schonmal die Knöpfe hinzugefügt für das Löschen fixes #2 --- .../static/js/list/ShoppingCategory.js | 131 +++--------------- src/main/resources/static/js/list/list.js | 7 +- src/main/resources/static/js/list/listAPI.js | 12 +- .../resources/static/js/list/listFrontend.js | 6 +- 4 files changed, 38 insertions(+), 118 deletions(-) diff --git a/src/main/resources/static/js/list/ShoppingCategory.js b/src/main/resources/static/js/list/ShoppingCategory.js index 3a2d076..7a4bcea 100644 --- a/src/main/resources/static/js/list/ShoppingCategory.js +++ b/src/main/resources/static/js/list/ShoppingCategory.js @@ -1,120 +1,35 @@ -import { addNewItem } from "./main.js"; - export class ShoppingCategory { - - constructor(categoryName, onDelete, onUpdate) { + constructor(categoryName) { this.categoryName = categoryName; - this.itemsInCategory = []; - this.remove = false; - this.isEditing = false; - this.onDelete = onDelete; - this.onUpdate = onUpdate; + this.categoryID = null; + } + + static fromJSON(categoryAsJSON) { + const category = new ShoppingCategory(categoryAsJSON.categoryName); + category.categoryID = categoryAsJSON.id; + return category; } render() { - let element; - const outerLi = document.createElement("li"); - //if (this.itemsInCategory.length == 0) return; + const li = document.createElement("li"); + const span = document.createElement("span"); + const deleteCategoryButton = document.createElement("button"); + const deleteAllItemsCheckbox = document.createElement("input"); + li.id = this.categoryID; + li.classList.add("category"); + span.textContent = this.categoryName; + span.classList.add("category__name--bold", "category__name--big"); - if (this.isEditing) { - element = this.#renderEditing(); - } else { - element = this.#renderNormal(); - } - outerLi.append(element); - return outerLi; - } + deleteCategoryButton.classList.add("category__deleteButton"); + deleteCategoryButton.textContent = "Kategorie löschen"; - #renderEditing() { - //const li = document.createElement("li"); - const editForm = document.createElement("form"); - const editCategoryNameField = document.createElement("input"); - const saveButton = document.createElement("button"); - const abortButton = document.createElement("button"); + deleteAllItemsCheckbox.setAttribute("type", "checkbox"); + li.appendChild(span); + li.appendChild(deleteCategoryButton); + li.appendChild(deleteAllItemsCheckbox); - editCategoryNameField.setAttribute("name", "newCategoryName"); - editCategoryNameField.setAttribute("value", this.categoryName); - - - abortButton.textContent = "Abbrechen"; - abortButton.addEventListener("click", (event) => { - event.preventDefault(); - this.isEditing = false; - this.onUpdate(); - }); - - saveButton.textContent = "Speichern"; - editForm.addEventListener("submit", (event) => { - event.preventDefault(); - - const editFormData = Object.fromEntries(new FormData(editForm)); - - if (!editFormData.newCategoryName) { - return; - } - - this.categoryName = editFormData.newCategoryName; - this.isEditing = false; - this.onUpdate(); - this.onDelete(); - }); - - editForm.appendChild(editCategoryNameField); - editForm.appendChild(saveButton); - editForm.appendChild(abortButton); - //li.appendChild(editForm); - - return editForm; - - } - - #renderNormal() { - - const spanCategoryName = document.createElement("span"); - const removeCategoryButton = document.createElement("button"); // Entfernen der Kategorie - const removeCategoryItemsCheckbox = document.createElement("input"); // alle Gegenstände drunter entfernen oder nicht - const removeCategoryItemsText = document.createElement("span"); - const ul = document.createElement("ul"); - const items = this.itemsInCategory.filter((item) => !item.remove); - - spanCategoryName.textContent = this.categoryName; - spanCategoryName.classList.add("category__name--big", "category__name--bold"); - spanCategoryName.addEventListener("click", () => { - this.isEditing = true; - this.onUpdate(); - }); - - removeCategoryItemsCheckbox.setAttribute("type", "checkbox"); - removeCategoryItemsText.textContent = "Alle Gegenstände in dieser Kategorie löschen? :"; - - - removeCategoryButton.textContent = "Löschen"; - removeCategoryButton.addEventListener("click", () => { - this.remove = true; - if (!removeCategoryItemsCheckbox.checked) { - this.itemsInCategory.forEach((element) => { - addNewItem(element.itemName, element.itemAmount, ""); - }); - } - this.onUpdate(); - this.onDelete(); - - }); - - ul.appendChild(spanCategoryName); - ul.appendChild(removeCategoryButton); - ul.appendChild(removeCategoryItemsText); - ul.appendChild(removeCategoryItemsCheckbox); - items.forEach((item, index) => { - ul.append(item.render()); - }); - - return ul; - } - - addItem(item) { - this.itemsInCategory.push(item); + return li; } } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 89b2131..6254fb5 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -12,10 +12,11 @@ function addItem(itemName, itemAmount, categoryID) { ui.addItem(); } -function addCategory(categoryName) { +async function addCategory(categoryName) { console.log(`adding category ${categoryName}`) - api.addCategory(currentList.id, categoryName); - ui.addCategory(categoryName); + const categoryAsJSON = await api.addCategory(currentList.id, categoryName); + console.log(categoryAsJSON); + ui.addCategory(categoryAsJSON); return 0; } diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index fc48881..f85cc2b 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -25,16 +25,16 @@ export function deleteItem(itemID) { } -export function addCategory(listID, categoryName) { - fetch(`/api/list/${listID}/category/`, +export async function addCategory(listID, categoryName) { + const newCategory = await fetch(`/api/list/${listID}/category/`, { method: "POST" , body: JSON.stringify({ "categoryName": categoryName }) , headers: { "Content-Type": "application/json" } - }).then(r => console.log("Add new category")); - listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); - renderItemList(); - return 0; + }); + //listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); + //renderItemList(); + return await newCategory.json(); } diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index dfa6751..f5f9d05 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -1,3 +1,4 @@ +import { ShoppingCategory } from "./ShoppingCategory.js"; export function addItem() { @@ -7,8 +8,11 @@ export function deleteItem(li) { li.remove(); } -export function addCategory() { +export function addCategory(categoryAsJSON) { + const list = document.querySelector(".displayedList"); + const category = ShoppingCategory.fromJSON(categoryAsJSON); + list.appendChild(category.render()); } export function deleteCategory() { From ccb37a666a65ad31b7059f096283eaca9d488038 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:14:46 +0200 Subject: [PATCH 55/82] =?UTF-8?q?events=20f=C3=BCr=20die=20vorhanden=20und?= =?UTF-8?q?=20kommenden=20Elemente=20werden=20nun=20via=20event=20deligati?= =?UTF-8?q?on=20hydrated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 6254fb5..1de5cc5 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -38,12 +38,17 @@ function init() { addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); }) - document.querySelectorAll(".item__buttonDelete").forEach(button => { - button.addEventListener("click", event => { - const li = button.closest("li"); - deleteItem(li); - }) - }) + //event delegation ist schon geil + document.querySelector(".displayedList").addEventListener("click", (event) => { + if (event.target.matches(".item__deleteButton")) { + deleteItem(event.target.closest("li")); + } else if (event.target.matches(".category__deleteButton")) { + const li = event.target.closest("li"); + const checkbox = li.querySelector("input[type=checkbox]"); + deleteCategory(checkbox.checked, li.id); + } + + }); console.log("javascript initialized!"); return 0; From 9e8202d3824a66726aebae4ecab3668a4b707702 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:15:21 +0200 Subject: [PATCH 56/82] =?UTF-8?q?addItem=20ist=20nun=20async=20und=20gibt?= =?UTF-8?q?=20das=20neue=20item=20als=20json=20zur=C3=BCck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/listAPI.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index f85cc2b..1baeaf7 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -1,18 +1,19 @@ -export function addItem(listID, itemName, itemAmount, categoryID) { - fetch(`/api/list/${listID}/item`, +export async function addItem(listID, itemName, itemAmount, categoryID) { + const newItem = await fetch(`/api/item`, { method: "POST", body: JSON.stringify({ "itemName": itemName, "itemAmount": itemAmount, - "categoryID": categoryID + "categoryID": categoryID, + "listID": listID }), headers: { "Content-Type": "application/json" } - }).then(r => console.log("added new item")); + }); - return 0; + return await newItem.json(); } From fbd20f9089bb0cb538b63caa248eacbc7712e27a Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 15:15:37 +0200 Subject: [PATCH 57/82] =?UTF-8?q?deletItem=20ist=20asynch=20und=20gibt=20r?= =?UTF-8?q?esponse-object=20zur=C3=BCck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/listAPI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index 1baeaf7..b95e281 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -17,12 +17,12 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { } -export function deleteItem(itemID) { +export async function deleteItem(itemID) { - fetch(`/api/item/${itemID}`, { method: "DELETE" }) + const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" }) .then(r => console.log("item deleted")); - return 0; + return response; } From 2963dd40a6533cb7ea039dabec12cd094dac5875 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:25:25 +0200 Subject: [PATCH 58/82] itemName und itemAmount werden im selben span dargesetllt --- src/main/resources/templates/list.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 0b5ff4a..853eeb4 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -46,8 +46,7 @@
        • - - +
        @@ -55,8 +54,7 @@
      • - - +
      From ffb4a7e2c692001159d5e917afdef66a0551ab85 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:25:37 +0200 Subject: [PATCH 59/82] li eines items hat nun die Klasse "item" --- src/main/resources/templates/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 853eeb4..fcc15b7 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -52,7 +52,7 @@
  • -
  • +
  • From 600c39352abb72397eb698cb1c1fdad56e619095 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:26:30 +0200 Subject: [PATCH 60/82] umbennen von ShoppingListItem zu ShoppingItem, erstellung des items aus JSON und render zu einem
  • implementiert --- .../resources/static/js/list/ShoppingItem.js | 42 +++++++ .../static/js/list/ShoppingListItem.js | 104 ------------------ 2 files changed, 42 insertions(+), 104 deletions(-) create mode 100644 src/main/resources/static/js/list/ShoppingItem.js delete mode 100644 src/main/resources/static/js/list/ShoppingListItem.js diff --git a/src/main/resources/static/js/list/ShoppingItem.js b/src/main/resources/static/js/list/ShoppingItem.js new file mode 100644 index 0000000..35e87b4 --- /dev/null +++ b/src/main/resources/static/js/list/ShoppingItem.js @@ -0,0 +1,42 @@ +export class ShoppingItem { + + constructor(itemName, itemAmount) { + this.itemName = itemName; + this.itemAmount = itemAmount; + this.itemID = null; + this.isEditing = true; + } + + + static fromJSON(itemAsJSON) { + const item = new ShoppingItem(itemAsJSON.itemName, itemAsJSON.itemAmount); + item.itemID = itemAsJSON.itemID; + return item; + } + + // gibt das darzustellende
  • zurück + render() { + const li = document.createElement("li"); + + const checkboxDone = document.createElement("input"); + const span = document.createElement("span"); + const deleteItemButton = document.createElement("button"); + + li.id = this.itemID; + li.classList.add("item"); + + checkboxDone.setAttribute("type", "checkbox"); + + span.textContent = this.itemName + " " + this.itemAmount; + + deleteItemButton.classList.add("item__deleteButton"); + deleteItemButton.textContent = "Löschen"; + + li.appendChild(checkboxDone) + li.appendChild(span); + li.appendChild(deleteItemButton); + + return li; + } + +} diff --git a/src/main/resources/static/js/list/ShoppingListItem.js b/src/main/resources/static/js/list/ShoppingListItem.js deleted file mode 100644 index bd8ad2a..0000000 --- a/src/main/resources/static/js/list/ShoppingListItem.js +++ /dev/null @@ -1,104 +0,0 @@ -export class ShoppingListItem { - - constructor(itemName, itemAmount, onChange) { - this.itemName = itemName; - this.itemAmount = itemAmount; - this.isEditing = false; - this.isDone = false; - this.remove = false; - this.onChange = onChange; - } - - //gibt ein
  • Element zurück - render() { - let li; - if (this.isEditing) { - li = this.#renderEditing(); - } else { - li = this.#renderNormal() - } - return li; - - } - - #renderEditing() { - const li = document.createElement("li"); - const editForm = document.createElement("form"); - const editItemNameField = document.createElement("input"); - const editItemAmountField = document.createElement("input"); - const saveButton = document.createElement("button"); - const abortButton = document.createElement("button"); - - - editItemNameField.setAttribute("name", "newItemName"); - editItemNameField.setAttribute("value", this.itemName); - - editItemAmountField.setAttribute("itemName", "newItemAmount"); - editItemAmountField.setAttribute("value", this.itemAmount); - - abortButton.textContent = "Abbrechen"; - abortButton.addEventListener("click", (event) => { - event.preventDefault(); - this.isEditing = false; - this.onChange(); - }); - - saveButton.textContent = "Speichern"; - editForm.addEventListener("submit", (event) => { - event.preventDefault(); - - const editFormData = Object.fromEntries(new FormData(editForm)); - - if (!editFormData.newItemName && !editFormData.newItemAmount) { - return; - } - - this.itemName = editFormData.newItemName; - this.itemAmount = editFormData.newItemAmount; - this.isEditing = false; - this.onChange(); - }); - - editForm.appendChild(editItemNameField); - editForm.appendChild(editItemAmountField); - editForm.appendChild(saveButton); - editForm.appendChild(abortButton); - li.appendChild(editForm); - - return li; - } - - #renderNormal() { - const li = document.createElement("li"); - const listContent = document.createElement("span"); - const removeButton = document.createElement("button"); - const doneButton = document.createElement("input"); - - - doneButton.setAttribute("type", "checkbox"); - doneButton.addEventListener("change", () => { - this.isDone = true; - li.classList.toggle("displayedList__item--checked"); - }); - - listContent.addEventListener("click", () => { - this.isEditing = true; - this.onChange(); - }); - - removeButton.textContent = "Löschen"; - removeButton.addEventListener("click", () => { - this.remove = true; - this.onChange(); - }); - - listContent.textContent = this.itemName + " " + this.itemAmount; - - li.appendChild(doneButton); - li.appendChild(listContent); - li.appendChild(removeButton); - - return li; - - } -} From 65cdc95b7202424b5bec528774c6ea372add99ca Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:27:08 +0200 Subject: [PATCH 61/82] =?UTF-8?q?addItem=20async=20f=C3=BCr=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 1de5cc5..6b71dd7 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -6,10 +6,11 @@ const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); const currentList = document.querySelector(".list"); -function addItem(itemName, itemAmount, categoryID) { - console.log(`${currentList.id}, ${itemName}, ${itemAmount}, ${categoryID}`) - api.addItem(currentList.id, itemName, itemAmount, categoryID); - ui.addItem(); +async function addItem(itemName, itemAmount, categoryID) { + console.log(` adding item with id:${currentList.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`) + const itemAsJSON = await api.addItem(currentList.id, itemName, itemAmount, categoryID); + console.log(`rendering frointend item: ${itemAsJSON}`); + ui.addItem(itemAsJSON); } async function addCategory(categoryName) { From ab8a85e1f1f1a81f7600e26a404319e066ba40e3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:28:09 +0200 Subject: [PATCH 62/82] =?UTF-8?q?addItem=20f=C3=BCr=20frotnend=20implemene?= =?UTF-8?q?ntiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit das item wird entsprechend nach vorhandener categoryID einer Kategorie unterstellt oder nicht fixes #3 --- src/main/resources/static/js/list/listFrontend.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index f5f9d05..9d7d16e 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -1,7 +1,17 @@ import { ShoppingCategory } from "./ShoppingCategory.js"; +import { ShoppingItem } from "./ShoppingItem.js"; -export function addItem() { +export function addItem(itemAsJSON) { + let list; + if (!itemAsJSON.categoryID) { + list = document.querySelector(".displayedList"); + } else { + list = document.getElementById(`${itemAsJSON.categoryID}`).querySelector("ul"); + } + const item = ShoppingItem.fromJSON(itemAsJSON); + + list.appendChild(item.render()); } export function deleteItem(li) { From 51d4e1b451fb67b0c047ba1cf2ecdb7675d3e991 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:47:48 +0200 Subject: [PATCH 63/82] =?UTF-8?q?api-funktionen=20ausgelagert=20f=C3=BCr?= =?UTF-8?q?=20bessere=20=C3=BCbersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShoppingCategoryController.java | 41 +++++++++++++++ .../Controller/ShoppingItemController.java | 51 +++++++++++++++++++ .../Controller/ShoppingListController.java | 37 -------------- 3 files changed, 92 insertions(+), 37 deletions(-) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java new file mode 100644 index 0000000..83e24a4 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -0,0 +1,41 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.UUID; + +@RestController +public class ShoppingCategoryController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/list/{listID}/category/") + public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + + String name = newCategory.categoryName(); + ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); + + ShoppingCategory category = new ShoppingCategory(name, List.of(),list); + + shoppingCategoryRepository.save(category); + + return category; + } + + +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java new file mode 100644 index 0000000..a9eb767 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -0,0 +1,51 @@ +package de.timaldinger.einkaufsliste.Controller; + +import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; +import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Models.ShoppingList; +import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; +import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.UUID; + +@RestController +public class ShoppingItemController { + @Autowired + private ShoppingCategoryRepository shoppingCategoryRepository; + @Autowired + private ShoppingListRepository shoppingListRepository; + @Autowired + private ShoppingItemRepository shoppingItemRepository; + + @PostMapping("/api/item") + public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ + String name = newItem.itemName(); + String amount = newItem.itemAmount(); + ShoppingCategory c; + if(newItem.categoryID() != null){ + c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); + }else{ + c = null; + } + ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); + ShoppingItem item = new ShoppingItem(name, amount, false, c, list); + shoppingItemRepository.save(item); + + return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); + } + + @DeleteMapping("/api/item/{itemID}") + public ResponseEntity deleteItem(@PathVariable UUID itemID){ + if(!shoppingItemRepository.existsById(itemID)){ + return ResponseEntity.notFound().build(); + } + shoppingItemRepository.deleteById(itemID); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 142a0e2..1f30f38 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -26,42 +26,5 @@ public class ShoppingListController { @Autowired private ShoppingItemRepository shoppingItemRepository; - @PostMapping("/api/list/{listID}/category/") - public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ - String name = newCategory.categoryName(); - ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); - - ShoppingCategory category = new ShoppingCategory(name, List.of(),list); - - shoppingCategoryRepository.save(category); - - return category; - } - - @PostMapping("/api/item") - public ShoppingItemResponseDTO addItem(@RequestBody ShoppingItemDTO newItem){ - String name = newItem.itemName(); - String amount = newItem.itemAmount(); - ShoppingCategory c; - if(newItem.categoryID() != null){ - c = shoppingCategoryRepository.findById(newItem.categoryID()).orElseThrow(); - }else{ - c = null; - } - ShoppingList list = shoppingListRepository.findById(newItem.listID()).orElseThrow(); - ShoppingItem item = new ShoppingItem(name, amount, false, c, list); - shoppingItemRepository.save(item); - - return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); - } - - @DeleteMapping("/api/item/{itemID}") - public ResponseEntity deleteItem(@PathVariable UUID itemID){ - if(!shoppingItemRepository.existsById(itemID)){ - return ResponseEntity.notFound().build(); - } - shoppingItemRepository.deleteById(itemID); - return ResponseEntity.noContent().build(); - } } From 47a3849220032ebab81846553fe23da65eaee2dd Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 16:47:55 +0200 Subject: [PATCH 64/82] kommentare --- .../de/timaldinger/einkaufsliste/Models/ShoppingCategory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java index 2141ddb..b39e680 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingCategory.java @@ -18,9 +18,9 @@ public class ShoppingCategory extends ShoppingElement{ @NotBlank private String categoryName; - @OneToMany(mappedBy = "category") + @OneToMany(mappedBy = "category") //eine Liste hat mehrere Kategorien, diese sind mappedBy category (Feld in ShoppingItem) damit keine extra Tabelle erzeugt wird private List itemsInCategory; - @ManyToOne + @ManyToOne //mehrere Kategorien (Many) gehören (to) einer Liste an (one) @JoinColumn(name="list_id", nullable = false) private ShoppingList shoppingList; From a99342cc989313f81ae3efe3596ac4b754bc140f Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:45:45 +0200 Subject: [PATCH 65/82] =?UTF-8?q?Kategorie=20kann=20nun=20gel=C3=B6scht=20?= =?UTF-8?q?werden=20unter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Über eine DELETE-Request an /api/category/{categoryID}?deleteAllItems=(true|false) kann beim löschen einer Kategorie entschieden werden, ob alle darunterliegen items gleich mitgelöscht werden sollen. Dafür wurden im ShoppingItemRepository eine neue Methode finAllByCategory_Id() angegelgt, welches nach der category von jedem Item schaut und dann sie mit der Id der category (das _Id) aus dem parameter vergleicht. Falls deleteAllItems=true dann löschen wir erst die items, falls false dann setzen wir category=null. Das .save() ist optional wegen OSIV aber expliziter. Beim Fehlen von dem Parameter wird eine 400 geworfen mit Custom nachricht (deswegen required = false) im listFrontEnd.deleteCategory() wählen wir die category nach ihrere ID aus und schauen das
      element weil sich da die Items befiden und entpakcen dann die kinder der ul mit ...ul.children und fügen sie in die displayed list ein. Am Ende wird die gesamte Kategorie samt Kinder aus dem Frontend entfernt fixes #4 --- .../ShoppingCategoryController.java | 29 ++++++++++++++++--- .../Repository/ShoppingItemRepository.java | 1 + src/main/resources/static/js/list/list.js | 6 ++++ src/main/resources/static/js/list/listAPI.js | 7 ++++- .../resources/static/js/list/listFrontend.js | 9 +++++- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 83e24a4..8810559 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -2,15 +2,16 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; import de.timaldinger.einkaufsliste.Models.ShoppingCategory; +import de.timaldinger.einkaufsliste.Models.ShoppingItem; import de.timaldinger.einkaufsliste.Models.ShoppingList; import de.timaldinger.einkaufsliste.Repository.ShoppingCategoryRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingItemRepository; import de.timaldinger.einkaufsliste.Repository.ShoppingListRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.server.ResponseStatusException; import java.util.List; import java.util.UUID; @@ -37,5 +38,25 @@ public class ShoppingCategoryController { return category; } + @DeleteMapping("/api/category/{categoryID}") + public ResponseEntity deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){ + + if(deleteAllItems == null){ + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Missing required parameter deleteAllItems (can be either true or false)"); + } + + List itemList = shoppingItemRepository.findAllByCategory_Id(categoryID); + if(deleteAllItems){ + itemList.forEach((item) -> shoppingItemRepository.deleteById(item.getId())); + }else{ + itemList.forEach((item) -> item.setCategory(null)); + shoppingItemRepository.saveAll(itemList); + } + + shoppingCategoryRepository.deleteById(categoryID); + + return ResponseEntity.noContent().build(); + } + } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 4c17a06..08090f1 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -9,4 +9,5 @@ import java.util.UUID; public interface ShoppingItemRepository extends JpaRepository { List findByListAndCategoryIsNull(Object list); + List findAllByCategory_Id(UUID categoryID); } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 6b71dd7..4b7986a 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -26,6 +26,12 @@ function deleteItem(li) { ui.deleteItem(li); } +function deleteCategory(deleteAllItems, categoryID) { + console.log(`deleting category with allItems: ${deleteAllItems} id: ${categoryID}`); + api.deleteCategory(deleteAllItems, categoryID); + ui.deleteCategory(deleteAllItems, categoryID); +} + function init() { addCategoryForm.addEventListener("submit", (event) => { event.preventDefault(); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index b95e281..1994d8d 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -39,6 +39,11 @@ export async function addCategory(listID, categoryName) { } -export function deleteCategory() { +export async function deleteCategory(deleteAllItems, categoryID) { + const response = await fetch(`/api/category/${categoryID}?deleteAllItems=${deleteAllItems}`, { method: "DELETE" }); + if (response.status == 204) { + console.log(`deleted item ${categoryID}`); + } + return response; } diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 9d7d16e..34db4e2 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -25,6 +25,13 @@ export function addCategory(categoryAsJSON) { list.appendChild(category.render()); } -export function deleteCategory() { +export function deleteCategory(deleteAllItems, categoryID) { + const category = document.getElementById(categoryID); + if (!deleteAllItems) { + const ul = category.querySelector("ul"); + if (ul) document.querySelector(".displayedList").append(...ul.children); + } + category.remove() +} } From 7698efd446f9263cd775b4b7bf4aa6450450afef Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:48:07 +0200 Subject: [PATCH 66/82] responsestatus handling --- src/main/resources/static/js/list/listAPI.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index 1994d8d..755043d 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -19,8 +19,11 @@ export async function addItem(listID, itemName, itemAmount, categoryID) { export async function deleteItem(itemID) { - const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" }) - .then(r => console.log("item deleted")); + const response = await fetch(`/api/item/${itemID}`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`deleted item ${itemID}`); + } return response; From 4f62c7f93ec344d713d1e79c632efc50a58d911f Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:48:22 +0200 Subject: [PATCH 67/82] addCategory zeigt auf den korrigierten API-Pfad --- .../Controller/ShoppingCategoryController.java | 6 +++--- src/main/resources/static/js/list/listAPI.js | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 8810559..9837c54 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -25,11 +25,11 @@ public class ShoppingCategoryController { @Autowired private ShoppingItemRepository shoppingItemRepository; - @PostMapping("/api/list/{listID}/category/") - public ShoppingCategory addCategory(@PathVariable UUID listID, @RequestBody ShoppingCategoryDTO newCategory){ + @PostMapping("/api/category") + public ShoppingCategory addCategory(@RequestBody ShoppingCategoryDTO newCategory){ String name = newCategory.categoryName(); - ShoppingList list = shoppingListRepository.findById(listID).orElseThrow(); + ShoppingList list = shoppingListRepository.findById(newCategory.listID()).orElseThrow(); ShoppingCategory category = new ShoppingCategory(name, List.of(),list); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index 755043d..508dd0c 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -30,14 +30,12 @@ export async function deleteItem(itemID) { } export async function addCategory(listID, categoryName) { - const newCategory = await fetch(`/api/list/${listID}/category/`, + const newCategory = await fetch(`/api/category`, { method: "POST" - , body: JSON.stringify({ "categoryName": categoryName }) + , body: JSON.stringify({ "categoryName": categoryName, "listID": listID }) , headers: { "Content-Type": "application/json" } }); - //listElements.push(new ShoppingCategory(categoryName, renderAddItemPrompt, renderItemList)); - //renderItemList(); return await newCategory.json(); } From 4c67f191a2def79684aeba20b1dcf6a221cba9c9 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:48:50 +0200 Subject: [PATCH 68/82] =?UTF-8?q?erstelle=20Kategorien=20im=20frontend=20h?= =?UTF-8?q?aben=20jetzt=20wie=20die=20Kategorien=20in=20list.html=20eine?= =?UTF-8?q?=20ul=20f=C3=BCr=20die=20items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/ShoppingCategory.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/static/js/list/ShoppingCategory.js b/src/main/resources/static/js/list/ShoppingCategory.js index 7a4bcea..345b5ee 100644 --- a/src/main/resources/static/js/list/ShoppingCategory.js +++ b/src/main/resources/static/js/list/ShoppingCategory.js @@ -15,6 +15,7 @@ export class ShoppingCategory { const span = document.createElement("span"); const deleteCategoryButton = document.createElement("button"); const deleteAllItemsCheckbox = document.createElement("input"); + const innerUl = document.createElement("ul"); li.id = this.categoryID; li.classList.add("category"); @@ -29,6 +30,7 @@ export class ShoppingCategory { li.appendChild(span); li.appendChild(deleteCategoryButton); li.appendChild(deleteAllItemsCheckbox); + li.appendChild(innerUl); return li; } From bfca2878b9b7af842f76c1e3b68dd344f1fa79f0 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:49:08 +0200 Subject: [PATCH 69/82] Object mit ShoppingList erstezt weil soll so sein? --- .../einkaufsliste/Repository/ShoppingItemRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 08090f1..0bd84ce 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -1,6 +1,7 @@ package de.timaldinger.einkaufsliste.Repository; import de.timaldinger.einkaufsliste.Models.ShoppingItem; +import de.timaldinger.einkaufsliste.Models.ShoppingList; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -8,6 +9,6 @@ import java.util.UUID; public interface ShoppingItemRepository extends JpaRepository { - List findByListAndCategoryIsNull(Object list); + List findByListAndCategoryIsNull(ShoppingList list); List findAllByCategory_Id(UUID categoryID); } From 9b8887793e34c29698cabc5f61096a8f44759640 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:49:36 +0200 Subject: [PATCH 70/82] =?UTF-8?q?listID=20f=C3=BCr=20ShoppingCategoryDTO?= =?UTF-8?q?=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java index 6671ca9..2eb04e2 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryDTO.java @@ -1,4 +1,6 @@ package de.timaldinger.einkaufsliste.Dto; -public record ShoppingCategoryDTO(String categoryName) { +import java.util.UUID; + +public record ShoppingCategoryDTO(String categoryName, UUID listID) { } From bce0b982ee9e6e5dd4e70d02e715c23bd520ad71 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 17:50:07 +0200 Subject: [PATCH 71/82] items haben jtz die Klasse item --- src/main/resources/templates/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index fcc15b7..8be10b0 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -44,7 +44,7 @@
        -
      • +
      • From cd12da1099b548d64f7187d941e202ac3613cb89 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Tue, 6 Oct 2026 23:04:04 +0200 Subject: [PATCH 72/82] =?UTF-8?q?user=20story=20template=20hinzugef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/user_stories.yml | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .gitea/user_stories.yml diff --git a/.gitea/user_stories.yml b/.gitea/user_stories.yml new file mode 100644 index 0000000..c65ca73 --- /dev/null +++ b/.gitea/user_stories.yml @@ -0,0 +1,57 @@ +name: User Story template +about: Vorlage für eine User Story mit Backend- und Frontend-Aufgaben +title: "[User Story]: " +body: + - type: textarea + id: user-story + attributes: + label: User Story + description: Die User Story erscheint im Issue als Zitat (Zeilen mit `>` beginnen). + placeholder: Als möchte ich , damit . + value: "> " + validations: + required: true + + - type: markdown + attributes: + value: "# Technisch" + + - type: markdown + attributes: + value: "## Backend" + + - type: textarea + id: backend-beschreibung + attributes: + label: Was muss gemacht werden + description: Fließtext + validations: + required: false + + - type: textarea + id: backend-todos + attributes: + label: To-Do Liste + description: Pro Zeile ein To-Do, beliebig viele. + value: "- [ ] " + validations: + required: false + + - type: markdown + attributes: + value: "## Frontend" + + - type: textarea + id: frontend-beschreibung + attributes: + label: Was muss gemacht werden + description: Fließtext + validations: + required: false + + - type: textarea + id: frontend-todos + attributes: + label: To-Do Liste + description: Pro Zeile ein To-Do, beliebig viele. + value: "- [ ] " \ No newline at end of file From 344ae5c584da72d163dbbe1e4e422209ab6249ed Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 14:10:09 +0200 Subject: [PATCH 73/82] =?UTF-8?q?dto=20erstellt=20f=C3=BCr=20PATCH=20auf?= =?UTF-8?q?=20items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java new file mode 100644 index 0000000..442b2c5 --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingItemPatchDTO.java @@ -0,0 +1,6 @@ +package de.timaldinger.einkaufsliste.Dto; + +import java.util.UUID; + +public record ShoppingItemPatchDTO(String itemName, String itemAmount, Boolean isDone, UUID categoryID) { +} From 1b321420a5d04e04dcfe0955c610dc2c9437c3d4 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 14:14:19 +0200 Subject: [PATCH 74/82] Items wenn abgehakt werden auch im backend als done markiert, fixes #13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wir haben eine editItem() Methode erstellt, welches ein JSON mitbekommen kriegt mit den Änderungen eines bestimmten items mit itemID. Das ShoppingItemPatchDTO hat nullable Felder und im Controller wird nur das geändert von einem item, was nicht null ist. --- .../Controller/ShoppingItemController.java | 15 +++++++++++++++ src/main/resources/static/js/list/list.js | 5 +++++ src/main/resources/static/js/list/listAPI.js | 11 +++++++++++ src/main/resources/templates/list.html | 4 ++-- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java index a9eb767..01f8d79 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingItemController.java @@ -1,6 +1,7 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingItemDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemPatchDTO; import de.timaldinger.einkaufsliste.Dto.ShoppingItemResponseDTO; import de.timaldinger.einkaufsliste.Models.ShoppingCategory; import de.timaldinger.einkaufsliste.Models.ShoppingItem; @@ -40,6 +41,20 @@ public class ShoppingItemController { return new ShoppingItemResponseDTO(name, amount, item.getId(), c != null? c.getId() : null); } + @PatchMapping("/api/item/{itemID}") + public ResponseEntity editItem(@PathVariable UUID itemID ,@RequestBody ShoppingItemPatchDTO toChange){ + ShoppingItem item = shoppingItemRepository.findById(itemID).orElseThrow(); + + if(toChange.itemName() != null) item.setItemName(toChange.itemName()); + if(toChange.itemAmount() != null) item.setItemAmount(toChange.itemAmount()); + if(toChange.isDone() != null) item.setDone(toChange.isDone()); + if(toChange.categoryID() != null) item.setCategory(shoppingCategoryRepository.findById(toChange.categoryID()).orElseThrow()); + + shoppingItemRepository.save(item); + + return ResponseEntity.noContent().build(); + } + @DeleteMapping("/api/item/{itemID}") public ResponseEntity deleteItem(@PathVariable UUID itemID){ if(!shoppingItemRepository.existsById(itemID)){ diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 4b7986a..999e8bf 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -55,6 +55,11 @@ function init() { deleteCategory(checkbox.checked, li.id); } + document.querySelector(".displayedList").addEventListener("change", (e) => { + if (e.target.matches(".item__markAsDone")) { + const item = e.target.closest("li"); + api.editItem(item.id, { done: e.target.checked }); + } }); console.log("javascript initialized!"); diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index 508dd0c..c2e6964 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -29,6 +29,17 @@ export async function deleteItem(itemID) { } +export async function editItem(itemID, toChange) { + const response = await fetch(`/api/item/${itemID}`, + { + method: "PATCH", + body: JSON.stringify(toChange), + headers: { "Content-Type": "application/json" } + }); + + return response; +} + export async function addCategory(listID, categoryName) { const newCategory = await fetch(`/api/category`, { diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 8be10b0..7def583 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -45,7 +45,7 @@
        • - +
        • @@ -53,7 +53,7 @@
        • - +
        • From 4bbbdf7d1000ad6e0103b1007251f62f87288eec Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:10:52 +0200 Subject: [PATCH 75/82] =?UTF-8?q?bug:=20autocomplete=20standardm=C3=A4?= =?UTF-8?q?=C3=9Fig=20on,=20l=C3=A4sst=20nach=20dem=20l=C3=B6schen=20von?= =?UTF-8?q?=20einem=20done=20item=20das=20nachr=C3=BCckende=20als=20done?= =?UTF-8?q?=20markieren,=20verwirrt=20nutzer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/ShoppingItem.js | 1 + src/main/resources/templates/list.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/ShoppingItem.js b/src/main/resources/static/js/list/ShoppingItem.js index 35e87b4..b0aa38b 100644 --- a/src/main/resources/static/js/list/ShoppingItem.js +++ b/src/main/resources/static/js/list/ShoppingItem.js @@ -26,6 +26,7 @@ export class ShoppingItem { li.classList.add("item"); checkboxDone.setAttribute("type", "checkbox"); + checkboxDone.setAttribute("autocomplete", "off"); span.textContent = this.itemName + " " + this.itemAmount; diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html index 7def583..fc1dd83 100644 --- a/src/main/resources/templates/list.html +++ b/src/main/resources/templates/list.html @@ -53,7 +53,7 @@
        • - +
        • From e4df4f492d2aaf31ad7d06d472acd3580d447488 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:11:24 +0200 Subject: [PATCH 76/82] refactor, findByList zu findByList_Id --- .../de/timaldinger/einkaufsliste/Controller/PageController.java | 2 +- .../einkaufsliste/Repository/ShoppingItemRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index 7105e56..50df31c 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -54,7 +54,7 @@ public class PageController { ShoppingList list = shoppingListRepository.findById(id).orElseThrow(); model.addAttribute("list", list); model.addAttribute("categories", shoppingCategoryRepository.findByShoppingList(list)); - model.addAttribute("items", shoppingItemRepository.findByListAndCategoryIsNull(list)); + model.addAttribute("items", shoppingItemRepository.findByList_IdAndCategoryIsNull(id)); return "list"; } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 0bd84ce..76e69f9 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -9,6 +9,6 @@ import java.util.UUID; public interface ShoppingItemRepository extends JpaRepository { - List findByListAndCategoryIsNull(ShoppingList list); + List findByList_IdAndCategoryIsNull(UUID list); List findAllByCategory_Id(UUID categoryID); } From 226e7f68ce94f667113874363b55d1004444bb11 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:12:35 +0200 Subject: [PATCH 77/82] =?UTF-8?q?toString=20ausgabe=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../de/timaldinger/einkaufsliste/Models/ShoppingItem.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java index 67567c7..b7540fe 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Models/ShoppingItem.java @@ -4,16 +4,14 @@ import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter @Entity @AllArgsConstructor @NoArgsConstructor +@ToString public class ShoppingItem extends ShoppingElement { @NotBlank From 6bd55f6e8676aea9565465683d0d8facc0bcd6df Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:13:02 +0200 Subject: [PATCH 78/82] deleteMapping methode entfernt und zu ShoppingListController verschoben --- .../einkaufsliste/Controller/PageController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java index 50df31c..8b4ecc0 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/PageController.java @@ -37,12 +37,6 @@ public class PageController { return "index"; } - @DeleteMapping("/api/list/{id}") - public String deleteList(Model model, @PathVariable UUID id){ - shoppingListRepository.deleteById(id); - return "redirect:/"; - } - /** * Gibt die list.html Seite einer Liste zurück mit den Attributen list, categories und items * @param model From 2ade9c974453d6a9c84131037f674a25e08720ce Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:13:22 +0200 Subject: [PATCH 79/82] checkboxen der erstellten items im frontend haben auch item__markAsDone klasse --- src/main/resources/static/js/list/ShoppingItem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/static/js/list/ShoppingItem.js b/src/main/resources/static/js/list/ShoppingItem.js index b0aa38b..6d2d75f 100644 --- a/src/main/resources/static/js/list/ShoppingItem.js +++ b/src/main/resources/static/js/list/ShoppingItem.js @@ -27,6 +27,7 @@ export class ShoppingItem { checkboxDone.setAttribute("type", "checkbox"); checkboxDone.setAttribute("autocomplete", "off"); + checkboxDone.classList.add("item__markAsDone"); span.textContent = this.itemName + " " + this.itemAmount; From abb1af276c39e253d27512ba876507a08b133b4b Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:13:42 +0200 Subject: [PATCH 80/82] =?UTF-8?q?bug:=20falscher=20json=20paraemter,=20sol?= =?UTF-8?q?l=20isDone=20hei=C3=9Fen=20nicht=20done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/list/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 999e8bf..4e3d1e7 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -58,7 +58,7 @@ function init() { document.querySelector(".displayedList").addEventListener("change", (e) => { if (e.target.matches(".item__markAsDone")) { const item = e.target.closest("li"); - api.editItem(item.id, { done: e.target.checked }); + api.editItem(item.id, { isDone: e.target.checked }); } }); From ed0df61e1631a18abf37681b6fc9597da2752df3 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:15:54 +0200 Subject: [PATCH 81/82] =?UTF-8?q?alle=20abgeschlossenene=20Items=20werden?= =?UTF-8?q?=20gel=C3=B6scht,=20fixes=20#6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wir schicken eine delete request an /api/list/{listID}, im backend wird dann geschaut, welche items in der liste mit der listID schon abgeschlossen sind. Im frontend entfernen wir alle li dessen child input checked=true und item__markAsDone klasse hat --- .../Controller/ShoppingListController.java | 8 ++++++++ .../Repository/ShoppingItemRepository.java | 1 + src/main/resources/static/js/list/list.js | 13 ++++++++++++- src/main/resources/static/js/list/listAPI.js | 11 +++++++++++ src/main/resources/static/js/list/listFrontend.js | 5 +++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java index 1f30f38..98b9774 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingListController.java @@ -26,5 +26,13 @@ public class ShoppingListController { @Autowired private ShoppingItemRepository shoppingItemRepository; + @DeleteMapping("/api/list/{listID}") + public ResponseEntity deleteAllDoneItems(@PathVariable UUID listID, @RequestParam(required = false) boolean deleteAllDoneItems){ + if(deleteAllDoneItems){ + List items = shoppingItemRepository.findByList_IdAndIsDoneIsTrue(listID); + shoppingItemRepository.deleteAll(items); + } + return ResponseEntity.noContent().build(); + } } diff --git a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java index 76e69f9..fa5e64f 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Repository/ShoppingItemRepository.java @@ -11,4 +11,5 @@ public interface ShoppingItemRepository extends JpaRepository findByList_IdAndCategoryIsNull(UUID list); List findAllByCategory_Id(UUID categoryID); + List findByList_IdAndIsDoneIsTrue(UUID listID); } diff --git a/src/main/resources/static/js/list/list.js b/src/main/resources/static/js/list/list.js index 4e3d1e7..43e5307 100644 --- a/src/main/resources/static/js/list/list.js +++ b/src/main/resources/static/js/list/list.js @@ -5,6 +5,7 @@ import * as ui from "./listFrontend.js" const addCategoryForm = document.querySelector(".addCategoryForm"); const addItemForm = document.querySelector(".addItemForm"); const currentList = document.querySelector(".list"); +const deleteAllDoneItemsButton = document.querySelector(".deleteAllDoneItemsButton"); async function addItem(itemName, itemAmount, categoryID) { console.log(` adding item with id:${currentList.id}, name: ${itemName}, amount: ${itemAmount}, category: ${categoryID}`) @@ -32,6 +33,12 @@ function deleteCategory(deleteAllItems, categoryID) { ui.deleteCategory(deleteAllItems, categoryID); } +function deleteAllDoneItems() { + console.log(`deleting all done items...`) + api.deleteAllDoneItems(currentList.id); + ui.deleteAllDoneItems(); +} + function init() { addCategoryForm.addEventListener("submit", (event) => { event.preventDefault(); @@ -43,7 +50,11 @@ function init() { event.preventDefault(); let formData = Object.fromEntries(new FormData(addItemForm)); addItem(formData.itemName, formData.itemAmount, formData.itemCategoryID); - }) + }); + + deleteAllDoneItemsButton.addEventListener("click", event => { + deleteAllDoneItems(); + }); //event delegation ist schon geil document.querySelector(".displayedList").addEventListener("click", (event) => { diff --git a/src/main/resources/static/js/list/listAPI.js b/src/main/resources/static/js/list/listAPI.js index c2e6964..bf238ac 100644 --- a/src/main/resources/static/js/list/listAPI.js +++ b/src/main/resources/static/js/list/listAPI.js @@ -59,3 +59,14 @@ export async function deleteCategory(deleteAllItems, categoryID) { } return response; } + +export async function deleteAllDoneItems(listID) { + + const response = await fetch(`/api/list/${listID}?deleteAllDoneItems=true`, { method: "DELETE" }); + + if (response.status == 204) { + console.log(`items have been deleted`); + } + return response; + +} diff --git a/src/main/resources/static/js/list/listFrontend.js b/src/main/resources/static/js/list/listFrontend.js index 34db4e2..74cad93 100644 --- a/src/main/resources/static/js/list/listFrontend.js +++ b/src/main/resources/static/js/list/listFrontend.js @@ -34,4 +34,9 @@ export function deleteCategory(deleteAllItems, categoryID) { category.remove() } +export function deleteAllDoneItems() { + const doneItems = document.querySelectorAll("li.item:has(input[type=checkbox]:checked)"); + doneItems.forEach((li) => { + li.remove(); + }) } From 1acd4af71f246361f88535fcd40d81e91ed5d492 Mon Sep 17 00:00:00 2001 From: Tim Aldinger Date: Wed, 7 Oct 2026 15:24:11 +0200 Subject: [PATCH 82/82] =?UTF-8?q?patch=20methode=20f=C3=BCr=20Kategorie=20?= =?UTF-8?q?mit=20PatchDTO=20Objekt=20implementiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ShoppingCategoryController.java | 14 ++++++++++++++ .../Dto/ShoppingCategoryPatchDTO.java | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java diff --git a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java index 9837c54..6ec7cf7 100644 --- a/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java +++ b/src/main/java/de/timaldinger/einkaufsliste/Controller/ShoppingCategoryController.java @@ -1,6 +1,8 @@ package de.timaldinger.einkaufsliste.Controller; import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingCategoryPatchDTO; +import de.timaldinger.einkaufsliste.Dto.ShoppingItemPatchDTO; import de.timaldinger.einkaufsliste.Models.ShoppingCategory; import de.timaldinger.einkaufsliste.Models.ShoppingItem; import de.timaldinger.einkaufsliste.Models.ShoppingList; @@ -38,6 +40,18 @@ public class ShoppingCategoryController { return category; } + @PatchMapping("/api/category/{categoryID}") + public ResponseEntity editCategory(@PathVariable UUID categoryID,@RequestBody ShoppingCategoryPatchDTO toChange){ + ShoppingCategory category = shoppingCategoryRepository.findById(categoryID).orElseThrow(); + + if(toChange.categoryName() != null) category.setCategoryName(toChange.categoryName()); + + shoppingCategoryRepository.save(category); + + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/api/category/{categoryID}") public ResponseEntity deleteCategory(@PathVariable UUID categoryID, @RequestParam(required = false) Boolean deleteAllItems){ diff --git a/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java new file mode 100644 index 0000000..34da89b --- /dev/null +++ b/src/main/java/de/timaldinger/einkaufsliste/Dto/ShoppingCategoryPatchDTO.java @@ -0,0 +1,4 @@ +package de.timaldinger.einkaufsliste.Dto; + +public record ShoppingCategoryPatchDTO(String categoryName) { +}