conflicts resolved

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

@@ -7,43 +7,47 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Data
-public class CreateCallRequest {
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 
+@Data
+public class CreateCallRequestStep1 {
+
+	@NotEmpty
     private String name;
 
+	@NotEmpty
     private String descriptionShort;
 
+	@NotEmpty
     private String descriptionLong;
 
+	@NotNull
     private LocalDateTime startDate;
 
+	@NotNull
     private LocalDateTime endDate;
 
+	@NotNull
     private Long regionId;
 
+	@NotNull
     private BigDecimal amount;
 
+	@NotNull
     private BigDecimal amountMax;
 
+	@NotNull
     private List<LookUpDataReq> aimedTo;
 
+	@NotEmpty
     private String documentationRequested;
 
-    private Integer threshold;
-
     private Boolean Confidi;
 
-    List<EvaluationCriteriaReq> criteria;
-
     private List<FaqReq> faq;
 
-    private List<LookUpDataReq> checkList;
-
-    private List<DocumentReq> docs;
-
-    private List<DocumentReq> images;
-
+    @NotNull
     private CallTypeEnum status;
 
 }

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

@@ -0,0 +1,29 @@
+package net.gepafin.tendermanagement.model.request;
+
+import java.util.List;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.CallTypeEnum;
+
+@Data
+public class CreateCallRequestStep2 {
+
+	@NotNull
+	private Long callId;
+
+    private Long threshold;
+
+    @NotNull
+    private List<EvaluationCriteriaReq> criteria;
+
+    @NotNull
+    private List<LookUpDataReq> checkList;
+
+    private List<DocumentReq> docs;
+
+    private List<DocumentReq> images;
+
+    private CallTypeEnum status;
+
+}

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

@@ -1,10 +1,12 @@
 package net.gepafin.tendermanagement.model.request;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
 public class LookUpDataReq {
 
+	@NotNull
     private Long lookUpDataId;
 
     private String value;

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

@@ -1,8 +1,6 @@
 package net.gepafin.tendermanagement.model.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -21,5 +19,7 @@ public class RoleReq {
     private String permissions;
 
     private Long regionId;
+    
+    private String roleType;
 
 }

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

@@ -1,7 +1,5 @@
 package net.gepafin.tendermanagement.model.request;
 
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import net.gepafin.tendermanagement.enums.UserStatusEnum;

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

@@ -36,6 +36,4 @@ public class UserReq {
 
     private String country;
 
-    private UserStatusEnum status;
-
 }