Changeset e0ee7c8 for ReserveNGo-backend/src/main/java
- Timestamp:
- 04/29/25 14:12:58 (45 hours ago)
- Branches:
- master
- Children:
- bf78464, dad25fc
- Parents:
- 97d3eca
- 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 2 2 3 3 4 public record UserDTO(4 public record CreateUserDTO( 5 5 String firstName, 6 6 String lastName, -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AdminServiceImpl.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.service.impl; 2 2 3 import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO; 3 4 import mk.ukim.finki.it.reservengo.service.intf.AdminService; 4 5 import mk.ukim.finki.it.reservengo.service.intf.LocalService; … … 15 16 16 17 @Override 17 public void addLocal( String name) {18 localService.save( name);18 public void addLocal(CreateLocalDTO localDTO) { 19 localService.save(localDTO.name()); 19 20 } 20 21 -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/UserServiceImpl.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.service.impl; 2 2 3 import mk.ukim.finki.it.reservengo.dto.userDTO. UserDTO;3 import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO; 4 4 import mk.ukim.finki.it.reservengo.model.domain.User; 5 5 import mk.ukim.finki.it.reservengo.model.exceptions.CustomerNotFoundException; … … 26 26 27 27 @Override 28 public User editUserInfo(Long userId, UserDTO userDTO) {28 public User editUserInfo(Long userId, CreateUserDTO createUserDTO) { 29 29 User user = findUser(userId); 30 updateUserFromDto(user, userDTO);30 updateUserFromDto(user, createUserDTO); 31 31 return userRepository.save(user); 32 32 } 33 33 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()); 37 37 } 38 if ( userDTO.lastName() != null) {39 user.setLastName( userDTO.lastName());38 if (createUserDTO.lastName() != null) { 39 user.setLastName(createUserDTO.lastName()); 40 40 } 41 if ( userDTO.email() != null) {42 user.setEmail( userDTO.email());41 if (createUserDTO.email() != null) { 42 user.setEmail(createUserDTO.email()); 43 43 } 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())); 46 46 } 47 if ( userDTO.phoneNumber() != null) {48 user.setPhoneNumber( userDTO.phoneNumber());47 if (createUserDTO.phoneNumber() != null) { 48 user.setPhoneNumber(createUserDTO.phoneNumber()); 49 49 } 50 50 } -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/AdminService.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.service.intf; 2 2 3 import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO; 4 3 5 public interface AdminService { 4 void addLocal( String name);6 void addLocal(CreateLocalDTO localDTO); 5 7 6 8 void deleteLocal(Long id); -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/UserService.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.service.intf; 2 2 3 import mk.ukim.finki.it.reservengo.dto.userDTO. UserDTO;3 import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO; 4 4 import mk.ukim.finki.it.reservengo.model.domain.User; 5 5 … … 7 7 User findUser(Long userId); 8 8 9 User editUserInfo(Long userId, UserDTO userDTO);9 User editUserInfo(Long userId, CreateUserDTO createUserDTO); 10 10 11 11 } -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/AdminController.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.web; 2 2 3 import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO; 3 4 import mk.ukim.finki.it.reservengo.service.intf.AdminService; 4 5 import org.springframework.http.ResponseEntity; … … 18 19 19 20 @PostMapping("/add") 20 public ResponseEntity<?> addLocal(@Request Param String name) {21 adminService.addLocal( name);21 public ResponseEntity<?> addLocal(@RequestBody CreateLocalDTO localDTO) { 22 adminService.addLocal(localDTO); 22 23 return ResponseEntity.ok().build(); 23 24 } -
ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/UserController.java
r97d3eca re0ee7c8 1 1 package mk.ukim.finki.it.reservengo.web; 2 2 3 import mk.ukim.finki.it.reservengo.dto.userDTO. UserDTO;3 import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO; 4 4 import mk.ukim.finki.it.reservengo.model.domain.User; 5 5 import mk.ukim.finki.it.reservengo.service.intf.UserService; … … 26 26 27 27 @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); 30 30 return ResponseEntity.ok(user); 31 31 }
Note:
See TracChangeset
for help on using the changeset viewer.