From b8fbec14dd3e42adfefac6eb6ba2728bf4e6a096 Mon Sep 17 00:00:00 2001 From: "f.shimich" Date: Fri, 6 Jun 2025 05:52:31 +0300 Subject: [PATCH 1/5] fix --- src/main/resources/application.yml | 7 +- src/main/resources/db/migration/V5__TEMP.SQL | 84 +++++++++++++++++++ .../vality/binbase/batch/BatchUploadTest.java | 60 ++++++------- .../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, 158 insertions(+), 91 deletions(-) create mode 100644 src/main/resources/db/migration/V5__TEMP.SQL 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/main/resources/db/migration/V5__TEMP.SQL b/src/main/resources/db/migration/V5__TEMP.SQL new file mode 100644 index 0000000..a5ddd22 --- /dev/null +++ b/src/main/resources/db/migration/V5__TEMP.SQL @@ -0,0 +1,84 @@ +-- Autogenerated: do not edit this file + +CREATE TABLE BATCH_JOB_INSTANCE +( + JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY, + VERSION BIGINT, + JOB_NAME VARCHAR(100) NOT NULL, + JOB_KEY VARCHAR(32) NOT NULL, + constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) +); + +CREATE TABLE BATCH_JOB_EXECUTION +( + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + VERSION BIGINT, + JOB_INSTANCE_ID BIGINT NOT NULL, + CREATE_TIME TIMESTAMP NOT NULL, + START_TIME TIMESTAMP DEFAULT NULL, + END_TIME TIMESTAMP DEFAULT NULL, + STATUS VARCHAR(10), + EXIT_CODE VARCHAR(2500), + EXIT_MESSAGE VARCHAR(2500), + LAST_UPDATED TIMESTAMP, + constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) + references BATCH_JOB_INSTANCE (JOB_INSTANCE_ID) +); + +CREATE TABLE BATCH_JOB_EXECUTION_PARAMS +( + JOB_EXECUTION_ID BIGINT NOT NULL, + PARAMETER_NAME VARCHAR(100) NOT NULL, + PARAMETER_TYPE VARCHAR(100) NOT NULL, + PARAMETER_VALUE VARCHAR(2500), + IDENTIFYING CHAR(1) NOT NULL, + constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) +); + +CREATE TABLE BATCH_STEP_EXECUTION +( + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + VERSION BIGINT NOT NULL, + STEP_NAME VARCHAR(100) NOT NULL, + JOB_EXECUTION_ID BIGINT NOT NULL, + CREATE_TIME TIMESTAMP NOT NULL, + START_TIME TIMESTAMP DEFAULT NULL, + END_TIME TIMESTAMP DEFAULT NULL, + STATUS VARCHAR(10), + COMMIT_COUNT BIGINT, + READ_COUNT BIGINT, + FILTER_COUNT BIGINT, + WRITE_COUNT BIGINT, + READ_SKIP_COUNT BIGINT, + WRITE_SKIP_COUNT BIGINT, + PROCESS_SKIP_COUNT BIGINT, + ROLLBACK_COUNT BIGINT, + EXIT_CODE VARCHAR(2500), + EXIT_MESSAGE VARCHAR(2500), + LAST_UPDATED TIMESTAMP, + constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) +); + +CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT +( + STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + SHORT_CONTEXT VARCHAR(2500) NOT NULL, + SERIALIZED_CONTEXT TEXT, + constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) + references BATCH_STEP_EXECUTION (STEP_EXECUTION_ID) +); + +CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT +( + JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, + SHORT_CONTEXT VARCHAR(2500) NOT NULL, + SERIALIZED_CONTEXT TEXT, + constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) + references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) +); + +CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; +CREATE SEQUENCE BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NO CYCLE; \ No newline at end of file diff --git a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java index 9d0e644..22f7fea 100644 --- a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java +++ b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java @@ -2,31 +2,37 @@ 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 lombok.SneakyThrows; 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.batch.core.Job; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.beans.factory.annotation.Autowired; 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,31 +42,19 @@ 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"); - } + @Autowired + private JobLauncher jobLauncher; + @Autowired + private Job binBaseJob; + @SneakyThrows @BeforeEach public void setup() throws URISyntaxException { + JobParameters jobParameters = new JobParametersBuilder() + .addLong("timestamp", System.currentTimeMillis()) + .toJobParameters(); + jobLauncher.run(binBaseJob, jobParameters); + binbaseClient = new THSpawnClientBuilder() .withAddress(new URI("http://localhost:" + port + "/v1/binbase")) .withNetworkTimeout(0) 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..0226e1b 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;;;;; \ No newline at end of file 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..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,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 +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 b79b57d..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,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 \ No newline at end of file From 235c453bb5fe3893dac7005d78d4b3f840b12a61 Mon Sep 17 00:00:00 2001 From: "f.shimich" Date: Fri, 6 Jun 2025 07:43:48 +0300 Subject: [PATCH 2/5] fix --- .../dev/vality/binbase/config/BatchConfig.java | 4 ---- .../vality/binbase/batch/BatchUploadTest.java | 17 ----------------- 2 files changed, 21 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/test/java/dev/vality/binbase/batch/BatchUploadTest.java b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java index 22f7fea..3335839 100644 --- a/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java +++ b/src/test/java/dev/vality/binbase/batch/BatchUploadTest.java @@ -9,15 +9,9 @@ import dev.vality.damsel.binbase.Reference; import dev.vality.damsel.binbase.ResponseData; import dev.vality.woody.thrift.impl.http.THSpawnClientBuilder; -import lombok.SneakyThrows; import org.apache.thrift.TException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersBuilder; -import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.TestPropertySource; @@ -42,19 +36,8 @@ class BatchUploadTest { private BinbaseSrv.Iface binbaseClient; - @Autowired - private JobLauncher jobLauncher; - @Autowired - private Job binBaseJob; - - @SneakyThrows @BeforeEach public void setup() throws URISyntaxException { - JobParameters jobParameters = new JobParametersBuilder() - .addLong("timestamp", System.currentTimeMillis()) - .toJobParameters(); - jobLauncher.run(binBaseJob, jobParameters); - binbaseClient = new THSpawnClientBuilder() .withAddress(new URI("http://localhost:" + port + "/v1/binbase")) .withNetworkTimeout(0) From 2d91ad2463fd1512a55d0d28b90dbfeb5b721955 Mon Sep 17 00:00:00 2001 From: "f.shimich" Date: Fri, 6 Jun 2025 07:45:59 +0300 Subject: [PATCH 3/5] fix --- src/main/resources/db/migration/V5__TEMP.SQL | 84 -------------------- 1 file changed, 84 deletions(-) delete mode 100644 src/main/resources/db/migration/V5__TEMP.SQL diff --git a/src/main/resources/db/migration/V5__TEMP.SQL b/src/main/resources/db/migration/V5__TEMP.SQL deleted file mode 100644 index a5ddd22..0000000 --- a/src/main/resources/db/migration/V5__TEMP.SQL +++ /dev/null @@ -1,84 +0,0 @@ --- Autogenerated: do not edit this file - -CREATE TABLE BATCH_JOB_INSTANCE -( - JOB_INSTANCE_ID BIGINT NOT NULL PRIMARY KEY, - VERSION BIGINT, - JOB_NAME VARCHAR(100) NOT NULL, - JOB_KEY VARCHAR(32) NOT NULL, - constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) -); - -CREATE TABLE BATCH_JOB_EXECUTION -( - JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - VERSION BIGINT, - JOB_INSTANCE_ID BIGINT NOT NULL, - CREATE_TIME TIMESTAMP NOT NULL, - START_TIME TIMESTAMP DEFAULT NULL, - END_TIME TIMESTAMP DEFAULT NULL, - STATUS VARCHAR(10), - EXIT_CODE VARCHAR(2500), - EXIT_MESSAGE VARCHAR(2500), - LAST_UPDATED TIMESTAMP, - constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID) - references BATCH_JOB_INSTANCE (JOB_INSTANCE_ID) -); - -CREATE TABLE BATCH_JOB_EXECUTION_PARAMS -( - JOB_EXECUTION_ID BIGINT NOT NULL, - PARAMETER_NAME VARCHAR(100) NOT NULL, - PARAMETER_TYPE VARCHAR(100) NOT NULL, - PARAMETER_VALUE VARCHAR(2500), - IDENTIFYING CHAR(1) NOT NULL, - constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) -); - -CREATE TABLE BATCH_STEP_EXECUTION -( - STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - VERSION BIGINT NOT NULL, - STEP_NAME VARCHAR(100) NOT NULL, - JOB_EXECUTION_ID BIGINT NOT NULL, - CREATE_TIME TIMESTAMP NOT NULL, - START_TIME TIMESTAMP DEFAULT NULL, - END_TIME TIMESTAMP DEFAULT NULL, - STATUS VARCHAR(10), - COMMIT_COUNT BIGINT, - READ_COUNT BIGINT, - FILTER_COUNT BIGINT, - WRITE_COUNT BIGINT, - READ_SKIP_COUNT BIGINT, - WRITE_SKIP_COUNT BIGINT, - PROCESS_SKIP_COUNT BIGINT, - ROLLBACK_COUNT BIGINT, - EXIT_CODE VARCHAR(2500), - EXIT_MESSAGE VARCHAR(2500), - LAST_UPDATED TIMESTAMP, - constraint JOB_EXEC_STEP_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) -); - -CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT -( - STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - SHORT_CONTEXT VARCHAR(2500) NOT NULL, - SERIALIZED_CONTEXT TEXT, - constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID) - references BATCH_STEP_EXECUTION (STEP_EXECUTION_ID) -); - -CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT -( - JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, - SHORT_CONTEXT VARCHAR(2500) NOT NULL, - SERIALIZED_CONTEXT TEXT, - constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID) - references BATCH_JOB_EXECUTION (JOB_EXECUTION_ID) -); - -CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; -CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ MAXVALUE 9223372036854775807 NO CYCLE; -CREATE SEQUENCE BATCH_JOB_SEQ MAXVALUE 9223372036854775807 NO CYCLE; \ No newline at end of file From a7fd1dba9edf0226d4da637f9de64274480ee2a9 Mon Sep 17 00:00:00 2001 From: "f.shimich" Date: Fri, 6 Jun 2025 07:53:36 +0300 Subject: [PATCH 4/5] rollback --- .../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 +- 7 files changed, 55 insertions(+), 43 deletions(-) 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 0226e1b..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;;;;; \ No newline at end of file +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 5418eaf2787b0978d83e11e0a74604b3f4364bc7 Mon Sep 17 00:00:00 2001 From: Gretchen-z Date: Mon, 9 Jun 2025 11:38:27 +0300 Subject: [PATCH 5/5] Fix csv files --- .../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 +- 7 files changed, 43 insertions(+), 55 deletions(-) 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