Merging the pull

Merge branch 'main' of https://github.com/uca-m1informatique-softeng/Moodle_light into main

.gitignore

@@ -1,5 +1,6 @@
 **/*~
 .idea
+*.properties
 **/*.class
 *.iml
 target/*

src/main/java/Model/Controllers/AuthController.java

@@ -61,6 +61,8 @@ public String generateJwt(String userName, String password) {
     }
 
 
+
+
     @PostMapping("/a")
     public ResponseEntity<?> authenticateUser(@RequestBody SignupRequest signupRequest){
 

src/main/java/Model/Controllers/ModuleController.java

@@ -25,7 +25,7 @@
 
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
-@RequestMapping("/api/module")
+@RequestMapping("/api/modules")
 public class ModuleController {
 	@Autowired
 	AuthenticationManager authenticationManager;
@@ -49,22 +49,37 @@ public class ModuleController {
 	JwtUtils jwtUtils;
 
 
-	@GetMapping("/{name}/getModules")
-	public ArrayList<String> getmodules(@PathVariable String name){
-		ArrayList<String> strings = new ArrayList<>();
-		Optional<User> ouser = userRepository.findByUsername(name);
+	@PreAuthorize("hasRole('TEACHER')")
+	@GetMapping("/who")
+	public ArrayList<String> getPersonne(Principal principal) {
+		ArrayList<String> data = new ArrayList<>();
+		data.add("la personne connectée est " +principal.getName());
+		return data ;
+
+	}
+
+
+	@GetMapping("/{idUser}")
+	public ArrayList<String> getmodules(@PathVariable Long idUser){
+		ArrayList<String> userModules = new ArrayList<>();
+		Optional<User> ouser = userRepository.findById(idUser);
 		if (!ouser.isPresent()) {
 			return null;
 		}
 		User user= ouser.get();
 
 		Set<Module> modules = user.getModules();
+
 		for (Module module:modules) {
-			strings.add(module.name + "/" + module.id);
+			userModules.add("module name : "+module.name + "| id : " + module.id);
 		}
-		return strings;
+		return userModules;
 	}
 
+
+
+
+
 	@GetMapping("/{id}/getRessources")
 	public ArrayList<String> getRessources(@PathVariable long id){
 		ArrayList<String> strings = new ArrayList<>();
@@ -163,22 +178,24 @@ public ResponseEntity<?> addUser(Principal principal, @PathVariable long id, @Pa
 		User actor = userRepository.findByUsername(principal.getName()).get();
 
 		Set<User> participants = module.getParticipants();
-		if ((participants.isEmpty() && actor.equals(user))
-				|| participants.contains(actor)) {
+//		if ((participants.isEmpty() && actor.equals(user))
+//				|| participants.contains(actor)) {
 			// verifie si user n'apartient pas déjà à participants
 			if(!participants.contains(user)) {
 				participants.add(user);
+				user.getModules().add(module);
 			}else{
 				return ResponseEntity
 						.badRequest()
 						.body(new MessageResponse("Error: User y apartient deja !"));
 			}
-		} else {
-			return ResponseEntity
-					.badRequest()
-					.body(new MessageResponse("Error: Not allowed to add user!"));
-		}
+//		} else {
+//			return ResponseEntity
+//					.badRequest()
+//					.body(new MessageResponse("Error: Not allowed to add user!"));
+//		}
 		moduleRepository.save(module);
+		userRepository.save(user);
 		return ResponseEntity.ok(new MessageResponse("User successfully added to module!"));
 	}
 

src/main/java/Model/Documents/Module.java

@@ -24,11 +24,11 @@ public class Module {
             inverseJoinColumns = @JoinColumn(name = "ressource_id"))
     public Set<Ressource> ressources = new HashSet<>();
 
-    @ManyToMany(fetch = FetchType.LAZY)
+    @ManyToMany(fetch = FetchType.EAGER)
     @JoinTable(	name = "module_user",
             joinColumns = @JoinColumn(name = "module_id"),
             inverseJoinColumns = @JoinColumn(name = "user_id"))
-    public Set<User> users;
+    public Set<User> users = new HashSet<>();
 
     public Module() {
     }

src/main/java/Model/Repositories/ModuleRepository.java

@@ -10,5 +10,4 @@
 public interface ModuleRepository extends JpaRepository<Module, Long> {
     Optional<Module> findByName(String name);
 
-    Optional<Module> findById(String name);
 }

src/main/resources/application.properties

@@ -1,8 +1,7 @@
-
 spring.datasource.url= jdbc:postgresql://localhost:5432/postgres
 spring.datasource.username= postgres
-spring.datasource.password= p34kleiorntk09kslQ
-
+spring.datasource.password= gestionduprojet
+#logging.level.root=error
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation= true
 spring.jpa.properties.hibernate.dialect= org.hibernate.dialect.PostgreSQLDialect
 

src/test/resources/features/Get.feature

@@ -0,0 +1,10 @@
+Feature: Get
+
+  Background:
+    Given a user with login "steve"
+    And a module named "Gestion de projet"
+    And a cours named "Gestion"
+
+  Scenario: user check all modules that he subsccribe to
+    When "steve" check his modules
+    Then return all modules names