refactoring

src/main/java/fr/jaquin/bdlg/planner/controller/ApiController.java

@@ -17,9 +17,8 @@ import org.springframework.web.server.ResponseStatusException;
 import fr.jaquin.bdlg.planner.persistence.Evenement;
 import fr.jaquin.bdlg.planner.persistence.EvenementAlreadyExistException;
 import fr.jaquin.bdlg.planner.persistence.EvenementData;
-import fr.jaquin.bdlg.planner.persistence.EvenementLob;
+import fr.jaquin.bdlg.planner.persistence.EvenementDataLob;
 import fr.jaquin.bdlg.planner.persistence.EvenementNotFoundException;
-import fr.jaquin.bdlg.planner.persistence.MyUser;
 import fr.jaquin.bdlg.planner.persistence.Questionnaire;
 import fr.jaquin.bdlg.planner.persistence.QuestionnaireQuestion;
 import fr.jaquin.bdlg.planner.persistence.QuestionnaireQuestionCompetence;
@@ -30,6 +29,7 @@ import fr.jaquin.bdlg.planner.persistence.repositories.MyUserRepository;
 import fr.jaquin.bdlg.planner.persistence.repositories.QuestionnaireQuestionRepo;
 import fr.jaquin.bdlg.planner.persistence.repositories.QuestionnaireRepo;
 import fr.jaquin.bdlg.planner.persistence.repositories.RegistrationRepository;
+import fr.jaquin.bdlg.planner.security.MyUser;
 
 @RestController
 @RequestMapping("/api")
