Changes in / [dd7a2b6:ae61ea4]

Location:

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

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• dto/userDTO/CreateUserDTO.java (added)
• dto/userDTO/DisplayUserDTO.java (deleted)
• dto/userDTO/DisplayUserEmailDTO.java (deleted)
• dto/userDTO/EditUserEmailDTO.java (deleted)
• dto/userDTO/EditUserPasswordDTO.java (deleted)
• dto/userDTO/EditUserProfileDTO.java (deleted)
• service/impl/UserServiceImpl.java (modified) (3 diffs)
• service/intf/UserService.java (modified) (2 diffs)
• web/advice/GlobalExceptionHandler.java (modified) (1 diff)
• web/controller/AdminController.java (modified) (3 diffs)
• web/controller/CustomerController.java (modified) (5 diffs)
• web/controller/LocalController.java (modified) (3 diffs)
• web/controller/UserController.java (modified) (2 diffs)

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/config/WebSecurityConfig.java

@@ -46 +46 @@
                                 "/uploads/**")
                         .permitAll()
-                        .requestMatchers("/api/user/**").authenticated()
                         .requestMatchers("/api/customer/**").hasRole("CUSTOMER")
                         .requestMatchers("/api/admin/**").hasRole("ADMIN")

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.*;
+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.EmailNotFoundException;
-import mk.ukim.finki.it.reservengo.model.exceptions.UserEmailAlreadyExistsException;
 import mk.ukim.finki.it.reservengo.model.exceptions.UserIdNotFoundException;
 import mk.ukim.finki.it.reservengo.repository.UserRepository;
-import mk.ukim.finki.it.reservengo.service.intf.JWTService;
 import mk.ukim.finki.it.reservengo.service.intf.UserService;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -16 +14 @@
 
     private final UserRepository userRepository;
-    private final JWTService jwtService;
     private final PasswordEncoder passwordEncoder;
 
-    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder, JWTService jwtService) {
+    public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) {
         this.userRepository = userRepository;
-        this.jwtService = jwtService;
         this.passwordEncoder = passwordEncoder;
     }
@@ -41 +37 @@
 
     @Override
-    public DisplayUserEmailDTO changeEmail(Long userId, EditUserEmailDTO editUserEmailDTO) {
+    public User editUserProfile(Long userId, CreateUserDTO createUserDTO) {
         User user = userRepository.findById(userId).orElseThrow(() -> new UserIdNotFoundException(userId));
-
-        if (editUserEmailDTO.newEmail().equals(user.getEmail())) {
-            throw new IllegalArgumentException("New email must be different from the current email.");
-        }
-        if (emailExists(editUserEmailDTO.newEmail())) {
-            throw new UserEmailAlreadyExistsException(editUserEmailDTO.newEmail());
-        }
-        user.setEmail(editUserEmailDTO.newEmail());
-
-        userRepository.save(user);
-        String jwt = jwtService.generateToken(user);
-
-        return DisplayUserEmailDTO.fromUser(user, jwt);
+        updateUserFromDto(user, createUserDTO);
+        return userRepository.save(user);
     }
 
-    @Override
-    public String changePassword(Long userId, EditUserPasswordDTO editUserPasswordDTO) {
-        User user = userRepository.findById(userId).orElseThrow(() -> new UserIdNotFoundException(userId));
-
-        if (!passwordEncoder.matches(editUserPasswordDTO.currentPassword(), user.getPassword())) {
-            throw new IllegalArgumentException("Current password is incorrect");
+    private void updateUserFromDto(User user, CreateUserDTO createUserDTO) {
+        if (createUserDTO.firstName() != null) {
+            user.setFirstName(createUserDTO.firstName());
         }
-
-        user.setPassword(passwordEncoder.encode(editUserPasswordDTO.newPassword()));
-        userRepository.save(user);
-
-        return "Password updated successfully!";
-    }
-
-    @Override
-    public DisplayUserDTO editUser(Long userId, EditUserProfileDTO editUserProfileDTO) {
-        User user = userRepository.findById(userId).orElseThrow(() -> new UserIdNotFoundException(userId));
-
-        user.setFirstName(editUserProfileDTO.firstName());
-        user.setLastName(editUserProfileDTO.lastName());
-        user.setPhoneNumber(editUserProfileDTO.phoneNumber());
-        userRepository.save(user);
-
-        return DisplayUserDTO.fromUser(user);
+        if (createUserDTO.lastName() != null) {
+            user.setLastName(createUserDTO.lastName());
+        }
+        if (createUserDTO.email() != null) {
+            user.setEmail(createUserDTO.email());
+        }
+        if (createUserDTO.password() != null && !createUserDTO.password().isEmpty()) {
+            user.setPassword(passwordEncoder.encode(createUserDTO.password()));
+        }
+        if (createUserDTO.phoneNumber() != null) {
+            user.setPhoneNumber(createUserDTO.phoneNumber());
+        }
     }
 }

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.*;
+import mk.ukim.finki.it.reservengo.dto.userDTO.CreateUserDTO;
 import mk.ukim.finki.it.reservengo.model.domain.User;
 
@@ -7 +7 @@
     User getUserById(Long userId);
 
-    DisplayUserDTO editUser(Long userId, EditUserProfileDTO editUserProfileDTO);
+    User editUserProfile(Long userId, CreateUserDTO createUserDTO);
 
     User getUserByEmail(String email);
 
     boolean emailExists(String email);
-
-    DisplayUserEmailDTO changeEmail(Long userId, EditUserEmailDTO editUserEmailDTO);
-
-    String changePassword(Long userId, EditUserPasswordDTO editUserPasswordDTO);
 }

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

@@ -24 +24 @@
     @ExceptionHandler(AuthenticationException.class)
     public ResponseEntity<String> handleAuthenticationError(AuthenticationException ex) {
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ex.getMessage());
-    }
-
-    @ExceptionHandler(IllegalArgumentException.class)
-    public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException ex) {
-        return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE).body(ex.getMessage());
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
     }
 

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

