Skip to content
Snippets Groups Projects
Commit f4a1bb26 authored by hugcubi's avatar hugcubi
Browse files

Corrección Monolito, tanteo de booking remoto

parent 64d82921
No related branches found
No related tags found
2 merge requests!36Develop,!29Refactor/auth user split
Showing
with 52 additions and 52 deletions
package com.uva.api;
package com.uva.monolith;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......
package com.uva.api.config;
package com.uva.monolith.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......@@ -8,8 +8,8 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
import com.uva.api.filter.JwtAuthenticationFilter;
import com.uva.api.services.users.models.UserRol;
import com.uva.monolith.filter.JwtAuthenticationFilter;
import com.uva.monolith.services.users.models.UserRol;
@Configuration
@EnableWebSecurity
......
package com.uva.api.exceptions;
package com.uva.monolith.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
package com.uva.api.exceptions;
package com.uva.monolith.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
......
package com.uva.api.exceptions;
package com.uva.monolith.exceptions;
public class InvalidDateRangeException extends RuntimeException {
public InvalidDateRangeException(String message) {
......
package com.uva.api.exceptions;
package com.uva.monolith.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
......
package com.uva.api.filter;
package com.uva.monolith.filter;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier;
......@@ -13,7 +13,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component;
import com.uva.api.services.users.models.UserRol;
import com.uva.monolith.services.users.models.UserRol;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
......
package com.uva.api.services.bookings.controllers;
package com.uva.monolith.services.bookings.controllers;
import com.uva.api.services.bookings.models.Booking;
import com.uva.api.services.bookings.services.BookingService;
import com.uva.monolith.services.bookings.models.Booking;
import com.uva.monolith.services.bookings.services.BookingService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
......
package com.uva.api.services.bookings.models;
package com.uva.monolith.services.bookings.models;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
......@@ -13,8 +13,8 @@ import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import java.time.LocalDate;
import com.uva.api.services.hotels.models.Room;
import com.uva.api.services.users.models.Client;
import com.uva.monolith.services.hotels.models.Room;
import com.uva.monolith.services.users.models.Client;
@Entity
@Table(name = "bookings")
......
// BookingRepository.java
package com.uva.api.services.bookings.repositories;
package com.uva.monolith.services.bookings.repositories;
import jakarta.transaction.Transactional;
......@@ -11,7 +11,7 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import com.uva.api.services.bookings.models.Booking;
import com.uva.monolith.services.bookings.models.Booking;
public interface BookingRepository extends JpaRepository<Booking, Integer> {
@Query("SELECT b FROM Booking b WHERE b.userId.id = ?1")
......
package com.uva.api.services.bookings.services;
import com.uva.api.services.bookings.models.Booking;
import com.uva.api.services.bookings.repositories.BookingRepository;
import com.uva.api.services.hotels.models.Room;
import com.uva.api.services.hotels.repositories.RoomRepository;
import com.uva.api.services.users.models.Client;
import com.uva.api.services.users.repositories.ClientRepository;
package com.uva.monolith.services.bookings.services;
import com.uva.monolith.services.bookings.models.Booking;
import com.uva.monolith.services.bookings.repositories.BookingRepository;
import com.uva.monolith.services.hotels.models.Room;
import com.uva.monolith.services.hotels.repositories.RoomRepository;
import com.uva.monolith.services.users.models.Client;
import com.uva.monolith.services.users.repositories.ClientRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
package com.uva.api.services.hotels.controllers;
package com.uva.monolith.services.hotels.controllers;
import java.util.List;
import java.util.Map;
......@@ -11,16 +11,16 @@ import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.uva.api.exceptions.HotelNotFoundException;
import com.uva.api.exceptions.InvalidDateRangeException;
import com.uva.api.exceptions.InvalidRequestException;
import com.uva.api.services.bookings.repositories.BookingRepository;
import com.uva.api.services.hotels.models.Hotel;
import com.uva.api.services.hotels.models.Room;
import com.uva.api.services.hotels.repositories.HotelRepository;
import com.uva.api.services.hotels.repositories.RoomRepository;
import com.uva.api.services.users.models.HotelManager;
import com.uva.api.services.users.repositories.HotelManagerRepository;
import com.uva.monolith.exceptions.HotelNotFoundException;
import com.uva.monolith.exceptions.InvalidDateRangeException;
import com.uva.monolith.exceptions.InvalidRequestException;
import com.uva.monolith.services.bookings.repositories.BookingRepository;
import com.uva.monolith.services.hotels.models.Hotel;
import com.uva.monolith.services.hotels.models.Room;
import com.uva.monolith.services.hotels.repositories.HotelRepository;
import com.uva.monolith.services.hotels.repositories.RoomRepository;
import com.uva.monolith.services.users.models.HotelManager;
import com.uva.monolith.services.users.repositories.HotelManagerRepository;
@RestController
@RequestMapping("hotels")
......
package com.uva.api.services.hotels.models;
package com.uva.monolith.services.hotels.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
......
package com.uva.api.services.hotels.models;
package com.uva.monolith.services.hotels.models;
import java.util.List;
import com.uva.api.services.users.models.HotelManager;
import com.uva.monolith.services.users.models.HotelManager;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
......
package com.uva.api.services.hotels.models;
package com.uva.monolith.services.hotels.models;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.uva.api.services.bookings.models.Booking;
import com.uva.monolith.services.bookings.models.Booking;
import jakarta.persistence.Basic;
import jakarta.persistence.CascadeType;
......
package com.uva.api.services.hotels.models;
package com.uva.monolith.services.hotels.models;
public enum RoomType {
SINGLE,
......
package com.uva.api.services.hotels.repositories;
package com.uva.monolith.services.hotels.repositories;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import com.uva.api.services.hotels.models.Hotel;
import com.uva.monolith.services.hotels.models.Hotel;
public interface HotelRepository extends JpaRepository<Hotel, Integer> {
@Query("SELECT h FROM Hotel h WHERE h.hotelManager.id = ?1")
......
package com.uva.api.services.hotels.repositories;
package com.uva.monolith.services.hotels.repositories;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import com.uva.api.services.hotels.models.Room;
import com.uva.monolith.services.hotels.models.Room;
import java.time.LocalDate;
import java.util.List;
......
package com.uva.api.services.users.controllers;
package com.uva.monolith.services.users.controllers;
import java.util.List;
import java.util.Map;
......@@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpClientErrorException;
import com.uva.api.services.users.models.User;
import com.uva.api.services.users.models.UserStatus;
import com.uva.api.services.users.services.UserService;
import com.uva.monolith.services.users.models.User;
import com.uva.monolith.services.users.models.UserStatus;
import com.uva.monolith.services.users.services.UserService;
@RestController
@RequestMapping("users")
......
package com.uva.api.services.users.models;
package com.uva.monolith.services.users.models;
public class AuthResponse {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment