Skip to content
Snippets Groups Projects
Commit 7133a6e0 authored by Anders Austlid's avatar Anders Austlid
Browse files

Refactored pacakge structure for cleaner project structure

parent 331d9904
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 41 deletions
package ntnu.idatt2016.v233.SmartMat.config;
package ntnu.idatt2016.v233.SmartMat.config.security;
import lombok.AllArgsConstructor;
import ntnu.idatt2016.v233.SmartMat.config.properties.DomainProperty;
......
package ntnu.idatt2016.v233.SmartMat.config;
package ntnu.idatt2016.v233.SmartMat.config.security;
import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean;
......
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;
......
......@@ -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;
......
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
......
......@@ -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;
......
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
......
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;
......
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.*;
......
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;
......
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;
......
......@@ -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;
/**
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.group;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
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.
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
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.
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.Builder;
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.product;
import lombok.AllArgsConstructor;
import lombok.Builder;
......
package ntnu.idatt2016.v233.SmartMat.dto.request;
package ntnu.idatt2016.v233.SmartMat.dto.request.user;
/**
* LoginRequest is a record class representing a login request.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment