Conflict Resolved
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
package net.gepafin.tendermanagement.model.request;
|
||||
|
||||
import lombok.Data;
|
||||
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
|
||||
|
||||
@Data
|
||||
public class AssignedApplicationsRequest {
|
||||
private String note;
|
||||
private AssignedApplicationEnum status;
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -5,4 +5,5 @@ import lombok.Data;
|
||||
@Data
|
||||
public class InitiatePasswordResetReq {
|
||||
private String email;
|
||||
private String hubUuid;
|
||||
}
|
||||
|
||||
@@ -14,5 +14,6 @@ public class LoginReq {
|
||||
private String email;
|
||||
@NotEmpty
|
||||
private String password;
|
||||
private String hubUuid;
|
||||
private Boolean rememberMe;
|
||||
}
|
||||
|
||||
@@ -8,6 +8,6 @@ public class ResetPasswordReq {
|
||||
private String token;
|
||||
private String newPassword;
|
||||
private String confirmPassword;
|
||||
|
||||
private String hubUuid;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.gepafin.tendermanagement.model.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
public class S3ConfigReq {
|
||||
@NotNull
|
||||
private String path;
|
||||
|
||||
@NotNull
|
||||
private String type;
|
||||
|
||||
@NotNull
|
||||
private String bucketName;
|
||||
|
||||
@NotNull
|
||||
private String parentFolder;
|
||||
}
|
||||
@@ -39,4 +39,8 @@ public class UserReq {
|
||||
private Boolean thirdParty;
|
||||
|
||||
private String emailPec;
|
||||
|
||||
private String hubUuid;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import lombok.Data;
|
||||
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
|
||||
import net.gepafin.tendermanagement.model.BaseBean;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class AssignedApplicationsResponse extends BaseBean {
|
||||
private Long applicationId;
|
||||
private Long userId;
|
||||
private Long assignedBy;
|
||||
private AssignedApplicationEnum status;
|
||||
private String note;
|
||||
private LocalDateTime assignedAt;
|
||||
private Long protocolNumber;
|
||||
private String callName;
|
||||
private String beneficiaryName;
|
||||
private LocalDateTime submissionDate;
|
||||
private LocalDateTime callStartDate;
|
||||
private LocalDateTime callEndDate;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@ public class CallDetailsResponseBean {
|
||||
|
||||
private List<LocalDateTime> dates;
|
||||
|
||||
private Boolean confidi;
|
||||
|
||||
private CallStatusEnum status;
|
||||
|
||||
private Long regionId;
|
||||
|
||||
@@ -5,8 +5,10 @@ import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import lombok.Data;
|
||||
import net.gepafin.tendermanagement.enums.CallStatusEnum;
|
||||
import net.gepafin.tendermanagement.util.DynamicLocalTimeSerializer;
|
||||
|
||||
@Data
|
||||
public class CallResponse {
|
||||
@@ -47,8 +49,10 @@ public class CallResponse {
|
||||
|
||||
private String phoneNumber;
|
||||
|
||||
@JsonSerialize(using = DynamicLocalTimeSerializer.class)
|
||||
private LocalTime startTime;
|
||||
|
||||
@JsonSerialize(using = DynamicLocalTimeSerializer.class)
|
||||
private LocalTime endTime;
|
||||
|
||||
private LocalDateTime createdDate;
|
||||
|
||||
@@ -13,5 +13,7 @@ public class ContentResponseBean {
|
||||
private String label;
|
||||
private List<SettingResponseBean> settings;
|
||||
private Map<String,Object> validators;
|
||||
private List<Long> criteria;
|
||||
private String dynamicData;
|
||||
private Integer dbId;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.gepafin.tendermanagement.model.BaseBean;
|
||||
|
||||
import java.util.Map;
|
||||
@Getter
|
||||
@Setter
|
||||
public class HubResponseBean extends BaseBean {
|
||||
|
||||
private String companyName;
|
||||
|
||||
private String firstName;
|
||||
|
||||
private String lastName;
|
||||
|
||||
private String email;
|
||||
|
||||
private String city;
|
||||
|
||||
private String country;
|
||||
|
||||
private String vatNumber;
|
||||
|
||||
private String appConfig;
|
||||
|
||||
private String domainName;
|
||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||
private String uniqueUuid;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package net.gepafin.tendermanagement.model.response;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class S3ConfigBean {
|
||||
private String path;
|
||||
private String type;
|
||||
private String bucketName;
|
||||
private String parentFolder;
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
/**
|
||||
* Copyright (c) 2017 The JNanoID Authors
|
||||
* Copyright (c) 2017 Aventrix LLC
|
||||
* Copyright (c) 2017 Andrey Sitnik
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
* this software and associated documentation files (the "Software"), to deal in
|
||||
* the Software without restriction, including without limitation the rights to
|
||||
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
* the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package net.gepafin.tendermanagement.model.util;
|
||||
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Random;
|
||||
|
||||
|
||||
public final class NanoIdUtils {
|
||||
|
||||
/**
|
||||
* <code>NanoIdUtils</code> instances should NOT be constructed in standard programming.
|
||||
* Instead, the class should be used as <code>NanoIdUtils.randomNanoId();</code>.
|
||||
*/
|
||||
private NanoIdUtils() {
|
||||
//Do Nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* The default random number generator used by this class.
|
||||
* Creates cryptographically strong NanoId Strings.
|
||||
*/
|
||||
public static final SecureRandom DEFAULT_NUMBER_GENERATOR = new SecureRandom();
|
||||
|
||||
/**
|
||||
* The default alphabet used by this class.
|
||||
* Creates url-friendly NanoId Strings using 64 unique symbols.
|
||||
*/
|
||||
public static final char[] DEFAULT_ALPHABET =
|
||||
"_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
|
||||
|
||||
/**
|
||||
* The default size used by this class.
|
||||
* Creates NanoId Strings with slightly more unique values than UUID v4.
|
||||
*/
|
||||
public static final int DEFAULT_SIZE = 21;
|
||||
|
||||
/**
|
||||
* Static factory to retrieve a url-friendly, pseudo randomly generated, NanoId String.
|
||||
*
|
||||
* The generated NanoId String will have 21 symbols.
|
||||
*
|
||||
* The NanoId String is generated using a cryptographically strong pseudo random number
|
||||
* generator.
|
||||
*
|
||||
* @return A randomly generated NanoId String.
|
||||
*/
|
||||
public static String randomNanoId() {
|
||||
return randomNanoId(DEFAULT_NUMBER_GENERATOR, DEFAULT_ALPHABET, DEFAULT_SIZE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Static factory to retrieve a NanoId String.
|
||||
*
|
||||
* The string is generated using the given random number generator.
|
||||
*
|
||||
* @param random The random number generator.
|
||||
* @param alphabet The symbols used in the NanoId String.
|
||||
* @param size The number of symbols in the NanoId String.
|
||||
* @return A randomly generated NanoId String.
|
||||
*/
|
||||
public static String randomNanoId(final Random random, final char[] alphabet, final int size) {
|
||||
|
||||
if (random == null) {
|
||||
throw new IllegalArgumentException("random cannot be null.");
|
||||
}
|
||||
|
||||
if (alphabet == null) {
|
||||
throw new IllegalArgumentException("alphabet cannot be null.");
|
||||
}
|
||||
|
||||
if (alphabet.length == 0 || alphabet.length >= 256) {
|
||||
throw new IllegalArgumentException("alphabet must contain between 1 and 255 symbols.");
|
||||
}
|
||||
|
||||
if (size <= 0) {
|
||||
throw new IllegalArgumentException("size must be greater than zero.");
|
||||
}
|
||||
|
||||
double value = (double) (alphabet.length - 1);
|
||||
|
||||
final int mask = (2 << (int) Math.floor(Math.log(value) / Math.log(2))) - 1;
|
||||
final int step = (int) Math.ceil(1.6 * mask * size / alphabet.length);
|
||||
|
||||
final StringBuilder idBuilder = new StringBuilder();
|
||||
|
||||
while (true) {
|
||||
|
||||
final byte[] bytes = new byte[step];
|
||||
random.nextBytes(bytes);
|
||||
|
||||
for (int i = 0; i < step; i++) {
|
||||
|
||||
final int alphabetIndex = bytes[i] & mask;
|
||||
|
||||
if (alphabetIndex < alphabet.length) {
|
||||
idBuilder.append(alphabet[alphabetIndex]);
|
||||
if (idBuilder.length() == size) {
|
||||
return idBuilder.toString();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user