resolved conflicts

src/main/java/net/gepafin/tendermanagement/dao/UserDao.java

@@ -1,14 +1,12 @@
 package net.gepafin.tendermanagement.dao;
 
 import net.gepafin.tendermanagement.config.Translator;
-import net.gepafin.tendermanagement.config.jwt.TokenProvider;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.LoginReq;
 import net.gepafin.tendermanagement.model.request.UpdateUserReq;
 import net.gepafin.tendermanagement.model.request.UserReq;
-import net.gepafin.tendermanagement.model.response.LoginResponse;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
 import net.gepafin.tendermanagement.model.util.JWTToken;

src/main/java/net/gepafin/tendermanagement/entities/RegionEntity.java

@@ -2,19 +2,15 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.BaseEntity;
 
 import java.math.BigDecimal;
 
 @Entity
-@Table(name = "\"REGION\"")
+@Table(name = "REGION")
 @Getter
 @Setter
 public class RegionEntity extends BaseEntity {

src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "\"ROLE\"")
+@Table(name = "ROLE")
 @Getter
 @Setter
 public class RoleEntity extends BaseEntity {

src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.BaseEntity;
 
 import java.time.LocalDateTime;
 

src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java

@@ -1,7 +1,5 @@
 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;
@@ -9,14 +7,12 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 @Getter
 @Setter
 public class UserReq {
 
-    @NotBlank(message = "{email.not.blank}")
-    @Email(message = "{email.invalid}")
+    @NotBlank
+    @Email
     private String email;
     @NotEmpty
     private String password;
@@ -28,7 +24,7 @@ public class UserReq {
     private String lastName;
 
     private String phoneNumber;
-    @NotEmpty
+    @NotNull
     private Long roleId;
 
     private String organization;

src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @Validated
-//@RequestMapping("/user")
 public interface UserApi {
 
     @Operation(summary = "Api to create user",
@@ -39,7 +38,7 @@ public interface UserApi {
             produces = {"application/json"},
             method = RequestMethod.POST)
     default ResponseEntity<Response<UserResponseBean>> createUser(
-            @Parameter(description = "User request object", required = true) @Valid @RequestBody UserReq userReq) {
+            @Parameter(description = "User request object", required = true) @Validated @RequestBody UserReq userReq) {
         return new ResponseEntity<Response<UserResponseBean>>(HttpStatus.NOT_IMPLEMENTED);
     }
 

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java

@@ -32,8 +32,7 @@ public class UserApiController implements UserApi {
     private UserService userService;
 
     @Override
-    public ResponseEntity<Response<UserResponseBean>> createUser(
-            @Valid @RequestBody UserReq userReq) {
+    public ResponseEntity<Response<UserResponseBean>> createUser(@RequestBody UserReq userReq) {
         log.info("Create User with - Request Body: {}", userReq);
         UserResponseBean createdUser = userService.createUser(userReq);
         return ResponseEntity.status(HttpStatus.CREATED)