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

feat: COM_医師勤務先のテストカバレッジを100%にした

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-04-11 21:14:08 +09:00
parent 766bf45ab5
commit 8612b7af11
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_delete.csv
View File

@ -1,5 +1,5 @@
"502","01","997682","","B","00","5408060","","1","20141204","20141206","","","","","",""
"502","01","997906","","B","00","5409446","","1","20141128","20141206","","","","","",""
"502","01","997682","","B","00","5412977","","1","20141204","20141206","","","","","",""
"502","01","995783","","B","00","5414992","","1","20141204","20141206","","","","","",""
"502","01","997906","","B","00","5503358","","1","20141202","20141206","","","","","",""
"502","01","997682","","B","00","5408060","","1","20141204","20141206","","","1512","","",""
"502","01","997906","","B","00","5409446","","1","20141128","20141206","","","6802","","",""
"502","01","997682","","B","00","5412977","","1","20141204","20141206","","","6720","","",""
"502","01","995783","","B","00","5414992","","1","20141204","20141206","","","1118","","",""
"502","01","997906","","B","00","5503358","","1","20141202","20141206","","","7212","","",""

1 502 01 997682 B 00 5408060 1 20141204 20141206 1512
2 502 01 997906 B 00 5409446 1 20141128 20141206 6802
3 502 01 997682 B 00 5412977 1 20141204 20141206 6720
4 502 01 995783 B 00 5414992 1 20141204 20141206 1118
5 502 01 997906 B 00 5503358 1 20141202 20141206 7212

3
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv
View File

@ -1,4 +1,5 @@
"502","01","997906","","B","00","5409446","","","20170906","20170910","","","","","","@"
"502","01","995783","","B","00","5507600","","","20170907","20170910","@","802","@","","",""
"502","01","995783","","B","00","5507600","","","20170907","20170910","@","802","@","＠","@",""
"502","01","997682","","A","00","5408060","","","20141113","20141114","","","","","",""
"502","01","997682","","B","00","5402984","","","20141113","20141114","165","@","","","",""
"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ",""
1 502 01 997906 B 00 5409446 20170906 20170910 @
2 502 01 995783 B 00 5507600 20170907 20170910 @ 802 @ ＠ @
3 502 01 997682 A 00 5408060 20141113 20141114
4 502 01 997682 B 00 5402984 20141113 20141114 165 @
5 502 01 999613 B 00 5504428 2 20170328 20170401 501 9999 内分泌・骨代謝外来 ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ

6
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_blng_sec_before_delete.csv Normal file
View File

@ -0,0 +1,6 @@
"blng_sec_cd","blng_sec_kana","blng_sec_name","regist_ymd","update_ymd","delete_ymd","inst_category","trt_category","category_sort","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
"1512",,NULL,"20150825","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2015-08-25 00:10:58","clsComBlngSec","2022-05-16 22:18:28","clsComBlngSec"
"6802","NULL",,"20150825","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2015-08-25 00:10:58","clsComBlngSec","2022-05-30 22:18:48","clsComBlngSec"
"6720",,"NULL","20150825","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2015-08-25 00:10:58","clsComBlngSec","2019-12-23 22:13:44","clsComBlngSec"
"1118","NULL",,"20150825","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2015-08-25 00:10:58","clsComBlngSec","2016-05-17 00:13:18","clsComBlngSec"
"7212",,"NULL","20150818","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2015-08-18 00:12:58","clsComBlngSec","2021-01-11 22:15:40","clsComBlngSec"
1 blng_sec_cd blng_sec_kana blng_sec_name regist_ymd update_ymd delete_ymd inst_category trt_category category_sort regist_date create_user update_date update_user sys_regist_date regist_prgm_id sys_update_date update_prgm_id
2 1512 NULL 20150825 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2015-08-25 00:10:58 clsComBlngSec 2022-05-16 22:18:28 clsComBlngSec
3 6802 NULL 20150825 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2015-08-25 00:10:58 clsComBlngSec 2022-05-30 22:18:48 clsComBlngSec
4 6720 NULL 20150825 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2015-08-25 00:10:58 clsComBlngSec 2019-12-23 22:13:44 clsComBlngSec
5 1118 NULL 20150825 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2015-08-25 00:10:58 clsComBlngSec 2016-05-17 00:13:18 clsComBlngSec
6 7212 NULL 20150818 NULL NULL NULL NULL NULL NULL NULL NULL NULL 2015-08-18 00:12:58 clsComBlngSec 2021-01-11 22:15:40 clsComBlngSec

4
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv
View File

@ -1,8 +1,8 @@
"dcf_dsf_inst_cd","dcf_pcf_dr_cd","blng_sec_cd","post_cd","identity_cd","aply_start_ymd","blng_sec_name_kana","blng_sec_name","notdm_flg","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id"
"005414992","01995783",,"501",,"2020-02-22",,,,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005507600","01995783","9999",,"802","2020-02-23",,,"1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005507600","01995783","9999",,"802","2020-02-23","NULL","NULL","1","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005402984","01997682","1512","165",,"2020-02-23","ｼﾖｳｶｷｹﾞｶ","消化器外科",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005408060","01997682","6802",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005408060","01997682","6802",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ1","消化器外科学Ⅰ",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005412977","01997682","6720",,"144","2020-02-22","ｼﾖｳｶｷｹﾞｶｶﾞｸ","消化器外科学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"
"005409446","01997906","1118","501",,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科","NULL","2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:43:43","com_dr_wrkplace_mapper"
"005503358","01997906","1118","172","144","2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:23:39","clsComDrWrk"

