Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into feature/GEPAFINBE-55

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

@@ -13,6 +13,8 @@ public class ContentRequestBean {
     private String label;
     private List<SettingRequestBean> settings;
     private Map<String,Object> validators;
+    private List<Long> criteria;
+    private String dynamicData;
     private Integer dbId;
 
 }

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

@@ -0,0 +1,38 @@
+package net.gepafin.tendermanagement.model.request;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+
+@Getter
+@Setter
+public class HubReq {
+	
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
+	private Long id;
+	
+	private String companyName;
+	
+	private String firstName;
+	
+	private String lastName;
+
+	private String email;
+	
+	private String city;
+
+	private String country;
+	
+	private String vatNumber;
+
+	private String domainName;
+	
+	private Map<String, Object> appConfig;
+	
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
+	private String uniqueUuid;
+}

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

@@ -5,4 +5,5 @@ import lombok.Data;
 @Data
 public class InitiatePasswordResetReq {
     private String email;
+    private  String hubUuid;
 }

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

@@ -14,5 +14,6 @@ public class LoginReq {
     private String email;
     @NotEmpty
     private String password;
+    private  String hubUuid;
     private  Boolean rememberMe;
 }

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

@@ -8,6 +8,6 @@ public class ResetPasswordReq {
     private String token;
     private String newPassword;
     private String confirmPassword;
-
+    private  String hubUuid;
 
 }

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

@@ -39,4 +39,8 @@ public class UserReq {
     private Boolean thirdParty;
 
     private String emailPec;
+    
+    private  String hubUuid;
+    
+    
 }