resolved conflicts

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

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class FlowDataRequestBean {
+
+    private Long formId;
+
+    private String chosenField;
+
+    private String chosenValue;
+}

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+@Data
+public class FlowEdgesRequestBean {
+
+    private String id;
+
+    private String source;
+
+    private String target;
+
+    private String type;
+}

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

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FlowRequestBean {
+
+    private Long initialForm;
+
+    private Long finalForm;
+
+    private List<FlowDataRequestBean> flowData;
+
+    private List<FlowEdgesRequestBean> flowEdges;
+}

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

@@ -10,6 +10,10 @@ public class FormFieldRequest {
 
     private String name;
 
+    private String description;
+
+    private Integer sortOrder;
+
     private String label;
 
     private List<SettingRequestBean> settings;

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class FlowDataResponseBean {
+
+    private Long id;
+
+    private Long formId;
+
+    private String chosenField;
+
+    private String chosenValue;
+}

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

@@ -0,0 +1,16 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
+import org.springframework.security.core.parameters.P;
+
+@Data
+public class FlowEdgesResponseBean {
+    private String id;
+
+    private String source;
+
+    private String target;
+
+    private String type;
+}

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

@@ -0,0 +1,22 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.request.FlowDataRequestBean;
+import net.gepafin.tendermanagement.model.request.FlowEdgesRequestBean;
+
+import java.util.List;
+
+@Data
+public class FlowResponseBean {
+
+    private Long callId;
+
+    private Long initialForm;
+
+    private Long finalForm;
+
+    private List<FlowDataResponseBean> flowData;
+
+    private List<FlowEdgesResponseBean> flowEdges;
+}
+

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

@@ -14,6 +14,11 @@ public class FormFieldResponseBean {
 
     private String label;
 
+    private String description;
+
+    private Integer sortOrder;
+
+
     private List<SettingResponseBean> settings;
 
     private Map<String,Object> validators;