diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/HistoryConfig.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/HistoryConfig.java index 2458ba1ca..40918ca81 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/HistoryConfig.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/HistoryConfig.java @@ -183,8 +183,8 @@ public class HistoryConfig { sbscr.setSearchProxyMapName(IMDGDistributedNames.Map_SearchSession); sbscr.setFullHistoryMapName(IMDGDistributedNames.Map_Session); sbscr.setConditions(List.of( - new TradingDateFromCondition(pb), - new TradingDateToCondition(pb) + new ClearingDateFromCondition(pb), + new ClearingDateToCondition(pb) )); return sbscr; } diff --git a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/index/SearchProxySession.java b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/index/SearchProxySession.java index 5d8f191d4..755783efe 100644 --- a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/index/SearchProxySession.java +++ b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/index/SearchProxySession.java @@ -1,22 +1,22 @@ package ru.spcex.clearing.historyimdg.index; -import ru.spcex.clearing.historyimdg.index.field.SearchWithTradingDate; +import ru.spcex.clearing.historyimdg.index.field.SearchWithClearingDate; import java.time.LocalDate; -public class SearchProxySession extends SearchProxy implements SearchWithTradingDate { +public class SearchProxySession extends SearchProxy implements SearchWithClearingDate { /** - * trading_date или created_at + * clearing_date или created_at */ - private LocalDate tradingDate; + private LocalDate clearingDate; @Override - public LocalDate getTradingDate() { - return tradingDate; + public LocalDate getClearingDate() { + return clearingDate; } @Override - public void setTradingDate(LocalDate tradingDate) { - this.tradingDate = tradingDate; + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; } } diff --git a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/mapstores/SearchSessionMapStore.java b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/mapstores/SearchSessionMapStore.java index 70330851b..ffc8051cf 100644 --- a/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/mapstores/SearchSessionMapStore.java +++ b/clearing-parent/imdg-hist/src/main/java/ru/spcex/clearing/historyimdg/mapstores/SearchSessionMapStore.java @@ -33,10 +33,10 @@ public class SearchSessionMapStore extends AbstractSliceMapLoader { SearchProxySession proxyFond = new SearchProxySession(); proxyFond.setId(rs.getObject("id", Long.class)); - LocalDate date = getLocalDateFromSqlDate(rs, "trading_date"); + LocalDate date = getLocalDateFromSqlDate(rs, "clearing_date"); if (date == null) date = getLocalDateFromSqlDate(rs, "created_at"); - proxyFond.setTradingDate(date); + proxyFond.setClearingDate(date); return proxyFond; }); }