From 3b81feb17890c857927b08ac139d228fcb7f8e9d Mon Sep 17 00:00:00 2001 From: Gretchen-z Date: Thu, 5 Jun 2025 11:37:41 +0300 Subject: [PATCH 1/7] Bump SB 3, jdk 21 --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- pom.xml | 51 ++++++++++------ .../vality/binbase/batch/BinBaseXmlData.java | 2 +- .../batch/listener/DefaultChunkListener.java | 2 +- .../binbase/batch/writer/BinRangeWriter.java | 4 +- .../vality/binbase/config/BatchConfig.java | 22 ++++--- .../binbase/endpoint/BinbaseServlet.java | 4 +- src/main/resources/application.yml | 14 ++--- .../vality/binbase/batch/BatchUploadTest.java | 33 +++++++++- .../vality/binbase/config/PostgresqlTest.java | 5 ++ .../binbase/service/BinbaseServiceTest.java | 2 +- .../data/binbase/case1/V1_binbase_1.2.0.csv | 11 +++- .../data/binbase/case1/V2_binbase_1.2.5.csv | 5 +- .../data/binbase/case1/V3_binbase_1.3.0.csv | 7 ++- .../data/binbase/case1/V4_binbase_1.3.5.csv | 4 +- .../data/binbase/case1/V5_binbase_1.4.0.csv | 5 +- .../data/binbase/case1/V6_binbase_1.8.5.csv | 61 ++++++++++--------- .../data/binbase/case1/V7_binbase_1.9.0.csv | 5 +- 19 files changed, 154 insertions(+), 87 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a654702..dbb1a95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,4 +7,4 @@ on: jobs: build: - uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-build.yml@v3 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cfeee39..bcc177c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ on: jobs: deploy: - uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v1 + uses: valitydev/java-workflow/.github/workflows/maven-service-deploy.yml@v3 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }} diff --git a/pom.xml b/pom.xml index 192249c..c2919e5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.vality service-parent-pom - 1.0.19 + 3.1.1 binbase @@ -29,8 +29,8 @@ postgres postgres binbase - 1.568-9362c08 - 1.4.3 + 1.655-5ca4f4a + 3.0.0 @@ -52,7 +52,7 @@ dev.vality cds-proto - 1.66-01353ce + 1.70-5227377 @@ -78,6 +78,10 @@ org.flywaydb flyway-core + + org.flywaydb + flyway-database-postgresql + com.zaxxer HikariCP @@ -95,25 +99,20 @@ 17.0.0 - javax.xml.bind - jaxb-api - 2.3.0 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 org.glassfish.jaxb jaxb-runtime - 2.3.0 + 3.0.2 runtime - - javax.activation - javax.activation-api - 1.2.0 - commons-io commons-io - 1.3.2 + 2.11.0 com.google.guava @@ -150,9 +149,9 @@ test - javax.xml.ws - jaxws-api - 2.3.0 + jakarta.xml.ws + jakarta.xml.ws-api + 3.0.0 test @@ -161,6 +160,24 @@ ${testcontainers.annotations.version} test + + io.undertow + undertow-websockets-jsr + 2.3.10.Final + test + + + jakarta.transaction + jakarta.transaction-api + 2.0.1 + test + + + io.zipkin.reporter2 + zipkin-reporter + 2.16.3 + test + diff --git a/src/main/java/dev/vality/binbase/batch/BinBaseXmlData.java b/src/main/java/dev/vality/binbase/batch/BinBaseXmlData.java index 1577aa5..febcdca 100644 --- a/src/main/java/dev/vality/binbase/batch/BinBaseXmlData.java +++ b/src/main/java/dev/vality/binbase/batch/BinBaseXmlData.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @NoArgsConstructor diff --git a/src/main/java/dev/vality/binbase/batch/listener/DefaultChunkListener.java b/src/main/java/dev/vality/binbase/batch/listener/DefaultChunkListener.java index 1eed799..dc991f9 100644 --- a/src/main/java/dev/vality/binbase/batch/listener/DefaultChunkListener.java +++ b/src/main/java/dev/vality/binbase/batch/listener/DefaultChunkListener.java @@ -16,7 +16,7 @@ public void beforeChunk(ChunkContext context) { @Override public void afterChunk(ChunkContext context) { - int readCount = context.getStepContext().getStepExecution().getReadCount(); + long readCount = context.getStepContext().getStepExecution().getReadCount(); if (readCount > 0 && readCount % loggingInterval == 0) { log.info("{} rows processed", readCount); } diff --git a/src/main/java/dev/vality/binbase/batch/writer/BinRangeWriter.java b/src/main/java/dev/vality/binbase/batch/writer/BinRangeWriter.java index 52d839e..795d030 100644 --- a/src/main/java/dev/vality/binbase/batch/writer/BinRangeWriter.java +++ b/src/main/java/dev/vality/binbase/batch/writer/BinRangeWriter.java @@ -4,10 +4,10 @@ import dev.vality.binbase.domain.BinData; import dev.vality.binbase.service.BinbaseService; import lombok.RequiredArgsConstructor; +import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; import org.springframework.stereotype.Component; -import java.util.List; import java.util.Map; @Component @@ -17,7 +17,7 @@ public class BinRangeWriter implements ItemWriter private final BinbaseService binbaseService; @Override - public void write(List>> binDataRanges) throws Exception { + public void write(Chunk>> binDataRanges) throws Exception { binDataRanges.forEach(binDataRange -> binbaseService.saveRange(binDataRange.getKey(), binDataRange.getValue())); } diff --git a/src/main/java/dev/vality/binbase/config/BatchConfig.java b/src/main/java/dev/vality/binbase/config/BatchConfig.java index 08e07c2..206f45a 100644 --- a/src/main/java/dev/vality/binbase/config/BatchConfig.java +++ b/src/main/java/dev/vality/binbase/config/BatchConfig.java @@ -16,9 +16,10 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; -import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; -import org.springframework.batch.core.configuration.annotation.StepBuilderFactory; import org.springframework.batch.core.configuration.annotation.StepScope; +import org.springframework.batch.core.job.builder.JobBuilder; +import org.springframework.batch.core.repository.JobRepository; +import org.springframework.batch.core.step.builder.StepBuilder; import org.springframework.batch.item.file.FlatFileItemReader; import org.springframework.batch.item.file.MultiResourceItemReader; import org.springframework.batch.item.file.builder.MultiResourceItemReaderBuilder; @@ -34,6 +35,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.oxm.jaxb.Jaxb2Marshaller; +import org.springframework.transaction.PlatformTransactionManager; import java.util.Map; @@ -49,8 +51,8 @@ public class BatchConfig { "isonumber", "url", "phone", "bin_length", "affiliation", "mark" }; - private final JobBuilderFactory jobBuilderFactory; - private final StepBuilderFactory stepBuilderFactory; + private final JobRepository jobRepository; + private final PlatformTransactionManager transactionManager; private final BinbaseService binbaseService; @Value("${batch.strict_mode}") @@ -115,9 +117,8 @@ public FlatFileItemReader buildBinBasePsbCsvReader() { @Bean public Job binBaseJob(Step step) { - return jobBuilderFactory.get("binBaseJob") - .flow(step) - .end() + return new JobBuilder("binBaseJob", jobRepository) + .start(step) .build(); } @@ -128,10 +129,11 @@ public ClassifierCompositeItemProcessor compositeProcessor() { .build(); } + @Bean - public Step step(MultiResourceItemReader multiResourceItemReader) { - return stepBuilderFactory.get("binBaseStep") - .>>chunk(1000) + public Step step(MultiResourceItemReader multiResourceItemReader) { + return new StepBuilder("binBaseStep", jobRepository) + .>>chunk(1000, transactionManager) .reader(multiResourceItemReader) .processor(compositeProcessor()) .writer(new BinRangeWriter(binbaseService)) diff --git a/src/main/java/dev/vality/binbase/endpoint/BinbaseServlet.java b/src/main/java/dev/vality/binbase/endpoint/BinbaseServlet.java index 911fb22..725a87d 100644 --- a/src/main/java/dev/vality/binbase/endpoint/BinbaseServlet.java +++ b/src/main/java/dev/vality/binbase/endpoint/BinbaseServlet.java @@ -4,8 +4,8 @@ import dev.vality.woody.thrift.impl.http.THServiceBuilder; import org.springframework.beans.factory.annotation.Autowired; -import javax.servlet.*; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebServlet; import java.io.IOException; @WebServlet("/v1/binbase") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 907e0d2..91e5d30 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,16 +1,16 @@ server: - port: '@server.port@' + port: ${server.port} spring: application: - name: '@name@' - description: '@description@' + name: ${name} + description: ${description} datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: org.postgresql.Driver - url: '@db.url@' - username: '@db.user@' - password: '@db.password@' + url: ${db.url} + username: ${db.user} + password: ${db.password} batch: jdbc: initialize-schema: always @@ -22,7 +22,7 @@ batch: management: server: - port: '@management.port@' + port: ${management.port} metrics: export: prometheus: diff --git a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java index ea6d868..9d0e644 100644 --- a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java +++ b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java @@ -5,20 +5,28 @@ import dev.vality.damsel.binbase.*; import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; import org.apache.thrift.TException; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.context.TestPropertySource; import java.net.URI; import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import static org.junit.jupiter.api.Assertions.*; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -@TestPropertySource(properties = {"batch.file_path=classpath:/data/binbase/case1", "batch.strict_mode=false"}) +//@TestPropertySource(properties = {"batch.file_path=classpath:/data/binbase/case1", "batch.strict_mode=false"}) @PostgresqlTest @SpringBootTest(webEnvironment = RANDOM_PORT) class BatchUploadTest { @@ -28,6 +36,29 @@ class BatchUploadTest { private BinbaseSrv.Iface binbaseClient; + private static Path tempDir; + + @BeforeAll + static void init() throws Exception { + tempDir = Files.createTempDirectory("binbase-case1"); + + Resource[] resources = new PathMatchingResourcePatternResolver() + .getResources("classpath:/data/binbase/case1/*.csv"); + + for (Resource resource : resources) { + Path dest = tempDir.resolve(resource.getFilename()); + Files.copy(resource.getInputStream(), dest, StandardCopyOption.REPLACE_EXISTING); + } + + System.out.println("✅ Copied test CSVs to: " + tempDir.toAbsolutePath()); + } + + @DynamicPropertySource + static void overrideProps(DynamicPropertyRegistry registry) { + registry.add("batch.file_path", () -> tempDir.toAbsolutePath().toString()); + registry.add("batch.strict_mode", () -> "false"); + } + @BeforeEach public void setup() throws URISyntaxException { binbaseClient = new THSpawnClientBuilder() diff --git a/src/test/java/dev/vality/binbase/config/PostgresqlTest.java b/src/test/java/dev/vality/binbase/config/PostgresqlTest.java index f01a49e..716381d 100644 --- a/src/test/java/dev/vality/binbase/config/PostgresqlTest.java +++ b/src/test/java/dev/vality/binbase/config/PostgresqlTest.java @@ -1,6 +1,9 @@ package dev.vality.binbase.config; import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -9,6 +12,8 @@ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) +@ExtendWith(SpringExtension.class) +@SpringBootTest @PostgresqlTestcontainerSingleton public @interface PostgresqlTest { } diff --git a/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java b/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java index cd8d423..d2d3b87 100644 --- a/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java +++ b/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java @@ -18,7 +18,7 @@ @Transactional @PostgresqlTest -@SpringBootTest +@SpringBootTest(properties = "management.server.port=8023") class BinbaseServiceTest { @Autowired diff --git a/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv b/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv index f23c25a..3f7cd7c 100644 --- a/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv +++ b/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv @@ -1,2 +1,9 @@ -100001;PRIVATE LABEL;CENTRAL SUPPLIES - TDFS;;;CANADA;CA;CAN;124;;;;; -100115;UATP;;;;;;;0;;;;; +bin,countryCode,cardType,version +100001,USA,credit,3 +100001,USA,credit_or_debit,2 +100001,CA,,1 +100115,,, +100117,,, +430288,AW,,1 +4302885002,AW,,4 + diff --git a/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv b/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv index f3f37b9..e27e063 100644 --- a/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv +++ b/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv @@ -1,2 +1,3 @@ -100001;PRIVATE LABEL;CENTRAL SUPPLIES - TDFS;DEBIT OR CREDIT;;CANADA;US;USA;840;;;;; -100117;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; +bin,countryCode,cardType,version +100001,USA,credit_or_debit,3 +100117,USA,credit,1 diff --git a/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv b/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv index 16446a0..009402f 100644 --- a/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv +++ b/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv @@ -1,3 +1,4 @@ -100001;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; -100117;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; -999999;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; +bin,countryCode,cardType,version +100001,USA,credit,3 +100117,USA,credit,1 +999999,USA,credit,1 diff --git a/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv b/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv index a0ac08e..c6088df 100644 --- a/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv +++ b/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv @@ -1,2 +1,2 @@ -4302885;VISA;ARUBA;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; -4302885;VISA;ARUBA BANK N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; +bin,countryCode,cardType,version +4302885,ABW,credit,1 diff --git a/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv b/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv index 453175f..d61b6f0 100644 --- a/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv +++ b/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv @@ -1,2 +1,3 @@ -430288;VISA;ARUBA N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; -4302885;VISA;BANK N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; +bin,countryCode,cardType,version +430288,ABW,credit,1 +4302885,ABW,credit,2 diff --git a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv index edc7573..c611ffd 100644 --- a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv +++ b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv @@ -1,30 +1,31 @@ -1244;PRIVATE LABEL;BANCO BRADESCO;;;BRAZIL;BR;BRA;76 -2102;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 -2195;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -2201;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -2239;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -2361;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 -4078;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 -4080;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 -7343;PRIVATE LABEL;BANCO PAN;DEBIT;;BRAZIL;BR;BRA;76 -10051;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10053;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10108;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10150;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10258;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10300;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -10309;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -11300;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11301;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11302;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11303;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11304;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11305;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11306;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11308;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -11309;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -12004;PRIVATE LABEL;TBI BANK;DEBIT;;BULGARIA;BG;BGR;100 -12047;PRIVATE LABEL;BANCO DE CREDITO ARGENTINO;DEBIT;;ARGENTINA;AR;ARG;32 -20010;PRIVATE LABEL;INDUSTRIAL AND COMMERCIAL BANK OF CHINA;DEBIT;;CHINA;CN;CHN;156 -20083;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -20084;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 \ No newline at end of file +bin,countryCode,cardType,version +1244,BRA,,1 +2102,CHN,credit,1 +2195,CHN,debit,1 +2201,CHN,debit,1 +2239,CHN,debit,1 +2361,CHN,credit,1 +4078,USA,debit,1 +4080,USA,debit,1 +7343,BRA,debit,1 +10051,ITA,debit,1 +10053,ITA,debit,1 +10108,ITA,debit,1 +10150,ITA,debit,1 +10258,ITA,debit,1 +10300,ITA,debit,1 +10309,ITA,debit,1 +11300,PHL,debit,1 +11301,PHL,debit,1 +11302,PHL,debit,1 +11303,PHL,debit,1 +11304,PHL,debit,1 +11305,PHL,debit,1 +11306,PHL,debit,1 +11308,PHL,debit,1 +11309,PHL,debit,1 +12004,BGR,debit,1 +12047,ARG,debit,1 +20010,CHN,debit,1 +20083,ITA,debit,1 +20084,ITA,debit,1 diff --git a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv index 9b1a09a..b79b57d 100644 --- a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv +++ b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv @@ -1,2 +1,3 @@ -976200;NSPK;"CJSC ""Dushanbe City Bank""";DEBIT;MIR Classic;Tajikistan;TJ;TJK;762 -977700;NSPK;MRB Bank;DEBIT;MIR Classic;Republic of South Ossetia;OS;OST;896 \ No newline at end of file +bin,countryCode,cardType,version +976200,TJK,debit,1 +977700,OST,debit,1 From 22025b713a9b255e7c270b8731636c79ab837820 Mon Sep 17 00:00:00 2001 From: Fedor Date: Mon, 9 Jun 2025 13:46:22 +0300 Subject: [PATCH 2/7] fix (#29) * fix * fix * fix * rollback * Fix csv files --------- Co-authored-by: Gretchen-z --- .../vality/binbase/config/BatchConfig.java | 4 -- src/main/resources/application.yml | 7 ++- .../vality/binbase/batch/BatchUploadTest.java | 45 ++++---------- .../data/binbase/case1/V1_binbase_1.2.0.csv | 11 +--- .../data/binbase/case1/V2_binbase_1.2.5.csv | 5 +- .../data/binbase/case1/V3_binbase_1.3.0.csv | 7 +-- .../data/binbase/case1/V4_binbase_1.3.5.csv | 4 +- .../data/binbase/case1/V5_binbase_1.4.0.csv | 5 +- .../data/binbase/case1/V6_binbase_1.8.5.csv | 61 +++++++++---------- .../data/binbase/case1/V7_binbase_1.9.0.csv | 5 +- 10 files changed, 58 insertions(+), 96 deletions(-) diff --git a/src/main/java/dev/vality/binbase/config/BatchConfig.java b/src/main/java/dev/vality/binbase/config/BatchConfig.java index 206f45a..c49b3d5 100644 --- a/src/main/java/dev/vality/binbase/config/BatchConfig.java +++ b/src/main/java/dev/vality/binbase/config/BatchConfig.java @@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; -import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; import org.springframework.batch.core.repository.JobRepository; @@ -30,7 +29,6 @@ import org.springframework.batch.item.support.builder.ClassifierCompositeItemProcessorBuilder; import org.springframework.batch.item.xml.StaxEventItemReader; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; @@ -40,8 +38,6 @@ import java.util.Map; @Configuration -@EnableBatchProcessing -@EnableAutoConfiguration @RequiredArgsConstructor public class BatchConfig { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 91e5d30..11005bb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,9 +24,6 @@ management: server: port: ${management.port} metrics: - export: - prometheus: - enabled: false tags: application: wb-list-manager endpoint: @@ -40,6 +37,10 @@ management: web: exposure: include: health,info,prometheus + prometheus: + metrics: + export: + enabled: false client: cds: diff --git a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java index 9d0e644..3335839 100644 --- a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java +++ b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java @@ -2,31 +2,31 @@ import dev.vality.binbase.config.PostgresqlTest; import dev.vality.binbase.domain.CountryCode; -import dev.vality.damsel.binbase.*; +import dev.vality.damsel.binbase.BinNotFound; +import dev.vality.damsel.binbase.BinbaseSrv; +import dev.vality.damsel.binbase.CardType; +import dev.vality.damsel.binbase.Last; +import dev.vality.damsel.binbase.Reference; +import dev.vality.damsel.binbase.ResponseData; import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; import org.apache.thrift.TException; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.test.context.DynamicPropertyRegistry; -import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.context.TestPropertySource; import java.net.URI; import java.net.URISyntaxException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -//@TestPropertySource(properties = {"batch.file_path=classpath:/data/binbase/case1", "batch.strict_mode=false"}) +@TestPropertySource(properties = {"batch.file_path=classpath:/data/binbase/case1", "batch.strict_mode=false"}) @PostgresqlTest @SpringBootTest(webEnvironment = RANDOM_PORT) class BatchUploadTest { @@ -36,29 +36,6 @@ class BatchUploadTest { private BinbaseSrv.Iface binbaseClient; - private static Path tempDir; - - @BeforeAll - static void init() throws Exception { - tempDir = Files.createTempDirectory("binbase-case1"); - - Resource[] resources = new PathMatchingResourcePatternResolver() - .getResources("classpath:/data/binbase/case1/*.csv"); - - for (Resource resource : resources) { - Path dest = tempDir.resolve(resource.getFilename()); - Files.copy(resource.getInputStream(), dest, StandardCopyOption.REPLACE_EXISTING); - } - - System.out.println("✅ Copied test CSVs to: " + tempDir.toAbsolutePath()); - } - - @DynamicPropertySource - static void overrideProps(DynamicPropertyRegistry registry) { - registry.add("batch.file_path", () -> tempDir.toAbsolutePath().toString()); - registry.add("batch.strict_mode", () -> "false"); - } - @BeforeEach public void setup() throws URISyntaxException { binbaseClient = new THSpawnClientBuilder() diff --git a/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv b/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv index 3f7cd7c..f23c25a 100644 --- a/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv +++ b/src/test/resources/data/binbase/case1/V1_binbase_1.2.0.csv @@ -1,9 +1,2 @@ -bin,countryCode,cardType,version -100001,USA,credit,3 -100001,USA,credit_or_debit,2 -100001,CA,,1 -100115,,, -100117,,, -430288,AW,,1 -4302885002,AW,,4 - +100001;PRIVATE LABEL;CENTRAL SUPPLIES - TDFS;;;CANADA;CA;CAN;124;;;;; +100115;UATP;;;;;;;0;;;;; diff --git a/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv b/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv index e27e063..f3f37b9 100644 --- a/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv +++ b/src/test/resources/data/binbase/case1/V2_binbase_1.2.5.csv @@ -1,3 +1,2 @@ -bin,countryCode,cardType,version -100001,USA,credit_or_debit,3 -100117,USA,credit,1 +100001;PRIVATE LABEL;CENTRAL SUPPLIES - TDFS;DEBIT OR CREDIT;;CANADA;US;USA;840;;;;; +100117;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; diff --git a/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv b/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv index 009402f..16446a0 100644 --- a/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv +++ b/src/test/resources/data/binbase/case1/V3_binbase_1.3.0.csv @@ -1,4 +1,3 @@ -bin,countryCode,cardType,version -100001,USA,credit,3 -100117,USA,credit,1 -999999,USA,credit,1 +100001;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; +100117;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; +999999;UATP;AMERICAN AIRLINES (AA);CREDIT;;UNITED STATES;US;USA;840;;;;; diff --git a/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv b/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv index c6088df..a0ac08e 100644 --- a/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv +++ b/src/test/resources/data/binbase/case1/V4_binbase_1.3.5.csv @@ -1,2 +1,2 @@ -bin,countryCode,cardType,version -4302885,ABW,credit,1 +4302885;VISA;ARUBA;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; +4302885;VISA;ARUBA BANK N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; diff --git a/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv b/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv index d61b6f0..453175f 100644 --- a/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv +++ b/src/test/resources/data/binbase/case1/V5_binbase_1.4.0.csv @@ -1,3 +1,2 @@ -bin,countryCode,cardType,version -430288,ABW,credit,1 -4302885,ABW,credit,2 +430288;VISA;ARUBA N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; +4302885;VISA;BANK N.V.;CREDIT;PLATINUM;ARUBA;AW;ABW;533;HTTP://WWW.ARUBABANK.COM/;(+297) 527 7777;;; diff --git a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv index c611ffd..831a01c 100644 --- a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv +++ b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv @@ -1,31 +1,30 @@ -bin,countryCode,cardType,version -1244,BRA,,1 -2102,CHN,credit,1 -2195,CHN,debit,1 -2201,CHN,debit,1 -2239,CHN,debit,1 -2361,CHN,credit,1 -4078,USA,debit,1 -4080,USA,debit,1 -7343,BRA,debit,1 -10051,ITA,debit,1 -10053,ITA,debit,1 -10108,ITA,debit,1 -10150,ITA,debit,1 -10258,ITA,debit,1 -10300,ITA,debit,1 -10309,ITA,debit,1 -11300,PHL,debit,1 -11301,PHL,debit,1 -11302,PHL,debit,1 -11303,PHL,debit,1 -11304,PHL,debit,1 -11305,PHL,debit,1 -11306,PHL,debit,1 -11308,PHL,debit,1 -11309,PHL,debit,1 -12004,BGR,debit,1 -12047,ARG,debit,1 -20010,CHN,debit,1 -20083,ITA,debit,1 -20084,ITA,debit,1 +124411;PRIVATE LABEL;BANCO BRADESCO;;;BRAZIL;BR;BRA;76 +210211;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 +219511;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +220111;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +223911;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +236111;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 +407811;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 +408011;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 +734311;PRIVATE LABEL;BANCO PAN;DEBIT;;BRAZIL;BR;BRA;76 +100511;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +100531;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +101081;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +101501;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +102581;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +103001;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +103091;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +113001;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113011;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113021;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113031;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113041;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113051;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113061;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113081;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +113091;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +120041;PRIVATE LABEL;TBI BANK;DEBIT;;BULGARIA;BG;BGR;100 +120471;PRIVATE LABEL;BANCO DE CREDITO ARGENTINO;DEBIT;;ARGENTINA;AR;ARG;32 +200101;PRIVATE LABEL;INDUSTRIAL AND COMMERCIAL BANK OF CHINA;DEBIT;;CHINA;CN;CHN;156 +200831;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +200841;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 diff --git a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv index b79b57d..e2493e7 100644 --- a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv +++ b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv @@ -1,3 +1,2 @@ -bin,countryCode,cardType,version -976200,TJK,debit,1 -977700,OST,debit,1 +976200;NSPK;"CJSC ""Dushanbe City Bank""";DEBIT;MIR Classic;Tajikistan;TJ;TJK;762 +977700;NSPK;MRB Bank;DEBIT;MIR Classic;Republic of South Ossetia;OS;OST;896 From b199c8d222a7cdcffcf8863a56f27ba43fb9054f Mon Sep 17 00:00:00 2001 From: Egor Cherniak Date: Mon, 9 Jun 2025 13:47:50 +0300 Subject: [PATCH 3/7] Revert csv changes --- .../data/binbase/case1/V6_binbase_1.8.5.csv | 60 +++++++++---------- .../data/binbase/case1/V7_binbase_1.9.0.csv | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv index 831a01c..edc7573 100644 --- a/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv +++ b/src/test/resources/data/binbase/case1/V6_binbase_1.8.5.csv @@ -1,30 +1,30 @@ -124411;PRIVATE LABEL;BANCO BRADESCO;;;BRAZIL;BR;BRA;76 -210211;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 -219511;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -220111;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -223911;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 -236111;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 -407811;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 -408011;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 -734311;PRIVATE LABEL;BANCO PAN;DEBIT;;BRAZIL;BR;BRA;76 -100511;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -100531;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -101081;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -101501;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -102581;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -103001;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -103091;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -113001;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113011;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113021;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113031;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113041;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113051;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113061;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113081;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -113091;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 -120041;PRIVATE LABEL;TBI BANK;DEBIT;;BULGARIA;BG;BGR;100 -120471;PRIVATE LABEL;BANCO DE CREDITO ARGENTINO;DEBIT;;ARGENTINA;AR;ARG;32 -200101;PRIVATE LABEL;INDUSTRIAL AND COMMERCIAL BANK OF CHINA;DEBIT;;CHINA;CN;CHN;156 -200831;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 -200841;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +1244;PRIVATE LABEL;BANCO BRADESCO;;;BRAZIL;BR;BRA;76 +2102;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 +2195;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +2201;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +2239;PRIVATE LABEL;CHINA MERCHANTS BANK;DEBIT;;CHINA;CN;CHN;156 +2361;PRIVATE LABEL;CHINA MERCHANTS BANK;CREDIT;STANDARD;CHINA;CN;CHN;156 +4078;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 +4080;PRIVATE LABEL;SHIFT4 PAYMENTS;DEBIT;GIFT;UNITED STATES;US;USA;840 +7343;PRIVATE LABEL;BANCO PAN;DEBIT;;BRAZIL;BR;BRA;76 +10051;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10053;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10108;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10150;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10258;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10300;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +10309;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +11300;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11301;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11302;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11303;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11304;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11305;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11306;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11308;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +11309;LOCAL BRAND;BDO UNIBANK, INC.;DEBIT;PROPRIETARY ATM;PHILIPPINES;PH;PHL;608 +12004;PRIVATE LABEL;TBI BANK;DEBIT;;BULGARIA;BG;BGR;100 +12047;PRIVATE LABEL;BANCO DE CREDITO ARGENTINO;DEBIT;;ARGENTINA;AR;ARG;32 +20010;PRIVATE LABEL;INDUSTRIAL AND COMMERCIAL BANK OF CHINA;DEBIT;;CHINA;CN;CHN;156 +20083;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 +20084;PAGOBANCOMAT;;DEBIT;;ITALY;IT;ITA;380 \ No newline at end of file diff --git a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv index e2493e7..9b1a09a 100644 --- a/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv +++ b/src/test/resources/data/binbase/case1/V7_binbase_1.9.0.csv @@ -1,2 +1,2 @@ 976200;NSPK;"CJSC ""Dushanbe City Bank""";DEBIT;MIR Classic;Tajikistan;TJ;TJK;762 -977700;NSPK;MRB Bank;DEBIT;MIR Classic;Republic of South Ossetia;OS;OST;896 +977700;NSPK;MRB Bank;DEBIT;MIR Classic;Republic of South Ossetia;OS;OST;896 \ No newline at end of file From c50373162c08d3e362891260f83350da68249927 Mon Sep 17 00:00:00 2001 From: Egor Cherniak Date: Mon, 9 Jun 2025 14:57:15 +0300 Subject: [PATCH 4/7] Fix test --- pom.xml | 2 +- .../java/dev/vality/binbase/config/PostgresqlTest.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c2919e5..6fa83d8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ postgres binbase 1.655-5ca4f4a - 3.0.0 + 3.1.0 diff --git a/src/test/java/dev/vality/binbase/config/PostgresqlTest.java b/src/test/java/dev/vality/binbase/config/PostgresqlTest.java index 716381d..14904a6 100644 --- a/src/test/java/dev/vality/binbase/config/PostgresqlTest.java +++ b/src/test/java/dev/vality/binbase/config/PostgresqlTest.java @@ -1,9 +1,6 @@ package dev.vality.binbase.config; import dev.vality.testcontainers.annotations.postgresql.PostgresqlTestcontainerSingleton; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit.jupiter.SpringExtension; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,8 +9,6 @@ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) -@ExtendWith(SpringExtension.class) -@SpringBootTest -@PostgresqlTestcontainerSingleton +@PostgresqlTestcontainerSingleton(truncateTables = false) public @interface PostgresqlTest { } From 94eb7859596a34c5ba218d26d5a3b8662ce6885e Mon Sep 17 00:00:00 2001 From: Egor Cherniak Date: Mon, 9 Jun 2025 14:58:56 +0300 Subject: [PATCH 5/7] Remove redundant property --- .../java/dev/vality/binbase/service/BinbaseServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java b/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java index d2d3b87..cd8d423 100644 --- a/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java +++ b/src/test/java/dev/vality/binbase/service/BinbaseServiceTest.java @@ -18,7 +18,7 @@ @Transactional @PostgresqlTest -@SpringBootTest(properties = "management.server.port=8023") +@SpringBootTest class BinbaseServiceTest { @Autowired From 4ec72a75eeee3a48aad01f9da8046510cfb86c51 Mon Sep 17 00:00:00 2001 From: Egor Cherniak Date: Mon, 9 Jun 2025 16:31:35 +0300 Subject: [PATCH 6/7] Bump testcontainers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fa83d8..1554ef3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ postgres binbase 1.655-5ca4f4a - 3.1.0 + 3.1.1 From 2cd16100c3c454442e93cda4cb2d66ca245c5a1a Mon Sep 17 00:00:00 2001 From: Gretchen-z Date: Mon, 9 Jun 2025 16:53:29 +0300 Subject: [PATCH 7/7] Remove unnecessary dependencies --- pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pom.xml b/pom.xml index 1554ef3..9a640dc 100644 --- a/pom.xml +++ b/pom.xml @@ -160,24 +160,6 @@ ${testcontainers.annotations.version} test - - io.undertow - undertow-websockets-jsr - 2.3.10.Final - test - - - jakarta.transaction - jakarta.transaction-api - 2.0.1 - test - - - io.zipkin.reporter2 - zipkin-reporter - 2.16.3 - test -