From a1da4a90677f04656aa407a603a5d32ae811e075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 10:01:02 +0900 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90=EF=BC=88?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E9=83=A8=E7=A7=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_blng_sec_mapper.py | 105 ++++++++++ .../utmp_tables/tables/com_blng_sec.py | 22 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../__init__.py | 0 .../com_blng_sec/com_blng_sec_delete.csv | 7 + .../com_blng_sec/com_blng_sec_insert.csv | 7 + .../com_blng_sec/com_blng_sec_update.csv | 6 + .../db_com_blng_sec_before_delete.csv | 7 + .../db_com_blng_sec_before_update.csv | 8 + .../expect_com_blng_sec_delete.csv | 8 + .../expect_com_blng_sec_insert.csv | 8 + .../expect_com_blng_sec_update.csv | 8 + .../com_blng_sec/test_com_blng_sec_mapper.py | 197 ++++++++++++++++++ .../table_mapper/com_manage/__init__.py | 0 .../com_manage_delete.csv | 0 .../com_manage_insert.csv | 0 .../com_manage_update.csv | 0 .../db_com_manage_before_delete.csv | 0 .../db_com_manage_before_update.csv | 0 .../expect_com_manage_delete.csv | 0 .../expect_com_manage_insert.csv | 0 .../expect_com_manage_update.csv | 0 .../test_com_manage_mapper.py | 0 23 files changed, 386 insertions(+), 1 deletion(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_blng_sec.py rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_blng_sec}/__init__.py (100%) create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/test_com_blng_sec_mapper.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/__init__.py rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/com_manage_delete.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/com_manage_insert.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/com_manage_update.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/db_com_manage_before_delete.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/db_com_manage_before_update.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/expect_com_manage_delete.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/expect_com_manage_insert.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/expect_com_manage_update.csv (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_manage copy => com_manage}/test_com_manage_mapper.py (100%) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py new file mode 100644 index 00000000..3970919a --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_blng_sec_mapper.py @@ -0,0 +1,105 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_blng_sec import ComBlngSec + + +class ComBlngSecMapper(UltmarcTableMapper): + """レイアウト区分008: COM_所属部科 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_blng_sec + WHERE + blng_sec_cd = :blng_sec_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_blng_sec + ( + blng_sec_cd, + blng_sec_kana, + blng_sec_name, + inst_category, + trt_category, + category_sort, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :blng_sec_cd, + :blng_sec_kana, + :blng_sec_name, + :inst_category, + :trt_category, + :category_sort, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 変更用SQL + UPDATE_QUERY = """\ + UPDATE + src05.com_blng_sec + SET + blng_sec_kana = :blng_sec_kana, + blng_sec_name = :blng_sec_name, + inst_category = :inst_category, + trt_category = :trt_category, + category_sort = :category_sort, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + blng_sec_cd = :blng_sec_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_blng_sec + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + blng_sec_cd = :blng_sec_cd + """ + record: ComBlngSec + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComBlngSec) + program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) + # モジュール名をクエリパラメータに設定 + self.query_parameter['program_name'] = program_name + # 読み込んだレコード値もクエリパラメータに追加 + self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} + + def make_query(self): + # 修正区分がC(削除)の場合、論理削除 + if self.record.maint_flag == 'C': + self.queries.append(self.LOGICAL_DELETE_QUERY) + return + + # 追加、更新の場合 + self.queries.append(self.__make_upsert_query()) + return + + def __make_upsert_query(self): + # レコードの存在確認 + record_count = self.db.execute_select(self.RECORD_EXISTS_QUERY, self.query_parameter) + # 存在しない場合はInsert + if record_count[0]['count_num'] == 0: + return self.INSERT_QUERY + + # 存在する場合ではUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_blng_sec.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_blng_sec.py new file mode 100644 index 00000000..20395f9f --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_blng_sec.py @@ -0,0 +1,22 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComBlngSec(UltmarcTable): + """レイアウト区分008: COM_所属部科""" + blng_sec_cd: str # 所属部科コード + blng_sec_kana: str # 所属部科カナ + blng_sec_name: str # 所属部科名 + inst_category: str # 分類補助ｺｰﾄﾞ(施設分類) + trt_category: str # 分類補助ｺｰﾄﾞ(診療分野分類) + category_sort: str # 分類補助ｺｰﾄﾞ(ｿｰﾄｺｰﾄﾞ) + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.blng_sec_cd = record[1] + self.maint_flag = record[2] + self.blng_sec_name = record[5] + self.blng_sec_kana = record[6] + self.inst_category = record[7] + self.trt_category = record[8] + self.category_sort = record[9] diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py index c06d8873..1f101aeb 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/ultmarc_table_mapper_factory.py @@ -64,6 +64,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_manage_mapper impor ComManageMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.mst_prefc_mapper import \ MstPrefcMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_blng_sec_mapper import \ + ComBlngSecMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ NullMapper @@ -111,7 +113,7 @@ COM_TABLE_LIST = { # COM_経営体 "007": ComManageMapper, # COM_所属部科 - "008": NullMapper, + "008": ComBlngSecMapper, # COM_学会 "009": NullMapper, # COM_専門医資格 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/__init__.py similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/__init__.py rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/__init__.py diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_delete.csv new file mode 100644 index 00000000..cbeb7eae --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_delete.csv @@ -0,0 +1,7 @@ +"008","0067","A","20141113","20141114","","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","1","A02","117" +"008","0068","A","20141113","20141114","緩和内科","ｶﾝﾜ","1","A79","030" +"008","0069","A","20141113","20141114","小児外科、成育外科、小腸移植外科","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","2","L81","010" +"008","0070","C","20141113","20141114","腎臓・血液透析科","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","1","A08","052" +"008","0071","A","20141113","20141114","糖尿病内分泌・甲状腺科","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","1","A06","020" +"008","0072","A","20141113","20141114","血液・膠原病科","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","1","A05","137" +"008","0073","A","20141113","20141114","内科（内分泌・代謝）","ﾅｲｶ(ﾅｲﾌﾞﾝﾋﾟ.ﾀｲｼﾔ)","1","A05","144" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_insert.csv new file mode 100644 index 00000000..f9a527d2 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_insert.csv @@ -0,0 +1,7 @@ +"008","0067","A","20141113","20141114","消化器内科・血液内科","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","1","A02","117" +"008","0068","A","20141113","20141114","緩和内科","ｶﾝﾜﾅｲｶ","1","A79","030" +"008","0069","A","20141113","20141114","小児外科、成育外科、小腸移植外科","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","1","L81","010" +"008","0070","A","20141113","20141114","腎臓・血液透析科","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","1","A07","052" +"008","0071","A","20141113","20141114","糖尿病内分泌・甲状腺科","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","1","A06","019" +"008","0072","A","20141113","20141114","血液・膠原病科","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","1","A05","137" +"008","9999","A","","","あいうえおかきくけこあいうえおかきくけこあいうえお","アイウエオアイウエオアイウエオアイウエオアイｳ","9","999","999" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_update.csv new file mode 100644 index 00000000..b2aff05b --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/com_blng_sec_update.csv @@ -0,0 +1,6 @@ +"008","0067","A","20141113","20141114","","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","1","A02","117" +"008","0068","A","20141113","20141114","緩和内科","ｶﾝﾜ","1","A79","030" +"008","0069","A","20141113","20141114","小児外科、成育外科、小腸移植外科","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","2","L81","010" +"008","0070","A","20141113","20141114","腎臓・血液透析科","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","1","A08","052" +"008","0071","A","20141113","20141114","糖尿病内分泌・甲状腺科","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","1","A06","020" +"008","0072","A","20141113","20141114","血液・膠原病科","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","1","A05","137" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_delete.csv new file mode 100644 index 00000000..6637e500 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_delete.csv @@ -0,0 +1,7 @@ +"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" +"0067","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","","20171024","20171024","NULL","1","A02","117","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" +"0068","ｶﾝﾜ","緩和内科","20171024","20171024","NULL","1","A79","030","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" +"0069","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","小児外科、成育外科、小腸移植外科","20171024","20171024","NULL","2","L81","010","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" +"0070","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","腎臓・血液透析科","20171024","20171024","NULL","1","A08","052","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" +"0071","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","糖尿病内分泌・甲状腺科","20171024","20171024","NULL","1","A06","020","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" +"0072","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","20171024","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:59:43","clsComBlngSec" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_update.csv new file mode 100644 index 00000000..9e3d6b55 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/db_com_blng_sec_before_update.csv @@ -0,0 +1,8 @@ +"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" +"0067","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","消化器内科・血液内科","20171024","NULL","NULL","1","A02","117","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"0068","ｶﾝﾜﾅｲｶ","緩和内科","20171024","NULL","NULL","1","A79","030","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"0069","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","小児外科、成育外科、小腸移植外科","20171024","NULL","NULL","1","L81","010","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"0070","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","腎臓・血液透析科","20171024","NULL","NULL","1","A07","052","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"0071","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","糖尿病内分泌・甲状腺科","20171024","NULL","NULL","1","A06","019","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"0072","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","NULL","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" +"9999","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","NULL","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_delete.csv new file mode 100644 index 00000000..445e496f --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_delete.csv @@ -0,0 +1,8 @@ +"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" +"0067","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","","20171024","20230515","NULL","1","A02","117","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0068","ｶﾝﾜ","緩和内科","20171024","20230515","NULL","1","A79","030","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0069","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","小児外科、成育外科、小腸移植外科","20171024","20230515","NULL","2","L81","010","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0070","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","腎臓・血液透析科","20171024","20171024","20230515","1","A08","052","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0071","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","糖尿病内分泌・甲状腺科","20171024","20230515","NULL","1","A06","020","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0072","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","20230515","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 11:10:31","com_blng_sec_mapper" +"0073","ﾅｲｶ(ﾅｲﾌﾞﾝﾋﾟ.ﾀｲｼﾔ)","内科（内分泌・代謝）","20230515","NULL","NULL","1","A05","144","NULL","NULL","NULL","NULL","2023/05/15 11:10:31","com_blng_sec_mapper","2023/05/15 11:10:31","com_blng_sec_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_insert.csv new file mode 100644 index 00000000..501d4cdb --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_insert.csv @@ -0,0 +1,8 @@ +"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" +"0067","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","消化器内科・血液内科","20230515","NULL","NULL","1","A02","117","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"0068","ｶﾝﾜﾅｲｶ","緩和内科","20230515","NULL","NULL","1","A79","030","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"0069","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","小児外科、成育外科、小腸移植外科","20230515","NULL","NULL","1","L81","010","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"0070","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","腎臓・血液透析科","20230515","NULL","NULL","1","A07","052","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"0071","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","糖尿病内分泌・甲状腺科","20230515","NULL","NULL","1","A06","019","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"0072","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20230515","NULL","NULL","1","A05","137","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" +"9999","アイウエオアイウエオアイウエオアイウエオアイｳ","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","9","999","999","NULL","NULL","NULL","NULL","2023/05/15 10:49:50","com_blng_sec_mapper","2023/05/15 10:49:50","com_blng_sec_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_update.csv new file mode 100644 index 00000000..9743e740 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/expect_com_blng_sec_update.csv @@ -0,0 +1,8 @@ +"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" +"0067","ｼﾖｳｶｷﾅｲｶ.ｹﾂｴｷﾅｲｶ","","20171024","20230515","NULL","1","A02","117","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"0068","ｶﾝﾜ","緩和内科","20171024","20230515","NULL","1","A79","030","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"0069","ｼﾖｳﾆｹﾞｶ.ｾｲｲｸｹﾞｶ.ｼﾖｳﾁﾖｳｲｼﾖｸｹﾞｶ","小児外科、成育外科、小腸移植外科","20171024","20230515","NULL","2","L81","010","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"0070","ｼﾞﾝｿﾞｳ.ｹﾂｴｷﾄｳｾｷｶ","腎臓・血液透析科","20171024","20230515","NULL","1","A08","052","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"0071","ﾄｳﾆﾖｳﾋﾞﾖｳﾅｲﾌﾞﾝﾋﾟ.ｺｳｼﾞﾖｳｾﾝｶ","糖尿病内分泌・甲状腺科","20171024","20230515","NULL","1","A06","020","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"0072","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","20230515","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2023/05/15 10:59:43","com_blng_sec_mapper" +"9999","ｹﾂｴｷ.ｺｳｹﾞﾝﾋﾞﾖｳｶ","血液・膠原病科","20171024","NULL","NULL","1","A05","137","NULL","NULL","NULL","NULL","2017/10/24 10:49:50","clsComBlngSec","2017/10/24 10:49:50","clsComBlngSec" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/test_com_blng_sec_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/test_com_blng_sec_mapper.py new file mode 100644 index 00000000..4825682e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_blng_sec/test_com_blng_sec_mapper.py @@ -0,0 +1,197 @@ +import os.path as path +from datetime import datetime + +import pytest + +from src.batch.common.batch_context import BatchContext +from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_blng_sec_mapper +from src.db.database import Database +from tests.testing_utility import (assert_table_results, + create_db_data_from_csv, + create_delete_sql_with_parameter, + create_insert_sql_with_parameter, + create_ultmarc_table_mapper_sut, + create_ultmarc_test_data_from_csv) + + +class TestComBlngSecMapper: + """レイアウト区分008: COM_所属部科""" + + db: Database + batch_context: BatchContext + test_file_path: str = path.dirname(__file__) + + @pytest.fixture(autouse=True, scope='function') + def pre_test(self, database: Database): + """テスト実行前後処理""" + self.batch_context = BatchContext.get_instance() + # setup + self.db = database + self.db.connect() + self.db.begin() + + # testing + yield + + # teardown + self.db.rollback() + self.db.disconnect() + + def test_insert_record(self): + """ + Cases: + COM_所属部科テーブルにレコードを登録する + Arranges: + - CSVデータを用意し、読み込む + - 追加対象となるレコードを削除する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_blng_sec_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_blng_sec', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_blng_sec_mapper.ComBlngSecMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_blng_sec_mapper.ComBlngSecMapper, f'{line_number}行目:マッパークラスが期通りか' + + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_blng_sec_insert.csv')) + primary_keys = [f"'{primary_key['blng_sec_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_blng_sec WHERE blng_sec_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_update_record(self): + """ + Cases: + COM_所属部科テーブルのレコードを更新する + Arranges: + - CSVデータを用意し、読み込む + - 更新対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_blng_sec_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_blng_sec', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_blng_sec_before_update.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_blng_sec_mapper.ComBlngSecMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_blng_sec_mapper.ComBlngSecMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_blng_sec_update.csv')) + primary_keys = [f"'{primary_key['blng_sec_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_blng_sec WHERE blng_sec_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'update_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' + + def test_logical_delete(self): + """ + Cases: + COM_所属部科テーブルのレコードを1件論理削除する + Arranges: + - CSVデータを用意し、読み込む + - 削除対象となるレコードを登録する + Expects: + - 登録内容が期待値と一致すること + """ + + # Arrange + # 処理日設定 + self.batch_context.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_blng_sec_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_blng_sec', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + # テストデータをDBに登録 + # DBデータを読み込む + 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_blng_sec_mapper.ComBlngSecMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_blng_sec_mapper.ComBlngSecMapper, f'{line_number}行目:マッパークラスが期通りか' + sut.make_query() + sut.execute_queries() + + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_blng_sec_delete.csv')) + primary_keys = [f"'{primary_key['blng_sec_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_blng_sec WHERE blng_sec_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['regist_ymd', 'update_ymd', 'delete_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + line_number = 0 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + line_number += 1 + for actual_col_name, expect_col_name in zip(actual_row, expect_row): + if actual_col_name in ignore_columns: + if expect_row[expect_col_name] is None: + assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_delete.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_delete.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_insert.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_insert.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_insert.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_update.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/com_manage_update.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/db_com_manage_before_delete.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/db_com_manage_before_delete.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/db_com_manage_before_update.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/db_com_manage_before_update.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_delete.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_delete.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_insert.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_insert.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_insert.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_update.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/expect_com_manage_update.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/test_com_manage_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/test_com_manage_mapper.py similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/test_com_manage_mapper.py rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage/test_com_manage_mapper.py