Ignore:
Timestamp:
04/29/25 14:12:58 (45 hours ago)
Author:
ivanov1332 <zareivanov070@…>
Branches:
master
Children:
bf78464, dad25fc
Parents:
97d3eca
Message:

Added CreateLocalDTO and also fixed some issues

Location:
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo
Files:
1 added
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/userDTO/CreateUserDTO.java

    r97d3eca re0ee7c8  
    22
    33
    4 public record UserDTO(
     4public record CreateUserDTO(
    55        String firstName,
    66        String lastName,
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AdminServiceImpl.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.service.impl;
    22
     3import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
    34import mk.ukim.finki.it.reservengo.service.intf.AdminService;
    45import mk.ukim.finki.it.reservengo.service.intf.LocalService;
     
    1516
    1617    @Override
    17     public void addLocal(String name) {
    18         localService.save(name);
     18    public void addLocal(CreateLocalDTO localDTO) {
     19        localService.save(localDTO.name());
    1920    }
    2021
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/UserServiceImpl.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.service.impl;
    22
    3 import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
     3import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
    44import mk.ukim.finki.it.reservengo.model.domain.User;
    55import mk.ukim.finki.it.reservengo.model.exceptions.CustomerNotFoundException;
     
    2626
    2727    @Override
    28     public User editUserInfo(Long userId, UserDTO userDTO) {
     28    public User editUserInfo(Long userId, CreateUserDTO createUserDTO) {
    2929        User user = findUser(userId);
    30         updateUserFromDto(user, userDTO);
     30        updateUserFromDto(user, createUserDTO);
    3131        return userRepository.save(user);
    3232    }
    3333
    34     private void updateUserFromDto(User user, UserDTO userDTO) {
    35         if (userDTO.firstName() != null) {
    36             user.setFirstName(userDTO.firstName());
     34    private void updateUserFromDto(User user, CreateUserDTO createUserDTO) {
     35        if (createUserDTO.firstName() != null) {
     36            user.setFirstName(createUserDTO.firstName());
    3737        }
    38         if (userDTO.lastName() != null) {
    39             user.setLastName(userDTO.lastName());
     38        if (createUserDTO.lastName() != null) {
     39            user.setLastName(createUserDTO.lastName());
    4040        }
    41         if (userDTO.email() != null) {
    42             user.setEmail(userDTO.email());
     41        if (createUserDTO.email() != null) {
     42            user.setEmail(createUserDTO.email());
    4343        }
    44         if (userDTO.password() != null && !userDTO.password().isEmpty()) {
    45             user.setPassword(passwordEncoder.encode(userDTO.password()));
     44        if (createUserDTO.password() != null && !createUserDTO.password().isEmpty()) {
     45            user.setPassword(passwordEncoder.encode(createUserDTO.password()));
    4646        }
    47         if (userDTO.phoneNumber() != null) {
    48             user.setPhoneNumber(userDTO.phoneNumber());
     47        if (createUserDTO.phoneNumber() != null) {
     48            user.setPhoneNumber(createUserDTO.phoneNumber());
    4949        }
    5050    }
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/AdminService.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.service.intf;
    22
     3import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
     4
    35public interface AdminService {
    4     void addLocal(String name);
     6    void addLocal(CreateLocalDTO localDTO);
    57
    68    void deleteLocal(Long id);
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/UserService.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.service.intf;
    22
    3 import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
     3import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
    44import mk.ukim.finki.it.reservengo.model.domain.User;
    55
     
    77    User findUser(Long userId);
    88
    9     User editUserInfo(Long userId, UserDTO userDTO);
     9    User editUserInfo(Long userId, CreateUserDTO createUserDTO);
    1010
    1111}
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/AdminController.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.web;
    22
     3import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
    34import mk.ukim.finki.it.reservengo.service.intf.AdminService;
    45import org.springframework.http.ResponseEntity;
     
    1819
    1920    @PostMapping("/add")
    20     public ResponseEntity<?> addLocal(@RequestParam String name) {
    21         adminService.addLocal(name);
     21    public ResponseEntity<?> addLocal(@RequestBody CreateLocalDTO localDTO) {
     22        adminService.addLocal(localDTO);
    2223        return ResponseEntity.ok().build();
    2324    }
  • ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/UserController.java

    r97d3eca re0ee7c8  
    11package mk.ukim.finki.it.reservengo.web;
    22
    3 import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
     3import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
    44import mk.ukim.finki.it.reservengo.model.domain.User;
    55import mk.ukim.finki.it.reservengo.service.intf.UserService;
     
    2626
    2727    @PutMapping("/{userId}/edit-info")
    28     public ResponseEntity<?> editPersonalInfo(@PathVariable Long userId, @RequestBody UserDTO userDTO) {
    29         User user = userService.editUserInfo(userId, userDTO);
     28    public ResponseEntity<?> editPersonalInfo(@PathVariable Long userId, @RequestBody CreateUserDTO createUserDTO) {
     29        User user = userService.editUserInfo(userId, createUserDTO);
    3030        return ResponseEntity.ok(user);
    3131    }
Note: See TracChangeset for help on using the changeset viewer.