Resolved conflicts

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class ChangePasswordRequest {
+
+
+    private String email;
+
+    private String password;
+
+    private String newPassword;
+
+    private String confirmPassword;
+}

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

@@ -1,14 +1,12 @@
 package net.gepafin.tendermanagement.model.request;
 
-import lombok.Data;
-import net.gepafin.tendermanagement.enums.CallTypeEnum;
-
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
 @Data
 public class CreateCallRequestStep1 {
@@ -43,11 +41,8 @@ public class CreateCallRequestStep1 {
 	@NotEmpty
     private String documentationRequested;
 
-    private Boolean Confidi;
+    private Boolean confidi;
 
     private List<FaqReq> faq;
 
-    @NotNull
-    private CallTypeEnum status;
-
 }

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

@@ -4,14 +4,10 @@ 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
@@ -24,6 +20,4 @@ public class CreateCallRequestStep2 {
 
     private List<DocumentReq> images;
 
-    private CallTypeEnum status;
-
 }

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

@@ -1,11 +1,11 @@
 package net.gepafin.tendermanagement.model.request;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@NoArgsConstructor
 @Data
-public class EvaluationCriteriaReq {
+public class EvaluationCriteriaReq extends LookUpDataReq{
 
-    private String name;
-    private String value;
-    private Integer score;
+    private Long score;
 }

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

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class EvaluationCriteriaRequest extends LookUpDataReq {
+
+    private Long callId;
+
+    private Long score;
+}

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

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class FaqReq {
 
+	private Long id;
     private Boolean isVisible;
     private String questionShort;
     private String question;

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

@@ -0,0 +1,8 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class InitiatePasswordResetReq {
+    private String email;
+}

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

@@ -0,0 +1,10 @@
+package net.gepafin.tendermanagement.model.request;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.Data;
+
+@Data
+public class LogoutReq {
+    private String email;
+}

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

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

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

@@ -0,0 +1,12 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum;
+
+@Data
+public class LookUpDataRequest {
+
+    private String title;
+    private LookUpDataTypeEnum type;
+    private String value;
+}

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

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class ResetPasswordReq {
+    private String email;
+    private String token;
+    private String newPassword;
+    private String confirmPassword;
+
+
+}

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

@@ -0,0 +1,43 @@
+package net.gepafin.tendermanagement.model.request;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class UpdateCallRequestStep1 {
+
+	
+    private String name;
+
+	
+    private String descriptionShort;
+
+	
+    private String descriptionLong;
+
+	
+    private LocalDateTime startDate;
+
+	
+    private LocalDateTime endDate;
+
+	
+    private BigDecimal amount;
+
+	
+    private BigDecimal amountMax;
+
+	
+    private List<LookUpDataReq> aimedTo;
+
+	
+    private String documentationRequested;
+
+    private Boolean confidi;
+
+    private List<FaqReq> faq;
+
+}

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

@@ -1,14 +1,13 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-import net.gepafin.tendermanagement.enums.CallTypeEnum;
+import net.gepafin.tendermanagement.enums.CallStatusEnum;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-
 @Data
-public class CreateCallResponseBean {
+public class CallDetailsResponseBean {
 
     private Long id;
 
@@ -20,7 +19,7 @@ public class CreateCallResponseBean {
 
     private List<LocalDateTime> dates;
 
-    private CallTypeEnum status;
+    private CallStatusEnum status;
 
     private Long regionId;
 
@@ -54,7 +53,5 @@ public class CreateCallResponseBean {
 
     private List<LookUpDataResponse> checkList;
 
+    private String currentStep;
 }
-
-
-

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

@@ -0,0 +1,66 @@
+package net.gepafin.tendermanagement.model.response;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.CallStatusEnum;
+
+@Data
+public class CallResponse {
+
+    private Long id;
+
+    private String name;
+
+    private String descriptionShort;
+
+    private String descriptionLong;
+
+    private LocalDateTime startDate;
+    
+    private LocalDateTime endDate;
+
+    private CallStatusEnum status;
+
+    private Long regionId;
+
+    private BigDecimal amount;
+
+    private BigDecimal amountMax;
+
+    private String contactInfo;
+
+    private String submissionMethod;
+
+    private Long threshold;
+
+    private String priorityArea;
+
+    private String documentationReqested;
+    
+    private Boolean confidi;
+
+    private LocalDateTime createdDate;
+
+    private LocalDateTime updatedDate;
+
+    private List<LookUpDataResponse> aimedTo;
+
+    private List<EvaluationCriteriaResponseBean> criteria;
+
+    private List<DocumentResponseBean> docs;
+
+    private List<FaqResponseBean> faq;
+
+    private List<DocumentResponseBean> images;
+
+    private List<LookUpDataResponse> checkList;
+    
+    private String currentStep;
+
+}
+
+
+

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

@@ -1,21 +1,11 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
 
-import java.time.LocalDateTime;
 
 @Data
-public class EvaluationCriteriaResponseBean {
+public class EvaluationCriteriaResponseBean extends LookUpDataResponse{
 
-    private Long id;
-
-    private String name;
-
-    private String description;
-
-    private Integer score;
-
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
+    private Long score;
 }

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

@@ -1,16 +1,15 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
 
 
 import java.time.LocalDateTime;
 
 @Data
-public class FaqResponseBean {
+public class FaqResponseBean extends BaseBean {
 
-    private Long id;
-
-     private Long userId;
+    private Long userId;
 
     private Boolean isVisible;
 
@@ -24,7 +23,4 @@ public class FaqResponseBean {
 
     private LocalDateTime responseDate;
 
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
 }

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

@@ -1,13 +1,10 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
-
-import java.time.LocalDateTime;
+import net.gepafin.tendermanagement.model.BaseBean;
 
 @Data
-public class LookUpDataResponse {
-
-    private Long id;
+public class LookUpDataResponse extends BaseBean {
 
     private Long lookUpDataId;
 
@@ -15,8 +12,4 @@ public class LookUpDataResponse {
 
     private String value;
 
-    private LocalDateTime createdDate;
-
-    private LocalDateTime updatedDate;
-
 }

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class LookUpDataResponseBean extends BaseBean {
+
+    private String title;
+
+    private String value;
+
+    private LookUpDataTypeEnum type;
+}