Merge remote-tracking branch 'origin/dev' into dev

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityNewAction.java

@@ -11,7 +11,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSe
 import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 
-import java.time.Instant;
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -21,12 +21,12 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant startDate;
+    public LocalDate startDate;
     @ApiModelProperty(value = "Дата окончания действия", example = "2022-02-21")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant endDate;
+    public LocalDate endDate;
     @ApiModelProperty(value = "Номинал", example = "20.5")
     @JsonProperty
     public Double nominalValue;
@@ -73,19 +73,19 @@ public class MoneyMarketSecurityNewAction implements IAction<MoneyMarketSecurity
         return ActionType.NEW;
     }
 
-    public Instant getStartDate() {
+    public LocalDate getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Instant startDate) {
+    public void setStartDate(LocalDate startDate) {
         this.startDate = startDate;
     }
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/securities/MoneyMarketSecurityUpdateAction.java

@@ -9,7 +9,7 @@ import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSecurityUpdateRequest;
 import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
 
-import java.time.Instant;
+import java.time.LocalDate;
 
 public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecurityUpdateRequest> {
     @ApiModelProperty(hidden = true)
@@ -19,7 +19,7 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant endDate;
+    public LocalDate endDate;
     @ApiModelProperty(value = "Номинал", example = "20.5")
     @JsonProperty
     public Double nominalValue;
@@ -56,11 +56,11 @@ public class MoneyMarketSecurityUpdateAction implements IAction<MoneyMarketSecur
     }
 
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateNewAction.java

@@ -12,7 +12,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeser
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 
 import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -25,12 +25,12 @@ public class KeyRateNewAction implements IAction<KeyRateNewRequest> {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant startDate;
+    public LocalDate startDate;
     @ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant endDate;
+    public LocalDate endDate;
     @ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum")
     @JsonProperty
     public String document;
@@ -66,19 +66,19 @@ public class KeyRateNewAction implements IAction<KeyRateNewRequest> {
         this.keyRate = keyRate;
     }
 
-    public Instant getStartDate() {
+    public LocalDate getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Instant startDate) {
+    public void setStartDate(LocalDate startDate) {
         this.startDate = startDate;
     }
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java

@@ -10,7 +10,7 @@ import ru.spcex.clearing.platform.messaging.domain.cud.utilities.KeyRateUpdateRe
 import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
 
 import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.LocalDate;
 
 public class KeyRateUpdateAction implements IAction<KeyRateUpdateRequest> {
     @ApiModelProperty(hidden = true)
@@ -23,12 +23,12 @@ public class KeyRateUpdateAction implements IAction<KeyRateUpdateRequest> {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant startDate;
+    public LocalDate startDate;
     @ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
     @JsonDeserialize(using = InstantDeserializer.class)
     @JsonProperty
-    public Instant endDate;
+    public LocalDate endDate;
     @ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum")
     @JsonProperty
     public String document;
@@ -58,19 +58,19 @@ public class KeyRateUpdateAction implements IAction<KeyRateUpdateRequest> {
         this.keyRate = keyRate;
     }
 
-    public Instant getStartDate() {
+    public LocalDate getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Instant startDate) {
+    public void setStartDate(LocalDate startDate) {
         this.startDate = startDate;
     }
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer;
 
 import java.time.Instant;
+import java.time.LocalDate;
 
 public class TradingCalendarBackendGetFields {
     @JsonProperty
@@ -21,7 +22,7 @@ public class TradingCalendarBackendGetFields {
     private Instant created;
     @JsonProperty
     @JsonSerialize(using = InstantSerializer.class)
-    private Instant updated;
+    private LocalDate updated;
 
     public Long getId() {
         return id;
@@ -31,11 +32,11 @@ public class TradingCalendarBackendGetFields {
         this.id = id;
     }
 
-    public Instant getClearingDate() {
+    public LocalDate getClearingDate() {
         return clearingDate;
     }
 
-    public void setClearingDate(Instant clearingDate) {
+    public void setClearingDate(LocalDate clearingDate) {
         this.clearingDate = clearingDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java

@@ -6,6 +6,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSeriali
 
 import java.math.BigDecimal;
 import java.time.Instant;
+import java.time.LocalDate;
 
 public class MoneyMarketSecurityBackendGetFields {
     @JsonProperty
@@ -16,10 +17,10 @@ public class MoneyMarketSecurityBackendGetFields {
     private String description;
     @JsonSerialize(using = InstantSerializer.class)
     @JsonProperty
-    private Instant startDate;
+    private LocalDate startDate;
     @JsonSerialize(using = InstantSerializer.class)
     @JsonProperty
-    private Instant endDate;
+    private LocalDate endDate;
     @JsonProperty
     private BigDecimal nominalValue;
     @JsonProperty
@@ -59,15 +60,15 @@ public class MoneyMarketSecurityBackendGetFields {
         return startDate;
     }
 
-    public void setStartDate(Instant startDate) {
+    public void setStartDate(LocalDate startDate) {
         this.startDate = startDate;
     }
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }
 

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer;
 
 import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.LocalDate;
 
 public class KeyRateBackendGetFields {
     @JsonProperty
@@ -14,10 +14,10 @@ public class KeyRateBackendGetFields {
     private BigDecimal rate;
     @JsonSerialize(using = InstantSerializer.class)
     @JsonProperty
-    private Instant startDate;
+    private LocalDate startDate;
     @JsonSerialize(using = InstantSerializer.class)
     @JsonProperty
-    private Instant endDate;
+    private LocalDate endDate;
     @JsonProperty
     private String document;
     @JsonProperty
@@ -39,19 +39,19 @@ public class KeyRateBackendGetFields {
         this.rate = rate;
     }
 
-    public Instant getStartDate() {
+    public LocalDate getStartDate() {
         return startDate;
     }
 
-    public void setStartDate(Instant startDate) {
+    public void setStartDate(LocalDate startDate) {
         this.startDate = startDate;
     }
 
-    public Instant getEndDate() {
+    public LocalDate getEndDate() {
         return endDate;
     }
 
-    public void setEndDate(Instant endDate) {
+    public void setEndDate(LocalDate endDate) {
         this.endDate = endDate;
     }