From 7fe65014bfcc16cda8bd97358936c8ed72801ad5 Mon Sep 17 00:00:00 2001
From: Axely <axel.ytteraas@gmail.com>
Date: Fri, 5 May 2023 12:54:06 +0200
Subject: [PATCH] Changed day from enum to string, so frontend can easily
display the days in Norwegian
---
.../matsvinnbackend/model/DayMenu.java | 12 +-------
.../service/WeekMenuService.java | 28 +++++++++----------
.../service/WeekMenuServiceTest.java | 2 +-
3 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/DayMenu.java b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/DayMenu.java
index 12c883c..fcbece7 100644
--- a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/DayMenu.java
+++ b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/model/DayMenu.java
@@ -20,15 +20,5 @@ public class DayMenu {
@Setter @Getter @ManyToOne Recipe recipe;
- @Setter @Getter Day day;
-
- public enum Day{
- MONDAY,
- TUESDAY,
- WEDNESDAY,
- THURSDAY,
- FRIDAY,
- SATURDAY,
- SUNDAY
- }
+ @Setter @Getter String day;
}
diff --git a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuService.java b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuService.java
index 26ccff0..d92daea 100644
--- a/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuService.java
+++ b/src/main/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuService.java
@@ -51,25 +51,25 @@ public class WeekMenuService {
}
for (DayMenu dayMenu: weekmenu.getDayMenus()) {
- if (dayMenu.getDay() == DayMenu.Day.MONDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Mandag")) {
weekRecipes.add(0, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.TUESDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Tirsdag")) {
weekRecipes.add(1, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.WEDNESDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Onsdag")) {
weekRecipes.add(2, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.THURSDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Torsdag")) {
weekRecipes.add(3, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.FRIDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Fredag")) {
weekRecipes.add(4, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.SATURDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Lørdag")) {
weekRecipes.add(5, dayMenu);
}
- if (dayMenu.getDay() == DayMenu.Day.SUNDAY) {
+ if (Objects.equals(dayMenu.getDay(), "Søndag")) {
weekRecipes.add(6, dayMenu);
}
}
@@ -143,13 +143,13 @@ public class WeekMenuService {
fridgeService.combineReservedIngredients(loggedInAccount);
List<DayMenu> dayMenus = new ArrayList<>();
- DayMenu monday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(0),DayMenu.Day.MONDAY));
- DayMenu tuesday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(1),DayMenu.Day.TUESDAY));
- DayMenu wednesday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(2),DayMenu.Day.WEDNESDAY));
- DayMenu thursday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(3),DayMenu.Day.THURSDAY));
- DayMenu friday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(4),DayMenu.Day.FRIDAY));
- DayMenu saturday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(5),DayMenu.Day.SATURDAY));
- DayMenu sunday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(6),DayMenu.Day.SUNDAY));
+ DayMenu monday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(0),"Mandag"));
+ DayMenu tuesday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(1),"Tirsdag"));
+ DayMenu wednesday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(2),"Onsdag"));
+ DayMenu thursday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(3),"Torsdag"));
+ DayMenu friday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(4),"Fredag"));
+ DayMenu saturday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(5),"Lørdag"));
+ DayMenu sunday = dayMenuRepository.save(new DayMenu(null,weekMenu.get(6),"Søndag"));
dayMenus.add(monday);
dayMenus.add(tuesday);
diff --git a/src/test/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuServiceTest.java b/src/test/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuServiceTest.java
index 5f137ee..74b297e 100644
--- a/src/test/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuServiceTest.java
+++ b/src/test/java/edu/ntnu/idatt210602/matsvinnbackend/service/WeekMenuServiceTest.java
@@ -105,7 +105,7 @@ public class WeekMenuServiceTest {
when(recipeSearchService.getRecipesByIngExpiry(any(),any())).thenReturn(new ArrayList<>());
when(recipeSearchService.getRecipeSuggestions(any(),any(),any(),any(),any())).thenReturn(new ArrayList<>());
when(recipeRepository.findAll()).thenReturn(recipes);
- when(dayMenuRepository.save(any())).thenReturn(new DayMenu(null, recipe, DayMenu.Day.MONDAY));
+ when(dayMenuRepository.save(any())).thenReturn(new DayMenu(null, recipe, "Mandag"));
assertDoesNotThrow(() -> weekMenuService.generateWeekMenu(account,1));
assertEquals(7, weekMenuService.generateWeekMenu(account,1).getDayMenus().size());
}
--
GitLab