nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: V取引区分マスタの対応

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-09-16 16:41:02 +09:00
parent ffc13ab2b3
commit 4a32976deb
4 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py
View File

@ -660,7 +660,7 @@ class VjskReceiveFileMapper:
SELECT
t.v_tran_cd
,t.sub_num
,t.name
,medaca_common.convert_empty_to_null(t.name)
,t.start_date
,t.end_date
,t.dsp_odr
@ -670,15 +670,15 @@ class VjskReceiveFileMapper:
,SYSDATE()
FROM org05.tran_kbn_mst_v AS t
ON DUPLICATE KEY UPDATE
v_tran_cd=t.v_tran_cd
,sub_num=t.sub_num
,name=t.name
,start_date=t.start_date
,end_date=t.end_date
,dsp_odr=t.dsp_odr
,rec_sts_kbn=t.rec_sts_kbn
,ins_dt=nullif(t.ins_dt, 0)
,upd_dt=nullif(t.upd_dt, 0)
v_tran_cd=VALUES(v_tran_cd)
,sub_num=VALUES(sub_num)
,name=VALUES(name)
,start_date=VALUES(start_date)
,end_date=VALUES(end_date)
,dsp_odr=VALUES(dsp_odr)
,rec_sts_kbn=VALUES(rec_sts_kbn)
,ins_dt=VALUES(ins_dt)
,upd_dt=VALUES(upd_dt)
,dwh_upd_dt=SYSDATE()
;
""")

20
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py
View File

@ -280,7 +280,7 @@ class TestImportFileToDb:
# srcテーブル結果が期待値通りかを突合
assert_table_results(result_src, assert_list, ignore_columns)
# srcテーブル結果のレコード件数 (insert 6row + update 2row + insert 2row =8row)
# srcテーブル結果のレコード件数 (insert 6row + update 2row + insert 2row = 8row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
assert result_src_count[0]['count(*)'] == 8
@ -533,7 +533,7 @@ class TestImportFileToDb:
# srcテーブル結果が期待値通りかを突合
assert_table_results(result_src, assert_list, ignore_columns)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 8row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
assert result_src_count[0]['count(*)'] == 8
@ -604,7 +604,7 @@ class TestImportFileToDb:
# srcテーブル結果が期待値通りかを突合
assert_table_results(result_src, assert_list, ignore_columns, force_cast_to_str_columns)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 8row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
assert result_src_count[0]['count(*)'] == 8
@ -686,7 +686,7 @@ class TestImportFileToDb:
self.batch_context.is_vjsk_stock_import_day = True
self.db.execute(f"truncate table {table_name_src}")
# assertion1 (insert 4row)
# assertion1 (insert 6row)
# 処理実行
target_dict = {
@ -702,7 +702,7 @@ class TestImportFileToDb:
# 突合から除外する項目
ignore_columns = ['dwh_upd_dt']
# orgテーブル結果が期待値通りかを突合
assert_table_results(result_org, assert_list, ignore_columns)
assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
# srcテーブル結果を取得
result_src = self.db.execute_select(f"select * from {table_name_src}")
# 突合から除外する項目
@ -726,18 +726,18 @@ class TestImportFileToDb:
# 突合から除外する項目
ignore_columns = ['dwh_upd_dt']
# orgテーブル結果が期待値通りかを突合
assert_table_results(result_org, assert_list, ignore_columns)
assert_table_results(result_org, assert_list, ignore_columns, is_loaddata=True)
# srcテーブル結果(orgテーブル結果のPK値で一致するもの)を取得
result_src = self.db.execute_select(
f"select * from {table_name_src} s inner join {table_name_org} o on (s.v_tran_cd = o.v_tran_cd and s.sub_num = o.sub_num)")
f"select s.* from {table_name_src} s inner join {table_name_org} o on (s.v_tran_cd = o.v_tran_cd and s.sub_num = o.sub_num)")
# 突合から除外する項目
ignore_columns = ['dwh_upd_dt']
# srcテーブル結果が期待値通りかを突合
assert_table_results(result_src, assert_list, ignore_columns)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 8row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
assert result_src_count[0]['count(*)'] == 6
assert result_src_count[0]['count(*)'] == 8
# teardown
@ -1115,7 +1115,7 @@ class TestImportFileToDb:
# srcテーブル結果が期待値通りかを突合
assert_table_results(result_src, assert_list, ignore_columns)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 6row)
# srcテーブル結果のレコード件数 (insert 4row + update 2row + insert 2row = 8row)
result_src_count = self.db.execute_select(f"select count(*) from {table_name_src} ")
assert result_src_count[0]['count(*)'] == 8

2
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/tran_kbn_mst_202304280000.tsv vendored
View File

@ -3,3 +3,5 @@
"10001" "2" "Veeva取引区分名01-2" "20230102" "99991231" "1" "0" "2023-05-09 12:00:02" "2023-05-09 13:00:02"
"10001" "3" "Veeva取引区分名01-3" "20230103" "99991231" "1" "0" "2023-05-09 12:00:03" "2023-05-09 13:00:03"
"10001" "4" "Veeva取引区分名01-4" "20230104" "99991231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"
"10001" "5" "" "20230104" "99991231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"
"10001" "6" "Veeva取引区分名01-6" "20230104" "99991231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"

1 v_tran_cd sub_no nm start_dt end_dt dsp_odr rec_sts_kbn ins_dt upd_dt
3 10001 2 Veeva取引区分名01-2 20230102 99991231 1 0 2023-05-09 12:00:02 2023-05-09 13:00:02
4 10001 3 Veeva取引区分名01-3 20230103 99991231 1 0 2023-05-09 12:00:03 2023-05-09 13:00:03
5 10001 4 Veeva取引区分名01-4 20230104 99991231 1 0 2023-05-09 12:00:04 2023-05-09 13:00:04
6 10001 5 20230104 99991231 1 0 2023-05-09 12:00:04 2023-05-09 13:00:04
7 10001 6 Veeva取引区分名01-6 20230104 99991231 1 0 2023-05-09 12:00:04 2023-05-09 13:00:04

8
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/tran_kbn_mst_202304290000.tsv vendored
View File

@ -1,5 +1,5 @@
"v_tran_cd" "sub_no" "nm" "start_dt" "end_dt" "dsp_odr" "rec_sts_kbn" "ins_dt" "upd_dt"
"10001" "3" "Veeva取引区分名01-3" "20230201" "20301231" "1" "0" "2023-05-09 12:00:03" "2023-05-09 13:00:03"
"10001" "4" "Veeva取引区分名01-4" "20230202" "20301231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"
"10001" "5" "Veeva取引区分名01-5" "20230203" "20301231" "1" "0" "2023-05-09 12:00:05" "2023-05-09 13:00:05"
"10002" "1" "Veeva取引区分名02-1" "20230204" "20301231" "1" "0" "2023-05-09 12:00:06" "2023-05-09 13:00:06"
"10001" "5" "Veeva取引区分名01-5" "20230104" "99991231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"
"10001" "6" "" "20230104" "99991231" "1" "0" "2023-05-09 12:00:04" "2023-05-09 13:00:04"
"10002" "1" "Veeva取引区分名0-1" "20230203" "20301231" "1" "0" "2023-05-09 12:00:05" "2023-05-09 13:00:05"
"10002" "2" "Veeva取引区分名02-2" "20230204" "20301231" "1" "0" "2023-05-09 12:00:06" "2023-05-09 13:00:06"

1 v_tran_cd sub_no nm start_dt end_dt dsp_odr rec_sts_kbn ins_dt upd_dt
2 10001 3 5 Veeva取引区分名01-3 Veeva取引区分名01-5 20230201 20230104 20301231 99991231 1 0 2023-05-09 12:00:03 2023-05-09 12:00:04 2023-05-09 13:00:03 2023-05-09 13:00:04
3 10001 4 6 Veeva取引区分名01-4 20230202 20230104 20301231 99991231 1 0 2023-05-09 12:00:04 2023-05-09 13:00:04
4 10001 10002 5 1 Veeva取引区分名01-5 Veeva取引区分名0-1 20230203 20301231 1 0 2023-05-09 12:00:05 2023-05-09 13:00:05
5 10002 1 2 Veeva取引区分名02-1 Veeva取引区分名02-2 20230204 20301231 1 0 2023-05-09 12:00:06 2023-05-09 13:00:06