Align desktop user contract with backend
- Replace firstName and lastName with fullName and email in UserRequest - Add email and updatedAt to UserResponse - Update StaffRegisterDialogController to build fullName from firstName + lastName - Update StaffRegisterDialogController to include email validation and send email - Update StaffAccountsController to use backend email from UserResponse instead of hardcoding blank
This commit is contained in:
@@ -3,8 +3,8 @@ package org.example.petshopdesktop.api.dto.user;
|
|||||||
public class UserRequest {
|
public class UserRequest {
|
||||||
private String username;
|
private String username;
|
||||||
private String password;
|
private String password;
|
||||||
private String firstName;
|
private String fullName;
|
||||||
private String lastName;
|
private String email;
|
||||||
private String role;
|
private String role;
|
||||||
private Boolean active;
|
private Boolean active;
|
||||||
|
|
||||||
@@ -27,20 +27,20 @@ public class UserRequest {
|
|||||||
this.password = password;
|
this.password = password;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFirstName() {
|
public String getFullName() {
|
||||||
return firstName;
|
return fullName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setFirstName(String firstName) {
|
public void setFullName(String fullName) {
|
||||||
this.firstName = firstName;
|
this.fullName = fullName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLastName() {
|
public String getEmail() {
|
||||||
return lastName;
|
return email;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLastName(String lastName) {
|
public void setEmail(String email) {
|
||||||
this.lastName = lastName;
|
this.email = email;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getRole() {
|
public String getRole() {
|
||||||
|
|||||||
@@ -6,9 +6,11 @@ public class UserResponse {
|
|||||||
private Long id;
|
private Long id;
|
||||||
private String username;
|
private String username;
|
||||||
private String fullName;
|
private String fullName;
|
||||||
|
private String email;
|
||||||
private String role;
|
private String role;
|
||||||
private Boolean active;
|
private Boolean active;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
private LocalDateTime updatedAt;
|
||||||
|
|
||||||
public UserResponse() {
|
public UserResponse() {
|
||||||
}
|
}
|
||||||
@@ -37,6 +39,14 @@ public class UserResponse {
|
|||||||
this.fullName = fullName;
|
this.fullName = fullName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getEmail() {
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEmail(String email) {
|
||||||
|
this.email = email;
|
||||||
|
}
|
||||||
|
|
||||||
public String getRole() {
|
public String getRole() {
|
||||||
return role;
|
return role;
|
||||||
}
|
}
|
||||||
@@ -60,4 +70,12 @@ public class UserResponse {
|
|||||||
public void setCreatedAt(LocalDateTime createdAt) {
|
public void setCreatedAt(LocalDateTime createdAt) {
|
||||||
this.createdAt = createdAt;
|
this.createdAt = createdAt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LocalDateTime getUpdatedAt() {
|
||||||
|
return updatedAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUpdatedAt(LocalDateTime updatedAt) {
|
||||||
|
this.updatedAt = updatedAt;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ public class StaffAccountsController {
|
|||||||
String[] names = splitFullName(fullName);
|
String[] names = splitFullName(fullName);
|
||||||
String firstName = names[0];
|
String firstName = names[0];
|
||||||
String lastName = names[1];
|
String lastName = names[1];
|
||||||
String email = "";
|
String email = user.getEmail() != null ? user.getEmail() : "";
|
||||||
String phone = "";
|
String phone = "";
|
||||||
boolean active = user.getActive() != null ? user.getActive() : false;
|
boolean active = user.getActive() != null ? user.getActive() : false;
|
||||||
Timestamp createdAt = user.getCreatedAt() != null
|
Timestamp createdAt = user.getCreatedAt() != null
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ public class StaffRegisterDialogController {
|
|||||||
|
|
||||||
String firstName = value(txtFirstName);
|
String firstName = value(txtFirstName);
|
||||||
String lastName = value(txtLastName);
|
String lastName = value(txtLastName);
|
||||||
|
String email = value(txtEmail);
|
||||||
String username = value(txtUsername);
|
String username = value(txtUsername);
|
||||||
String password = txtPassword.getText() == null ? "" : txtPassword.getText();
|
String password = txtPassword.getText() == null ? "" : txtPassword.getText();
|
||||||
String confirm = txtPasswordConfirm.getText() == null ? "" : txtPasswordConfirm.getText();
|
String confirm = txtPasswordConfirm.getText() == null ? "" : txtPasswordConfirm.getText();
|
||||||
@@ -56,6 +57,10 @@ public class StaffRegisterDialogController {
|
|||||||
lblError.setText("First name and last name are required.");
|
lblError.setText("First name and last name are required.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (email.isBlank()) {
|
||||||
|
lblError.setText("Email is required.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (username.isBlank()) {
|
if (username.isBlank()) {
|
||||||
lblError.setText("Username is required.");
|
lblError.setText("Username is required.");
|
||||||
return;
|
return;
|
||||||
@@ -76,8 +81,8 @@ public class StaffRegisterDialogController {
|
|||||||
UserRequest request = new UserRequest();
|
UserRequest request = new UserRequest();
|
||||||
request.setUsername(username);
|
request.setUsername(username);
|
||||||
request.setPassword(password);
|
request.setPassword(password);
|
||||||
request.setFirstName(firstName);
|
request.setFullName(firstName + " " + lastName);
|
||||||
request.setLastName(lastName);
|
request.setEmail(email);
|
||||||
request.setRole("STAFF");
|
request.setRole("STAFF");
|
||||||
request.setActive(true);
|
request.setActive(true);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user