Resolved conflicts

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

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+
+import java.util.List;
+
+@Data
+public class ApplicationAmendmentPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<ApplicationAmendmentRequestEnum> status;
+}

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

@@ -11,7 +11,7 @@ public class AppointmentCreationRequest {
 
     @Data
     public static class Input {
-        private String id;
+        private Long id;
         private String ndg;
         private List<RichiestaCliente> richiestaCliente;
     }
@@ -20,8 +20,8 @@ public class AppointmentCreationRequest {
     public static class RichiestaCliente {
         private String codAbi;
         private String codCab;
-        private Integer durataMesiFinanziamento;
-        private Integer idMotivazione;
+        private int durataMesiFinanziamento;
+        private int idMotivazione;
         private String idNota;
         private String importoAgevolato;
         private Double importoBreveTermine;

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
+
+import java.util.List;
+
+@Data
+public class AssignedApplicationPageableRequestBean {
+
+
+    private GlobalFilters globalFilters;
+
+    private List<AssignedApplicationEnum> status;
+}

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

@@ -26,7 +26,7 @@ public class CreateCallRequestStep1 {
 
     private Long numberOfCheck;
 
-    private Long productId;
+    private Long appointmentTemplateId;
 
     private List<LookUpDataReq> aimedTo;
 

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

@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.List;
 
 import lombok.Data;
@@ -43,7 +42,7 @@ public class UpdateCallRequestStep1 {
 
 	private Long numberOfCheck;
 
-	private Long productId;
+	private Long appointmentTemplateId;
 
 	private EvaluationVersionEnum evaluationVersion;
 

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

@@ -0,0 +1,21 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.TimePeriodEnum;
+import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
+
+import java.util.List;
+
+@Data
+public class UserActionPaginationRequest {
+
+   private GlobalFilters globalFilters;
+
+   private TimePeriodEnum timeFilter;
+
+   private List<UserActionContextEnum> actionContext;
+
+   private List<UserActionLogsEnum> actionType;
+
+}

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

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
+
+import java.util.List;
+
+@Data
+public class UserPaginationRequestBean {
+
+    private GlobalFilters globalFilters;
+
+    private List<UserStatusEnum> status;
+
+    private List<RoleStatusEnum> role;
+}

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

@@ -44,7 +44,7 @@ public class ApplicationEvaluationFormResponse {
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
     private EvaluationVersionEnum evaluationVersion;
-    private BigDecimal numberOfCheck;
-    private BigDecimal productId;
+    private Long numberOfCheck;
+    private Long appointmentTemplateId;
 
 }

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

@@ -45,7 +45,7 @@ public class ApplicationEvaluationResponse {
     private LocalDateTime dateAccepted;
     private LocalDateTime dateRejected;
     private Long numberOfCheck;
-    private Long productId;
+    private Long appointmentTemplateId;
     private EvaluationVersionEnum evaluationVersion;
     
 }

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

@@ -5,7 +5,6 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -25,9 +24,10 @@ public class AssignedApplicationsResponse extends BaseBean {
     private String companyName;
     private LocalDateTime evaluationEndDate;
     private Long numberOfCheck;
-    private Long productId;
+    private Long appointmentTemplateId;
     private EvaluationVersionEnum evaluationVersion;
-
+    private String ndg;
+    private String appointmentId;
 }
 
 

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

@@ -59,7 +59,7 @@ public class CallDetailsResponseBean {
 
     private Long numberOfCheck;
 
-    private Long productId;
+    private Long appointmentTemplateId;
 
     private EvaluationVersionEnum evaluationVersion;
 }

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

@@ -52,7 +52,7 @@ public class CallResponse {
 
     private Long numberOfCheck;
 
-    private Long productId;
+    private Long appointmentTemplateId;
 
     @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime startTime;

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

@@ -14,5 +14,4 @@ public class SummaryPageResponseBean {
     private LocalDateTime registrationDate;
     private Long numberOfLoginAttempts;
     private Long applicationsProcessed;
-    private List<UserActionResponseBean> userActions;
 }