SidharthPL/Canteen-Management-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Repeat order settings added

Browse Source
This commit is contained in:
Sidharth Prabhu
2026-04-17 11:21:13 +05:30
parent acfe9598cb
commit 90926256ca
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/com/rit/canteen/sales/service/UserService.java
View File

@@ -177,7 +177,7 @@ public class UserService {
} }
/** /**
* Update user details as an administrator. * Update user details as an administrator or user.
*/ */
public LoginResponse.UserDto updateUser(Long userId, String name, String mobileNumber, String newPin) { public LoginResponse.UserDto updateUser(Long userId, String name, String mobileNumber, String newPin) {
Optional<User> userOpt = userRepository.findById(userId); Optional<User> userOpt = userRepository.findById(userId);
@@ -186,8 +186,22 @@ public class UserService {
} }
User user = userOpt.get(); User user = userOpt.get();
// Handle mobile number update with conflict check
if (mobileNumber != null && !mobileNumber.equals(user.getMobileNumber())) {
// Validate format
if (!mobileNumber.matches("^[0-9]{10}$")) {
return null; // Invalid format
}
// Check for conflict
if (userRepository.existsByMobileNumber(mobileNumber)) {
return null; // Conflict: mobile number already taken
}
user.setMobileNumber(mobileNumber);
}
if (name != null) user.setName(name); if (name != null) user.setName(name);
if (mobileNumber != null) user.setMobileNumber(mobileNumber);
// Only update PIN if it is provided and valid // Only update PIN if it is provided and valid
if (newPin != null && !newPin.isBlank()) { if (newPin != null && !newPin.isBlank()) {