1 dcf_dsf_inst_cd dcf_pcf_dr_cd blng_sec_cd post_cd identity_cd aply_start_ymd blng_sec_name_kana blng_sec_name notdm_flg regist_ymd update_ymd regist_date create_user update_date update_user sys_regist_date regist_prgm_id sys_update_date update_prgm_id
2 005414992 01995783 501 2020-02-22 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
3 005507600 01995783 9999 802 2020-02-23 NULL NULL 1 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 com_dr_wrkplace_mapper
4 005402984 01997682 1512 165 2020-02-23 ｼﾖｳｶｷｹﾞｶ 消化器外科 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 com_dr_wrkplace_mapper
5 005408060 01997682 6802 144 2020-02-22 ｼﾖｳｶｷｹﾞｶｶﾞｸ1 消化器外科学Ⅰ 2022-02-03 NULL 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 2022-02-03 14:43:43 clsComDrWrk com_dr_wrkplace_mapper
6 005412977 01997682 6720 144 2020-02-22 ｼﾖｳｶｷｹﾞｶｶﾞｸ 消化器外科学 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk
7 005409446 01997906 1118 501 2020-02-22 ｹﾂｴｷﾅｲｶ 血液内科 NULL 2022-02-03 2022-02-03 NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:43:43 com_dr_wrkplace_mapper
8 005503358 01997906 1118 172 144 2020-02-22 ｹﾂｴｷﾅｲｶ 血液内科 2022-02-03 NULL NULL NULL NULL NULL 2022-02-03 14:23:39 clsComDrWrk 2022-02-03 14:23:39 clsComDrWrk

26
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py
View File

@ -183,8 +183,6 @@ class TestComDrWrkplaceMapper:
# 期待値ファイルを読み込む
expect_dr_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_dr_wrkplace_update.csv'))
expect_his_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_dr_wrkplace_his_update.csv'))
primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_dr_data_list]
primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_dr_data_list]
# 複合主キーのため、1件ずつ取得して期待値を作る
actual_dr_data_list = []
actual_his_data_list = []
@ -200,21 +198,25 @@ class TestComDrWrkplaceMapper:
dcf_dsf_inst_cd = :dcf_dsf_inst_cd
AND dcf_pcf_dr_cd = :dcf_pcf_dr_cd
"""
# COM_医師勤務先の取得
primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_dr_data_list]
primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_dr_data_list]
for param_dcf_dsf_inst_cd, param_dcf_pcf_dr_cd in zip(primary_keys_dcf_dsf_inst_cd, primary_keys_dcf_pcf_dr_cd):
# COM_医師勤務先の取得
actual_dr_data = self.db.execute_select(
actual_dr_select_sql,
{**param_dcf_dsf_inst_cd, **param_dcf_pcf_dr_cd})
assert len(actual_dr_data) == 1, '1件取得できていること'
actual_dr_data_list.append(actual_dr_data[0])
# COM_医師勤務先履歴の取得
# 取得できないこと
# COM_医師勤務先履歴の取得
primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_his_data_list]
primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_his_data_list]
for param_dcf_dsf_inst_cd, param_dcf_pcf_dr_cd in zip(primary_keys_dcf_dsf_inst_cd, primary_keys_dcf_pcf_dr_cd):
actual_his_data = self.db.execute_select(
actual_his_select_sql,
{**param_dcf_dsf_inst_cd, **param_dcf_pcf_dr_cd})
if len(actual_his_data) != 0:
actual_his_data_list.append(actual_his_data[0])
assert len(actual_dr_data) == 1, '1件取得できていること'
actual_his_data_list.append(actual_his_data[0])
assert len(actual_his_data_list) == len(expect_his_data_list), 'COM_医師勤務先が期待値通りの件数作成されていること'
assert len(actual_his_data_list) == len(expect_his_data_list), 'COM_医師勤務先履歴が期待値通りの件数作成されていること'
@ -296,6 +298,16 @@ class TestComDrWrkplaceMapper:
)
self.db.execute(insert_sql, insert_parameter)
# COM_所属部科を登録
test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_blng_sec_before_delete.csv'))
for test_data in test_sql_data_list:
insert_sql, insert_parameter = create_insert_sql_with_parameter(
'src05.com_blng_sec',
test_data.keys(),
test_data.values()
)
self.db.execute(insert_sql, insert_parameter)
# Act
for line_number, line in enumerate(test_dat_file, start=1):
sut: com_dr_wrkplace_mapper.ComDrWrkplaceMapper = create_ultmarc_table_mapper_sut(line, self.db)