resolved conflicts

pom.xml

@@ -27,14 +27,12 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.24</version>
 		</dependency>
 
 		<!-- H2 Database for in-memory testing -->
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.200</version>
 		</dependency>
 
 		<!-- PostgreSQL Database -->
@@ -103,6 +101,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+		    <groupId>jakarta.validation</groupId>
+		    <artifactId>jakarta.validation-api</artifactId>
+		</dependency>
+		<dependency>
+		    <groupId>org.hibernate.validator</groupId>
+		    <artifactId>hibernate-validator</artifactId>
+		</dependency>
 
 	</dependencies>
 

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}")
+    @NotBlank
-    @Email(message = "{email.invalid}")
+    @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(
+    public ResponseEntity<Response<UserResponseBean>> createUser(@RequestBody UserReq userReq) {
-            @Valid @RequestBody UserReq userReq) {
         log.info("Create User with - Request Body: {}", userReq);
         UserResponseBean createdUser = userService.createUser(userReq);
         return ResponseEntity.status(HttpStatus.CREATED)

src/main/resources/application-dev.properties

@@ -0,0 +1,8 @@
+# DataSource Configuration
+spring.datasource.url=jdbc:postgresql://dbstaging.memento.credit:20184/gepaDb
+spring.datasource.username=usergepa
+spring.datasource.password=vs1pAc9vu07mMcdx93j6WiBS
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+# JPA Configuration
+spring.h2.console.enabled=true

src/main/resources/application-local.properties

@@ -0,0 +1,8 @@
+# DataSource Configuration
+spring.datasource.url=jdbc:postgresql://localhost:5432/gepafin_local
+spring.datasource.username=postgres
+spring.datasource.password=root
+spring.datasource.driver-class-name=org.postgresql.Driver
+
+# JPA Configuration
+spring.jpa.show-sql=true

src/main/resources/application-testing.properties

@@ -0,0 +1,7 @@
+# DataSource Configuration
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=sa
+
+# JPA Configuration
+spring.h2.console.enabled=true

src/main/resources/application.properties

@@ -1,19 +1,16 @@
 spring.application.name=tendermanagement
-springdoc.api-docs.path=/v1/api-docs
-springdoc.swagger-ui.configUrl=/v1/api-docs
-springfox.documentation.swagger-ui.path=/v1/api-docs
-springdoc.swagger-ui.disable-swagger-default-url=true
-springdoc.swagger-ui.path=/swagger-ui.html
 
-# DataSource Configuration
+# Multipart Configuration
-spring.datasource.url=jdbc:postgresql://localhost:5432/gepafin_local
+spring.servlet.multipart.max-file-size=50MB
-spring.datasource.username=postgres
+spring.servlet.multipart.max-request-size=50MB
-spring.datasource.password=root
+
-spring.datasource.driver-class-name=org.postgresql.Driver
+spring.profiles.active=testing
+
 
 # JPA Configuration
 spring.jpa.properties.hibernate.default_schema=gepafin_schema
 spring.jpa.hibernate.ddl-auto=none
+spring.jpa.show-sql=false
 
 
 # Liquibase Configuration
@@ -21,9 +18,11 @@ spring.liquibase.change-log=classpath:db/changelog/db.changelog-master.xml
 spring.liquibase.default-schema=gepafin_schema
 spring.liquibase.enabled=true
 
-# Debugging and SQL Output
+
-logging.level.org.springframework.boot.autoconfigure.liquibase=ERROR
+# Swagger Configuration
-logging.level.liquibase=ERROR
+springdoc.api-docs.path=/v1/api-docs
+
+
 # JWT configuration
 # Ensure these values match your expectations
 security.authentication.jwt.secret=my-secret-token-to-change-in-prod-environment-your-super-secure-randomly-generated-key
@@ -32,4 +31,3 @@ security.authentication.jwt.token-validity-in-seconds=86400
 
 spring.main.allow-circular-references=true
 
-