Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java
#	src/main/java/com/kamco/cd/kamcoback/changedetection/dto/ChangeDetectionDto.java

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataEntity.java

@@ -10,12 +10,9 @@ import jakarta.persistence.Table;
 import jakarta.validation.constraints.Size;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
 
 @Getter
 @Setter
@@ -149,5 +146,4 @@ public class MapSheetAnalDataEntity {
 
   @Column(name = "ref_map_sheet_num")
   private Long refMapSheetNum;
-
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/UserEntity.java

@@ -12,13 +12,16 @@ import jakarta.persistence.UniqueConstraint;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.time.ZonedDateTime;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
 
 @Getter
 @Setter
 @Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(
     name = "tb_user",
     uniqueConstraints = {@UniqueConstraint(name = "ux_tb_user_user_id", columnNames = "user_id")})
@@ -52,7 +55,7 @@ public class UserEntity {
   @NotNull
   @ColumnDefault("'ACTIVE'")
   @Column(name = "state", nullable = false)
-  private String state;
+  private String state = "ACTIVE";
 
   @Column(name = "date_withdrawal")
   private ZonedDateTime dateWithdrawal;
@@ -85,16 +88,31 @@ public class UserEntity {
   @Column(name = "emp_id", nullable = false)
   private String empId;
 
+  public UserEntity(
+      Long id,
+      String userAuth,
+      String userNm,
+      String userId,
+      String empId,
+      String userEmail,
+      String userPw) {
+    this.id = id;
+    this.userAuth = userAuth;
+    this.userNm = userNm;
+    this.userId = userId;
+    this.empId = empId;
+    this.userEmail = userEmail;
+    this.userPw = userPw;
+  }
+
   public AuthDto.Basic toDto() {
     return new AuthDto.Basic(
-      this.id,
-      this.userAuth,
-      this.userNm,
-      this.userId,
-      this.empId,
-      this.userEmail,
-      this.createdDttm
-    ) ;
-
+        this.id,
+        this.userAuth,
+        this.userNm,
+        this.userId,
+        this.empId,
+        this.userEmail,
+        this.createdDttm);
   }
 }