Compare commits
No commits in common. "9a55149802ee1f3ec3779823456893a384010ecc" and "9f8c9aec8009b99dc1bb660a4f224aa7a7116d85" have entirely different histories.
9a55149802
...
9f8c9aec80
7 changed files with 1 additions and 272 deletions
|
@ -1,42 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.config;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.service.JpaUserDetailsService;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.security.config.Customizer;
|
|
||||||
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
||||||
import org.springframework.security.web.SecurityFilterChain;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableWebSecurity
|
|
||||||
@EnableMethodSecurity
|
|
||||||
public class SecurityConfig {
|
|
||||||
|
|
||||||
private final JpaUserDetailsService jpaUserDetailsService;
|
|
||||||
|
|
||||||
public SecurityConfig(JpaUserDetailsService jpaUserDetailsService) {
|
|
||||||
this.jpaUserDetailsService = jpaUserDetailsService;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
|
|
||||||
return http
|
|
||||||
.csrf(csrf -> csrf.disable())
|
|
||||||
.authorizeHttpRequests(auth -> auth
|
|
||||||
.requestMatchers("/api/v1/restaurants/**").permitAll()
|
|
||||||
.requestMatchers("/api/v1/personnes/**").permitAll()
|
|
||||||
.anyRequest().authenticated())
|
|
||||||
.userDetailsService(jpaUserDetailsService)
|
|
||||||
.httpBasic(Customizer.withDefaults())
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
PasswordEncoder passwordEncoder() {
|
|
||||||
return new BCryptPasswordEncoder();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,91 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.controller;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.models.Restaurant;
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.service.RestaurantService;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Controleur REST pour la gestion des restaurants.
|
|
||||||
* Expose les endpoints de l'API pour les opérations CRUD.
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/api/v1/restaurants")
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class RestaurantController {
|
|
||||||
private final RestaurantService restaurantService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Endpoint pour récupérer la liste de tous les restaurants.
|
|
||||||
* @return une ResponseEntity contenant la liste des restaurants et le statut HTTP OK.
|
|
||||||
*/
|
|
||||||
@GetMapping
|
|
||||||
public ResponseEntity<List<Restaurant>> getAllRestaurants() {
|
|
||||||
List<Restaurant> restaurants = restaurantService.getAllRestaurants();
|
|
||||||
return new ResponseEntity<>(restaurants, HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Endpoint pour récupérer un restaurant par son identifiant.
|
|
||||||
* @param id L'identifiant du restaurant.
|
|
||||||
* @return une ResponseEntity contenant le restaurant s'il est trouvé (OK), sinon NOT_FOUND.
|
|
||||||
*/
|
|
||||||
@GetMapping("/{id}")
|
|
||||||
public ResponseEntity<Restaurant> getRestaurantById(@PathVariable Integer id) {
|
|
||||||
return restaurantService.getRestaurantById(id)
|
|
||||||
.map(restaurant -> new ResponseEntity<>(restaurant, HttpStatus.OK))
|
|
||||||
.orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Endpoint pour créer un nouveau restaurant.
|
|
||||||
* @param restaurant Le restaurant à créer.
|
|
||||||
* @return une ResponseEntity contenant le restaurant créé et le statut CREATED.
|
|
||||||
*/
|
|
||||||
@PostMapping
|
|
||||||
public ResponseEntity<Restaurant> createRestaurant(@RequestBody Restaurant restaurant) {
|
|
||||||
Restaurant savedRestaurant = restaurantService.saveRestaurant(restaurant);
|
|
||||||
return new ResponseEntity<>(savedRestaurant, HttpStatus.CREATED);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Endpoint pour mettre à jour un restaurant existant.
|
|
||||||
* @param id L'identifiant du restaurant à mettre à jour.
|
|
||||||
* @param restaurantDetails Les nouvelles données du restaurant.
|
|
||||||
* @return une ResponseEntity contenant le restaurant mis à jour (OK), sinon NOT_FOUND.
|
|
||||||
*/
|
|
||||||
@PutMapping("/{id}")
|
|
||||||
public ResponseEntity<Restaurant> updateRestaurant(@PathVariable Integer id, @RequestBody Restaurant restaurantDetails) {
|
|
||||||
return restaurantService.updateRestaurant(id, restaurantDetails)
|
|
||||||
.map(updateRestaurant -> new ResponseEntity<>(updateRestaurant, HttpStatus.OK))
|
|
||||||
.orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Endpoint pour supprimer un restaurant.
|
|
||||||
* @param id L'identifiant du restaurant à supprimer.
|
|
||||||
* @return une ResponseEntity avec le statut NO_CONTENT si la suppression réussit,
|
|
||||||
* ou NOT_FOUND si le restaurant n'existe pas.
|
|
||||||
*/
|
|
||||||
@DeleteMapping("/{id}")
|
|
||||||
public ResponseEntity<Void> deleteRestaurant(@PathVariable Integer id) {
|
|
||||||
if (restaurantService.getRestaurantById(id).isPresent()) {
|
|
||||||
restaurantService.deleteRestaurant(id);
|
|
||||||
return ResponseEntity.noContent().build();
|
|
||||||
}
|
|
||||||
return ResponseEntity.notFound().build();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -13,10 +13,7 @@ import java.util.Collection;
|
||||||
*/
|
*/
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "restaurant")
|
@Table(name = "restaurant")
|
||||||
@Getter
|
@Data
|
||||||
@Setter
|
|
||||||
@ToString(exclude = {"typerestaus", "preference"})
|
|
||||||
@EqualsAndHashCode(exclude = {"typerestaus", "preference"})
|
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Builder
|
@Builder
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.repository;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.models.Personne;
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public interface PersonneRepository extends JpaRepository<Personne, Integer> {
|
|
||||||
Optional<Personne> findByEmail(String email);
|
|
||||||
}
|
|
|
@ -1,16 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.repository;
|
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.models.Restaurant;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dépot pour l'entité Restaurant.
|
|
||||||
* Fournit les méthodes pour les opérations CRUD.
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Repository
|
|
||||||
public interface RestaurantRepository extends JpaRepository<Restaurant, Integer>{
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.service;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.models.Personne;
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.repository.PersonneRepository;
|
|
||||||
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;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class JpaUserDetailsService implements UserDetailsService {
|
|
||||||
|
|
||||||
private final PersonneRepository personneRepository;
|
|
||||||
|
|
||||||
public JpaUserDetailsService(PersonneRepository personneRepository) {
|
|
||||||
this.personneRepository = personneRepository;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
|
|
||||||
Personne personne = personneRepository.findByEmail(username)
|
|
||||||
.orElseThrow(() -> new UsernameNotFoundException("Aucun utilisateur trouvé avec l'email: " + username));
|
|
||||||
|
|
||||||
return new org.springframework.security.core.userdetails.User(
|
|
||||||
personne.getEmail(),
|
|
||||||
personne.getPassword(),
|
|
||||||
personne.getRoleList());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,78 +0,0 @@
|
||||||
package fr.vincent.ramiere.mangerautourdesimplonback.service;
|
|
||||||
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.models.Restaurant;
|
|
||||||
import fr.vincent.ramiere.mangerautourdesimplonback.repository.RestaurantRepository;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Service pour la gestion des restaurants.
|
|
||||||
* Contient la logique métier liée aux opérations sur les restaurants.
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class RestaurantService {
|
|
||||||
private final RestaurantRepository restaurantRepository;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Récupère tous les restaurants.
|
|
||||||
* @return une liste de tous les restaurants.
|
|
||||||
*/
|
|
||||||
public List<Restaurant> getAllRestaurants() {
|
|
||||||
return restaurantRepository.findAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Récupère un restaurant par son identifiant.
|
|
||||||
* @param id L'identifiant du restaurant.
|
|
||||||
* @return un Optional contenant le restaurant s'il est trouvé, sinon un Optional vide.
|
|
||||||
*/
|
|
||||||
public Optional<Restaurant> getRestaurantById(Integer id) {
|
|
||||||
return restaurantRepository.findById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enregistre un nouveau restaurant.
|
|
||||||
* @param restaurant Le restaurant à enregistrer.
|
|
||||||
* @return le restaurant enregistré
|
|
||||||
*/
|
|
||||||
public Restaurant saveRestaurant(Restaurant restaurant) {
|
|
||||||
return restaurantRepository.save(restaurant);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Met à jour un restaurant existant.
|
|
||||||
* @param id L'identifiant du restaurant à mettre à jour.
|
|
||||||
* @param restaurantDetails Les nouvelles informations du restaurant.
|
|
||||||
* @return le restaurant mis à jour.
|
|
||||||
*/
|
|
||||||
public Optional<Restaurant> updateRestaurant(Integer id, Restaurant restaurantDetails) {
|
|
||||||
return restaurantRepository.findById(id)
|
|
||||||
.map(existingRestaurant -> {
|
|
||||||
existingRestaurant.setNom(restaurantDetails.getNom());
|
|
||||||
existingRestaurant.setAdresse(restaurantDetails.getAdresse());
|
|
||||||
existingRestaurant.setTelephone(restaurantDetails.getTelephone());
|
|
||||||
existingRestaurant.setAccesPMR(restaurantDetails.getAccesPMR());
|
|
||||||
existingRestaurant.setAEmporter(restaurantDetails.getAEmporter());
|
|
||||||
existingRestaurant.setSurPlace(restaurantDetails.getSurPlace());
|
|
||||||
existingRestaurant.setPrix(restaurantDetails.getPrix());
|
|
||||||
existingRestaurant.setLatitude(restaurantDetails.getLatitude());
|
|
||||||
existingRestaurant.setLongitude(restaurantDetails.getLongitude());
|
|
||||||
existingRestaurant.setWebsite(restaurantDetails.getWebsite());
|
|
||||||
return restaurantRepository.save(existingRestaurant);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Supprime un restaurant par son identifiant.
|
|
||||||
* @param id L'identifiant du restaurant à supprimer.
|
|
||||||
*/
|
|
||||||
public void deleteRestaurant(Integer id) {
|
|
||||||
restaurantRepository.deleteById(id);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue