Merge branch 'dev' into Romain

src/main/java/fr/cardon/simpleat/controller/PersonneController.java

@@ -27,7 +27,7 @@ import fr.cardon.simpleat.repository.RoleRepository;
 import fr.cardon.simpleat.service.PersonneService;
 
 @RestController
-@CrossOrigin("*")
+@CrossOrigin("http://localhost:4200")
 public class PersonneController {
 	
 	
@@ -125,7 +125,7 @@ public class PersonneController {
 	        }
 	    }
 	 
-	 @PostMapping("/sign-up")
+	 @PostMapping("/signup")
 	    public ResponseEntity<JsonWebToken> signUp(@RequestBody Personne personne) {
 	        try {
 	            return ResponseEntity.ok(new JsonWebToken(personneService.signup(personne)));

src/main/java/fr/cardon/simpleat/controller/PreferenceController.java

@@ -49,8 +49,17 @@ public class PreferenceController {
 	}
 	
 	
-	@PostMapping("/add-preference")
-	public ResponseEntity<?> ajoutPreference(@RequestBody Preference preference){
+//	@PostMapping("/add-preference")
+//	public ResponseEntity<?> ajoutPreference(@RequestBody Preference preference){
+//		System.out.println(preference);
+//		return ResponseEntity.status(HttpStatus.OK).body(preferenceRepository.save(preference));
+//	}
+	
+	@PostMapping("/add-preference/{iduser}/{idrestau}")
+	public ResponseEntity<?> ajoutPreference(@PathVariable int iduser, @PathVariable int idrestau ){
+		System.out.println("hello");
+		Preference preference = new Preference(new PreferencePK(personneRepository.getById(iduser) ,restaurantRepository.getById(idrestau)));
+		
 		return ResponseEntity.status(HttpStatus.OK).body(preferenceRepository.save(preference));
 	}
 
@@ -60,7 +69,7 @@ public class PreferenceController {
 //		return ResponseEntity.status(HttpStatus.OK).body(preferenceRepository.save(personne));
 //	}	
 //	
-	@DeleteMapping("/delete-preference/{idrestau}/{iduser}")
+	@DeleteMapping("/delete-preference/{iduser}/{idrestau}")
 	public void deletePreferenceById(@PathVariable int iduser, @PathVariable int idrestau ){
 		PreferencePK id = new PreferencePK(personneRepository.getById(iduser) ,restaurantRepository.getById(idrestau));
 		preferenceRepository.deleteById(id);

src/main/java/fr/cardon/simpleat/controller/RestaurantController.java

@@ -44,7 +44,7 @@ public class RestaurantController {
 
 	
 	@PutMapping(value = "/update-restaurant/{id}")
-	
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	public ResponseEntity<?> modifRestaurant(@PathVariable int id, @RequestBody Restaurant personne){
 		return ResponseEntity.status(HttpStatus.OK).body(restaurantRepository.save(personne));
 	}	

src/main/java/fr/cardon/simpleat/model/Preference.java

@@ -19,6 +19,13 @@ public class Preference {
 	}
 	
 	
+	
+	
+	public Preference(PreferencePK preferencePK) {
+		super();
+		this.preferencePK = preferencePK;
+	}
+
 	public Preference(PreferencePK preferencePK, int note, boolean favoris) {
 		super();
 		this.preferencePK = preferencePK;

src/main/java/fr/cardon/simpleat/model/PreferencePK.java

@@ -10,6 +10,7 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PrimaryKeyJoinColumn;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
@@ -40,7 +41,7 @@ public class PreferencePK implements Serializable {
 
 	@ManyToOne
 	@PrimaryKeyJoinColumn(name="id_personne", referencedColumnName ="id_personne" )
-	@JsonIgnore
+	@JsonBackReference("personne")
 	public Personne getPersonne() {
 		return personne;
 	}

src/main/java/fr/cardon/simpleat/security/JwtTokenProvider.java

@@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import fr.cardon.simpleat.exception.InvalidJWTException;
 import fr.cardon.simpleat.model.EnumRole;
+import fr.cardon.simpleat.repository.PersonneRepository;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
@@ -43,6 +44,9 @@ public class JwtTokenProvider {
 
     @Autowired
     private UserDetailsService userDetailsService;
+    
+    @Autowired
+    private PersonneRepository personneRepository;
 
     /**
      * Cette méthode d'initialisation s'exécute avant le constructeur
@@ -104,6 +108,7 @@ public class JwtTokenProvider {
     public String createToken(String email, List<EnumRole> roleList){
 
         Claims claims = Jwts.claims().setSubject(email);
+        claims.put("userId", personneRepository.findByEmail(email).get().getId());
         claims.put("auth", roleList.stream().map(s -> new SimpleGrantedAuthority(s.getAuthority())).filter(Objects::nonNull).collect(Collectors.toList()));
 
         System.out.println("claims = "+claims);