From 7133a6e0980dfdb932afd70a9b0e5621aad40686 Mon Sep 17 00:00:00 2001
From: Anders Austlid <andemau@ntnu.no>
Date: Fri, 5 May 2023 20:25:04 +0200
Subject: [PATCH] Refactored pacakge structure for cleaner project structure
---
.../config/{ => security}/CorsConfig.java | 2 +-
.../config/{ => security}/SecurityConfig.java | 2 +-
.../{user => group}/AchievementController.java | 2 +-
.../controller/group/FridgeController.java | 2 +-
.../{ => group}/ShoppingListController.java | 7 +++----
.../controller/group/WasteController.java | 4 ++--
.../{ => group}/WeeklyMenuController.java | 8 +++-----
.../{ => product}/AllergyController.java | 6 +++---
.../controller/product/ProductController.java | 5 ++---
.../{ => product}/RecipeController.java | 6 +++---
.../{ => user}/AuthenticationController.java | 6 +++---
.../SmartMat/controller/user/UserController.java | 9 +++------
.../request/{ => group}/ShoppingListRequest.java | 2 +-
.../dto/request/{ => group}/WasteRequest.java | 2 +-
.../dto/request/{ => product}/AllergyRequest.java | 2 +-
.../request/{ => product}/FavoriteRequest.java | 2 +-
.../{ => product}/FridgeProductRequest.java | 2 +-
.../dto/request/{ => product}/ProductRequest.java | 2 +-
.../dto/request/{ => product}/RecipeRequest.java | 2 +-
.../dto/request/{ => user}/LoginRequest.java | 2 +-
.../request/{ => user}/RegisterUserRequest.java | 2 +-
.../dto/request/{ => user}/UpdateUserRequest.java | 2 +-
.../response/{ => group}/WeeklyMenuResponse.java | 2 +-
.../response/{ => product}/AllergyResponse.java | 2 +-
.../dto/response/{ => product}/RecipeDetails.java | 2 +-
.../{ => product}/RecipeWithMatchCount.java | 3 ++-
.../v233/SmartMat/entity/group/Group.java | 2 --
.../SmartMat/entity/{ => group}/ShoppingList.java | 2 +-
.../v233/SmartMat/entity/{ => group}/Waste.java | 2 +-
.../v233/SmartMat/entity/product/Product.java | 5 +----
.../SmartMat/entity/{ => product}/Recipe.java | 2 +-
.../idatt2016/v233/SmartMat/entity/user/User.java | 2 +-
.../{user => group}/AchievementRepository.java | 2 +-
.../{ => group}/ShoppingListRepository.java | 4 ++--
.../repository/group/WasteRepository.java | 2 +-
.../{ => product}/AllergyRepository.java | 2 +-
.../{ => product}/RecipeRepository.java | 5 ++---
.../SmartMat/service/group/FridgeService.java | 7 ++-----
.../v233/SmartMat/service/group/GroupService.java | 4 ++--
.../service/{ => group}/ShoppingListService.java | 6 +++---
.../v233/SmartMat/service/group/WasteService.java | 7 ++-----
.../service/{ => group}/WeeklyMenuService.java | 6 +++---
.../service/{ => product}/AllergyService.java | 6 +++---
.../service/{ => product}/RecipeService.java | 10 +++++-----
.../SmartMat/service/user/AchievementService.java | 2 +-
.../SmartMat/service/{ => user}/TokenService.java | 2 +-
.../v233/SmartMat/service/user/UserService.java | 10 +++-------
.../v233/SmartMat/util/StatisticUtil.java | 3 +--
.../AchievementControllerTest.java | 3 ++-
.../controller/group/FridgeControllerTest.java | 2 +-
.../{ => group}/ShoppingListControllerTest.java | 8 ++++----
.../controller/group/WasteControllerTest.java | 8 ++------
.../{ => group}/WeeklyMenuControllerTest.java | 15 ++++++++-------
.../{ => product}/AllergyControllerTest.java | 7 ++++---
.../controller/product/ProductControllerTest.java | 4 ++--
.../{ => product}/RecipeControllerTest.java | 10 ++++------
.../{ => user}/AuthenticationControllerTest.java | 8 ++++----
.../controller/user/UserControllerTest.java | 6 +++---
.../{ => group}/ShoppingListRequestTest.java | 3 ++-
.../request/{ => product}/AllergyRequestTest.java | 3 ++-
.../{ => product}/FavoriteRequestTest.java | 3 ++-
.../request/{ => product}/RecipeRequestTest.java | 3 ++-
.../response/{ => group}/AllergyResponseTest.java | 3 ++-
.../{ => group}/WeeklyMenuResponseTest.java | 3 ++-
.../response/{ => product}/RecipeDetailsTest.java | 3 ++-
.../{ => product}/RecipeWithMatchCountTest.java | 4 +++-
.../SmartMat/entity/{ => group}/WasteTest.java | 3 ++-
.../SmartMat/entity/{ => product}/RecipeTest.java | 3 ++-
.../repository/group/GroupRepositoryTest.java | 2 --
.../{ => group}/ShoppingListRepositoryTest.java | 5 +++--
.../repository/group/WasteRepositoryTest.java | 12 +-----------
.../{ => product}/AllergyRepositoryTest.java | 3 ++-
.../{ => product}/ProductRepositoryTest.java | 2 +-
.../{ => product}/RecipeRepositoryTest.java | 5 +++--
.../user/AchievementRepositoryTest.java | 2 +-
.../repository/{ => user}/UserRepositoryTest.java | 6 ++----
.../SmartMat/service/group/FridgeServiceTest.java | 4 ++--
.../SmartMat/service/group/GroupServiceTest.java | 2 +-
.../{ => group}/ShoppingListServiceTest.java | 7 ++++---
.../SmartMat/service/group/WasteServiceTest.java | 9 ++-------
.../service/{ => product}/AllergyServiceTest.java | 7 ++++---
.../service/{ => product}/RecipeServiceTest.java | 12 +++++-------
.../service/user/AchievementServiceTest.java | 2 +-
.../service/{ => user}/TokenServiceTest.java | 3 ++-
.../service/user/WeeklyMenuServiceTest.java | 6 +++---
85 files changed, 171 insertions(+), 201 deletions(-)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/config/{ => security}/CorsConfig.java (97%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/config/{ => security}/SecurityConfig.java (97%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{user => group}/AchievementController.java (97%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{ => group}/ShoppingListController.java (97%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{ => group}/WeeklyMenuController.java (78%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{ => product}/AllergyController.java (87%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{ => product}/RecipeController.java (93%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/controller/{ => user}/AuthenticationController.java (94%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => group}/ShoppingListRequest.java (86%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => group}/WasteRequest.java (85%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/AllergyRequest.java (88%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/FavoriteRequest.java (89%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/FridgeProductRequest.java (89%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/ProductRequest.java (90%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/RecipeRequest.java (88%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => user}/LoginRequest.java (76%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => user}/RegisterUserRequest.java (90%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => user}/UpdateUserRequest.java (91%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => group}/WeeklyMenuResponse.java (88%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => product}/AllergyResponse.java (83%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => product}/RecipeDetails.java (86%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => product}/RecipeWithMatchCount.java (72%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/entity/{ => group}/ShoppingList.java (96%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/entity/{ => group}/Waste.java (96%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/entity/{ => product}/Recipe.java (97%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/repository/{user => group}/AchievementRepository.java (91%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/repository/{ => group}/ShoppingListRepository.java (87%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/repository/{ => product}/AllergyRepository.java (92%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/repository/{ => product}/RecipeRepository.java (90%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/service/{ => group}/ShoppingListService.java (95%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/service/{ => group}/WeeklyMenuService.java (86%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/service/{ => product}/AllergyService.java (88%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/service/{ => product}/RecipeService.java (95%)
rename src/main/java/ntnu/idatt2016/v233/SmartMat/service/{ => user}/TokenService.java (97%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{user => group}/AchievementControllerTest.java (96%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{ => group}/ShoppingListControllerTest.java (97%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{ => group}/WeeklyMenuControllerTest.java (82%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{ => product}/AllergyControllerTest.java (90%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{ => product}/RecipeControllerTest.java (93%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/controller/{ => user}/AuthenticationControllerTest.java (93%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => group}/ShoppingListRequestTest.java (90%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/AllergyRequestTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/FavoriteRequestTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/{ => product}/RecipeRequestTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => group}/AllergyResponseTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => group}/WeeklyMenuResponseTest.java (94%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => product}/RecipeDetailsTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/{ => product}/RecipeWithMatchCountTest.java (90%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/entity/{ => group}/WasteTest.java (93%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/entity/{ => product}/RecipeTest.java (91%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/repository/{ => group}/ShoppingListRepositoryTest.java (95%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/repository/{ => product}/AllergyRepositoryTest.java (96%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/repository/{ => product}/ProductRepositoryTest.java (98%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/repository/{ => product}/RecipeRepositoryTest.java (95%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/repository/{ => user}/UserRepositoryTest.java (97%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/service/{ => group}/ShoppingListServiceTest.java (92%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/service/{ => product}/AllergyServiceTest.java (89%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/service/{ => product}/RecipeServiceTest.java (93%)
rename src/test/java/ntnu/idatt2016/v233/SmartMat/service/{ => user}/TokenServiceTest.java (94%)
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/config/CorsConfig.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/CorsConfig.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/config/CorsConfig.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/CorsConfig.java
index 1a228e45..3af4d237 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/config/CorsConfig.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/CorsConfig.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.config;
+package ntnu.idatt2016.v233.SmartMat.config.security;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.config.properties.DomainProperty;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/config/SecurityConfig.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/SecurityConfig.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/config/SecurityConfig.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/SecurityConfig.java
index 446e5800..f5ca823d 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/config/SecurityConfig.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/config/security/SecurityConfig.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.config;
+package ntnu.idatt2016.v233.SmartMat.config.security;
import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementController.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementController.java
index 30de9880..fdcd0321 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementController.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.controller.user;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
index 20bde998..f2761d9d 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
@@ -2,7 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.controller.group;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.dto.request.FridgeProductRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.FridgeProductRequest;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListController.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListController.java
index 58885303..53b94501 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListController.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
import java.util.Optional;
@@ -8,7 +8,6 @@ import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import ntnu.idatt2016.v233.SmartMat.service.group.GroupService;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import ntnu.idatt2016.v233.SmartMat.service.user.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
@@ -16,8 +15,8 @@ import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
-import ntnu.idatt2016.v233.SmartMat.service.ShoppingListService;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.service.group.ShoppingListService;
/**
* Controller for the shopping list
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 444287ff..372c8acd 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
@@ -2,8 +2,8 @@ package ntnu.idatt2016.v233.SmartMat.controller.group;
import java.util.List;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.request.WasteRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.group.WasteRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.service.group.GroupService;
import ntnu.idatt2016.v233.SmartMat.service.group.WasteService;
import ntnu.idatt2016.v233.SmartMat.util.CategoryUtil;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuController.java
similarity index 78%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuController.java
index 66e95908..5a09f731 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuController.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -9,10 +9,8 @@ import java.util.List;
import org.springframework.http.ResponseEntity;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeWithMatchCount;
-import ntnu.idatt2016.v233.SmartMat.dto.response.WeeklyMenuResponse;
-import ntnu.idatt2016.v233.SmartMat.service.RecipeService;
-import ntnu.idatt2016.v233.SmartMat.service.WeeklyMenuService;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeWithMatchCount;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
/**
* Controller for weekly menu
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyController.java
similarity index 87%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyController.java
index 578ce1f9..c2bd0a24 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyController.java
@@ -1,9 +1,9 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.product;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.response.AllergyResponse;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.AllergyResponse;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
-import ntnu.idatt2016.v233.SmartMat.service.AllergyService;
+import ntnu.idatt2016.v233.SmartMat.service.product.AllergyService;
import java.util.List;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
index 742a2ca7..91d34433 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
@@ -1,15 +1,14 @@
package ntnu.idatt2016.v233.SmartMat.controller.product;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.request.ProductRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.ProductRequest;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import ntnu.idatt2016.v233.SmartMat.entity.product.Category;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
-import ntnu.idatt2016.v233.SmartMat.service.AllergyService;
+import ntnu.idatt2016.v233.SmartMat.service.product.AllergyService;
import ntnu.idatt2016.v233.SmartMat.service.product.CategoryService;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import ntnu.idatt2016.v233.SmartMat.util.CategoryUtil;
-import ntnu.idatt2016.v233.SmartMat.util.ProductUtil;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeController.java
similarity index 93%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeController.java
index 4d737a31..0fee844f 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeController.java
@@ -1,11 +1,11 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.product;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.RestController;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
-import ntnu.idatt2016.v233.SmartMat.service.RecipeService;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
import java.util.List;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationController.java
similarity index 94%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationController.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationController.java
index f2d40cf8..8dd6615f 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationController.java
@@ -1,7 +1,7 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.user;
-import ntnu.idatt2016.v233.SmartMat.dto.request.LoginRequest;
-import ntnu.idatt2016.v233.SmartMat.service.TokenService;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.LoginRequest;
+import ntnu.idatt2016.v233.SmartMat.service.user.TokenService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
index df6a56d6..a94e7f96 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
@@ -2,11 +2,10 @@ package ntnu.idatt2016.v233.SmartMat.controller.user;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.request.AllergyRequest;
-import ntnu.idatt2016.v233.SmartMat.dto.request.RegisterUserRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.AllergyRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.RegisterUserRequest;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.dto.request.UpdateUserRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.UpdateUserRequest;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import ntnu.idatt2016.v233.SmartMat.service.user.UserService;
import org.springframework.http.HttpStatus;
@@ -16,9 +15,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
import java.util.Optional;
-import java.util.stream.Collectors;
/**
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequest.java
similarity index 86%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequest.java
index a2c08a96..98d84662 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.group;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/WasteRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/WasteRequest.java
similarity index 85%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/WasteRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/WasteRequest.java
index 929fc9a5..57fbb9e6 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/WasteRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/WasteRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.group;
/**
* WasteRequest is a record class representing a request to add a product to a fridge.
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequest.java
similarity index 88%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequest.java
index 88b9e45f..f704455a 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequest.java
similarity index 89%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequest.java
index dcb4dd85..16f916c6 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FridgeProductRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FridgeProductRequest.java
similarity index 89%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FridgeProductRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FridgeProductRequest.java
index 48da0a31..5b8fb3f2 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FridgeProductRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FridgeProductRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
/**
* FridgeProductRequest is a record class representing a request to add a product to a fridge.
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ProductRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/ProductRequest.java
similarity index 90%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ProductRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/ProductRequest.java
index 4e067b92..9ab92d07 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/ProductRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/ProductRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequest.java
similarity index 88%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequest.java
index fcc9451c..06466bef 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/LoginRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/LoginRequest.java
similarity index 76%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/LoginRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/LoginRequest.java
index 709e502b..edb09789 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/LoginRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/LoginRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.user;
/**
* LoginRequest is a record class representing a login request.
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RegisterUserRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/RegisterUserRequest.java
similarity index 90%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RegisterUserRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/RegisterUserRequest.java
index 6df60e0f..b4927c77 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/RegisterUserRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/RegisterUserRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.user;
import java.sql.Date;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/UpdateUserRequest.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/UpdateUserRequest.java
similarity index 91%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/UpdateUserRequest.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/UpdateUserRequest.java
index 2e7e6ccd..2c927fd3 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/UpdateUserRequest.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/user/UpdateUserRequest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.user;
import java.sql.Date;
import java.util.List;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponse.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponse.java
similarity index 88%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponse.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponse.java
index 3e203560..9137def5 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponse.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponse.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.group;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponse.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/AllergyResponse.java
similarity index 83%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponse.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/AllergyResponse.java
index fcf34981..60b8c137 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponse.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/AllergyResponse.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetails.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetails.java
similarity index 86%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetails.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetails.java
index f02cb54c..7018edf8 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetails.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetails.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCount.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCount.java
similarity index 72%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCount.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCount.java
index 72ad5a44..c316c27b 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCount.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCount.java
@@ -1,9 +1,10 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeDetails;
/**
* This class represents recipe response with match count
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
index ad150509..bb55257a 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
@@ -7,8 +7,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
-import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/ShoppingList.java
similarity index 96%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/ShoppingList.java
index 1a816673..989ac1bb 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/ShoppingList.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/ShoppingList.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.entity;
+package ntnu.idatt2016.v233.SmartMat.entity.group;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Waste.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Waste.java
similarity index 96%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Waste.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Waste.java
index 716a3db2..9b5a4d4e 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Waste.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Waste.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.entity;
+package ntnu.idatt2016.v233.SmartMat.entity.group;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
index febadac7..2b758610 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
@@ -1,16 +1,13 @@
package ntnu.idatt2016.v233.SmartMat.entity.product;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
-import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Recipe.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Recipe.java
index ab7b5737..935e3393 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Recipe.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.entity;
+package ntnu.idatt2016.v233.SmartMat.entity.product;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
index ff2635a7..2440c3fd 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import jakarta.persistence.*;
import lombok.*;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/AchievementRepository.java
similarity index 91%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepository.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/AchievementRepository.java
index b702e349..41442c7a 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/AchievementRepository.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.repository.user;
+package ntnu.idatt2016.v233.SmartMat.repository.group;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepository.java
similarity index 87%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepository.java
index f0dd1680..1e0966b9 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepository.java
@@ -1,9 +1,9 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.group;
import java.util.List;
import java.util.Optional;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
import org.springframework.data.jpa.repository.JpaRepository;
/**
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 aaa41eb7..dd7694b6 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,7 +1,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.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepository.java
similarity index 92%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepository.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepository.java
index 539e6349..fbf141bd 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepository.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.product;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepository.java
similarity index 90%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepository.java
index ace138c6..e6c4bede 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepository.java
@@ -1,11 +1,10 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.product;
import java.util.List;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
/**
* This interface defines the methods for the recipe repository
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java
index e7ae96f1..7552574b 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java
@@ -1,8 +1,8 @@
package ntnu.idatt2016.v233.SmartMat.service.group;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.request.FridgeProductRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.FridgeProductRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
@@ -14,13 +14,10 @@ import ntnu.idatt2016.v233.SmartMat.repository.product.FridgeProductAssoRepo;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import ntnu.idatt2016.v233.SmartMat.util.GroupUtil;
-import ntnu.idatt2016.v233.SmartMat.util.ProductUtil;
-import org.springframework.context.annotation.aspectj.EnableSpringConfigured;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.LocalDate;
-import java.util.Date;
import java.util.Optional;
/**
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java
index fb3e22f7..7094051a 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupService.java
@@ -2,12 +2,12 @@ package ntnu.idatt2016.v233.SmartMat.service.group;
import jakarta.transaction.Transactional;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupId;
-import ntnu.idatt2016.v233.SmartMat.repository.ShoppingListRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.group.ShoppingListRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.FridgeRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.GroupRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.UserGroupAssoRepository;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListService.java
similarity index 95%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListService.java
index 2d5701c9..646177fe 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListService.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.group;
import java.util.List;
import java.util.Optional;
@@ -7,8 +7,8 @@ import ntnu.idatt2016.v233.SmartMat.repository.product.ProductRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
-import ntnu.idatt2016.v233.SmartMat.repository.ShoppingListRepository;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.repository.group.ShoppingListRepository;
/**
* Service for the shopping list
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 20615c62..daa26dbc 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,13 +1,10 @@
package ntnu.idatt2016.v233.SmartMat.service.group;
-import java.nio.channels.FileChannel;
-import java.sql.Date;
import java.sql.Timestamp;
-import java.util.ArrayList;
import java.util.List;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.request.WasteRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.group.WasteRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
import ntnu.idatt2016.v233.SmartMat.repository.group.GroupRepository;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/WeeklyMenuService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WeeklyMenuService.java
similarity index 86%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/service/WeeklyMenuService.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WeeklyMenuService.java
index 2fedb932..c8a7bfcb 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/WeeklyMenuService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/WeeklyMenuService.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.group;
import java.util.List;
import java.util.stream.Collectors;
@@ -6,8 +6,8 @@ import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import ntnu.idatt2016.v233.SmartMat.dto.response.WeeklyMenuResponse;
-import ntnu.idatt2016.v233.SmartMat.repository.RecipeRepository;
+import ntnu.idatt2016.v233.SmartMat.dto.response.group.WeeklyMenuResponse;
+import ntnu.idatt2016.v233.SmartMat.repository.product.RecipeRepository;
/**
* Service class for weekly menu
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/AllergyService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyService.java
similarity index 88%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/service/AllergyService.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyService.java
index 20fa6707..a20246f0 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/AllergyService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyService.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.product;
import java.util.List;
import java.util.Optional;
@@ -7,9 +7,9 @@ import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import ntnu.idatt2016.v233.SmartMat.dto.response.AllergyResponse;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.AllergyResponse;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
-import ntnu.idatt2016.v233.SmartMat.repository.AllergyRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.product.AllergyRepository;
/**
* Service for allergies
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/RecipeService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeService.java
similarity index 95%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/service/RecipeService.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeService.java
index 04a38cb5..8758e6d5 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/RecipeService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeService.java
@@ -1,10 +1,10 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.product;
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeDetails;
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeWithMatchCount;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeDetails;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeWithMatchCount;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
-import ntnu.idatt2016.v233.SmartMat.repository.RecipeRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.product.RecipeRepository;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementService.java
index 7ef5c28b..9f4c1395 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementService.java
@@ -2,7 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.service.user;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
-import ntnu.idatt2016.v233.SmartMat.repository.user.AchievementRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.group.AchievementRepository;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/TokenService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenService.java
similarity index 97%
rename from src/main/java/ntnu/idatt2016/v233/SmartMat/service/TokenService.java
rename to src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenService.java
index 6f83285b..2602cc1c 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/TokenService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenService.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.user;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/UserService.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/UserService.java
index 7dc252ed..37ced9f8 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/UserService.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/service/user/UserService.java
@@ -1,21 +1,17 @@
package ntnu.idatt2016.v233.SmartMat.service.user;
import lombok.AllArgsConstructor;
-import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
-import ntnu.idatt2016.v233.SmartMat.repository.AllergyRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.product.AllergyRepository;
import ntnu.idatt2016.v233.SmartMat.repository.user.UserRepository;
-import ntnu.idatt2016.v233.SmartMat.service.RecipeService;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
-import jakarta.persistence.EntityNotFoundException;
-
-import java.nio.channels.FileChannel;
import java.util.List;
import java.util.Optional;
diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java
index 9ef7a57c..7089d5eb 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/util/StatisticUtil.java
@@ -1,8 +1,7 @@
package ntnu.idatt2016.v233.SmartMat.util;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
-import java.sql.Date;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementControllerTest.java
similarity index 96%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementControllerTest.java
index 02209b61..6e267fe6 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AchievementControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/AchievementControllerTest.java
@@ -1,6 +1,7 @@
-package ntnu.idatt2016.v233.SmartMat.controller.user;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
import com.fasterxml.jackson.databind.ObjectMapper;
+import ntnu.idatt2016.v233.SmartMat.controller.group.AchievementController;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
import ntnu.idatt2016.v233.SmartMat.service.user.AchievementService;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeControllerTest.java
index cb449e2f..b29d163e 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeControllerTest.java
@@ -2,7 +2,7 @@ package ntnu.idatt2016.v233.SmartMat.controller.group;
import com.fasterxml.jackson.databind.ObjectMapper;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.dto.request.FridgeProductRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.FridgeProductRequest;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListControllerTest.java
similarity index 97%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListControllerTest.java
index 4afee683..410c01b1 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/ShoppingListControllerTest.java
@@ -1,14 +1,14 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
+import ntnu.idatt2016.v233.SmartMat.controller.group.ShoppingListController;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.dto.request.ShoppingListRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupId;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
-import ntnu.idatt2016.v233.SmartMat.service.ShoppingListService;
+import ntnu.idatt2016.v233.SmartMat.service.group.ShoppingListService;
import ntnu.idatt2016.v233.SmartMat.service.group.GroupService;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import ntnu.idatt2016.v233.SmartMat.service.user.UserService;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteControllerTest.java
index c500c8cb..b8ef69fd 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteControllerTest.java
@@ -3,8 +3,6 @@ package ntnu.idatt2016.v233.SmartMat.controller.group;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
import java.sql.Timestamp;
import java.util.*;
@@ -20,17 +18,15 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.test.web.servlet.MockMvc;
import com.fasterxml.jackson.databind.ObjectMapper;
-import ntnu.idatt2016.v233.SmartMat.dto.request.WasteRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.group.WasteRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
import ntnu.idatt2016.v233.SmartMat.service.group.WasteService;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuControllerTest.java
similarity index 82%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuControllerTest.java
index 0d58818c..8957c6ef 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/group/WeeklyMenuControllerTest.java
@@ -1,10 +1,11 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
-
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeDetails;
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeWithMatchCount;
-import ntnu.idatt2016.v233.SmartMat.dto.response.WeeklyMenuResponse;
-import ntnu.idatt2016.v233.SmartMat.service.RecipeService;
-import ntnu.idatt2016.v233.SmartMat.service.WeeklyMenuService;
+package ntnu.idatt2016.v233.SmartMat.controller.group;
+
+import ntnu.idatt2016.v233.SmartMat.controller.group.WeeklyMenuController;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeDetails;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeWithMatchCount;
+import ntnu.idatt2016.v233.SmartMat.dto.response.group.WeeklyMenuResponse;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
+import ntnu.idatt2016.v233.SmartMat.service.group.WeeklyMenuService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyControllerTest.java
similarity index 90%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyControllerTest.java
index 4d021b81..58a4f9cc 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AllergyControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/AllergyControllerTest.java
@@ -1,8 +1,9 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.product;
-import ntnu.idatt2016.v233.SmartMat.dto.response.AllergyResponse;
+import ntnu.idatt2016.v233.SmartMat.controller.product.AllergyController;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.AllergyResponse;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
-import ntnu.idatt2016.v233.SmartMat.service.AllergyService;
+import ntnu.idatt2016.v233.SmartMat.service.product.AllergyService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductControllerTest.java
index 4c6bce4d..81942619 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductControllerTest.java
@@ -1,10 +1,10 @@
package ntnu.idatt2016.v233.SmartMat.controller.product;
-import ntnu.idatt2016.v233.SmartMat.dto.request.ProductRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.ProductRequest;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import ntnu.idatt2016.v233.SmartMat.entity.product.Category;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
-import ntnu.idatt2016.v233.SmartMat.service.AllergyService;
+import ntnu.idatt2016.v233.SmartMat.service.product.AllergyService;
import ntnu.idatt2016.v233.SmartMat.service.product.CategoryService;
import ntnu.idatt2016.v233.SmartMat.service.product.ProductService;
import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeControllerTest.java
similarity index 93%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeControllerTest.java
index ed41407f..78f8380a 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/RecipeControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/product/RecipeControllerTest.java
@@ -1,9 +1,10 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.product;
import com.fasterxml.jackson.databind.ObjectMapper;
+import ntnu.idatt2016.v233.SmartMat.controller.product.RecipeController;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
-import ntnu.idatt2016.v233.SmartMat.service.RecipeService;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -11,12 +12,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -28,7 +27,6 @@ import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationControllerTest.java
similarity index 93%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationControllerTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationControllerTest.java
index bb30a2a4..19b25fe3 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/AuthenticationControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/AuthenticationControllerTest.java
@@ -1,7 +1,8 @@
-package ntnu.idatt2016.v233.SmartMat.controller;
+package ntnu.idatt2016.v233.SmartMat.controller.user;
-import ntnu.idatt2016.v233.SmartMat.dto.request.LoginRequest;
-import ntnu.idatt2016.v233.SmartMat.service.TokenService;
+import ntnu.idatt2016.v233.SmartMat.controller.user.AuthenticationController;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.LoginRequest;
+import ntnu.idatt2016.v233.SmartMat.service.user.TokenService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
@@ -10,7 +11,6 @@ import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserControllerTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserControllerTest.java
index 6a0dc9a0..b39cf5d6 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserControllerTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserControllerTest.java
@@ -1,9 +1,9 @@
package ntnu.idatt2016.v233.SmartMat.controller.user;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.dto.request.AllergyRequest;
-import ntnu.idatt2016.v233.SmartMat.dto.request.RegisterUserRequest;
-import ntnu.idatt2016.v233.SmartMat.dto.request.UpdateUserRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.AllergyRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.RegisterUserRequest;
+import ntnu.idatt2016.v233.SmartMat.dto.request.user.UpdateUserRequest;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import ntnu.idatt2016.v233.SmartMat.repository.user.UserRepository;
import ntnu.idatt2016.v233.SmartMat.service.user.UserService;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequestTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequestTest.java
similarity index 90%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequestTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequestTest.java
index 89927c2e..23f84784 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/ShoppingListRequestTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/group/ShoppingListRequestTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.group;
+import ntnu.idatt2016.v233.SmartMat.dto.request.group.ShoppingListRequest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequestTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequestTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequestTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequestTest.java
index dcc52474..ff625ffc 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/AllergyRequestTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/AllergyRequestTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.AllergyRequest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequestTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequestTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequestTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequestTest.java
index 57d29996..1c0e1644 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/FavoriteRequestTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/FavoriteRequestTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.FavoriteRequest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequestTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequestTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequestTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequestTest.java
index 31c7ae30..9e437371 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/RecipeRequestTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/request/product/RecipeRequestTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.request;
+package ntnu.idatt2016.v233.SmartMat.dto.request.product;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.RecipeRequest;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponseTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/AllergyResponseTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponseTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/AllergyResponseTest.java
index 5b273676..75742093 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/AllergyResponseTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/AllergyResponseTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.group;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.AllergyResponse;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponseTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponseTest.java
similarity index 94%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponseTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponseTest.java
index e474c6ae..4dd1b4cd 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponseTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/group/WeeklyMenuResponseTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.group;
+import ntnu.idatt2016.v233.SmartMat.dto.response.group.WeeklyMenuResponse;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetailsTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetailsTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetailsTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetailsTest.java
index 0859efb8..71013dfa 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeDetailsTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeDetailsTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.product;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeDetails;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCountTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCountTest.java
similarity index 90%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCountTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCountTest.java
index 8a67d631..068627ed 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/RecipeWithMatchCountTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/dto/response/product/RecipeWithMatchCountTest.java
@@ -1,5 +1,7 @@
-package ntnu.idatt2016.v233.SmartMat.dto.response;
+package ntnu.idatt2016.v233.SmartMat.dto.response.product;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeDetails;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeWithMatchCount;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/WasteTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/group/WasteTest.java
similarity index 93%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/entity/WasteTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/entity/group/WasteTest.java
index 7f8a0862..06372e35 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/WasteTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/group/WasteTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.entity;
+package ntnu.idatt2016.v233.SmartMat.entity.group;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/RecipeTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/product/RecipeTest.java
similarity index 91%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/entity/RecipeTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/entity/product/RecipeTest.java
index 01f8b12b..52d50d3b 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/RecipeTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/entity/product/RecipeTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.entity;
+package ntnu.idatt2016.v233.SmartMat.entity.product;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
index 52d6a293..cbff7444 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepositoryTest.java
@@ -5,10 +5,8 @@ import static org.junit.jupiter.api.Assertions.*;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
import java.util.Optional;
-import ntnu.idatt2016.v233.SmartMat.repository.user.AchievementRepository;
import ntnu.idatt2016.v233.SmartMat.repository.user.UserRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepositoryTest.java
similarity index 95%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepositoryTest.java
index a379523d..117bf900 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ShoppingListRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/ShoppingListRepositoryTest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.group;
import static org.junit.jupiter.api.Assertions.*;
@@ -9,11 +9,12 @@ import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupId;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
+import ntnu.idatt2016.v233.SmartMat.repository.group.ShoppingListRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
@DataJpaTest
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepositoryTest.java
index 9c044f14..d428ef5b 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/group/WasteRepositoryTest.java
@@ -1,21 +1,11 @@
package ntnu.idatt2016.v233.SmartMat.repository.group;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
-import ntnu.idatt2016.v233.SmartMat.repository.group.WasteRepository;
-
-import static org.junit.jupiter.api.Assertions.*;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
@ExtendWith(SpringExtension.class)
@DataJpaTest
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepositoryTest.java
similarity index 96%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepositoryTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepositoryTest.java
index ea353c7d..93d24464 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/AllergyRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/AllergyRepositoryTest.java
@@ -1,7 +1,8 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.product;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
+import ntnu.idatt2016.v233.SmartMat.repository.product.AllergyRepository;
import ntnu.idatt2016.v233.SmartMat.repository.product.ProductRepository;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ProductRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/ProductRepositoryTest.java
similarity index 98%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ProductRepositoryTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/ProductRepositoryTest.java
index fcac75de..8e50b9e4 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/ProductRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/ProductRepositoryTest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.product;
import java.util.List;
import java.util.Optional;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepositoryTest.java
similarity index 95%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepositoryTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepositoryTest.java
index 6674f331..d28b0518 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/product/RecipeRepositoryTest.java
@@ -1,4 +1,4 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.product;
import static org.junit.jupiter.api.Assertions.*;
@@ -6,11 +6,12 @@ import java.util.List;
import java.util.Optional;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
+import ntnu.idatt2016.v233.SmartMat.repository.product.RecipeRepository;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
@DataJpaTest
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepositoryTest.java
index b89a2872..1f098c46 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/AchievementRepositoryTest.java
@@ -10,7 +10,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Optional;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
-import ntnu.idatt2016.v233.SmartMat.repository.user.AchievementRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.group.AchievementRepository;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepositoryTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/UserRepositoryTest.java
similarity index 97%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepositoryTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/UserRepositoryTest.java
index 5df6c84e..c8d67e7a 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/UserRepositoryTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/repository/user/UserRepositoryTest.java
@@ -1,9 +1,9 @@
-package ntnu.idatt2016.v233.SmartMat.repository;
+package ntnu.idatt2016.v233.SmartMat.repository.user;
import ntnu.idatt2016.v233.SmartMat.dto.enums.Authority;
-import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
+import ntnu.idatt2016.v233.SmartMat.repository.product.AllergyRepository;
import ntnu.idatt2016.v233.SmartMat.repository.user.UserRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -12,8 +12,6 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
import java.sql.Date;
-import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.Optional;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeServiceTest.java
index 5db6d649..0517dbd1 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeServiceTest.java
@@ -5,8 +5,8 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import ntnu.idatt2016.v233.SmartMat.dto.request.FridgeProductRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.product.FridgeProductRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.fridgeProduct.FridgeProductAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.Fridge;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupServiceTest.java
index 3136a725..0a7890fe 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/GroupServiceTest.java
@@ -5,7 +5,7 @@ import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupId;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
-import ntnu.idatt2016.v233.SmartMat.repository.ShoppingListRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.group.ShoppingListRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.FridgeRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.GroupRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.UserGroupAssoRepository;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListServiceTest.java
similarity index 92%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListServiceTest.java
index 954761ab..0c165a72 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/ShoppingListServiceTest.java
@@ -1,8 +1,9 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.group;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
+import ntnu.idatt2016.v233.SmartMat.service.group.ShoppingListService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -13,8 +14,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-import ntnu.idatt2016.v233.SmartMat.entity.ShoppingList;
-import ntnu.idatt2016.v233.SmartMat.repository.ShoppingListRepository;
+import ntnu.idatt2016.v233.SmartMat.entity.group.ShoppingList;
+import ntnu.idatt2016.v233.SmartMat.repository.group.ShoppingListRepository;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteServiceTest.java
index 1517a1cb..10a228a4 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/group/WasteServiceTest.java
@@ -1,26 +1,21 @@
package ntnu.idatt2016.v233.SmartMat.service.group;
-import ntnu.idatt2016.v233.SmartMat.dto.request.WasteRequest;
-import ntnu.idatt2016.v233.SmartMat.entity.Waste;
+import ntnu.idatt2016.v233.SmartMat.dto.request.group.WasteRequest;
+import ntnu.idatt2016.v233.SmartMat.entity.group.Waste;
import ntnu.idatt2016.v233.SmartMat.entity.group.Group;
-import ntnu.idatt2016.v233.SmartMat.entity.group.UserGroupAsso;
import ntnu.idatt2016.v233.SmartMat.entity.product.Category;
import ntnu.idatt2016.v233.SmartMat.entity.product.Product;
-import ntnu.idatt2016.v233.SmartMat.entity.user.User;
import ntnu.idatt2016.v233.SmartMat.repository.group.GroupRepository;
import ntnu.idatt2016.v233.SmartMat.repository.group.WasteRepository;
import ntnu.idatt2016.v233.SmartMat.repository.product.ProductRepository;
-import ntnu.idatt2016.v233.SmartMat.service.group.WasteService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;
import java.sql.Timestamp;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/AllergyServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyServiceTest.java
similarity index 89%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/service/AllergyServiceTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyServiceTest.java
index 5d4d23da..bfeda058 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/AllergyServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/AllergyServiceTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.product;
+import ntnu.idatt2016.v233.SmartMat.service.product.AllergyService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -10,9 +11,9 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-import ntnu.idatt2016.v233.SmartMat.dto.response.AllergyResponse;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.AllergyResponse;
import ntnu.idatt2016.v233.SmartMat.entity.product.Allergy;
-import ntnu.idatt2016.v233.SmartMat.repository.AllergyRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.product.AllergyRepository;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/RecipeServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeServiceTest.java
similarity index 93%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/service/RecipeServiceTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeServiceTest.java
index 64543e9d..b2f30e76 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/RecipeServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/product/RecipeServiceTest.java
@@ -1,19 +1,17 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.product;
-import ntnu.idatt2016.v233.SmartMat.dto.response.RecipeWithMatchCount;
-import ntnu.idatt2016.v233.SmartMat.entity.Recipe;
+import ntnu.idatt2016.v233.SmartMat.dto.response.product.RecipeWithMatchCount;
+import ntnu.idatt2016.v233.SmartMat.entity.product.Recipe;
import ntnu.idatt2016.v233.SmartMat.entity.user.User;
-import ntnu.idatt2016.v233.SmartMat.repository.RecipeRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.product.RecipeRepository;
import ntnu.idatt2016.v233.SmartMat.repository.user.UserRepository;
-import org.junit.jupiter.api.Assertions;
+import ntnu.idatt2016.v233.SmartMat.service.product.RecipeService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementServiceTest.java
index 869d43ec..a098bb12 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/AchievementServiceTest.java
@@ -1,7 +1,7 @@
package ntnu.idatt2016.v233.SmartMat.service.user;
import ntnu.idatt2016.v233.SmartMat.entity.group.Achievement;
-import ntnu.idatt2016.v233.SmartMat.repository.user.AchievementRepository;
+import ntnu.idatt2016.v233.SmartMat.repository.group.AchievementRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/TokenServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenServiceTest.java
similarity index 94%
rename from src/test/java/ntnu/idatt2016/v233/SmartMat/service/TokenServiceTest.java
rename to src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenServiceTest.java
index 9401989e..a66291c1 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/TokenServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/TokenServiceTest.java
@@ -1,5 +1,6 @@
-package ntnu.idatt2016.v233.SmartMat.service;
+package ntnu.idatt2016.v233.SmartMat.service.user;
+import ntnu.idatt2016.v233.SmartMat.service.user.TokenService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java
index 4ae0811f..52921e99 100644
--- a/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java
+++ b/src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java
@@ -1,6 +1,6 @@
package ntnu.idatt2016.v233.SmartMat.service.user;
-import ntnu.idatt2016.v233.SmartMat.service.WeeklyMenuService;
+import ntnu.idatt2016.v233.SmartMat.service.group.WeeklyMenuService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
@@ -10,8 +10,8 @@ import org.mockito.MockitoAnnotations;
import java.util.Arrays;
import java.util.List;
-import ntnu.idatt2016.v233.SmartMat.dto.response.WeeklyMenuResponse;
-import ntnu.idatt2016.v233.SmartMat.repository.RecipeRepository;
+import ntnu.idatt2016.v233.SmartMat.dto.response.group.WeeklyMenuResponse;
+import ntnu.idatt2016.v233.SmartMat.repository.product.RecipeRepository;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*;
--
GitLab