From be4e607303fb3cf8bc1a024527de54a3248b40f4 Mon Sep 17 00:00:00 2001
From: Magnus Lutro Allison <magnulal@stud.ntnu.no>
Date: Wed, 26 Apr 2023 10:14:35 +0200
Subject: [PATCH] Fixed the group waste endpoint
---
.../v233/SmartMat/controller/group/WasteController.java | 3 ++-
.../v233/SmartMat/repository/group/WasteRepository.java | 3 ++-
.../idatt2016/v233/SmartMat/service/group/WasteService.java | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
index 8a3ba7ec..33cc6d4e 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java
@@ -1,5 +1,6 @@
package ntnu.idatt2016.v233.SmartMat.controller.group;
+import java.util.List;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.entity.Waste;
import ntnu.idatt2016.v233.SmartMat.service.group.WasteService;
@@ -47,7 +48,7 @@ public class WasteController {
* @return a ResponseEntity containing the waste if it exists, or a 404 if it doesn't
*/
@GetMapping("/group/{groupId}")
- public ResponseEntity<Waste> getWasteByGroupId(@PathVariable("groupId") long groupId) {
+ public ResponseEntity<List<Waste>> getWasteByGroupId(@PathVariable("groupId") long groupId) {
return wasteService.getWasteByGroupId(groupId)
.map(ResponseEntity::ok)
.orElseGet(() -> ResponseEntity.notFound().build());
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
index bdf5c9aa..e43ed650 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepository.java
@@ -1,10 +1,11 @@
package ntnu.idatt2016.v233.SmartMat.repository.group;
+import java.util.List;
import ntnu.idatt2016.v233.SmartMat.entity.Waste;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
public interface WasteRepository extends JpaRepository<Waste, Long> {
- Optional<Waste> findByGroupId(long groupId);
+ Optional<List<Waste>> findByGroupId(long groupId);
}
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
index 5982f945..f0090491 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteService.java
@@ -1,5 +1,6 @@
package ntnu.idatt2016.v233.SmartMat.service.group;
+import java.util.List;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.entity.Waste;
import ntnu.idatt2016.v233.SmartMat.repository.group.WasteRepository;
@@ -37,7 +38,7 @@ public class WasteService {
* @param groupId the id of the group
* @return an optional containing the waste if it exists
*/
- public Optional<Waste> getWasteByGroupId(long groupId) {
+ public Optional<List<Waste>> getWasteByGroupId(long groupId) {
return wasteRepository.findByGroupId(groupId);
}
}
--
GitLab