Changeset b77dbe8


Ignore:
Timestamp:
04/30/25 01:18:09 (18 hours ago)
Author:
Nikola Jordanoski <nikolaj_koko@…>
Branches:
master
Parents:
349551d
Message:

Debel refactoring

Location:
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo
Files:
4 added
5 deleted
9 edited
7 moved

Legend:

Unmodified
Added
Removed

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/jwtDTO/JWTAuthenticationResponseDTO.java

    r349551d rb77dbe8  
    1818) {
    1919
    20     public static JWTAuthenticationResponseDTO toCustomer(Customer customer, String jwt) {
     20    public static JWTAuthenticationResponseDTO fromCustomer(Customer customer, String jwt) {
    2121        return new JWTAuthenticationResponseDTO(
    2222                customer.getId(),
    … …  
    3030    }
    3131
    32     public static JWTAuthenticationResponseDTO toLocalWorker(LocalWorker localWorker, String jwt) {
     32    public static JWTAuthenticationResponseDTO fromLocalWorker(LocalWorker localWorker, String jwt) {
    3333        return new JWTAuthenticationResponseDTO(
    3434                localWorker.getId(),
    … …  
    4242    }
    4343
    44     public static JWTAuthenticationResponseDTO toLocalManager(LocalManager localManager, String jwt) {
     44    public static JWTAuthenticationResponseDTO fromLocalManager(LocalManager localManager, String jwt) {
    4545        return new JWTAuthenticationResponseDTO(
    4646                localManager.getId(),
    … …  
    5454    }
    5555
    56     public static JWTAuthenticationResponseDTO toUser(User user, String jwt) {
     56    public static JWTAuthenticationResponseDTO fromUser(User user, String jwt) {
    5757        return new JWTAuthenticationResponseDTO(
    5858                user.getId(),

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/exceptions/EmailNotFoundException.java

    r349551d rb77dbe8  
    33public class EmailNotFoundException extends RuntimeException {
    44    public EmailNotFoundException(String username) {
    5         super("User with email: " + username + " was not found");
     5        super("User with email: " + username + " not found");
    66    }
    77}

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/exceptions/LocalIdNotFoundException.java

    r349551d rb77dbe8  
    33public class LocalIdNotFoundException extends RuntimeException {
    44    public LocalIdNotFoundException(Long id) {
    5         super("Local with ID " + id + " not found.");
     5        super("Local with id: " + id + " not found.");
    66    }
    77}

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AuthServiceImpl.java

    r349551d rb77dbe8  
    4848        String jwt = jwtService.generateToken(customer);
    4949
    50         return JWTAuthenticationResponseDTO.toCustomer(customer, jwt);
     50        return JWTAuthenticationResponseDTO.fromCustomer(customer, jwt);
    5151    }
    5252
    … …  
    5858        String jwt = jwtService.generateToken(localWorker);
    5959
    60         return JWTAuthenticationResponseDTO.toLocalWorker(localWorker, jwt);
     60        return JWTAuthenticationResponseDTO.fromLocalWorker(localWorker, jwt);
    6161    }
    6262
    … …  
    6868        String jwt = jwtService.generateToken(localManager);
    6969
    70         return JWTAuthenticationResponseDTO.toLocalManager(localManager, jwt);
     70        return JWTAuthenticationResponseDTO.fromLocalManager(localManager, jwt);
    7171    }
    7272
    … …  
    7878        String jwt = jwtService.generateToken(user);
    7979
    80         return JWTAuthenticationResponseDTO.toUser(user, jwt);
     80        return JWTAuthenticationResponseDTO.fromUser(user, jwt);
    8181    }
    8282}

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/CustomerServiceImpl.java

    r349551d rb77dbe8  
    33import mk.ukim.finki.it.reservengo.model.domain.Customer;
    44import mk.ukim.finki.it.reservengo.model.domain.Local;
    5 import mk.ukim.finki.it.reservengo.model.exceptions.CustomerNotFoundException;
     5import mk.ukim.finki.it.reservengo.model.exceptions.CustomerIdNotFoundException;
    66import mk.ukim.finki.it.reservengo.repository.CustomerRepository;
    77import mk.ukim.finki.it.reservengo.service.intf.CustomerService;
    … …  
    2222
    2323    @Override
    24     public Customer getCustomerProfile(Long id) {
    25         return customerRepository.findById(id).orElseThrow(() -> new CustomerNotFoundException(id));
    26     }
    27 
    28     @Override
    2924    public List<Local> listFavouriteLocals(Long id) {
    30         Customer customer = customerRepository.findById(id).orElseThrow(() -> new CustomerNotFoundException(id));
     25        Customer customer = customerRepository.findById(id).orElseThrow(() -> new CustomerIdNotFoundException(id));
    3126        return customer.getFavouriteLocals();
    3227    }
    … …  
    3429    @Override
    3530    public void addFavouriteLocal(Long userId, Long localId) {
    36         Customer customer = customerRepository.findById(userId).orElseThrow(() -> new CustomerNotFoundException(userId));
     31        Customer customer = customerRepository.findById(userId).orElseThrow(() -> new CustomerIdNotFoundException(userId));
    3732        Local local = localService.getLocalById(localId);
    3833
    … …  
    4641    @Override
    4742    public void removeFavouriteLocal(Long userId, Long localId) {
    48         Customer customer = customerRepository.findById(userId).orElseThrow(() -> new CustomerNotFoundException(userId));
     43        Customer customer = customerRepository.findById(userId).orElseThrow(() -> new CustomerIdNotFoundException(userId));
    4944        Local local = localService.getLocalById(localId);
    5045

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalManagerServiceImpl.java

    r349551d rb77dbe8  
    22
    33import mk.ukim.finki.it.reservengo.model.domain.Local;
    4 import mk.ukim.finki.it.reservengo.model.exceptions.LocalNotFoundException;
     4import mk.ukim.finki.it.reservengo.model.exceptions.LocalIdNotFoundException;
    55import mk.ukim.finki.it.reservengo.repository.LocalRepository;
    66import mk.ukim.finki.it.reservengo.service.intf.FileStorageService;
    … …  
    2222    @Override
    2323    public void uploadLogo(Long localId, MultipartFile logoFile) {
    24         Local local = localRepository.findById(localId).orElseThrow(() -> new LocalNotFoundException(localId));
     24        Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId));
    2525
    2626        String logoPath = fileStorageService.saveFile(logoFile);

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/ReservationServiceImpl.java

    r349551d rb77dbe8  
    22
    33import mk.ukim.finki.it.reservengo.model.domain.Reservation;
    4 import mk.ukim.finki.it.reservengo.model.exceptions.ReservationNotFoundException;
     4import mk.ukim.finki.it.reservengo.model.exceptions.ReservationIdNotFoundException;
    55import mk.ukim.finki.it.reservengo.repository.ReservationRepository;
    66import mk.ukim.finki.it.reservengo.service.intf.ReservationService;
    … …  
    2121    @Override
    2222    public Reservation getReservationById(Long id) {
    23         return this.reservationRepository.findById(id).orElseThrow(() -> new ReservationNotFoundException(id));
     23        return this.reservationRepository.findById(id).orElseThrow(() -> new ReservationIdNotFoundException(id));
    2424    }
    2525

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/UserServiceImpl.java

    r349551d rb77dbe8  
    33import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
    44import mk.ukim.finki.it.reservengo.model.domain.User;
    5 import mk.ukim.finki.it.reservengo.model.exceptions.CustomerNotFoundException;
     5import mk.ukim.finki.it.reservengo.model.exceptions.UserIdNotFoundException;
    66import mk.ukim.finki.it.reservengo.repository.UserRepository;
    77import mk.ukim.finki.it.reservengo.service.intf.UserService;
    … …  
    2222    @Override
    2323    public User findUser(Long userId) {
    24         return userRepository.findById(userId).orElseThrow(() -> new CustomerNotFoundException(userId));
     24        return userRepository.findById(userId).orElseThrow(() -> new UserIdNotFoundException(userId));
    2525    }
    2626
    2727    @Override
    2828    public User editUserInfo(Long userId, CreateUserDTO createUserDTO) {
    29         User user = findUser(userId);
     29        User user = userRepository.findById(userId).orElseThrow(() -> new UserIdNotFoundException(userId));
    3030        updateUserFromDto(user, createUserDTO);
    3131        return userRepository.save(user);

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/CustomerService.java

    r349551d rb77dbe8  
    11package mk.ukim.finki.it.reservengo.service.intf;
    22
    3 import mk.ukim.finki.it.reservengo.model.domain.Customer;
    43import mk.ukim.finki.it.reservengo.model.domain.Local;
    54
    … …  
    76
    87public interface CustomerService {
    9     Customer getCustomerProfile(Long id);
    10 
    118    List<Local> listFavouriteLocals(Long id);
    129

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/AdminController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/AuthController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.dto.jwtDTO.JWTAuthenticationRequestDTO;

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/CustomerController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    3 import mk.ukim.finki.it.reservengo.model.domain.Customer;
    43import mk.ukim.finki.it.reservengo.model.domain.Local;
    54import mk.ukim.finki.it.reservengo.model.domain.Reservation;
    … …  
    2524        this.customerService = customerService;
    2625        this.reservationService = reservationService;
    27     }
    28 
    29     @GetMapping("/profile")
    30     public ResponseEntity<?> getUserProfile(@AuthenticationPrincipal User user) {
    31         Customer userProfile = customerService.getCustomerProfile(user.getId());
    32         return ResponseEntity.ok(userProfile);
    3326    }
    3427

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.model.domain.Local;

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalManagerController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.service.intf.LocalManagerService;

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/ReservationController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.model.domain.Reservation;

  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/UserController.java

    r349551d rb77dbe8  
    1 package mk.ukim.finki.it.reservengo.web;
     1package mk.ukim.finki.it.reservengo.web.controller;
    22
    33import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
    … …  
    1919    }
    2020
    21     @GetMapping("/info")
    22     public ResponseEntity<?> getUserPersonalInfo(@AuthenticationPrincipal User user) {
     21    @GetMapping("/profile")
     22    public ResponseEntity<?> getProfile(@AuthenticationPrincipal User user) {
    2323        User u = userService.findUser(user.getId());
    2424        return ResponseEntity.ok(u);
    2525    }
    2626
    27     @PutMapping("/{userId}/edit-info")
    28     public ResponseEntity<?> editPersonalInfo(@PathVariable Long userId, @RequestBody CreateUserDTO createUserDTO) {
    29         User user = userService.editUserInfo(userId, createUserDTO);
    30         return ResponseEntity.ok(user);
     27    @PutMapping("/edit")
     28    public ResponseEntity<?> editProfile(@AuthenticationPrincipal User user, @RequestBody CreateUserDTO createUserDTO) {
     29        return ResponseEntity.ok(userService.editUserInfo(user.getId(), createUserDTO));
    3130    }
    3231}
Note: See TracChangeset for help on using the changeset viewer.