From 7c7848074af0b4ab1a886b18c040bef8ddef79c1 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 2 Jul 2024 20:40:04 +0300 Subject: [PATCH] swt-exporter DF-14 UNIT session fix --- .../exporter/services/exportimpl/DF14Exporter.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF14Exporter.java b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF14Exporter.java index a17a2b7b1..cd135d8cf 100644 --- a/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF14Exporter.java +++ b/clearing-parent/swt-exporter/src/main/java/ru/spcex/clearing/swt/exporter/services/exportimpl/DF14Exporter.java @@ -1,5 +1,8 @@ package ru.spcex.clearing.swt.exporter.services.exportimpl; +import java.io.PrintWriter; +import java.time.LocalDateTime; +import java.util.Collection; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.misc.Session; import ru.clearing.classes.statics.data.sdf.SDf14; @@ -14,10 +17,7 @@ import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.enumeration.SessionType; import ru.spcex.platform.enumeration.SwtTable; import ru.spcex.platform.imdg.api.ImdgProvider; - -import java.io.PrintWriter; -import java.time.LocalDateTime; -import java.util.Collection; +import ru.spcex.platform.utils.enumeration.IEnumKey; @Service @@ -41,10 +41,10 @@ public class DF14Exporter extends AbstractExporterService { @Override protected String sectionForFileName(SwtExporterRequest req) { Session session = session(req); - if (!Section.FOND.equalsByKey(session.getSection())) { - throw new IllegalStateException("%s is only processed for FOND section".formatted(typeForFileName())); + if (!IEnumKey.contains(session.getSection(), Section.FOND, Section.MULT)) { + throw new IllegalStateException("%s is not processed for %s section".formatted(typeForFileName(), session.getSection())); } - if (SessionType.TRDT.equalsByKey(session.getSessionType())) { + if (IEnumKey.contains(session.getSessionType(), SessionType.TRDT, SessionType.UNIT)) { return "fund"; } return "bond";