@@ -3 +3 @@
 import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDTO;
 import mk.ukim.finki.it.reservengo.service.intf.AdminService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -22 +21 @@
     public ResponseEntity<?> addLocal(@RequestBody CreateLocalDTO localDTO) {
         adminService.addLocal(localDTO);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok().build();
     }
 
@@ -28 +27 @@
     public ResponseEntity<?> deleteLocal(@PathVariable Long id) {
         adminService.deleteLocal(id);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok().build();
     }
 }

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

@@ -6 +6 @@
 import mk.ukim.finki.it.reservengo.service.intf.CustomerService;
 import mk.ukim.finki.it.reservengo.service.intf.ReservationService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -30 +29 @@
     public ResponseEntity<?> getCustomerReservations(@AuthenticationPrincipal User user) {
         List<Reservation> customerReservations = reservationService.getCustomerReservations(user.getId());
-        return new ResponseEntity<>(customerReservations, HttpStatus.OK);
+        return ResponseEntity.ok(customerReservations);
     }
 
@@ -36 +35 @@
     public ResponseEntity<?> listFavouriteLocals(@AuthenticationPrincipal User user) {
         List<Local> favouriteLocals = customerService.listFavouriteLocals(user.getId());
-        return new ResponseEntity<>(favouriteLocals, HttpStatus.OK);
+        return ResponseEntity.ok(favouriteLocals);
     }
 
@@ -42 +41 @@
     public ResponseEntity<?> addFavouriteLocal(@AuthenticationPrincipal User user, @PathVariable Long id) {
         customerService.addFavouriteLocal(user.getId(), id);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok().build();
     }
 
@@ -48 +47 @@
     public ResponseEntity<?> removeFavouriteLocal(@AuthenticationPrincipal User user, @PathVariable Long id) {
         customerService.removeFavouriteLocal(user.getId(), id);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return ResponseEntity.ok().build();
     }
 }

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

@@ -3 +3 @@
 import mk.ukim.finki.it.reservengo.model.domain.Local;
 import mk.ukim.finki.it.reservengo.service.intf.LocalService;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -19 +18 @@
     @GetMapping
     public ResponseEntity<?> getLocals() {
-        return new ResponseEntity<>(localService.listAll(), HttpStatus.OK);
+        return ResponseEntity.ok(localService.listAll());
     }
 
@@ -25 +24 @@
     public ResponseEntity<?> getLocalInformation(@PathVariable Long id) {
         Local local = localService.getLocalById(id);
-        return new ResponseEntity<>(local, HttpStatus.OK);
+        return ResponseEntity.ok(local);
     }
 }

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

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.web.controller;
 
-import mk.ukim.finki.it.reservengo.dto.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;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -21 +20 @@
 
     @GetMapping("/profile")
-    public ResponseEntity<DisplayUserDTO> getProfile(@AuthenticationPrincipal User user) {
-        DisplayUserDTO displayUserDTO = DisplayUserDTO.fromUser(userService.getUserById(user.getId()));
-        return new ResponseEntity<>(displayUserDTO, HttpStatus.OK);
+    public ResponseEntity<?> getProfile(@AuthenticationPrincipal User user) {
+        User u = userService.getUserById(user.getId());
+        return ResponseEntity.ok(u);
     }
 
     @PutMapping("/edit")
-    public ResponseEntity<DisplayUserDTO> editProfile(@AuthenticationPrincipal User user, @RequestBody EditUserProfileDTO editUserProfileDTO) {
-        return new ResponseEntity<>(userService.editUser(user.getId(), editUserProfileDTO), HttpStatus.OK);
-    }
-
-    @PatchMapping("/change-email")
-    public ResponseEntity<DisplayUserEmailDTO> changeEmail(@AuthenticationPrincipal User user, @RequestBody EditUserEmailDTO editUserEmailDTO) {
-        return new ResponseEntity<>(userService.changeEmail(user.getId(), editUserEmailDTO), HttpStatus.OK);
-    }
-
-    @PatchMapping("/change-password")
-    public ResponseEntity<String> changePassword(@AuthenticationPrincipal User user, @RequestBody EditUserPasswordDTO editUserPasswordDTO) {
-        return new ResponseEntity<>(userService.changePassword(user.getId(), editUserPasswordDTO), HttpStatus.OK);
+    public ResponseEntity<?> editProfile(@AuthenticationPrincipal User user, @RequestBody CreateUserDTO createUserDTO) {
+        return ResponseEntity.ok(userService.editUserProfile(user.getId(), createUserDTO));
     }
 }