User-Management

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

@@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import net.gepafin.tendermanagement.enums.RegionStatusEnum;
 
 import java.math.BigDecimal;
 
@@ -17,7 +18,7 @@ public class RegionReq {
 
     private String country;
 
-    private String status;
+    private RegionStatusEnum status;
 
     private String priorityArea;
 

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

@@ -20,8 +20,6 @@ public class RoleReq {
 
     private String permissions;
 
-    private String status;
-
     private Long regionId;
 
 }

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

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.request;
 
 import lombok.Getter;
 import lombok.Setter;
+import net.gepafin.tendermanagement.enums.RegionStatusEnum;
 
 @Getter
 @Setter
@@ -12,7 +13,7 @@ public class UpdateRegionReq {
 
     private String country;
 
-    private String status;
+    private RegionStatusEnum status;
 
     private String priorityArea;
 

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

@@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
 
 @Getter
 @Setter
@@ -16,6 +17,6 @@ public class UpdateUserReq  {
     private String organization;
     private String address;
     private String city;
-    private String status;
+    private UserStatusEnum status;
     private String country;
 }

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

@@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
 
 @Getter
 @Setter
@@ -35,6 +36,6 @@ public class UserReq {
 
     private String country;
 
-    private String status;
+    private UserStatusEnum status;
 
 }

src/main/java/net/gepafin/tendermanagement/model/response/RegionResponseBean.java

@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.model.response;
 
 import lombok.Getter;
 import lombok.Setter;
+import net.gepafin.tendermanagement.enums.RegionStatusEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
 import java.math.BigDecimal;
@@ -13,7 +14,7 @@ public class RegionResponseBean extends BaseBean {
     private String regionName;
     private String description;
     private String country;
-    private String status;
+    private RegionStatusEnum status;
     private String priorityArea;
     private Long population;
     private BigDecimal areaSize;

src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java

@@ -6,6 +6,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import net.gepafin.tendermanagement.entities.RoleEntity;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
 import java.time.LocalDateTime;
@@ -32,7 +33,7 @@ public class UserResponseBean extends BaseBean {
 
     private String country;
 
-    private String status;
+    private UserStatusEnum status;
 
     private LocalDateTime lastLogin;