@@ -81,7 +81,7 @@ public class ApiController {
 
   @GetMapping("/evenements/history/{uuid}/content/{id}")
   String historyContent(@PathVariable String uuid, @PathVariable Long id) {
-    Optional<EvenementLob> lob = repositoryLob.findById(id);
+    Optional<EvenementDataLob> lob = repositoryLob.findById(id);
     if (lob.isPresent() && lob.get().getEvenement().getUuid().equals(uuid)) {
       return lob.get().getJsonContent();
     } else {
@@ -150,7 +150,7 @@ public class ApiController {
     newEvenement.setLastVersion(true);
     newEvenement.setContentHash(evt.getContentHash());
     newEvenement = repository.save(newEvenement);
-    EvenementLob blob = new EvenementLob();
+    EvenementDataLob blob = new EvenementDataLob();
     blob.setEvenement(newEvenement);
     blob.setJsonContent(evt.getContent());
     repositoryLob.save(blob);

src/main/java/fr/jaquin/bdlg/planner/controller/SolverController.java

@@ -4,12 +4,6 @@ import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import fr.jaquin.bdlg.planner.domain.Assignement;
-import fr.jaquin.bdlg.planner.domain.MealAssignement;
-import fr.jaquin.bdlg.planner.domain.MealSlot;
-import fr.jaquin.bdlg.planner.domain.Planning;
-import fr.jaquin.bdlg.planner.domain.PlanningInput;
-import fr.jaquin.bdlg.planner.domain.PlanningSolution;
 import org.optaplanner.core.api.score.ScoreExplanation;
 import org.optaplanner.core.api.score.ScoreManager;
 import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
@@ -20,6 +14,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import fr.jaquin.bdlg.planner.solver.domain.Assignement;
+import fr.jaquin.bdlg.planner.solver.domain.MealAssignement;
+import fr.jaquin.bdlg.planner.solver.domain.MealSlot;
+import fr.jaquin.bdlg.planner.solver.domain.Planning;
+import fr.jaquin.bdlg.planner.solver.domain.PlanningInput;
+import fr.jaquin.bdlg.planner.solver.domain.PlanningSolution;
 
 @RestController
 public class SolverController {

src/main/java/fr/jaquin/bdlg/planner/controller/UserController.java

@@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
-import fr.jaquin.bdlg.planner.persistence.MyUser;
-import fr.jaquin.bdlg.planner.persistence.Role;
 import fr.jaquin.bdlg.planner.persistence.repositories.MyUserRepository;
 import fr.jaquin.bdlg.planner.persistence.repositories.RoleRepository;
+import fr.jaquin.bdlg.planner.security.MyUser;
+import fr.jaquin.bdlg.planner.security.Role;
 
 @RestController
 public class UserController {

src/main/java/fr/jaquin/bdlg/planner/persistence/Evenement.java

@@ -9,6 +9,7 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import fr.jaquin.bdlg.planner.security.MyUser;
 
 @Entity
 public class Evenement {

src/main/java/fr/jaquin/bdlg/planner/persistence/EvenementLob.java → src/main/java/fr/jaquin/bdlg/planner/persistence/EvenementDataLob.java

@@ -8,7 +8,7 @@ import javax.persistence.MapsId;
 import javax.persistence.OneToOne;
 
 @Entity
-public class EvenementLob {
+public class EvenementDataLob {
 
   @Id
   private Long id;
@@ -19,7 +19,7 @@ public class EvenementLob {
   @Lob
   private String jsonContent;
 
-  public EvenementLob() {}
+  public EvenementDataLob() {}
 
   public Long getId() {
     return this.id;
@@ -49,10 +49,10 @@ public class EvenementLob {
   public boolean equals(Object o) {
     if (o == this)
       return true;
-    if (!(o instanceof EvenementLob)) {
+    if (!(o instanceof EvenementDataLob)) {
       return false;
     }
-    EvenementLob evenementLob = (EvenementLob) o;
+    EvenementDataLob evenementLob = (EvenementDataLob) o;
     return id == evenementLob.id;
   }
 

src/main/java/fr/jaquin/bdlg/planner/persistence/repositories/EvenementLobRepository.java

@@ -1,8 +1,8 @@
 package fr.jaquin.bdlg.planner.persistence.repositories;
 
 import org.springframework.data.repository.CrudRepository;
-import fr.jaquin.bdlg.planner.persistence.EvenementLob;
+import fr.jaquin.bdlg.planner.persistence.EvenementDataLob;
 
-public interface EvenementLobRepository extends CrudRepository<EvenementLob, Long> {
+public interface EvenementLobRepository extends CrudRepository<EvenementDataLob, Long> {
 
 }

src/main/java/fr/jaquin/bdlg/planner/persistence/repositories/MyUserRepository.java

@@ -1,7 +1,7 @@
 package fr.jaquin.bdlg.planner.persistence.repositories;
 
 import org.springframework.data.repository.CrudRepository;
-import fr.jaquin.bdlg.planner.persistence.MyUser;
+import fr.jaquin.bdlg.planner.security.MyUser;
 
 public interface MyUserRepository extends CrudRepository<MyUser, Long> {
   MyUser findByUsername(String username);

src/main/java/fr/jaquin/bdlg/planner/persistence/repositories/RoleRepository.java

@@ -2,7 +2,7 @@ package fr.jaquin.bdlg.planner.persistence.repositories;
 
 
 import org.springframework.data.repository.CrudRepository;
-import fr.jaquin.bdlg.planner.persistence.Role;
+import fr.jaquin.bdlg.planner.security.Role;
 
 public interface RoleRepository extends CrudRepository<Role, Long> {
   Role findByName(String name);

src/main/java/fr/jaquin/bdlg/planner/security/CustomUserDetailService.java

@@ -5,7 +5,6 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import fr.jaquin.bdlg.planner.persistence.MyUser;
 import fr.jaquin.bdlg.planner.persistence.repositories.MyUserRepository;
 
 @Service

src/main/java/fr/jaquin/bdlg/planner/security/LoadFixedUser.java

@@ -6,9 +6,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import fr.jaquin.bdlg.planner.persistence.MyUser;
-import fr.jaquin.bdlg.planner.persistence.Role;
 import fr.jaquin.bdlg.planner.persistence.repositories.MyUserRepository;
 import fr.jaquin.bdlg.planner.persistence.repositories.RoleRepository;
 
@@ -26,8 +23,6 @@ public class LoadFixedUser {
       MyUser user = repository.findByUsername("admin");
       if (user == null) {
         user = new MyUser("admin", "1'mnotAnAdmin.");
-      } else {
-        user.setPassword("1'mnotAnAdmin.");
       }
       user.getRoles().add(userRole);
       user.getRoles().add(adminRole);
@@ -37,10 +32,6 @@ public class LoadFixedUser {
         user = new MyUser("clovis", "M1m2pBP.", userRole);
         log.info("Preloading " + repository.save(user));
       }
-      if (repository.findByUsername("marine") == null) {
-        user = new MyUser("marine", "BrassDansLaGaronne.M", userRole);
-        log.info("Preloading " + repository.save(user));
-      }
     };
   }
 

src/main/java/fr/jaquin/bdlg/planner/persistence/MyUser.java → src/main/java/fr/jaquin/bdlg/planner/security/MyUser.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.persistence;
+package fr.jaquin.bdlg.planner.security;
 
 import java.util.HashSet;
 import java.util.Objects;

src/main/java/fr/jaquin/bdlg/planner/security/MyUserDetails.java

@@ -6,8 +6,6 @@ import java.util.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
-import fr.jaquin.bdlg.planner.persistence.MyUser;
-import fr.jaquin.bdlg.planner.persistence.Role;
 
 public class MyUserDetails implements UserDetails {
 

src/main/java/fr/jaquin/bdlg/planner/persistence/Role.java → src/main/java/fr/jaquin/bdlg/planner/security/Role.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.persistence;
+package fr.jaquin.bdlg.planner.security;
 
 import javax.persistence.*;
 

src/main/java/fr/jaquin/bdlg/planner/solver/PlanningConstraintProvider.java

@@ -1,8 +1,5 @@
 package fr.jaquin.bdlg.planner.solver;
 
-import fr.jaquin.bdlg.planner.domain.Assignement;
-import fr.jaquin.bdlg.planner.domain.MealAssignement;
-
 import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;
 import org.optaplanner.core.api.score.stream.Constraint;
 import org.optaplanner.core.api.score.stream.ConstraintCollectors;
@@ -10,6 +7,8 @@ import org.optaplanner.core.api.score.stream.ConstraintFactory;
 import org.optaplanner.core.api.score.stream.ConstraintProvider;
 import org.optaplanner.core.api.score.stream.Joiners;
 import org.optaplanner.core.api.score.stream.uni.UniConstraintStream;
+import fr.jaquin.bdlg.planner.solver.domain.Assignement;
+import fr.jaquin.bdlg.planner.solver.domain.MealAssignement;
 
 public class PlanningConstraintProvider implements ConstraintProvider {
 

src/main/java/fr/jaquin/bdlg/planner/domain/Assignement.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/Assignement.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 
 import java.time.LocalDateTime;

src/main/java/fr/jaquin/bdlg/planner/domain/AssignementPair.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/AssignementPair.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 public class AssignementPair {
   public final String slotId;

src/main/java/fr/jaquin/bdlg/planner/domain/MealAssignement.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/MealAssignement.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.time.LocalDateTime;
 import org.optaplanner.core.api.domain.entity.PlanningEntity;

src/main/java/fr/jaquin/bdlg/planner/domain/MealSlot.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/MealSlot.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.time.LocalDateTime;
 import java.util.Objects;

src/main/java/fr/jaquin/bdlg/planner/domain/Planning.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/Planning.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.ArrayList;
 

src/main/java/fr/jaquin/bdlg/planner/domain/PlanningInput.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/PlanningInput.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.ArrayList;
 import java.util.HashSet;

src/main/java/fr/jaquin/bdlg/planner/domain/PlanningSolution.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/PlanningSolution.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.ArrayList;
 import org.optaplanner.core.api.score.buildin.hardmediumsoft.HardMediumSoftScore;

src/main/java/fr/jaquin/bdlg/planner/domain/Skill.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/Skill.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.Objects;
 
@@ -58,7 +58,7 @@ public class Skill {
       return false;
     }
     Skill competency = (Skill) o;
-    return id==competency.id;
+    return id == competency.id;
   }
 
   @Override

src/main/java/fr/jaquin/bdlg/planner/domain/Timeslot.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/Timeslot.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.time.LocalDateTime;
 import java.util.Set;
@@ -14,7 +14,7 @@ public class Timeslot {
   private Set<Skill> preferences;
   private int minAttendee;
 
-   public Timeslot(String id, LocalDateTime startTime, LocalDateTime endTime,
+  public Timeslot(String id, LocalDateTime startTime, LocalDateTime endTime,
       Set<Skill> softCompetencies, Set<Skill> hardCompetencies, Set<Skill> preferences,
       int minAttendee) {
     this.id = id;

src/main/java/fr/jaquin/bdlg/planner/domain/TimeslotRaw.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/TimeslotRaw.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.time.LocalDateTime;
 

src/main/java/fr/jaquin/bdlg/planner/domain/Volunteer.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/Volunteer.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.Objects;
 import java.util.Set;

src/main/java/fr/jaquin/bdlg/planner/domain/VolunteerRaw.java → src/main/java/fr/jaquin/bdlg/planner/solver/domain/VolunteerRaw.java

@@ -1,4 +1,4 @@
-package fr.jaquin.bdlg.planner.domain;
+package fr.jaquin.bdlg.planner.solver.domain;
 
 import java.util.Objects;