diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCurrencyService.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCurrencyService.java deleted file mode 100644 index 3e961321a..000000000 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/OrderCurrencyService.java +++ /dev/null @@ -1,53 +0,0 @@ -package ru.spcex.clearing.dflt.management.service; - -import java.util.Collection; -import java.util.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.misc.OvernightSettings; -import ru.clearing.classes.statics.data.registry.Registry; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.util.security.UserRoleVerification; -import ru.spcex.platform.enumeration.Market; -import ru.spcex.platform.enumeration.RegistryStatus; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; -import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; - -@Service -public class OrderCurrencyService { - private final Logger log = LoggerFactory.getLogger(getClass()); - private ImdgProvider imdgProvider; - private Imdg registryImdg; - private final Imdg overnightSettingsImdg; - - public OrderCurrencyService(ImdgProvider imdgProvider, - UserRoleVerification userRoleVerification) { - this.imdgProvider = imdgProvider; - this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); - this.overnightSettingsImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_OvernightSettings, OvernightSettings.class); - } - - - public Collection getCurrencyRegistry() { - ImdgPredicateBuilder builder = registryImdg.predicateBuilder(); - ImdgPredicate registryPredicate = builder.and( - builder.regex("registryCode", "^PM.*T"), - builder.not(builder.equals("registryStatus", RegistryStatus.OK.getKey())) - ); - - return registryImdg.getCollectionIdsByPredicate(registryPredicate); - } - - public Optional findOvernightSettingsByCompany(Long companyId) { - ImdgPredicateBuilder builder = overnightSettingsImdg.predicateBuilder(); - ImdgPredicate predicate = builder.and( - builder.equals("market", Market.curr), - builder.equals("companyId", companyId) - ); - OvernightSettings overnightSettings = overnightSettingsImdg.getFirstObjectByPredicate(predicate); - return Optional.ofNullable(overnightSettings); - } -} diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOrderTemplateBuilder.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOrderTemplateBuilder.java index e903955d7..147afc5b2 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOrderTemplateBuilder.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/SwapOrderTemplateBuilder.java @@ -12,11 +12,6 @@ import ru.spcex.platform.enumeration.Side; @Service public class SwapOrderTemplateBuilder { - private final ImdgQueryService imdgQueryService; - - public SwapOrderTemplateBuilder(ImdgQueryService imdgQueryService) { - this.imdgQueryService = imdgQueryService; - } public OrderCurrency buildPrimaryTransfer(SwapContext context) { OrderCurrency orderCurrency;