Ordered everything in subprojects

src/main/java/com/bernard/misael/auth/AuthController.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.web;
+package com.bernard.misael.auth;
 
 import java.security.Principal;
 import java.util.List;
@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.bernard.misael.model.Role;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.service.UserService;
-import com.bernard.misael.repository.UserRepository;
+import com.bernard.misael.auth.model.Role;
-import com.bernard.misael.service.UserService;
+import com.bernard.misael.auth.model.User;
-import com.bernard.misael.service.dto.UserDto;
+import com.bernard.misael.auth.service.dto.UserDto;
 
 import jakarta.validation.Valid;
 import lombok.Getter;

src/main/java/com/bernard/misael/auth/CustomUserDetailsService.java

@@ -1,4 +1,4 @@
-package com.bernard.misael;
+package com.bernard.misael.auth;
 
 import java.util.Set;
 import java.util.function.Function;
@@ -9,10 +9,10 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import com.bernard.misael.model.Privilege;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.Role;
+import com.bernard.misael.auth.model.Privilege;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.Role;
-import com.bernard.misael.repository.UserRepository;
+import com.bernard.misael.auth.model.User;
 
 @Service
 public class CustomUserDetailsService implements UserDetailsService {

src/main/java/com/bernard/misael/auth/SpringSecurity.java

@@ -1,4 +1,4 @@
-package com.bernard.misael;
+package com.bernard.misael.auth;
 
 import java.util.logging.Logger;
 

src/main/java/com/bernard/misael/auth/model/Privilege.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.model;
+package com.bernard.misael.auth.model;
 
 import org.springframework.security.core.GrantedAuthority;
 

src/main/java/com/bernard/misael/auth/model/Role.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.model;
+package com.bernard.misael.auth.model;
 
 import java.util.EnumSet;
 import java.util.List;

src/main/java/com/bernard/misael/auth/model/User.java

@@ -1,9 +1,11 @@
-package com.bernard.misael.model;
+package com.bernard.misael.auth.model;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import com.bernard.misael.quizz.model.Quizz;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

src/main/java/com/bernard/misael/auth/repository/RoleRepository.java

@@ -1,8 +1,8 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.auth.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.bernard.misael.model.Role;
+import com.bernard.misael.auth.model.Role;
 
 public interface RoleRepository extends JpaRepository<Role, Long> {
 

src/main/java/com/bernard/misael/auth/repository/UserRepository.java

@@ -1,8 +1,8 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.auth.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.User;
 
 public interface UserRepository extends JpaRepository<User, Long> {
 

src/main/java/com/bernard/misael/auth/service/AdminMaker.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service;
+package com.bernard.misael.auth.service;
 
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -11,11 +11,11 @@ import org.springframework.lang.NonNull;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
-import com.bernard.misael.model.Privilege;
+import com.bernard.misael.auth.repository.RoleRepository;
-import com.bernard.misael.model.Role;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.Privilege;
-import com.bernard.misael.repository.RoleRepository;
+import com.bernard.misael.auth.model.Role;
-import com.bernard.misael.repository.UserRepository;
+import com.bernard.misael.auth.model.User;
 
 import jakarta.transaction.Transactional;
 

src/main/java/com/bernard/misael/auth/service/UserService.java

@@ -1,10 +1,10 @@
-package com.bernard.misael.service;
+package com.bernard.misael.auth.service;
 
 import java.util.List;
 
-import com.bernard.misael.model.Privilege;
+import com.bernard.misael.auth.model.Privilege;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.User;
-import com.bernard.misael.service.dto.UserDto;
+import com.bernard.misael.auth.service.dto.UserDto;
 
 public interface UserService {
     

src/main/java/com/bernard/misael/auth/service/UserServiceImpl.java

@@ -1,14 +1,14 @@
-package com.bernard.misael.service;
+package com.bernard.misael.auth.service;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import com.bernard.misael.model.Privilege;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.service.dto.UserDto;
-import com.bernard.misael.repository.UserRepository;
+import com.bernard.misael.auth.model.Privilege;
-import com.bernard.misael.service.dto.UserDto;
+import com.bernard.misael.auth.model.User;
 
 @Service
 public class UserServiceImpl implements UserService {

src/main/java/com/bernard/misael/auth/service/dto/UserDto.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service.dto;
+package com.bernard.misael.auth.service.dto;
 
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;

src/main/java/com/bernard/misael/quizz/QuestionsController.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.web;
+package com.bernard.misael.quizz;
 
 import java.security.Principal;
 import java.util.ArrayList;
@@ -16,14 +16,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.QuizzForm;
+import com.bernard.misael.quizz.model.Quizz;
-import com.bernard.misael.model.User;
+import com.bernard.misael.quizz.model.QuizzForm;
-import com.bernard.misael.questions.QTypes;
+import com.bernard.misael.auth.model.User;
-import com.bernard.misael.repository.QuizzFormRepository;
+import com.bernard.misael.quizz.questions.QTypes;
-import com.bernard.misael.repository.QuizzRepository;
+import com.bernard.misael.quizz.repository.QuizzFormRepository;
-import com.bernard.misael.repository.UserRepository;
+import com.bernard.misael.quizz.repository.QuizzRepository;
-import com.bernard.misael.service.QuizzManager;
+import com.bernard.misael.quizz.service.QuizzManager;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 

src/main/java/com/bernard/misael/quizz/model/Answer.java

@@ -1,6 +1,6 @@
-package com.bernard.misael.model;
+package com.bernard.misael.quizz.model;
 
-import com.bernard.misael.service.JsonNodeConverter;
+import com.bernard.misael.quizz.service.JsonNodeConverter;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 

src/main/java/com/bernard/misael/quizz/model/Question.java

@@ -1,8 +1,8 @@
-package com.bernard.misael.model;
+package com.bernard.misael.quizz.model;
 
-import com.bernard.misael.questions.QTypes;
+import com.bernard.misael.quizz.questions.QTypes;
-import com.bernard.misael.questions.QuestionType;
+import com.bernard.misael.quizz.questions.QuestionType;
-import com.bernard.misael.service.JsonNodeConverter;
+import com.bernard.misael.quizz.service.JsonNodeConverter;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import jakarta.persistence.*;

src/main/java/com/bernard/misael/quizz/model/Quizz.java

@@ -1,9 +1,11 @@
-package com.bernard.misael.model;
+package com.bernard.misael.quizz.model;
 
 import java.util.Set;
 
 import org.hibernate.annotations.ColumnDefault;
 
+import com.bernard.misael.auth.model.User;
+
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/bernard/misael/quizz/model/QuizzForm.java

@@ -1,4 +1,6 @@
-package com.bernard.misael.model;
+package com.bernard.misael.quizz.model;
+
+import com.bernard.misael.auth.model.User;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

src/main/java/com/bernard/misael/quizz/questions/DccQuestion.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.questions;
+package com.bernard.misael.quizz.questions;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -13,9 +13,9 @@ import java.util.stream.StreamSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.bernard.misael.service.exception.MalformedAnswerException;
+import com.bernard.misael.quizz.service.exception.MalformedAnswerException;
-import com.bernard.misael.service.exception.MalformedClientAnswerException;
+import com.bernard.misael.quizz.service.exception.MalformedClientAnswerException;
-import com.bernard.misael.service.exception.QuestionTypeException;
+import com.bernard.misael.quizz.service.exception.QuestionTypeException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;

src/main/java/com/bernard/misael/quizz/questions/QTypes.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.questions;
+package com.bernard.misael.quizz.       questions;
 
 import java.util.function.Function;
 

src/main/java/com/bernard/misael/quizz/questions/QuestionType.java

@@ -1,6 +1,6 @@
-package com.bernard.misael.questions;
+package com.bernard.misael.quizz.   questions;
 
-import com.bernard.misael.service.exception.QuestionTypeException;
+import com.bernard.misael.quizz.service.exception.QuestionTypeException;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import lombok.AllArgsConstructor;

src/main/java/com/bernard/misael/quizz/repository/AnswerRepository.java

@@ -1,12 +1,12 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.quizz.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.bernard.misael.model.Answer;
+import com.bernard.misael.quizz.model.Answer;
-import com.bernard.misael.model.Question;
+import com.bernard.misael.quizz.model.Question;
-import com.bernard.misael.model.QuizzForm;
+import com.bernard.misael.quizz.model.QuizzForm;
 
 public interface AnswerRepository extends JpaRepository<Answer,Long> {
 

src/main/java/com/bernard/misael/quizz/repository/QuestionRepository.java

@@ -1,12 +1,12 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.quizz.repository;
 
 import java.util.List;
 import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.bernard.misael.model.Question;
+import com.bernard.misael.quizz.model.Question;
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.quizz.model.Quizz;
 
 
 public interface QuestionRepository extends JpaRepository<Question,Long> {

src/main/java/com/bernard/misael/quizz/repository/QuizzFormRepository.java

@@ -1,12 +1,12 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.quizz.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.quizz.model.Quizz;
-import com.bernard.misael.model.QuizzForm;
+import com.bernard.misael.quizz.model.QuizzForm;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.User;
 
 public interface QuizzFormRepository extends JpaRepository<QuizzForm,Long> {
 

src/main/java/com/bernard/misael/quizz/repository/QuizzRepository.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.repository;
+package com.bernard.misael.quizz.repository;
 
 import java.util.Optional;
 import java.util.Set;
@@ -6,8 +6,8 @@ import java.util.Set;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.lang.NonNull;
 
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.quizz.model.Quizz;
-import com.bernard.misael.model.User;
+import com.bernard.misael.auth.model.User;
 
 public interface QuizzRepository extends JpaRepository<Quizz,Long> {
 

src/main/java/com/bernard/misael/quizz/service/JsonNodeConverter.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service;
+package com.bernard.misael.quizz.service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;

src/main/java/com/bernard/misael/quizz/service/QuizzManager.java

@@ -1,12 +1,12 @@
-package com.bernard.misael.service;
+package com.bernard.misael.quizz.service;
 
 import java.util.List;
 import java.util.Optional;
 
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.auth.model.User;
-import com.bernard.misael.model.QuizzForm;
+import com.bernard.misael.quizz.model.Quizz;
-import com.bernard.misael.model.User;
+import com.bernard.misael.quizz.model.QuizzForm;
-import com.bernard.misael.questions.QTypes;
+import com.bernard.misael.quizz.questions.QTypes;
 import com.fasterxml.jackson.databind.JsonNode;
 
 public interface QuizzManager {

src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service;
+package com.bernard.misael.quizz.service;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -13,19 +13,21 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.bernard.misael.model.Answer;
+import com.bernard.misael.auth.repository.UserRepository;
-import com.bernard.misael.model.Privilege;
+import com.bernard.misael.auth.service.UserService;
-import com.bernard.misael.model.Question;
+import com.bernard.misael.quizz.model.Answer;
-import com.bernard.misael.model.Quizz;
+import com.bernard.misael.auth.model.Privilege;
-import com.bernard.misael.model.QuizzForm;
+import com.bernard.misael.quizz.model.Question;
-import com.bernard.misael.model.User;
+import com.bernard.misael.quizz.model.Quizz;
-import com.bernard.misael.questions.QTypes;
+import com.bernard.misael.quizz.model.QuizzForm;
-import com.bernard.misael.questions.QuestionType.AnswerResult;
+import com.bernard.misael.auth.model.User;
-import com.bernard.misael.repository.*;
+import com.bernard.misael.quizz.questions.QTypes;
-import com.bernard.misael.service.exception.MalformedAnswerException;
+import com.bernard.misael.quizz.questions.QuestionType.AnswerResult;
-import com.bernard.misael.service.exception.MalformedClientAnswerException;
+import com.bernard.misael.quizz.QuestionsController;
-import com.bernard.misael.service.exception.QuestionTypeException;
+import com.bernard.misael.quizz.repository.*;
-import com.bernard.misael.web.QuestionsController;
+import com.bernard.misael.quizz.service.exception.MalformedAnswerException;
+import com.bernard.misael.quizz.service.exception.MalformedClientAnswerException;
+import com.bernard.misael.quizz.service.exception.QuestionTypeException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;

src/main/java/com/bernard/misael/quizz/service/exception/MalformedAnswerException.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service.exception;
+package com.bernard.misael.quizz.service.exception;
 
 public class MalformedAnswerException extends QuestionTypeException{
 

src/main/java/com/bernard/misael/quizz/service/exception/MalformedClientAnswerException.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service.exception;
+package com.bernard.misael.quizz.service.exception;
 
 public class MalformedClientAnswerException extends QuestionTypeException {
 

src/main/java/com/bernard/misael/quizz/service/exception/QuestionTypeException.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.service.exception;
+package com.bernard.misael.quizz.service.exception;
 
 public abstract class QuestionTypeException extends Exception{
 

src/main/java/com/bernard/misael/thecrew/TheCrewConfig.java

@@ -1,4 +1,4 @@
-package com.bernard.misael;
+package com.bernard.misael.thecrew;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

src/main/java/com/bernard/misael/thecrew/TheCrewController.java

@@ -1,4 +1,4 @@
-package com.bernard.misael.web;
+package com.bernard.misael.thecrew;
 
 import java.io.File;
 import java.io.FileInputStream;

src/test/java/com/bernard/misael/MisaelApplicationTests.java

@@ -3,7 +3,7 @@ package com.bernard.misael;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import com.bernard.misael.questions.QTypes;
+import com.bernard.misael.quizz.questions.QTypes;
 
 @SpringBootTest
 class MisaelApplicationTests {