Merge pull request 'feature3-userId-added' (#32) from feature3-userId-added into develop

Reviewed-on: https://git.zeptic.in/himanshu/bbps/pulls/32

src/main/java/com/billpaymentservice/bbps/entites/BillCustomerParams.java

@@ -1,7 +1,5 @@
 package com.billpaymentservice.bbps.entites;
 
-import com.billpaymentservice.bbps.audit.Auditable;
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;

src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java

@@ -14,7 +14,10 @@ import lombok.Setter;
 import lombok.ToString;
 
 @Entity
-@Getter @Setter @NoArgsConstructor @ToString
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
 @Table(name = "bbps_inbound_trace_log")
 public class InboundTraceLog {
 
@@ -50,16 +53,16 @@ public class InboundTraceLog {
 	@Column(length = 255)
 	private String remark; // error ya note
 
-    public InboundTraceLog(String requestId, String txnId, String apiName, String mid, 
+	public InboundTraceLog(String requestId, String txnId, String apiName, String mid, String orgId, String httpMethod,
-            String orgId, String httpMethod, String requestPayload) {
+			String requestPayload) {
-this.requestId = requestId;
+		this.requestId = requestId;
-this.txnId = txnId;
+		this.txnId = txnId;
-this.apiName = apiName;
+		this.apiName = apiName;
-this.mid = mid;
+		this.mid = mid;
-this.orgId = orgId;
+		this.orgId = orgId;
-this.httpMethod = httpMethod;
+		this.httpMethod = httpMethod;
-this.requestPayload = requestPayload;
+		this.requestPayload = requestPayload;
-this.requestTime = LocalDateTime.now();
+		this.requestTime = LocalDateTime.now();
-this.createdAt = LocalDateTime.now();
+		this.createdAt = LocalDateTime.now();
-}
+	}
 }

src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java

@@ -14,7 +14,10 @@ import lombok.Setter;
 import lombok.ToString;
 
 @Entity
-@Getter @Setter @NoArgsConstructor @ToString
+@ToString
+@Getter
+@Setter
+@NoArgsConstructor
 @Table(name = "bbps_outbound_trace_log")
 public class OutboundTraceLog {
 
@@ -46,15 +49,16 @@ public class OutboundTraceLog {
 
 	@Column(length = 255)
 	private String remark;
-    public OutboundTraceLog(String txnId, String requestId, String apiName, 
+
-            String endpointUrl, String httpMethod, String requestPayload) {
+	public OutboundTraceLog(String txnId, String requestId, String apiName, String endpointUrl, String httpMethod,
-this.txnId = txnId;
+			String requestPayload) {
-this.requestId = requestId;
+		this.txnId = txnId;
-this.apiName = apiName;
+		this.requestId = requestId;
-this.endpointUrl = endpointUrl;
+		this.apiName = apiName;
-this.httpMethod = httpMethod;
+		this.endpointUrl = endpointUrl;
-this.requestPayload = requestPayload;
+		this.httpMethod = httpMethod;
-this.sendTime = LocalDateTime.now();
+		this.requestPayload = requestPayload;
-this.createdAt = LocalDateTime.now();
+		this.sendTime = LocalDateTime.now();
-}
+		this.createdAt = LocalDateTime.now();
+	}
 }

src/main/java/com/billpaymentservice/bbps/entites/UserEntity.java

@@ -38,4 +38,7 @@ public class UserEntity extends Auditable {
 	@Column(name = "mid")
 	private String mid;
 
+	@Column(name = "is_enabled")
+	private boolean enabled = true;
+
 }

src/main/resources/application-local.properties

@@ -3,7 +3,6 @@ spring.application.name=bbps
 
 # Server port
 server.port=9090
-spring.jpa.open-in-view=false
 
 # JPA & Hibernate
 spring.jpa.hibernate.ddl-auto=update
@@ -19,12 +18,11 @@ swagger.server.description=Local Development Server
 
 
 # DataSource
-#spring.datasource.url=jdbc:postgresql://localhost:5432/devdbuat
+spring.datasource.url=jdbc:postgresql://localhost:5432/devdbuat
-spring.datasource.url=jdbc:postgresql://localhost:5432/bbps_enhanced
 spring.datasource.username=postgres
-#spring.datasource.password=UAT@DB_2025
+spring.datasource.password=UAT@DB_2025
 
-spring.datasource.password=himanshu@123
+#spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource