Changeset e0ee7c8 for ReserveNGo-backend/src/main/java

Timestamp:

04/29/25 14:12:58 (3 weeks 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:

• dto/localDTO/CreateLocalDTO.java (added)
• dto/userDTO/CreateUserDTO.java (moved) (moved from ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/userDTO/UserDTO.java ) (1 diff)
• service/impl/AdminServiceImpl.java (modified) (2 diffs)
• service/impl/UserServiceImpl.java (modified) (2 diffs)
• service/intf/AdminService.java (modified) (1 diff)
• service/intf/UserService.java (modified) (2 diffs)
• web/AdminController.java (modified) (2 diffs)
• web/UserController.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 
-public record UserDTO(
+public record CreateUserDTO(
         String firstName,
         String lastName,

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.impl;
 
+import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
 import mk.ukim.finki.it.reservengo.service.intf.AdminService;
 import mk.ukim.finki.it.reservengo.service.intf.LocalService;
@@ -15 +16 @@
 
     @Override
-    public void addLocal(String name) {
-        localService.save(name);
+    public void addLocal(CreateLocalDTO localDTO) {
+        localService.save(localDTO.name());
     }
 

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.impl;
 
-import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
+import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
 import mk.ukim.finki.it.reservengo.model.domain.User;
 import mk.ukim.finki.it.reservengo.model.exceptions.CustomerNotFoundException;
@@ -26 +26 @@
 
     @Override
-    public User editUserInfo(Long userId, UserDTO userDTO) {
+    public User editUserInfo(Long userId, CreateUserDTO createUserDTO) {
         User user = findUser(userId);
-        updateUserFromDto(user, userDTO);
+        updateUserFromDto(user, createUserDTO);
         return userRepository.save(user);
     }
 
-    private void updateUserFromDto(User user, UserDTO userDTO) {
-        if (userDTO.firstName() != null) {
-            user.setFirstName(userDTO.firstName());
+    private void updateUserFromDto(User user, CreateUserDTO createUserDTO) {
+        if (createUserDTO.firstName() != null) {
+            user.setFirstName(createUserDTO.firstName());
         }
-        if (userDTO.lastName() != null) {
-            user.setLastName(userDTO.lastName());
+        if (createUserDTO.lastName() != null) {
+            user.setLastName(createUserDTO.lastName());
         }
-        if (userDTO.email() != null) {
-            user.setEmail(userDTO.email());
+        if (createUserDTO.email() != null) {
+            user.setEmail(createUserDTO.email());
         }
-        if (userDTO.password() != null && !userDTO.password().isEmpty()) {
-            user.setPassword(passwordEncoder.encode(userDTO.password()));
+        if (createUserDTO.password() != null && !createUserDTO.password().isEmpty()) {
+            user.setPassword(passwordEncoder.encode(createUserDTO.password()));
         }
-        if (userDTO.phoneNumber() != null) {
-            user.setPhoneNumber(userDTO.phoneNumber());
+        if (createUserDTO.phoneNumber() != null) {
+            user.setPhoneNumber(createUserDTO.phoneNumber());
         }
     }

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.intf;
 
+import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
+
 public interface AdminService {
-    void addLocal(String name);
+    void addLocal(CreateLocalDTO localDTO);
 
     void deleteLocal(Long id);

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.intf;
 
-import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
+import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
 import mk.ukim.finki.it.reservengo.model.domain.User;
 
@@ -7 +7 @@
     User findUser(Long userId);
 
-    User editUserInfo(Long userId, UserDTO userDTO);
+    User editUserInfo(Long userId, CreateUserDTO createUserDTO);
 
 }

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.web;
 
+import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
 import mk.ukim.finki.it.reservengo.service.intf.AdminService;
 import org.springframework.http.ResponseEntity;
@@ -18 +19 @@
 
     @PostMapping("/add")
-    public ResponseEntity<?> addLocal(@RequestParam String name) {
-        adminService.addLocal(name);
+    public ResponseEntity<?> addLocal(@RequestBody CreateLocalDTO localDTO) {
+        adminService.addLocal(localDTO);
         return ResponseEntity.ok().build();
     }

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.web;
 
-import mk.ukim.finki.it.reservengo.dto.userDTO.UserDTO;
+import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
 import mk.ukim.finki.it.reservengo.model.domain.User;
 import mk.ukim.finki.it.reservengo.service.intf.UserService;
@@ -26 +26 @@
 
     @PutMapping("/{userId}/edit-info")
-    public ResponseEntity<?> editPersonalInfo(@PathVariable Long userId, @RequestBody UserDTO userDTO) {
-        User user = userService.editUserInfo(userId, userDTO);
+    public ResponseEntity<?> editPersonalInfo(@PathVariable Long userId, @RequestBody CreateUserDTO createUserDTO) {
+        User user = userService.editUserInfo(userId, createUserDTO);
         return ResponseEntity.ok(user);
     }