From b28f7f1612b6ababaa1f5e87d4eba3babd04377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Fri, 21 Apr 2023 14:16:38 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=A6=E7=90=86=E3=81=AE?= =?UTF-8?q?=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=E4=B8=AD=EF=BC=88=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=93=E3=81=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_dr_wrkplace_mapper.py | 13 +++++++------ .../com_dr_wrkplace/com_dr_wrkplace_update.csv | 3 ++- .../db_com_dr_wrkplace_before_update.csv | 1 + .../expect_com_dr_wrkplace_update.csv | 17 +++++++++-------- .../test_com_dr_wrkplace_mapper.py | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py index 8b9253a2..eacaadae 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_wrkplace_mapper.py @@ -4,7 +4,7 @@ from src.batch.ultmarc.utmp_tables.tables.com_dr_wrkplace import ComDrWrkplace class ComDrWrkplaceMapper(UltmarcTableMapper): - """レイアウト区分501-01:COM_医師勤務先 登録処理""" + """レイアウト区分502:COM_医師勤務先 登録処理""" # レコード存在確認SQL RECORD_EXISTS_QUERY = """\ @@ -212,13 +212,14 @@ class ComDrWrkplaceMapper(UltmarcTableMapper): make_history_query = self.TO_HISTORY_QUERY update_columns = ','.join(set_clauses_with_historical + set_clause_without_historical) - if len(update_columns) > 0: + if len(update_columns) == 0: + update_query = None + else: # 何かしら更新がある場合、末尾にカンマを付けてSET句を完成させる update_columns += ',' - - update_query = self.UPDATE_QUERY.format( - update_columns=update_columns - ) + update_query = self.UPDATE_QUERY.format( + update_columns=update_columns + ) return [make_history_query, update_query] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv index 73c4c336..5cc42095 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/com_dr_wrkplace_update.csv @@ -2,4 +2,5 @@ "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","内分泌・骨代謝外来","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","" \ No newline at end of file +"502","01","999613","","B","00","5504428","","2","20170328","20170401","501","","9999","内分泌・骨代謝外来","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","" +"502","01","999999","","B","00","5409446","","","20170906","20170910","","","","","","" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv index f0da440a..8113fcc1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/db_com_dr_wrkplace_before_update.csv @@ -9,3 +9,4 @@ "005504428","01997906","7212",,"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" "005507600","01997906","9114",,"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" "005504428","01999613","5140",,"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","01999999","1118",,,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:54:00","com_dr_wrkplace_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv index 1cee6ac3..cce6de1e 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/expect_com_dr_wrkplace_update.csv @@ -1,11 +1,12 @@ "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","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","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" -"005504428","01997906","7212",,"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" -"005507600","01997906","9114",,"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" -"005504428","01999613","9999","501","144","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" \ No newline at end of file +"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:00:43","com_dr_wrkplace_mapper" +"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","clsComDrWrk" +"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:00: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:00:43","com_dr_wrkplace_mapper" +"005409446","01999999","1118",,,"2020-02-22","ｹﾂｴｷﾅｲｶ","血液内科",,"2022-02-02","NULL","NULL","NULL","NULL","NULL","2022-02-02 10:45:16","com_dr_wrkplace_mapper","2022-02-02 14:00:00","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:00:39","clsComDrWrk" +"005504428","01997906","7212",,"144","2020-02-22","ﾕｹﾂ.ｻｲﾎﾞｳﾁﾘﾖｳｶﾞｸ","輸血・細胞治療学",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005507600","01997906","9114",,"144","2020-02-22","ｻｲﾎﾞｳｲｼﾖｸﾌﾞﾓﾝ","細胞移植部門",,"2022-02-03","NULL","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:39","clsComDrWrk" +"005504428","01999613","9999","501","144","2020-02-23","ﾅｲﾌﾞﾝﾋﾟ.ﾎﾈﾀｲｼﾔｶﾞｲﾗｲ","内分泌・骨代謝外来",,"2022-02-03","2022-02-03","NULL","NULL","NULL","NULL","2022-02-03 14:23:39","clsComDrWrk","2022-02-03 14:00:43","com_dr_wrkplace_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py index 89e65b54..e532513d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_wrkplace/test_com_dr_wrkplace_mapper.py @@ -29,13 +29,13 @@ class TestComDrWrkplaceMapper: # setup self.db = database self.db.connect() - self.db.begin() + # self.db.begin() # testing yield # teardown - self.db.rollback() + # self.db.rollback() self.db.disconnect() def test_insert_record(self):