Merge branch 'main' into light-mode

# Conflicts:
#	ufund-ui/src/styles.css

1 files changed, 4 insertions, 0 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
index 859194a..33b272b 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/service/CupboardService.java
@@ -41,6 +41,8 @@ public class CupboardService {
             throw new IllegalArgumentException("Max Goal must be greater than zero");
         } else if (goalType.equals(Need.GoalType.PHYSICAL) && maxGoal % 1 != 0) {
             throw new IllegalArgumentException("Cannot have non whole number value for physical goal");
+        } else if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException("Required fields cannot be blank");
         }
 
         for (Need searchNeed : cupboardDAO.getNeeds()) {
@@ -103,6 +105,8 @@ public class CupboardService {
             throw new IllegalArgumentException("Goal must be greater than 0");
         } else if (need.getType().equals(Need.GoalType.PHYSICAL) && need.getMaxGoal() % 1 != 0) {
             throw new IllegalArgumentException("Cannot have non whole number value for physical goal");
+        } else if (need.getName() == null || need.getName().isEmpty()) {
+            throw new IllegalArgumentException("Required fields cannot be blank");
         }
         return cupboardDAO.updateNeed(need);
     }