rename feald TradingStatus -> DayStatus for ClearingCalendar and other entities

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

@@ -17,18 +17,6 @@ public class ClearingCalendarBackendGetAll extends BasicSpcexResponse {
     @ApiModelProperty(value = "Полезная нагрузка")
     private ClearingCalendarBackendPayload payload = new ClearingCalendarBackendPayload();
 
-    private static class ClearingCalendarBackendPayload {
-        private List<TradingCalendarBackendGetFields> items = new ArrayList<>();
-
-        public List<TradingCalendarBackendGetFields> getItems() {
-            return items;
-        }
-
-        public void setItems(List<TradingCalendarBackendGetFields> items) {
-            this.items = items;
-        }
-    }
-
     public ClearingCalendarBackendPayload getPayload() {
         return payload;
     }
@@ -44,11 +32,22 @@ public class ClearingCalendarBackendGetAll extends BasicSpcexResponse {
             singleItem.setId(tradingCalendar.getId());
             singleItem.setClearingDate(tradingCalendar.getClearingDate());
             singleItem.setCompanyId(tradingCalendar.getCompanyId());
-            singleItem.setTradingStatus(tradingCalendar.getTradingStatus());
+            singleItem.setDayStatus(tradingCalendar.getDayStatus());
             singleItem.setCreated(tradingCalendar.getCreated());
             singleItem.setUpdated(tradingCalendar.getUpdated());
             payload.getItems().add(singleItem);
         }
     }
 
+    private static class ClearingCalendarBackendPayload {
+        private List<TradingCalendarBackendGetFields> items = new ArrayList<>();
+
+        public List<TradingCalendarBackendGetFields> getItems() {
+            return items;
+        }
+
+        public void setItems(List<TradingCalendarBackendGetFields> items) {
+            this.items = items;
+        }
+    }
 }

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

@@ -17,7 +17,7 @@ public class TradingCalendarBackendGetFields {
     @JsonProperty
     private Long companyId;
     @JsonProperty
-    private String tradingStatus;
+    private String dayStatus;
     @JsonProperty
     @JsonSerialize(using = InstantSerializer.class)
     private Instant created;
@@ -49,12 +49,12 @@ public class TradingCalendarBackendGetFields {
         this.companyId = companyId;
     }
 
-    public String getTradingStatus() {
+    public String getDayStatus() {
-        return tradingStatus;
+        return dayStatus;
     }
 
-    public void setTradingStatus(String tradingStatus) {
+    public void setDayStatus(String dayStatus) {
-        this.tradingStatus = tradingStatus;
+        this.dayStatus = dayStatus;
     }
 
     public Instant getCreated() {

clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java

@@ -15,7 +15,7 @@ public class ClearingCalendar extends BusinessObject {
 
     private LocalDate clearingDate;
     private Long companyId;
-    private String tradingStatus;
+    private String dayStatus;
 
     public LocalDate getClearingDate() {
         return clearingDate;
@@ -33,12 +33,12 @@ public class ClearingCalendar extends BusinessObject {
         this.companyId = value;
     }
 
-    public String getTradingStatus() {
+    public String getDayStatus() {
-        return tradingStatus;
+        return dayStatus;
     }
 
-    public void setTradingStatus(String value) {
+    public void setDayStatus(String value) {
-        this.tradingStatus = value;
+        this.dayStatus = value;
     }
 
 }

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java

@@ -30,7 +30,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
     @Override
     public String[] getFields() {
         return new String[]{
-                "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "TRADING_STATUS"
+                "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "DAY_STATUS"
         };
     }
 
@@ -42,7 +42,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
         object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
         object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
         object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
-        object.setTradingStatus(resultSet.getObject("TRADING_STATUS", String.class));
+        object.setDayStatus(resultSet.getObject("DAY_STATUS", String.class));
         return object;
     }
 
@@ -54,7 +54,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
                 TimeUtil.toDateFromInstant(object.getUpdated()),
                 TimeUtil.toDateFromLocalDate(object.getClearingDate()),
                 object.getCompanyId(),
-                object.getTradingStatus()
+                object.getDayStatus()
         };
         return args;
     }

clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java

@@ -50,7 +50,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
         ClearingCalendar clearingCalendar = new ClearingCalendar();
         clearingCalendar.setClearingDate(req.getClearingDate());
         clearingCalendar.setCompanyId(req.getCompanyId());
-        clearingCalendar.setTradingStatus(req.getTradingStatus());
+        clearingCalendar.setDayStatus(req.getDayStatus());
         clearingCalendarMap.insert(clearingCalendar);
         log.debug("successfully processed, new id {}", clearingCalendar.getId());
     }
@@ -61,7 +61,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
         ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
         clearingCalendar.setClearingDate(req.getClearingDate());
         clearingCalendar.setCompanyId(req.getCompanyId());
-        clearingCalendar.setTradingStatus(req.getTradingStatus());
+        clearingCalendar.setDayStatus(req.getDayStatus());
         clearingCalendarMap.update(clearingCalendar);
         log.debug("successfully processed, new id {}", clearingCalendar.getId());
     }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java

@@ -16,7 +16,7 @@ public class ClearingCalendarNewRequest {
     @JsonProperty
     public Long companyId;
     @JsonProperty
-    public String tradingStatus;
+    public String dayStatus;
 
     public LocalDate getClearingDate() {
         return clearingDate;
@@ -34,11 +34,11 @@ public class ClearingCalendarNewRequest {
         this.companyId = companyId;
     }
 
-    public String getTradingStatus() {
+    public String getDayStatus() {
-        return tradingStatus;
+        return dayStatus;
     }
 
-    public void setTradingStatus(String tradingStatus) {
+    public void setDayStatus(String dayStatus) {
-        this.tradingStatus = tradingStatus;
+        this.dayStatus = dayStatus;
     }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java

@@ -19,7 +19,7 @@ public class ClearingCalendarUpdateRequest {
     @JsonProperty
     public Long companyId;
     @JsonProperty
-    public String tradingStatus;
+    public String dayStatus;
 
     public Long getId() {
         return id;
@@ -45,11 +45,11 @@ public class ClearingCalendarUpdateRequest {
         this.companyId = companyId;
     }
 
-    public String getTradingStatus() {
+    public String getDayStatus() {
-        return tradingStatus;
+        return dayStatus;
     }
 
-    public void setTradingStatus(String tradingStatus) {
+    public void setDayStatus(String dayStatus) {
-        this.tradingStatus = tradingStatus;
+        this.dayStatus = dayStatus;
     }
 }