From 2e540078390aaceafec1e607289cfe1e6aff5f21 Mon Sep 17 00:00:00 2001
From: Pedro Cardona <pedropca@stud.ntnu.no>
Date: Sun, 30 Apr 2023 14:10:50 +0200
Subject: [PATCH] Bug fixed related to waste id was fixed
---
.../v233/SmartMat/repository/group/WasteRepository.java | 3 ++-
.../idatt2016/v233/SmartMat/service/group/WasteService.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
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 522282e8..02b42664 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
@@ -2,6 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.repository.group;
import java.util.List;
import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
@@ -9,7 +10,7 @@ import org.springframework.data.repository.query.Param;
import java.util.Optional;
public interface WasteRepository extends JpaRepository<Waste, Long> {
- Optional<List<Waste>> findByGroupId(long groupId);
+ Optional<List<Waste>> findByGroupId( Group 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 59a76eba..768105a2 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
@@ -47,7 +47,9 @@ public class WasteService {
* @return an optional containing the waste if it exists
*/
public Optional<List<Waste>> getWasteByGroupId(long groupId) {
- return wasteRepository.findByGroupId(groupId);
+ Optional<Group> group = groupRepository.findByGroupId(groupId);
+ if(group.isPresent()) return wasteRepository.findByGroupId(group.get());
+ return Optional.empty();
}
/**
--
GitLab