diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index 4627a0194..2718a3053 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -18,7 +18,6 @@ import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.reports.config.element.ReportsServiceSettings; import ru.spcex.clearing.reports.reports.*; import ru.spcex.clearing.util.security.UserRoleVerification; -import ru.spcex.clearing.util.services.RequestHelper; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.ReportType; import ru.spcex.platform.utils.enumeration.IEnumKey; @@ -35,7 +34,6 @@ public class ReportService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); private final UserRoleVerification userRoleVerification; private final ValidationHelper validationHelper; - private final RequestHelper requestHelper; private final Function reportRequestValidator; private final Function reportRequestWithSessionIdValidator; private final Function reportRequestWithSessionIdListValidator; @@ -51,7 +49,6 @@ public class ReportService extends QueueConsumer implements InitializingBean { Producer kafkaResponseQueue, UserRoleVerification userRoleVerification, ValidationHelper validationHelper, - RequestHelper requestHelper, ReportsServiceSettings reportsServiceSettings, @Qualifier("reportBuildersWithoutParams") Map>> reportBuildersWithoutParams, @@ -72,7 +69,6 @@ public class ReportService extends QueueConsumer implements InitializingBean { super(kafkaQueue, kafkaResponseQueue); this.userRoleVerification = userRoleVerification; this.validationHelper = validationHelper; - this.requestHelper = requestHelper; this.reportRequestValidator = reportRequestValidator; this.reportRequestWithSessionIdValidator = reportRequestWithSessionIdValidator; this.reportRequestWithSessionIdListValidator = reportRequestWithSessionIdListValidator; diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java index 8e14c40d3..a0e09f150 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest.java @@ -7,15 +7,11 @@ import com.opencsv.CSVReaderBuilder; import com.opencsv.exceptions.CsvValidationException; import org.apache.commons.io.FileUtils; import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.clients.producer.Producer; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.company.Company; @@ -159,10 +155,10 @@ public class ReportServiceTest { @Autowired @Qualifier("hazelcastServiceTest") private ImdgProvider imdgProvider; - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer producer; + + @Autowired + @Qualifier("mockProducer") + private Producer producer; private static int reportRequestCnt = 0; private static int reportRequestWithSessionIdCnt = 0; @@ -204,7 +200,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/operational_liabilities_claims_expected.csv").getFile()); @@ -234,7 +230,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/period_liabilities_claims_expected.csv").getFile()); @@ -257,7 +253,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/summary_liabilities_claims_expected.csv").getFile()); @@ -289,7 +285,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/operational_money_change_expected.csv").getFile()); @@ -319,7 +315,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/period_money_change_expected.csv").getFile()); @@ -346,7 +342,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/summary_money_change_expected.csv").getFile()); @@ -399,7 +395,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles((dir, name) -> name.contains("INFTYPE_1"))[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/KS_BR_PFX64_INFTYPE_1_expected.csv").getFile()); @@ -451,7 +447,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles((dir, name) -> name.contains("INFTYPE_2"))[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/KS_BR_PFX64_INFTYPE_2_expected.csv").getFile()); @@ -500,7 +496,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles((dir, name) -> name.contains("INFTYPE_3"))[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/KS_BR_PFX64_INFTYPE_3_expected.csv").getFile()); @@ -550,7 +546,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles((dir, name) -> name.contains("INFTYPE_4"))[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/KS_BR_PFX64_INFTYPE_4_expected.csv").getFile()); @@ -600,7 +596,7 @@ public class ReportServiceTest { 0, jsonString); - TestUtils.waitingWhenAddedRecordAndCheckIt(0L, producer, producerRecord); + TestUtils.waitingSendAndCheckRecord(0L, producer); File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/unfulfilled_deal_report_expected.csv").getFile());