BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
harish
2024-08-22 10:54:32 +05:30
parent e7466d16ec 5c55a20b02
commit b42f66a5e9
33 changed files with 863 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/gepafin/tendermanagement/model/request/LoginReq.java Normal file
View File

@@ -0,0 +1,18 @@
package net.gepafin.tendermanagement.model.request;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class LoginReq {
@NotBlank(message = "{email.not.blank}")
@Email(message = "{email.invalid}")
private String email;
@NotEmpty
private String password;
private Boolean rememberMe;
}

20
src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java
View File

@@ -1,32 +1,30 @@
package net.gepafin.tendermanagement.model.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonValue;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
public class UserReq {
private String password;
private String confPassword;
@NotBlank
@Email
private String email;
@NotEmpty
private String password;
@NotEmpty
private String confPassword;
private String firstName;
private String lastName;
private String phoneNumber;
@NotNull
private Long roleId;
private String organization;
@@ -39,6 +37,4 @@ public class UserReq {
private String status;
private LocalDateTime lastLogin;
}