From 3a98128b11766e8eb081dcc53a41cb2335b20c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 10 May 2023 15:34:16 +0900 Subject: [PATCH 01/25] =?UTF-8?q?feat:=20DCF=E6=96=BD=E8=A8=AD=E7=B5=B1?= =?UTF-8?q?=E5=90=88=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90(?= =?UTF-8?q?=E4=BB=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 138 ++++++++++++++++++ .../batch/laundering/create_dcf_inst_merge.py | 15 -- 2 files changed, 138 insertions(+), 15 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py delete mode 100644 ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py new file mode 100644 index 00000000..f567ebae --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -0,0 +1,138 @@ +from src.batch.batch_functions import logging_sql +from src.batch.common.batch_context import BatchContext +from src.db.database import Database +from src.error.exceptions import BatchOperationException +from src.logging.get_logger import get_logger +from src.time.elapsed_time import ElapsedTime + +batch_context = BatchContext.get_instance() +logger = get_logger('DCF施設統合マスタ作成') + + +def exec(): + """DCF施設統合マスタ作成""" + + # アルトマーク取込が行われていない場合は処理をスキップする + # if not batch_context.is_ultmarc_imported: + # logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + + db = Database.get_instance() + try: + db.connect() + db.begin() + logger.debug('DCF施設統合マスタ作成処理開始') + # COM施設からDCF施設統合マスタに登録 + _insert_dcf_inst_merge_from_com_ci(db) + db.commit() + logger.debug('DCF施設統合マスタ作成処理終了') + except Exception as e: + db.rollback() + raise BatchOperationException(e) + finally: + db.disconnect() + + +def _insert_dcf_inst_merge_from_com_ci(db: Database): + # com_ciにdcf_inst_mergeにinsert + creater = 'batchuser' + enabledFlg = 'Y' + + try: + result = db.execute_select( + """ + SELECT + ci.dcf_dsf_inst_cd AS dcf_dsf_inst_cd, + ci.form_inst_name_kanji AS form_inst_name_kanji, + ci.dup_opp_cd AS dup_opp_cd, + ( + SELECT + dupci.form_inst_name_kanji + FROM + src05.com_inst AS dupci + WHERE + dupci.dcf_dsf_inst_cd = ci.dup_opp_cd + ) AS dup_inst_name_kanji, + DATE_FORMAT(DATE_ADD((SELECT syor_date FROM src05.hdke_tbl),INTERVAL 1 MONTH),'%Y%m') AS sys_update_date + FROM + src05.com_inst AS ci + WHERE + CHAR_LENGTH(ci.dup_opp_cd) > 0 + AND ci.delete_sche_reason_cd = 'D' + AND ci.abolish_ymd IS NULL + AND DATE_FORMAT(ci.sys_update_date, '%Y%m%d') BETWEEN (SELECT syor_date FROM src05.hdke_tbl) AND DATE_FORMAT(SYSDATE(), '%Y%m%d') + AND NOT EXISTS ( + SELECT + dim.dcf_inst_cd + FROM + src05.dcf_inst_merge AS dim + WHERE + dim.dcf_inst_cd = ci.dcf_dsf_inst_cd + ) + AND ( + EXISTS ( + SELECT + eci.inst_cd + FROM + src05.emp_chg_inst AS eci + WHERE + eci.inst_cd = ci.dcf_dsf_inst_cd + ) + OR ( + SELECT + sl.inst_cd + FROM + src05.sales_lau AS sl + WHERE + sl.inst_cd = ci.dcf_dsf_inst_cd + ) + ) + """ + ) + logger.debug('重複コードがあるデータの取得に成功') + except Exception as e: + logger.debug('重複コードがあるデータの取得に失敗') + raise e + + if len(result) == 0: + logger.info('重複コードがあるデータはありません') + return + + values_clauses = [] + params = {'enabledFlg': enabledFlg, 'creater': creater, "updater": creater} + clauses_no = 0 + for row in result: + dcfInstCdArr = f'dcfInstCd{clauses_no}' + dupOppCdArr = f'dupOppCd{clauses_no}' + tekiyoMonthArr = f'tekiyoMonth{clauses_no}' + placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, :enabledFlg, :creater, SYSDATE(), :updater, SYSDATE())' + values_clauses.append(placeholders) + params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] + params[dupOppCdArr] = row['dup_opp_cd'] + params[tekiyoMonthArr] = row['sys_update_date'] + clauses_no += 1 + + insert_sql = f""" + INSERT INTO + src05.dcf_inst_merge ( + dcf_inst_cd, + dup_opp_cd, + tekiyo_month, + enabled_flg, + creater, + create_date, + updater, + update_date + ) VALUES + {','.join(values_clauses)} + """ + + try: + elapsed_time = ElapsedTime() + res = db.execute(insert_sql, params) + logging_sql(logger, insert_sql) + logger.info(f'COM施設からDCF施設統合マスタに登録成功, {res.rowcount} 行更新 ({elapsed_time.of})') + except Exception as e: + logger.debug('COM施設からDCF施設統合マスタの登録に失敗') + raise e + + return diff --git a/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py deleted file mode 100644 index 974aa329..00000000 --- a/ecs/jskult-batch-daily/src/batch/laundering/create_dcf_inst_merge.py +++ /dev/null @@ -1,15 +0,0 @@ -from src.batch.common.batch_context import BatchContext -from src.logging.get_logger import get_logger - -batch_context = BatchContext.get_instance() -logger = get_logger('DCF施設統合マスタ作成') - - -def exec(): - """DCF施設統合マスタ作成""" - - # アルトマーク取込が行われていない場合は処理をスキップする - if not batch_context.is_ultmarc_imported: - logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') - - pass From 3215a92e70a5f755670c88fa9ef830494e2ceb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Wed, 10 May 2023 18:31:59 +0900 Subject: [PATCH 02/25] =?UTF-8?q?feat:=20=E3=83=AD=E3=82=B0=E5=87=BA?= =?UTF-8?q?=E5=8A=9B=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 53 +++++++++++++++---- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index f567ebae..301c9337 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -13,8 +13,8 @@ def exec(): """DCF施設統合マスタ作成""" # アルトマーク取込が行われていない場合は処理をスキップする - # if not batch_context.is_ultmarc_imported: - # logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + if not batch_context.is_ultmarc_imported: + logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') db = Database.get_instance() try: @@ -22,8 +22,10 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - _insert_dcf_inst_merge_from_com_ci(db) - db.commit() + (success, result) = _insert_dcf_inst_merge_from_com_ci(db) + # DCF施設統合マスタが追加ログを出力する + if success: + _output_dcf_inst_merge_log(result) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -32,11 +34,8 @@ def exec(): db.disconnect() -def _insert_dcf_inst_merge_from_com_ci(db: Database): +def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: # com_ciにdcf_inst_mergeにinsert - creater = 'batchuser' - enabledFlg = 'Y' - try: result = db.execute_select( """ @@ -95,16 +94,16 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database): if len(result) == 0: logger.info('重複コードがあるデータはありません') - return + return False, None values_clauses = [] - params = {'enabledFlg': enabledFlg, 'creater': creater, "updater": creater} + params = {} clauses_no = 0 for row in result: dcfInstCdArr = f'dcfInstCd{clauses_no}' dupOppCdArr = f'dupOppCd{clauses_no}' tekiyoMonthArr = f'tekiyoMonth{clauses_no}' - placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, :enabledFlg, :creater, SYSDATE(), :updater, SYSDATE())' + placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' values_clauses.append(placeholders) params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] params[dupOppCdArr] = row['dup_opp_cd'] @@ -130,9 +129,41 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database): elapsed_time = ElapsedTime() res = db.execute(insert_sql, params) logging_sql(logger, insert_sql) + db.commit() logger.info(f'COM施設からDCF施設統合マスタに登録成功, {res.rowcount} 行更新 ({elapsed_time.of})') except Exception as e: logger.debug('COM施設からDCF施設統合マスタの登録に失敗') raise e + return (True, result) + + +def _output_dcf_inst_merge_log(result: list[dict]): + sys_update_date = result[0]['sys_update_date'] + setYearMonth = '{set_year}年{set_month}月'.format( + set_year=sys_update_date[0:4], + set_month=sys_update_date[-2:] + ) + + add_dct_inst_list = [] + for row in result: + add_dct_inst_list.append("""DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}""".format( + dcf_dsf_inst_cd=row['dcf_dsf_inst_cd'], + form_inst_name_kanji=row['form_inst_name_kanji'], + dup_opp_cd=row['dup_opp_cd'], + dup_inst_name_kanji=row['dup_inst_name_kanji'] + ) + ) + + add_dct_inst_list = '\n'.join(add_dct_inst_list) + logger.info( + f"""[NOTICE]DCF施設統合マスタが追加されました。 +********************************************************** +適用月度{setYearMonth} +********************************************************** +{add_dct_inst_list} +********************************************************** +合計　{len(result)}件 + """ + ) return From 2be8461f5aadb5d4cc9d987405d8561d58b724bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Thu, 11 May 2023 09:59:06 +0900 Subject: [PATCH 03/25] =?UTF-8?q?feat:=20DCF=E6=96=BD=E8=A8=AD=E7=B5=B1?= =?UTF-8?q?=E5=90=88=E3=83=9E=E3=82=B9=E3=82=BF=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index 301c9337..de00baea 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -22,10 +22,10 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - (success, result) = _insert_dcf_inst_merge_from_com_ci(db) - # DCF施設統合マスタが追加ログを出力する - if success: - _output_dcf_inst_merge_log(result) + (is_add_dcf_inst, result) = _insert_dcf_inst_merge_from_com_ci(db) + # DCF施設統合マスタの追加のログを出力する + if is_add_dcf_inst: + _output_add_dcf_inst_log(result) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -35,10 +35,10 @@ def exec(): def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: - # com_ciにdcf_inst_mergeにinsert + # com_ciからdcf_inst_mergeにinsert + # 重複コードがあるデータを取得する(処理日～システム日付を対象) try: - result = db.execute_select( - """ + sql = """ SELECT ci.dcf_dsf_inst_cd AS dcf_dsf_inst_cd, ci.form_inst_name_kanji AS form_inst_name_kanji, @@ -85,9 +85,10 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: sl.inst_cd = ci.dcf_dsf_inst_cd ) ) - """ - ) - logger.debug('重複コードがあるデータの取得に成功') + """ + result = db.execute_select(sql) + logging_sql(logger, sql) + logger.info('重複コードがあるデータの取得に成功') except Exception as e: logger.debug('重複コードがあるデータの取得に失敗') raise e @@ -96,9 +97,10 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: logger.info('重複コードがあるデータはありません') return False, None + # DCF施設統合マスタ追加 values_clauses = [] params = {} - clauses_no = 0 + clauses_no = 1 for row in result: dcfInstCdArr = f'dcfInstCd{clauses_no}' dupOppCdArr = f'dupOppCd{clauses_no}' @@ -138,32 +140,26 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: return (True, result) -def _output_dcf_inst_merge_log(result: list[dict]): +def _output_add_dcf_inst_log(result: list[dict]): sys_update_date = result[0]['sys_update_date'] setYearMonth = '{set_year}年{set_month}月'.format( set_year=sys_update_date[0:4], set_month=sys_update_date[-2:] ) + add_dct_inst = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' add_dct_inst_list = [] for row in result: - add_dct_inst_list.append("""DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}""".format( - dcf_dsf_inst_cd=row['dcf_dsf_inst_cd'], - form_inst_name_kanji=row['form_inst_name_kanji'], - dup_opp_cd=row['dup_opp_cd'], - dup_inst_name_kanji=row['dup_inst_name_kanji'] - ) - ) - + add_dct_inst_list.append(add_dct_inst.format(**row)) add_dct_inst_list = '\n'.join(add_dct_inst_list) + logger.info( f"""[NOTICE]DCF施設統合マスタが追加されました。 ********************************************************** -適用月度{setYearMonth} +適用月度　{setYearMonth} ********************************************************** {add_dct_inst_list} ********************************************************** -合計　{len(result)}件 - """ +合計　{len(result)}件""" ) return From 300420031c64fdedcc27ed9f41527841e3e8cc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Thu, 11 May 2023 17:50:11 +0900 Subject: [PATCH 04/25] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcf_inst_merge/create_dcf_inst_merge.py | 70 +++++++++---------- ecs/jskult-batch-daily/src/jobctrl_daily.py | 3 +- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index de00baea..c7f10b9f 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -22,10 +22,11 @@ def exec(): db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 - (is_add_dcf_inst, result) = _insert_dcf_inst_merge_from_com_ci(db) - # DCF施設統合マスタの追加のログを出力する - if is_add_dcf_inst: - _output_add_dcf_inst_log(result) + (is_add_dcf_inst_merge, duplication_inst_records) = _insert_dcf_inst_merge_from_com_inst(db) + # DCF施設統合マスタ追加のログを出力する + if is_add_dcf_inst_merge: + logger.info('[NOTICE]DCF施設統合マスタが追加されました。') + _output_add_dcf_inst_merge_log(duplication_inst_records) logger.debug('DCF施設統合マスタ作成処理終了') except Exception as e: db.rollback() @@ -34,8 +35,8 @@ def exec(): db.disconnect() -def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: - # com_ciからdcf_inst_mergeにinsert +def _insert_dcf_inst_merge_from_com_inst(db: Database) -> tuple[bool, list[dict]]: + # com_instからdcf_inst_mergeにinsert # 重複コードがあるデータを取得する(処理日～システム日付を対象) try: sql = """ @@ -51,14 +52,14 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: WHERE dupci.dcf_dsf_inst_cd = ci.dup_opp_cd ) AS dup_inst_name_kanji, - DATE_FORMAT(DATE_ADD((SELECT syor_date FROM src05.hdke_tbl),INTERVAL 1 MONTH),'%Y%m') AS sys_update_date + DATE_FORMAT((src05.get_syor_date() + INTERVAL 1 MONTH), '%Y%m') AS sys_update_date FROM src05.com_inst AS ci WHERE CHAR_LENGTH(ci.dup_opp_cd) > 0 AND ci.delete_sche_reason_cd = 'D' AND ci.abolish_ymd IS NULL - AND DATE_FORMAT(ci.sys_update_date, '%Y%m%d') BETWEEN (SELECT syor_date FROM src05.hdke_tbl) AND DATE_FORMAT(SYSDATE(), '%Y%m%d') + AND ci.sys_update_date BETWEEN src05.get_syor_date() AND SYSDATE() AND NOT EXISTS ( SELECT dim.dcf_inst_cd @@ -86,31 +87,29 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: ) ) """ - result = db.execute_select(sql) + duplication_inst_records = db.execute_select(sql) logging_sql(logger, sql) logger.info('重複コードがあるデータの取得に成功') except Exception as e: logger.debug('重複コードがあるデータの取得に失敗') raise e - if len(result) == 0: + if len(duplication_inst_records) == 0: logger.info('重複コードがあるデータはありません') - return False, None + return (False, None) # DCF施設統合マスタ追加 values_clauses = [] params = {} - clauses_no = 1 - for row in result: - dcfInstCdArr = f'dcfInstCd{clauses_no}' - dupOppCdArr = f'dupOppCd{clauses_no}' - tekiyoMonthArr = f'tekiyoMonth{clauses_no}' - placeholders = f'(:{dcfInstCdArr}, :{dupOppCdArr}, :{tekiyoMonthArr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' - values_clauses.append(placeholders) - params[dcfInstCdArr] = row['dcf_dsf_inst_cd'] - params[dupOppCdArr] = row['dup_opp_cd'] - params[tekiyoMonthArr] = row['sys_update_date'] - clauses_no += 1 + for clauses_no, row in enumerate(duplication_inst_records, start=1): + dcf_inst_cd_arr = f'dcf_inst_cd{clauses_no}' + dup_opp_cd_arr = f'dup_opp_cd{clauses_no}' + tekiyo_month_arr = f'tekiyo_month{clauses_no}' + values_clause = f'(:{dcf_inst_cd_arr}, :{dup_opp_cd_arr}, :{tekiyo_month_arr}, "Y", CURRENT_USER(), SYSDATE(), CURRENT_USER(), SYSDATE())' + values_clauses.append(values_clause) + params[dcf_inst_cd_arr] = row['dcf_dsf_inst_cd'] + params[dup_opp_cd_arr] = row['dup_opp_cd'] + params[tekiyo_month_arr] = row['sys_update_date'] insert_sql = f""" INSERT INTO @@ -137,29 +136,30 @@ def _insert_dcf_inst_merge_from_com_ci(db: Database) -> tuple[bool, list[dict]]: logger.debug('COM施設からDCF施設統合マスタの登録に失敗') raise e - return (True, result) + return (True, duplication_inst_records) -def _output_add_dcf_inst_log(result: list[dict]): - sys_update_date = result[0]['sys_update_date'] - setYearMonth = '{set_year}年{set_month}月'.format( +def _output_add_dcf_inst_merge_log(duplication_inst_records: list[dict]): + sys_update_date = duplication_inst_records[0]['sys_update_date'] + set_year_month = '{set_year}年{set_month}月'.format( set_year=sys_update_date[0:4], set_month=sys_update_date[-2:] ) - add_dct_inst = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' - add_dct_inst_list = [] - for row in result: - add_dct_inst_list.append(add_dct_inst.format(**row)) - add_dct_inst_list = '\n'.join(add_dct_inst_list) + add_dct_inst_merge = 'DCF施設コード　{dcf_dsf_inst_cd}　{form_inst_name_kanji}, 　重複時相手先コード　{dup_opp_cd}　{dup_inst_name_kanji}' + add_dct_inst_merge_list = [] + for row in duplication_inst_records: + add_dct_inst_merge_list.append(add_dct_inst_merge.format(**row)) + add_dct_inst_merge_list = '\n'.join(add_dct_inst_merge_list) + # 顧客報告用にログ出力 logger.info( - f"""[NOTICE]DCF施設統合マスタが追加されました。 + f"""DCF施設統合マスタが追加されました。 ********************************************************** -適用月度　{setYearMonth} +適用月度　{set_year_month} ********************************************************** -{add_dct_inst_list} +{add_dct_inst_merge_list} ********************************************************** -合計　{len(result)}件""" +合計　{len(duplication_inst_records)}件""" ) return diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 370f2179..cb1cf9e1 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/ecs/jskult-batch-daily/src/jobctrl_daily.py @@ -7,7 +7,8 @@ from src.batch.batch_functions import ( update_batch_processing_flag_in_processing) from src.batch.common.batch_context import BatchContext from src.batch.common.calendar_file import CalendarFile -from src.batch.laundering import create_dcf_inst_merge, create_mst_inst +from src.batch.dcf_inst_merge import create_dcf_inst_merge +from src.batch.laundering import create_mst_inst from src.batch.ultmarc import ultmarc_process from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger From 35c68957b076a8ffccba8f6bc2b1b1d9eccf0207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Fri, 12 May 2023 10:14:24 +0900 Subject: [PATCH 05/25] =?UTF-8?q?feat:=20=E5=AE=9F=E8=A1=8C=E6=99=82?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E5=87=BA=E3=82=8B=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=81=AE=E5=AF=BE=E5=87=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/src/jobctrl_daily.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 2614ab22..a98c0d16 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/ecs/jskult-batch-daily/src/jobctrl_daily.py @@ -8,7 +8,7 @@ from src.batch.batch_functions import ( from src.batch.common.batch_context import BatchContext from src.batch.common.calendar_file import CalendarFile from src.batch.dcf_inst_merge import create_dcf_inst_merge -from src.batch.laundering mst_inst_laundering +from src.batch.laundering import mst_inst_laundering from src.batch.ultmarc import ultmarc_process from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger From 2eae9fa25af235b77be0710c977249775659a690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Mon, 15 May 2023 11:40:39 +0900 Subject: [PATCH 06/25] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6?= =?UTF-8?q?=E9=A8=93=E4=B8=8D=E5=85=B7=E5=90=88=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/dcf_inst_merge/create_dcf_inst_merge.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index c7f10b9f..bbeb86d3 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -15,6 +15,7 @@ def exec(): # アルトマーク取込が行われていない場合は処理をスキップする if not batch_context.is_ultmarc_imported: logger.info('アルトマーク取込が行われていないため、DCF施設統合マスタ作成処理をスキップします。') + return db = Database.get_instance() try: From 4496e6b07d89a870c529282a6c6388f41e5584c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 15 May 2023 14:14:21 +0900 Subject: [PATCH 07/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E5=BD=B9=E8=81=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_post_mapper.py | 92 ++++++++ .../ultmarc/utmp_tables/tables/com_post.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../table_mapper/com_post/__init__.py | 0 .../table_mapper/com_post/com_post_delete.csv | 7 + .../table_mapper/com_post/com_post_insert.csv | 7 + .../table_mapper/com_post/com_post_update.csv | 6 + .../com_post/db_com_post_before_delete.csv | 7 + .../com_post/db_com_post_before_update.csv | 7 + .../com_post/expect_com_post_delete.csv | 8 + .../com_post/expect_com_post_insert.csv | 8 + .../com_post/expect_com_post_update.csv | 7 + .../com_post/test_com_post_mapper.py | 197 ++++++++++++++++++ 13 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_post.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py new file mode 100644 index 00000000..ed127c78 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_post_mapper.py @@ -0,0 +1,92 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_post import ComPost + + +class ComPostMapper(UltmarcTableMapper): + """レイアウト区分005: COM_役職 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_post + WHERE + post_cd = :post_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_post + ( + post_cd, + form_post_name, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :post_cd, + :form_post_name, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + UPDATE_QUERY = """\ + UPDATE + src05.com_post + SET + form_post_name = :form_post_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + post_cd = :post_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_post + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + post_cd = :post_cd + """ + record: ComPost + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComPost) + 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_post.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_post.py new file mode 100644 index 00000000..e1095c51 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_post.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComPost(UltmarcTable): + """レイアウト区分005: COM_役職""" + post_cd: str # 役職コード + form_post_name: str # 正式役職名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.post_cd = record[1] + self.maint_flag = record[2] + self.form_post_name = record[5] 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 6ff9bf70..d013bb15 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 @@ -52,6 +52,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_snd_med_sphe_mapper ComSndMedSpheMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_area_city_mapper import \ ComMedAreaCityMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_post_mapper import \ + ComPostMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ NullMapper @@ -93,7 +95,7 @@ COM_TABLE_LIST = { # COM_出身校 "004": ComAlmaMapper, # COM_役職 - "005": NullMapper, + "005": ComPostMapper, # 都道府県マスタ "006": NullMapper, # COM_経営体 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_delete.csv new file mode 100644 index 00000000..ee22668f --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_delete.csv @@ -0,0 +1,7 @@ +"005","011","A","20141113","20141114","理事長" +"005","012","A","20141113","20141114","理事" +"005","013","A","20141113","20141114","副理事" +"005","014","A","20141113","20141114","" +"005","015","A","20141113","20141114","常任理" +"005","016","C","20141113","20141114","誉理事" +"005","021","A","20141113","20141114","誉会長" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_insert.csv new file mode 100644 index 00000000..b5b7efa5 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_insert.csv @@ -0,0 +1,7 @@ +"005","011","A","20141113","20141114","理事長" +"005","012","A","20141113","20141114","理事" +"005","013","A","20141113","20141114","副理事" +"005","014","A","20141113","20141114","常務理" +"005","015","A","20141113","20141114","常任理" +"005","016","A","20141113","20141114","誉理事" +"005","999","A","","","あいうえおかきくけこあいうえおかきくけこあいうえお" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_update.csv new file mode 100644 index 00000000..c27a867d --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/com_post_update.csv @@ -0,0 +1,6 @@ +"005","011","A","20141113","20141114","理事" +"005","012","A","20141113","20141114","理事長" +"005","013","A","20141113","20141114","副理事" +"005","014","A","20141113","20141114","" +"005","015","A","20141113","20141114","常任理" +"005","016","A","20141113","20141114","誉理事" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_delete.csv new file mode 100644 index 00000000..ceb7e085 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_delete.csv @@ -0,0 +1,7 @@ +"post_cd","form_post_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"011","理事","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" +"012","理事長","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" +"013","副理事","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" +"014","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" +"015","常任理","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" +"016","誉理事","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:55:50","clsComPost" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_update.csv new file mode 100644 index 00000000..ffb77574 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/db_com_post_before_update.csv @@ -0,0 +1,7 @@ +"post_cd","form_post_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"011","理事長","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" +"012","理事","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" +"013","副理事","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" +"014","常務理","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" +"015","常任理","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" +"016","誉理事","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2017/10/20 10:51:28","clsComPost" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_delete.csv new file mode 100644 index 00000000..8ea72f18 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_delete.csv @@ -0,0 +1,8 @@ +"post_cd","form_post_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"011","理事長","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"012","理事","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"013","副理事","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"014","","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"015","常任理","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"016","誉理事","20171020","20171020","20230514","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 11:00:25","com_post_mapper" +"021","誉会長","20230514","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 11:00:25","com_post_mapper","2023/05/14 11:00:25","com_post_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_insert.csv new file mode 100644 index 00000000..e1ccea70 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_insert.csv @@ -0,0 +1,8 @@ +"post_cd","form_post_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"011","理事長","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"012","理事","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"013","副理事","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"014","常務理","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"015","常任理","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"016","誉理事","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" +"999","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 10:51:28","com_post_mapper","2023/05/15 10:51:28","com_post_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_update.csv new file mode 100644 index 00000000..0b2e436d --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/expect_com_post_update.csv @@ -0,0 +1,7 @@ +"post_cd","form_post_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"011","理事","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" +"012","理事長","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" +"013","副理事","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" +"014","","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" +"015","常任理","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" +"016","誉理事","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:51:28","clsComPost","2023/05/14 10:55:50","com_post_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py new file mode 100644 index 00000000..54d87d49 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_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_post_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 TestComPostMapper: + """レイアウト区分005: 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_post_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_post', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_post_mapper.ComPostMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_post_mapper.ComPostMapper, 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_post_insert.csv')) + primary_keys = [f"'{primary_key['post_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_post WHERE post_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 ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + 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_post_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_post', {'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_post_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_post', + 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_post_mapper.ComPostMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_post_mapper.ComPostMapper, 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_post_update.csv')) + primary_keys = [f"'{primary_key['post_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_post WHERE post_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_post_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_post', {'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_post_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_post', + 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_post_mapper.ComPostMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_post_mapper.ComPostMapper, 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_post_delete.csv')) + primary_keys = [f"'{primary_key['post_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_post WHERE post_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}が、期待値以降であること' From 42b3b8f2e11ecb29e02954353121f0668235e247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 15 May 2023 15:18:03 +0900 Subject: [PATCH 08/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E9=83=BD=E9=81=93=E5=BA=9C=E7=9C=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/mst_prefc_mapper.py | 96 +++++++++ .../ultmarc/utmp_tables/tables/mst_prefc.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../com_post/test_com_post_mapper.py | 2 +- .../table_mapper/mst_prefc/__init__.py | 0 .../mst_prefc/db_mst_prefc_before_delete.csv | 7 + .../mst_prefc/db_mst_prefc_before_update.csv | 7 + .../mst_prefc/expect_mst_prefc_delete.csv | 8 + .../mst_prefc/expect_mst_prefc_insert.csv | 8 + .../mst_prefc/expect_mst_prefc_update.csv | 7 + .../mst_prefc/mst_prefc_delete.csv | 7 + .../mst_prefc/mst_prefc_insert.csv | 7 + .../mst_prefc/mst_prefc_update.csv | 6 + .../mst_prefc/test_mst_prefc_mapper.py | 197 ++++++++++++++++++ 14 files changed, 368 insertions(+), 2 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/mst_prefc.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/test_mst_prefc_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py new file mode 100644 index 00000000..64e14591 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/mst_prefc_mapper.py @@ -0,0 +1,96 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.mst_prefc import MstPrefc + + +class MstPrefcMapper(UltmarcTableMapper): + """レイアウト区分006: 都道府県マスタ 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.mst_prefc + WHERE + prefc_cd = :prefc_cd + """ + + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.mst_prefc + ( + prefc_cd, + prefc_name, + prefc_name_kana, + delete_flg, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :prefc_cd, + :prefc_name, + '', + '0', + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 更新用SQL + UPDATE_QUERY = """\ + UPDATE + src05.mst_prefc + SET + prefc_name = :prefc_name, + delete_flg = '0', + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + prefc_cd = :prefc_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.mst_prefc + SET + delete_flg = '1', + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + prefc_cd = :prefc_cd + """ + record: MstPrefc + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, MstPrefc) + 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/mst_prefc.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/mst_prefc.py new file mode 100644 index 00000000..ae8e48ce --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/mst_prefc.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class MstPrefc(UltmarcTable): + """レイアウト区分006: 都道府県マスタ""" + prefc_cd: str # 都道府県コード + prefc_name: str # 都道府県名称 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.maint_flag = record[2] + self.prefc_name = record[5] + self.prefc_cd = record[6] 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 d013bb15..a99f9f4f 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 @@ -54,6 +54,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_area_city_mappe ComMedAreaCityMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_post_mapper import \ ComPostMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.mst_prefc_mapper import \ + MstPrefcMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ NullMapper @@ -97,7 +99,7 @@ COM_TABLE_LIST = { # COM_役職 "005": ComPostMapper, # 都道府県マスタ - "006": NullMapper, + "006": MstPrefcMapper, # COM_経営体 "007": NullMapper, # COM_所属部科 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py index 54d87d49..e440dbb7 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_post/test_com_post_mapper.py @@ -79,7 +79,7 @@ class TestComPostMapper: 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 ['regist_ymd', 'sys_regist_date', 'sys_update_date']: + 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): diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_delete.csv new file mode 100644 index 00000000..753f271a --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_delete.csv @@ -0,0 +1,7 @@ +"prefc_cd","prefc_name","prefc_name_kana","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","北海道","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" +"02","","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" +"03","岩手県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" +"04","秋田県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" +"05","宮城県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" +"06","山形県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 15:15:17","clsMstPrefc" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_update.csv new file mode 100644 index 00000000..4097a7c9 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/db_mst_prefc_before_update.csv @@ -0,0 +1,7 @@ +"prefc_cd","prefc_name","prefc_name_kana","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","北海道","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" +"02","青森県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" +"03","岩手県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" +"04","宮城県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" +"05","秋田県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" +"06","山形県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2017/10/20 14:57:57","clsMstPrefc" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_delete.csv new file mode 100644 index 00000000..4998fe00 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_delete.csv @@ -0,0 +1,8 @@ +"prefc_cd","prefc_name","prefc_name_kana","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","北海道","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"02","","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"03","岩手県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"04","秋田県","","1","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"05","宮城県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"06","山形県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:22:55","mst_prefc_mapper" +"07","福島県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:22:55","mst_prefc_mapper","2023/05/14 15:22:55","mst_prefc_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_insert.csv new file mode 100644 index 00000000..59b8b231 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_insert.csv @@ -0,0 +1,8 @@ +"prefc_cd","prefc_name","prefc_name_kana","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","北海道","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"02","青森県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"03","岩手県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"04","宮城県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"05","秋田県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"06","山形県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" +"99","あいうえお","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 14:57:57","mst_prefc_mapper","2023/05/14 14:57:57","mst_prefc_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_update.csv new file mode 100644 index 00000000..3fef3d10 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/expect_mst_prefc_update.csv @@ -0,0 +1,7 @@ +"prefc_cd","prefc_name","prefc_name_kana","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","北海道","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" +"02","","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" +"03","岩手県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" +"04","秋田県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" +"05","宮城県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" +"06","山形県","","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 14:57:57","clsMstPrefc","2023/05/14 15:15:17","mst_prefc_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_delete.csv new file mode 100644 index 00000000..f5b68b65 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_delete.csv @@ -0,0 +1,7 @@ +"006","11","A","20141113","20141114","北海道","01" +"006","21","A","20141113","20141114","","02" +"006","22","A","20141113","20141114","岩手県","03" +"006","23","C","20141113","20141114","秋田県","04" +"006","24","A","20141113","20141114","宮城県","05" +"006","25","A","20141113","20141114","山形県","06" +"006","26","A","20141113","20141114","福島県","07" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_insert.csv new file mode 100644 index 00000000..65801d98 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_insert.csv @@ -0,0 +1,7 @@ +"006","11","A","20141113","20141114","北海道","01" +"006","21","A","20141113","20141114","青森県","02" +"006","22","A","20141113","20141114","岩手県","03" +"006","23","A","20141113","20141114","宮城県","04" +"006","24","A","20141113","20141114","秋田県","05" +"006","25","A","20141113","20141114","山形県","06" +"006","","A","","","あいうえお","99" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_update.csv new file mode 100644 index 00000000..cf9dcddf --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/mst_prefc_update.csv @@ -0,0 +1,6 @@ +"006","11","A","20141113","20141114","北海道","01" +"006","21","A","20141113","20141114","","02" +"006","22","A","20141113","20141114","岩手県","03" +"006","23","A","20141113","20141114","秋田県","04" +"006","24","A","20141113","20141114","宮城県","05" +"006","25","A","20141113","20141114","山形県","06" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/test_mst_prefc_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/test_mst_prefc_mapper.py new file mode 100644 index 00000000..9023ffef --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/mst_prefc/test_mst_prefc_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 mst_prefc_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 TestMstPrefcMapper: + """レイアウト区分006: 都道府県マスタ""" + + 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: + 都道府県マスタテーブルにレコードを登録する + 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, 'mst_prefc_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.mst_prefc', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: mst_prefc_mapper.MstPrefcMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is mst_prefc_mapper.MstPrefcMapper, 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_mst_prefc_insert.csv')) + primary_keys = [f"'{primary_key['prefc_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.mst_prefc WHERE prefc_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['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: + 都道府県マスタテーブルのレコードを更新する + 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, 'mst_prefc_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.mst_prefc', {'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_mst_prefc_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.mst_prefc', + 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: mst_prefc_mapper.MstPrefcMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is mst_prefc_mapper.MstPrefcMapper, 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_mst_prefc_update.csv')) + primary_keys = [f"'{primary_key['prefc_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.mst_prefc WHERE prefc_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['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: + 都道府県マスタテーブルのレコードを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, 'mst_prefc_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.mst_prefc', {'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_mst_prefc_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.mst_prefc', + 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: mst_prefc_mapper.MstPrefcMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is mst_prefc_mapper.MstPrefcMapper, 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_mst_prefc_delete.csv')) + primary_keys = [f"'{primary_key['prefc_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.mst_prefc WHERE prefc_cd IN ({','.join(primary_keys)})" + actual_data_list = self.db.execute_select(actual_select_sql) + # 期待値検査 + ignore_columns = ['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}が、期待値以降であること' From 468974d6bb54829dfa70284605fc995d1d728dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Mon, 15 May 2023 17:00:15 +0900 Subject: [PATCH 09/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E7=B5=8C=E5=96=B6=E4=BD=93=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_manage_mapper.py | 94 +++++++++ .../ultmarc/utmp_tables/tables/com_manage.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../table_mapper/com_manage copy/__init__.py | 0 .../com_manage copy/com_manage_delete.csv | 7 + .../com_manage copy/com_manage_insert.csv | 7 + .../com_manage copy/com_manage_update.csv | 6 + .../db_com_manage_before_delete.csv | 7 + .../db_com_manage_before_update.csv | 8 + .../expect_com_manage_delete.csv | 8 + .../expect_com_manage_insert.csv | 8 + .../expect_com_manage_update.csv | 8 + .../com_manage copy/test_com_manage_mapper.py | 197 ++++++++++++++++++ 13 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_manage.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/test_com_manage_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py new file mode 100644 index 00000000..1fca8b00 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_manage_mapper.py @@ -0,0 +1,94 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_manage import ComManage + + +class ComManageMapper(UltmarcTableMapper): + """レイアウト区分007: COM_経営体 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_manage + WHERE + manage_cd = :manage_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_manage + ( + manage_cd, + manage_name, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :manage_cd, + :manage_name, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 更新用SQL + UPDATE_QUERY = """\ + UPDATE + src05.com_manage + SET + manage_name = :manage_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + manage_cd = :manage_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_manage + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + manage_cd = :manage_cd + """ + + record: ComManage + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComManage) + 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_manage.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_manage.py new file mode 100644 index 00000000..7d3bdefc --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_manage.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComManage(UltmarcTable): + """レイアウト区分007: COM_経営体""" + manage_cd: str # 経営体コード + manage_name: str # 経営体名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.manage_cd = record[1] + self.maint_flag = record[2] + self.manage_name = record[5] 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 bb8d416f..c06d8873 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 @@ -60,6 +60,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_med_area_city_mappe ComMedAreaCityMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_post_mapper import \ ComPostMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_manage_mapper import \ + ComManageMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.mst_prefc_mapper import \ MstPrefcMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ @@ -107,7 +109,7 @@ COM_TABLE_LIST = { # 都道府県マスタ "006": MstPrefcMapper, # COM_経営体 - "007": NullMapper, + "007": ComManageMapper, # COM_所属部科 "008": 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_manage copy/__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 copy/com_manage_delete.csv new file mode 100644 index 00000000..51b1ac36 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_delete.csv @@ -0,0 +1,7 @@ +"007","101","A","20141113","20141114","" +"007","102","C","20141113","20141114","文部" +"007","103","A","20141113","20141114","財務" +"007","104","A","20141113","20141114","警察" +"007","105","A","20141113","20141114","総務" +"007","106","A","20141113","20141114","防衛" +"007","107","A","20141113","20141114","独法国" 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 copy/com_manage_insert.csv new file mode 100644 index 00000000..8f21e4df --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_insert.csv @@ -0,0 +1,7 @@ +"007","101","A","20141113","20141114","厚生" +"007","102","A","20141113","20141114","文部" +"007","103","A","20141113","20141114","財務" +"007","104","A","20141113","20141114","総務" +"007","105","A","20141113","20141114","警察" +"007","106","A","20141113","20141114","防衛" +"007","999","A","","","あいうえおかきくけこあいうえおかきくけこあいうえお" 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 copy/com_manage_update.csv new file mode 100644 index 00000000..a4bc1313 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/com_manage_update.csv @@ -0,0 +1,6 @@ +"007","101","A","20141113","20141114","" +"007","102","A","20141113","20141114","文部" +"007","103","A","20141113","20141114","財務" +"007","104","A","20141113","20141114","警察" +"007","105","A","20141113","20141114","総務" +"007","106","A","20141113","20141114","防衛" 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 copy/db_com_manage_before_delete.csv new file mode 100644 index 00000000..d992c162 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_delete.csv @@ -0,0 +1,7 @@ +"manage_cd","manage_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"101","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" +"102","文部","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" +"103","財務","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" +"104","警察","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" +"105","総務","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" +"106","防衛","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:43:41","clsComManage" 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 copy/db_com_manage_before_update.csv new file mode 100644 index 00000000..1b73e668 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/db_com_manage_before_update.csv @@ -0,0 +1,8 @@ +"manage_cd","manage_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"101","厚生","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"102","文部","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"103","財務","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"104","総務","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"105","警察","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"106","防衛","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" +"999","あいうえおかきくけこ","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" 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 copy/expect_com_manage_delete.csv new file mode 100644 index 00000000..05318030 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_delete.csv @@ -0,0 +1,8 @@ +"manage_cd","manage_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"101","","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"102","文部","20171020","20171020","20230514","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"103","財務","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"104","警察","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"105","総務","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"106","防衛","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:51:00","com_manage_mapper" +"107","独法国","20230514","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:51:00","com_manage_mapper","2023/05/14 15:51:00","com_manage_mapper" 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 copy/expect_com_manage_insert.csv new file mode 100644 index 00000000..9041fe17 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_insert.csv @@ -0,0 +1,8 @@ +"manage_cd","manage_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"101","厚生","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"102","文部","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"103","財務","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"104","総務","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"105","警察","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"106","防衛","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" +"999","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/14 15:39:03","com_manage_mapper","2023/05/14 15:39:03","com_manage_mapper" 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 copy/expect_com_manage_update.csv new file mode 100644 index 00000000..4e2a7c7c --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/expect_com_manage_update.csv @@ -0,0 +1,8 @@ +"manage_cd","manage_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"101","","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"102","文部","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"103","財務","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"104","警察","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"105","総務","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"106","防衛","20171020","20230514","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2023/05/14 15:43:41","com_manage_mapper" +"999","あいうえおかきくけこ","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 15:39:03","clsComManage","2017/10/20 15:39:03","clsComManage" 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 copy/test_com_manage_mapper.py new file mode 100644 index 00000000..b27092a9 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_manage copy/test_com_manage_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_manage_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 TestComManageMapper: + """レイアウト区分007: 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_manage_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_manage', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_manage_mapper.ComManageMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_manage_mapper.ComManageMapper, 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_manage_insert.csv')) + primary_keys = [f"'{primary_key['manage_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_manage WHERE manage_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_manage_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_manage', {'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_manage_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_manage', + 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_manage_mapper.ComManageMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_manage_mapper.ComManageMapper, 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_manage_update.csv')) + primary_keys = [f"'{primary_key['manage_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_manage WHERE manage_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_manage_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_manage', {'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_manage_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_manage', + 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_manage_mapper.ComManageMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_manage_mapper.ComManageMapper, 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_manage_delete.csv')) + primary_keys = [f"'{primary_key['manage_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_manage WHERE manage_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}が、期待値以降であること' 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 10/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=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 From 9e38f5201ca8b184312abb0eccd53299beaab6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 10:37:30 +0900 Subject: [PATCH 11/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E5=AD=A6=E4=BC=9A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_sosiety_mapper.py | 93 +++++++++ .../ultmarc/utmp_tables/tables/com_sosiety.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../table_mapper/com_sosiety/__init__.py | 0 .../com_sosiety/com_sosiety_delete.csv | 7 + .../com_sosiety/com_sosiety_insert.csv | 7 + .../com_sosiety/com_sosiety_update.csv | 6 + .../db_com_sosiety_before_delete.csv | 7 + .../db_com_sosiety_before_update.csv | 8 + .../com_sosiety/expect_com_sosiety_delete.csv | 8 + .../com_sosiety/expect_com_sosiety_insert.csv | 8 + .../com_sosiety/expect_com_sosiety_update.csv | 8 + .../com_sosiety/test_com_sosiety_mapper.py | 197 ++++++++++++++++++ 13 files changed, 366 insertions(+), 1 deletion(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sosiety.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/test_com_sosiety_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py new file mode 100644 index 00000000..c98cfd1b --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sosiety_mapper.py @@ -0,0 +1,93 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_sosiety import ComSosiety + + +class ComSosietyMapper(UltmarcTableMapper): + """レイアウト区分009: COM_学会 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_sosiety + WHERE + sosiety_cd = :sosiety_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_sosiety + ( + sosiety_cd, + sosiety_name, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :sosiety_cd, + :sosiety_name, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 変更用SQL + UPDATE_QUERY = """\ + UPDATE + src05.com_sosiety + SET + sosiety_name = :sosiety_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + sosiety_cd = :sosiety_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_sosiety + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + sosiety_cd = :sosiety_cd + """ + record: ComSosiety + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComSosiety) + 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_sosiety.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sosiety.py new file mode 100644 index 00000000..556bef5b --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sosiety.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComSosiety(UltmarcTable): + """レイアウト区分009: COM_学会""" + sosiety_cd: str # 学会コード + sosiety_name: str # 学会名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.sosiety_cd = record[1] + self.maint_flag = record[2] + self.sosiety_name = record[5] 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 1f101aeb..b95274ff 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 @@ -66,6 +66,8 @@ 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.com_sosiety_mapper import \ + ComSosietyMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ NullMapper @@ -115,7 +117,7 @@ COM_TABLE_LIST = { # COM_所属部科 "008": ComBlngSecMapper, # COM_学会 - "009": NullMapper, + "009": ComSosietyMapper, # COM_専門医資格 "010": NullMapper, # COM_施設区分 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_delete.csv new file mode 100644 index 00000000..97dbe515 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_delete.csv @@ -0,0 +1,7 @@ +"009","001","A","20141113","20141114","" +"009","002","A","20141113","20141114","解剖" +"009","003","A","20141113","20141114","生理" +"009","004","C","20141113","20141114","生化" +"009","005","A","20141113","20141114","病理" +"009","006","A","20141113","20141114","薬理" +"009","007","A","20141113","20141114","癌" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_insert.csv new file mode 100644 index 00000000..ebdea438 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_insert.csv @@ -0,0 +1,7 @@ +"009","001","A","20141113","20141114","医史" +"009","002","A","20141113","20141114","解剖" +"009","003","A","20141113","20141114","生理" +"009","004","A","20141113","20141114","生化" +"009","005","A","20141113","20141114","薬理" +"009","006","A","20141113","20141114","病理" +"009","999","A","","","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_update.csv new file mode 100644 index 00000000..bb8eb3ba --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/com_sosiety_update.csv @@ -0,0 +1,6 @@ +"009","001","A","20141113","20141114","" +"009","002","A","20141113","20141114","解剖" +"009","003","A","20141113","20141114","生理" +"009","004","A","20141113","20141114","生化" +"009","005","A","20141113","20141114","病理" +"009","006","A","20141113","20141114","薬理" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_delete.csv new file mode 100644 index 00000000..87bee255 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_delete.csv @@ -0,0 +1,7 @@ +"sosiety_cd","sosiety_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"001","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" +"002","解剖","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" +"003","生理","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" +"004","生化","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" +"005","病理","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" +"006","薬理","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:39:30","clsComSosiety" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_update.csv new file mode 100644 index 00000000..5447e8b3 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/db_com_sosiety_before_update.csv @@ -0,0 +1,8 @@ +"sosiety_cd","sosiety_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"001","医史","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"002","解剖","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"003","生理","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"004","生化","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"005","薬理","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"006","病理","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" +"999","あいう","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_delete.csv new file mode 100644 index 00000000..ff96fbec --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_delete.csv @@ -0,0 +1,8 @@ +"sosiety_cd","sosiety_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"001","","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"002","解剖","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"003","生理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"004","生化","20171020","20171020","20230515","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"005","病理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"006","薬理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:50:50","com_sosiety_mapper" +"007","癌","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:50:50","com_sosiety_mapper","2023/05/15 16:50:50","com_sosiety_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_insert.csv new file mode 100644 index 00000000..8da80c1a --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_insert.csv @@ -0,0 +1,8 @@ +"sosiety_cd","sosiety_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"001","医史","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"002","解剖","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"003","生理","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"004","生化","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"005","薬理","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"006","病理","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" +"999","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 16:30:39","com_sosiety_mapper","2023/05/15 16:30:39","com_sosiety_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_update.csv new file mode 100644 index 00000000..d8c4d20a --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/expect_com_sosiety_update.csv @@ -0,0 +1,8 @@ +"sosiety_cd","sosiety_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"001","","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"002","解剖","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"003","生理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"004","生化","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"005","病理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"006","薬理","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2023/05/15 16:39:30","com_sosiety_mapper" +"999","あいう","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 16:30:39","clsComSosiety","2017/10/20 16:30:39","clsComSosiety" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/test_com_sosiety_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/test_com_sosiety_mapper.py new file mode 100644 index 00000000..1fd345b0 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sosiety/test_com_sosiety_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_sosiety_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 TestComSosietyMapper: + """レイアウト区分009: 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_sosiety_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_sosiety', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_sosiety_mapper.ComSosietyMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_sosiety_mapper.ComSosietyMapper, 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_sosiety_insert.csv')) + primary_keys = [f"'{primary_key['sosiety_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_sosiety WHERE sosiety_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_sosiety_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_sosiety', {'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_sosiety_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_sosiety', + 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_sosiety_mapper.ComSosietyMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_sosiety_mapper.ComSosietyMapper, 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_sosiety_update.csv')) + primary_keys = [f"'{primary_key['sosiety_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_sosiety WHERE sosiety_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_sosiety_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_sosiety', {'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_sosiety_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_sosiety', + 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_sosiety_mapper.ComSosietyMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_sosiety_mapper.ComSosietyMapper, 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_sosiety_delete.csv')) + primary_keys = [f"'{primary_key['sosiety_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_sosiety WHERE sosiety_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}が、期待値以降であること' From fce24a137b7d47f778d539787f5c41790608bcbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 13:21:54 +0900 Subject: [PATCH 12/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E5=B0=82=E9=96=80=E5=8C=BB=E8=B3=87=E6=A0=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_specialst_license_mapper.py | 93 +++++++++ .../tables/com_specialst_license.py | 14 ++ .../ultmarc_table_mapper_factory.py | 4 +- .../com_specialst_license/__init__.py | 0 .../com_specialst_license_delete.csv | 7 + .../com_specialst_license_insert.csv | 7 + .../com_specialst_license_update.csv | 6 + ...db_com_specialst_license_before_delete.csv | 7 + ...db_com_specialst_license_before_update.csv | 8 + .../expect_com_specialst_license_delete.csv | 8 + .../expect_com_specialst_license_insert.csv | 6 + .../expect_com_specialst_license_update.csv | 8 + .../test_com_specialst_license_mapper.py | 197 ++++++++++++++++++ 13 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py new file mode 100644 index 00000000..bf5ac147 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py @@ -0,0 +1,93 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_specialst_license import ComSpecialstLicense + + +class ComSpecialstLicenseMapper(UltmarcTableMapper): + """レイアウト区分010: COM_専門医資格 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_specialst_license + WHERE + specialst_cd = :specialst_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_specialst_license + ( + specialst_cd, + specialst_licens_name, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :specialst_cd, + :specialst_licens_name, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 変更用SQL + UPDATE_QUERY = """\ + UPDATE + src05.com_specialst_license + SET + specialst_licens_name = :specialst_licens_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + specialst_cd = :specialst_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_specialst_license + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + specialst_cd = :specialst_cd + """ + record: ComSpecialstLicense + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComSpecialstLicense) + 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_specialst_license.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py new file mode 100644 index 00000000..98ce930f --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComSpecialstLicense(UltmarcTable): + """レイアウト区分010: COM_専門医資格""" + specialst_cd: str # 専門医コード + specialst_licens_name: str # 専門医資格名 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.specialst_cd = record[1] + self.maint_flag = record[2] + self.specialst_licens_name = record[5] 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 b95274ff..5742af25 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 @@ -68,6 +68,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_blng_sec_mapper imp ComBlngSecMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_sosiety_mapper import \ ComSosietyMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_specialst_license_mapper import \ + ComSpecialstLicenseMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ NullMapper @@ -119,7 +121,7 @@ COM_TABLE_LIST = { # COM_学会 "009": ComSosietyMapper, # COM_専門医資格 - "010": NullMapper, + "010": ComSpecialstLicenseMapper, # COM_施設区分 "011": NullMapper, # COM_高度先進医療 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv new file mode 100644 index 00000000..79d312c4 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv @@ -0,0 +1,7 @@ +"010","0001","A","20141113","20141114","" +"010","0002","A","20141113","20141114","整形外科専門医" +"010","0003","A","20141113","20141114","麻酔科専門医" +"010","0004","A","20141113","20141114","産婦人科専門医" +"010","0005","C","20141113","20141114","放射線科専門医" +"010","0006","A","20141113","20141114","眼科専門医" +"010","0007","A","20141113","20141114","耳鼻咽喉科専門医" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv new file mode 100644 index 00000000..34854679 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv @@ -0,0 +1,7 @@ +"010","0001","A","20141113","20141114","皮膚科専門医" +"010","0002","A","20141113","20141114","整形外科専門医" +"010","0003","A","20141113","20141114","麻酔科専門医" +"010","0004","A","20141113","20141114","産婦人科専門医" +"010","0005","A","20141113","20141114","眼科専門医" +"010","0006","A","20141113","20141114","放射線科専門医" +"010","9999","A","","","あいうえおかきくけこあいうえおかきくけこあいうえお" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv new file mode 100644 index 00000000..f598cab6 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv @@ -0,0 +1,6 @@ +"010","0001","A","20141113","20141114","" +"010","0002","A","20141113","20141114","整形外科専門医" +"010","0003","A","20141113","20141114","麻酔科専門医" +"010","0004","A","20141113","20141114","産婦人科専門医" +"010","0005","A","20141113","20141114","放射線科専門医" +"010","0006","A","20141113","20141114","眼科専門医" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv new file mode 100644 index 00000000..60f3d7fb --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv @@ -0,0 +1,7 @@ +"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" +"0002","整形外科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" +"0003","麻酔科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" +"0004","産婦人科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" +"0005","放射線科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" +"0006","眼科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv new file mode 100644 index 00000000..96ec417b --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv @@ -0,0 +1,8 @@ +"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","皮膚科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"0002","整形外科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"0003","麻酔科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"0004","産婦人科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"0005","眼科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"0006","放射線科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" +"9999","ああああ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv new file mode 100644 index 00000000..b4d4506a --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv @@ -0,0 +1,8 @@ +"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0002","整形外科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0005","放射線科専門医","20171024","20171024","20230515","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" +"0007","耳鼻咽喉科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:47:40","com_specialst_license_mapper","2023/05/15 12:47:40","com_specialst_license_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv new file mode 100644 index 00000000..11f44661 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv @@ -0,0 +1,6 @@ +"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0003","麻酔科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" +"0004","産婦人科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" +"0005","眼科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" +"0006","放射線科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" +"9999","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv new file mode 100644 index 00000000..8125f178 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv @@ -0,0 +1,8 @@ +"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"0002","整形外科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"0005","放射線科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"9999","ああああ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py new file mode 100644 index 00000000..d8693046 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_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_specialst_license_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 TestComSpecialstLicenseMapper: + """レイアウト区分010: 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_specialst_license_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, 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_specialst_license_insert.csv')) + primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_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_specialst_license_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'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_specialst_license_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_specialst_license', + 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_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, 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_specialst_license_update.csv')) + primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_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_specialst_license_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'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_specialst_license_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_specialst_license', + 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_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, 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_specialst_license_delete.csv')) + primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_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}が、期待値以降であること' From 22906f882ff0ad7029b825e2d708d51c0c5f5db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 14:03:56 +0900 Subject: [PATCH 13/25] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90?= =?UTF-8?q?=EF=BC=88=E6=96=BD=E8=A8=AD=E5=8C=BA=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_inst_div_mapper.py | 93 +++++++++ .../utmp_tables/tables/com_inst_div.py | 14 ++ .../ultmarc_table_mapper_factory.py | 6 +- .../table_mapper/com_inst_div/__init__.py | 0 .../com_inst_div/com_inst_div_delete.csv | 7 + .../com_inst_div/com_inst_div_insert.csv | 7 + .../com_inst_div/com_inst_div_update.csv | 6 + .../db_com_inst_div_before_delete.csv | 7 + .../db_com_inst_div_before_update.csv | 8 + .../expect_com_inst_div_delete.csv | 8 + .../expect_com_inst_div_insert.csv | 8 + .../expect_com_inst_div_update.csv | 8 + .../com_inst_div/test_com_inst_div_mapper.py | 197 ++++++++++++++++++ 13 files changed, 366 insertions(+), 3 deletions(-) create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py create mode 100644 ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_div.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/__init__.py create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_delete.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_insert.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_update.csv create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/test_com_inst_div_mapper.py diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py new file mode 100644 index 00000000..08d9e03d --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_div_mapper.py @@ -0,0 +1,93 @@ +from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ + UltmarcTableMapper +from src.batch.ultmarc.utmp_tables.tables.com_inst_div import ComInstDiv + + +class ComInstDivMapper(UltmarcTableMapper): + """レイアウト区分011: COM_施設区分 登録処理""" + + # レコード存在確認SQL + RECORD_EXISTS_QUERY = """\ + SELECT + COUNT(*) AS count_num + FROM + src05.com_inst_div + WHERE + inst_div_cd = :inst_div_cd + """ + # データ登録用SQL + INSERT_QUERY = """\ + INSERT INTO src05.com_inst_div + ( + inst_div_cd, + inst_div_name, + regist_ymd, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + ) + VALUES ( + :inst_div_cd, + :inst_div_name, + :execute_date_str_ymd, + :execute_datetime, + :program_name, + :execute_datetime, + :program_name + ) + """ + + # 変更用SQL + UPDATE_QUERY = """\ + UPDATE + src05.com_inst_div + SET + inst_div_name = :inst_div_name, + update_ymd = :execute_date_str_ymd, + sys_update_date = :execute_datetime, + update_prgm_id = :program_name + WHERE + inst_div_cd = :inst_div_cd + """ + + # 修正区分が「C(削除)」の場合の更新SQL + LOGICAL_DELETE_QUERY = """\ + UPDATE + src05.com_inst_div + SET + delete_ymd = :execute_date_str_ymd, + sys_update_date = :execute_date_str_ymd, + update_prgm_id = :program_name + WHERE + inst_div_cd = :inst_div_cd + """ + record: ComInstDiv + + def __init__(self, record: list[str], db) -> None: + super().__init__(record, db, ComInstDiv) + 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_inst_div.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_div.py new file mode 100644 index 00000000..a51e5e3b --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_inst_div.py @@ -0,0 +1,14 @@ +from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable + + +class ComInstDiv(UltmarcTable): + """レイアウト区分011: COM_施設区分""" + inst_div_cd: str # 施設区分コード + inst_div_name: str # 施設区分名称 + maint_flag: str # 修正区分 + + def __init__(self, record: list[str]): + super().__init__(record) + self.inst_div_cd = record[1] + self.maint_flag = record[2] + self.inst_div_name = record[5] 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 5742af25..b5adf693 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 @@ -70,8 +70,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_sosiety_mapper impo ComSosietyMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_specialst_license_mapper import \ ComSpecialstLicenseMapper -from src.batch.ultmarc.utmp_tables.table_mapper.concrete.null_mapper import \ - NullMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_inst_div_mapper import \ + ComInstDivMapper # テーブルとのマッピング COM_TABLE_LIST = { @@ -123,7 +123,7 @@ COM_TABLE_LIST = { # COM_専門医資格 "010": ComSpecialstLicenseMapper, # COM_施設区分 - "011": NullMapper, + "011": ComInstDivMapper, # COM_高度先進医療 "021": ComHamtecMapper, # COM_先端医療機器 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_delete.csv new file mode 100644 index 00000000..904e9593 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_delete.csv @@ -0,0 +1,7 @@ +"011","01","A","20141113","20141114","" +"011","02","A","20141113","20141114","大学附属病院" +"011","03","A","20141113","20141114","大学附属病院分院" +"011","04","A","20141113","20141114","歯科病院（歯学部附属病院）" +"011","05","C","20141113","20141114","国立療養所" +"011","06","A","20141113","20141114","高次救急医療機関" +"011","07","A","20141113","20141114","社会福祉施設附属病院" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_insert.csv new file mode 100644 index 00000000..7d7d994d --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_insert.csv @@ -0,0 +1,7 @@ +"011","01","A","20141113","20141114","病院（大学ＨＰ以外）" +"011","02","A","20141113","20141114","大学附属病院" +"011","03","A","20141113","20141114","大学附属病院分院" +"011","04","A","20141113","20141114","歯科病院（歯学部附属病院）" +"011","05","A","20141113","20141114","高次救急医療機関" +"011","06","A","","","国立療養所" +"011","99","A","","","あいうえおかきくけこあいうえおかきくけこあいうえお" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_update.csv new file mode 100644 index 00000000..b220b54f --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/com_inst_div_update.csv @@ -0,0 +1,6 @@ +"011","01","A","20141113","20141114","" +"011","02","A","20141113","20141114","大学附属病院" +"011","03","A","20141113","20141114","大学附属病院分院" +"011","04","A","20141113","20141114","歯科病院（歯学部附属病院）" +"011","05","A","20141113","20141114","国立療養所" +"011","06","A","20141113","20141114","高次救急医療機関" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_delete.csv new file mode 100644 index 00000000..b5d0a632 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_delete.csv @@ -0,0 +1,7 @@ +"inst_div_cd","inst_div_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" +"02","大学附属病院","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" +"03","大学附属病院分院","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" +"04","歯科病院（歯学部附属病院）","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" +"05","国立療養所","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" +"06","高次救急医療機関","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:26:40","clsComInstDiv" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_update.csv new file mode 100644 index 00000000..96935038 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/db_com_inst_div_before_update.csv @@ -0,0 +1,8 @@ +"inst_div_cd","inst_div_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","病院（大学ＨＰ以外）","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"02","大学附属病院","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"03","大学附属病院分院","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"04","歯科病院（歯学部附属病院）","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"05","高次救急医療機関","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"06","国立療養所","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" +"99","ああああ","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_delete.csv new file mode 100644 index 00000000..8928715b --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_delete.csv @@ -0,0 +1,8 @@ +"inst_div_cd","inst_div_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:30:16","com_inst_div_mapper" +"02","大学附属病院","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:30:16","com_inst_div_mapper" +"03","大学附属病院分院","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:30:16","com_inst_div_mapper" +"04","歯科病院（歯学部附属病院）","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:30:16","com_inst_div_mapper" +"05","国立療養所","20171020","20171020","20230515","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:30:16","com_inst_div_mapper" +"06","高次救急医療機関","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:30:16","com_inst_div_mapper" +"07","社会福祉施設附属病院","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:30:16","com_inst_div_mapper","2023/05/15 17:30:16","com_inst_div_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_insert.csv new file mode 100644 index 00000000..b482c0bf --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_insert.csv @@ -0,0 +1,8 @@ +"inst_div_cd","inst_div_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","病院（大学ＨＰ以外）","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"02","大学附属病院","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"03","大学附属病院分院","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"04","歯科病院（歯学部附属病院）","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"05","高次救急医療機関","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"06","国立療養所","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" +"99","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 17:17:48","com_inst_div_mapper","2023/05/15 17:17:48","com_inst_div_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_update.csv new file mode 100644 index 00000000..1f416568 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/expect_com_inst_div_update.csv @@ -0,0 +1,8 @@ +"inst_div_cd","inst_div_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"01","","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"02","大学附属病院","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"03","大学附属病院分院","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"04","歯科病院（歯学部附属病院）","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"05","国立療養所","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"06","高次救急医療機関","20171020","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2023/05/15 17:26:40","com_inst_div_mapper" +"99","ああああ","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 17:17:48","clsComInstDiv","2017/10/20 17:17:48","clsComInstDiv" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/test_com_inst_div_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/test_com_inst_div_mapper.py new file mode 100644 index 00000000..17091505 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_div/test_com_inst_div_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_inst_div_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 TestComInstDivMapper: + """レイアウト区分011: 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_inst_div_insert.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_inst_div', {'1': '1'}) + self.db.execute(delete_sql, delete_parameter) + + # Act + for line_number, line in enumerate(test_dat_file, start=1): + sut: com_inst_div_mapper.ComInstDivMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_inst_div_mapper.ComInstDivMapper, 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_inst_div_insert.csv')) + primary_keys = [f"'{primary_key['inst_div_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_inst_div WHERE inst_div_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_inst_div_update.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_inst_div', {'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_inst_div_before_update.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_inst_div', + 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_inst_div_mapper.ComInstDivMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_inst_div_mapper.ComInstDivMapper, 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_inst_div_update.csv')) + primary_keys = [f"'{primary_key['inst_div_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_inst_div WHERE inst_div_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_inst_div_delete.csv')) + # 一旦全データをDBから削除 + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_inst_div', {'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_inst_div_before_delete.csv')) + for test_data in test_sql_data_list: + insert_sql, insert_parameter = create_insert_sql_with_parameter( + 'src05.com_inst_div', + 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_inst_div_mapper.ComInstDivMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_inst_div_mapper.ComInstDivMapper, 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_inst_div_delete.csv')) + primary_keys = [f"'{primary_key['inst_div_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_inst_div WHERE inst_div_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}が、期待値以降であること' From a0698a425de25537f37c21ac4a0ad30bd710dc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 16 May 2023 14:26:37 +0900 Subject: [PATCH 14/25] =?UTF-8?q?feat:=20=E5=8D=98=E4=BD=93=E8=A9=A6?= =?UTF-8?q?=E9=A8=93=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E6=8C=87=E6=91=98?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/dcf_inst_merge/create_dcf_inst_merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py index bbeb86d3..0dad2288 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/create_dcf_inst_merge.py @@ -90,13 +90,13 @@ def _insert_dcf_inst_merge_from_com_inst(db: Database) -> tuple[bool, list[dict] """ duplication_inst_records = db.execute_select(sql) logging_sql(logger, sql) - logger.info('重複コードがあるデータの取得に成功') + logger.info('施設統合対象データの取得に成功') except Exception as e: - logger.debug('重複コードがあるデータの取得に失敗') + logger.debug('施設統合対象データの取得に失敗') raise e if len(duplication_inst_records) == 0: - logger.info('重複コードがあるデータはありません') + logger.info('施設統合対象データはありません') return (False, None) # DCF施設統合マスタ追加 From 88ee68a7dd68dead92bea4aff2739aaf57d86ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 14:40:19 +0900 Subject: [PATCH 15/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expect_com_specialst_license_insert.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv index 11f44661..ef609890 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv @@ -1,4 +1,6 @@ "specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","皮膚科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" +"0002","整形外科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" "0003","麻酔科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" "0004","産婦人科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" "0005","眼科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" From bed40f038a5328641700dd406ce0e2d8ec69ee98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 16 May 2023 15:23:27 +0900 Subject: [PATCH 16/25] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=83=86=E3=83=A0=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_forfront_med_equip_mapper.py | 17 ++++++++--------- .../table_mapper/concrete/com_hamtec_mapper.py | 7 ++----- .../concrete/com_med_func_valuation_mapper.py | 7 ++----- .../concrete/com_nurse_assrt_mapper.py | 9 +++------ .../concrete/com_policy_med_mapper.py | 17 ++++++++--------- .../concrete/com_regn_critic_pass_mapper.py | 6 ++---- .../concrete/com_rehabili_mapper.py | 8 +++----- .../expect_com_forfront_med_equip_delete.csv | 2 +- .../expect_com_forfront_med_equip_update.csv | 2 +- .../com_hamtec/com_hamtec_delete.csv | 2 +- .../com_hamtec/com_hamtec_update.csv | 2 +- .../com_hamtec/expect_com_hamtec_delete.csv | 2 +- .../com_hamtec/expect_com_hamtec_update.csv | 2 +- .../expect_com_med_func_valuation_delete.csv | 2 +- .../expect_com_med_func_valuation_update.csv | 2 +- .../expect_com_nurse_assrt_delete.csv | 2 +- .../expect_com_nurse_assrt_update.csv | 2 +- .../expect_com_policy_med_delete.csv | 2 +- .../expect_com_policy_med_update.csv | 2 +- .../expect_com_regn_critic_pass_update.csv | 2 +- .../com_rehabili/expect_com_rehabili_delete.csv | 2 +- .../com_rehabili/expect_com_rehabili_update.csv | 2 +- 22 files changed, 43 insertions(+), 58 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py index 2892d074..089ef73d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_forfront_med_equip_mapper.py @@ -80,17 +80,16 @@ class ComForfrontMedEquipMapper(UltmarcTableMapper): 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: - self.queries.append(self.INSERT_QUERY) - return + return self.INSERT_QUERY - # 更新の場合 - if self.record.hi_medicmach_name != '': - self.queries.append(self.UPDATE_QUERY) - return - else: - self.queries.append(None) - return + # 存在する場合はUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py index 4cb71bbf..4d43560a 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_hamtec_mapper.py @@ -40,6 +40,7 @@ class ComHamtecMapper(UltmarcTableMapper): ) """ + # 更新用SQL UPDATE_QUERY = """\ UPDATE src05.com_hamtec @@ -92,8 +93,4 @@ class ComHamtecMapper(UltmarcTableMapper): return self.INSERT_QUERY # 存在する場合はUpdate - # 更新データがある場合のみ更新 - if self.record.hamtec_div != '' or self.record.hamtec_name != '': - return self.UPDATE_QUERY - else: - return None + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py index 530a1334..f7c03fef 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_med_func_valuation_mapper.py @@ -93,8 +93,5 @@ class ComMedFuncValuationMapper(UltmarcTableMapper): if record_count[0]['count_num'] == 0: return self.INSERT_QUERY - # med_func_valuation_nameが空で無い場合はUpdate - if len(self.record.med_func_valuation_name) == 0: - return None - else: - return self.UPDATE_QUERY + # 存在する場合はUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py index 6d1086f0..37a4c889 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_nurse_assrt_mapper.py @@ -40,6 +40,7 @@ class ComNurseAssrtMapper(UltmarcTableMapper): ) """ + # 更新用SQL UPDATE_QUERY = """\ UPDATE src05.com_nurse_assrt @@ -90,9 +91,5 @@ class ComNurseAssrtMapper(UltmarcTableMapper): if record_count[0]['count_num'] == 0: return self.INSERT_QUERY - # 更新する項目が無い場合 - if self.record.nurse_assrt_name == '': - return None - else: - # 更新する項目がある場合はUpdate - return self.UPDATE_QUERY + # 存在する場合はupdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_policy_med_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_policy_med_mapper.py index 17b1d937..0eba2a49 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_policy_med_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_policy_med_mapper.py @@ -81,17 +81,16 @@ class ComPolicyMedMapper(UltmarcTableMapper): 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: - self.queries.append(self.INSERT_QUERY) - return + return self.INSERT_QUERY - # 更新の場合 - if self.record.field_name != '': - self.queries.append(self.UPDATE_QUERY) - return - else: - self.queries.append(None) - return + # 存在する場合はUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py index 1bfbb38e..e3ac5f0d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_regn_critic_pass_mapper.py @@ -40,6 +40,7 @@ class ComRegnCriticPassMapper(UltmarcTableMapper): ) """ + # 更新用SQL UPDATE_QUERY = """\ UPDATE src05.com_regn_critic_pass @@ -91,7 +92,4 @@ class ComRegnCriticPassMapper(UltmarcTableMapper): return self.INSERT_QUERY # 存在する場合はUpdate - if len(self.record.disease_name_kanji) == 0: - return None - else: - return self.UPDATE_QUERY + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py index 1ff87694..363f7684 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_rehabili_mapper.py @@ -38,6 +38,7 @@ class ComRehabiliMapper(UltmarcTableMapper): ) """ + # 更新用SQL UPDATE_QUERY = """\ UPDATE src05.com_rehabili @@ -89,8 +90,5 @@ class ComRehabiliMapper(UltmarcTableMapper): if record_count[0]['count_num'] == 0: return self.INSERT_QUERY - # 存在する場合ではUpdate - if self.record.rehabili_name == '': - return None - else: - return self.UPDATE_QUERY + # 存在する場合はUpdate + return self.UPDATE_QUERY diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv index 0eead53f..0642d2d5 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_delete.csv @@ -1,5 +1,5 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"11","ＭＲＩ","20171023","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:07:41","clsComForfrontMedEqu" +"11","","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:07:41","com_forfront_med_equip_mapper" "12","Ｘ線ＣＴ","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" "13","ＣＲ","20171023","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" "14","血管造影システム","20171023","20171023","20230421","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:14:25","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv index 133e13a9..3b8e7904 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_forfront_med_equip/expect_com_forfront_med_equip_update.csv @@ -1,5 +1,5 @@ "forfront_med_equip_cd","forfront_med_equip_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"11","ＭＲＩ","20230421","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/21 10:01:26","clsComForfrontMedEqu","2017/10/23 10:07:41","com_forfront_med_equip_mapper" +"11","","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2023/04/21 10:01:26","clsComForfrontMedEqu","2017/10/23 10:07:41","com_forfront_med_equip_mapper" "12","Ｘ線ＣＴ","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" "13","ＣＲ","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 10:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" "14","血管造影システム","20230421","20230421","NULL","NULL","NULL","NULL","NULL","2017/10/23 15:01:26","clsComForfrontMedEqu","2017/10/23 15:10:02","com_forfront_med_equip_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_delete.csv index 7cbc586b..18531d8d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_delete.csv @@ -1,4 +1,4 @@ -"021","001",,"A","20141113","20141114", +"021","001","","A","20141113","20141114","" "021","002","1","A","20141113","20141114","電磁波温熱療法（放射線療法と併用しないもの）" "021","003","2","A","20141113","20141114","微小銅線による脳血管性病変に対しての電気的凝固治療" "021","004","1","C","20141113","20141114","顔面骨、頭蓋骨の観血的移動術" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_update.csv index 43b1e27c..90620670 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/com_hamtec_update.csv @@ -1,4 +1,4 @@ -"021","001",,"B","20141113","20141114", +"021","001","","B","20141113","20141114","" "021","002","1","B","20141113","20141114","電磁波温熱療法（放射線療法と併用しないもの）" "021","003","2","B","20141113","20141114","微小銅線による脳血管性病変に対しての電気的凝固治療" "021","004","1","B","20141113","20141114","顔面骨、頭蓋骨の観血的移動術" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_delete.csv index 9b5b62d9..e41f75a8 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_delete.csv @@ -1,5 +1,5 @@ "hamtec_cd","hamtec_div","hamtec_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"001","2","直流電流による骨電気治療法","20171018","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:03:10","clsComHamtec" +"001",,,"20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:03:10","com_hamtec_mapper" "002","1","電磁波温熱療法（放射線療法と併用しないもの）","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:21:01","com_hamtec_mapper" "003","2","微小銅線による脳血管性病変に対しての電気的凝固治療","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:21:01","com_hamtec_mapper" "004","1","顔面骨、頭蓋骨の観血的移動術","20171018","20171018","20171018","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:21:01","com_hamtec_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_update.csv index 1d9a61d4..fcdce90b 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_hamtec/expect_com_hamtec_update.csv @@ -1,5 +1,5 @@ "hamtec_cd","hamtec_div","hamtec_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"001","2","直流電流による骨電気治療法","20171018","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:03:10","clsComHamtec" +"001","","","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:03:10","com_hamtec_mapper" "002","1","電磁波温熱療法（放射線療法と併用しないもの）","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:08:06","com_hamtec_mapper" "003","2","微小銅線による脳血管性病変に対しての電気的凝固治療","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:08:06","com_hamtec_mapper" "004","1","顔面骨、頭蓋骨の観血的移動術","20171018","20171018","NULL","NULL","NULL","NULL","NULL","2017/10/18 17:03:10","clsComHamtec","2017/10/18 17:08:06","com_hamtec_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_delete.csv index 1d74c427..ec7302e3 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_delete.csv @@ -1,5 +1,5 @@ "med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati" +"01","","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","com_med_func_valuation_mapper" "02","一般病院Ｂ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper" "03","精神病院Ａ","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:22:50","com_med_func_valuation_mapper" "04","精神病院Ｂ","20171024","20171024","20230424","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2023/04/23 10:22:50","com_med_func_valuation_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_update.csv index 2d8e985a..b5292152 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_med_func_valuation/expect_com_med_func_valuation_update.csv @@ -1,5 +1,5 @@ "med_func_valuation_cd","med_func_valuation_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date",update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","一般病院Ａ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","clsComMedFuncValuati" +"01","","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:17:22","com_med_func_valuation_mapper" "02","一般病院Ｂ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper" "03","精神病院Ａ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper" "04","精神病院Ｂ","20171024","20230424","NULL","NULL","NULL","NULL","NULL","2017/10/24 10:17:22","clsComMedFuncValuati","2017/10/24 10:19:04","com_med_func_valuation_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv index 2c4cc78a..97e10546 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_delete.csv @@ -1,5 +1,5 @@ "nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"3991","","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","com_nurse_assrt_mapper" "4101","療養型介護療養施設サービス費（Ⅰ）","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" "4102","療養型介護療養施設サービス費（Ⅱ）","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" "4103","療養型介護療養施設サービス費（Ⅲ）","20171019","20171019","20230421","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:31:18","com_nurse_assrt_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv index 664f4879..82c4ee0a 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_nurse_assrt/expect_com_nurse_assrt_update.csv @@ -1,5 +1,5 @@ "nurse_assrt_cd","nurse_assrt_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"3991","診療所療養型種別不明","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","clsComNurseAssrt" +"3991","","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:16:17","com_nurse_assrt_mapper" "4101","療養型介護療養施設サービス費（Ⅰ）","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" "4102","療養型介護療養施設サービス費（Ⅱ）","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" "4103","療養型介護療養施設サービス費（Ⅲ）","20171019","20171019","NULL","NULL","NULL","NULL","NULL","2017/10/19 10:16:17","clsComNurseAssrt","2017/10/19 10:18:12","com_nurse_assrt_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_delete.csv index 33d4b95f..8863326e 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_delete.csv @@ -1,5 +1,5 @@ "policy_med_cd","field_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","がん","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2017/10/19 15:06:43","clsComPolicyMed" +"01","","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2022/10/20 15:06:43","com_policy_med_mapper" "02","循環器病","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2022/10/20 17:36:27","com_policy_med_mapper" "03","精神疾患","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2022/10/20 17:36:27","com_policy_med_mapper" "04","神経・筋疾患（筋ジスを含む）","20171019","20171019","20230425","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2022/10/20 17:36:27","com_policy_med_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_update.csv index 284e516f..b0d08781 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_policy_med/expect_com_policy_med_update.csv @@ -1,5 +1,5 @@ "policy_med_cd","field_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","がん","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2017/10/19 15:06:43","clsComPolicyMed" +"01","","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2023/04/19 15:06:43","com_policy_med_mapper" "02","循環器病","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2023/04/19 15:12:57","com_policy_med_mapper" "03","精神疾患","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2023/04/19 15:12:57","com_policy_med_mapper" "04","神経・筋疾患（筋ジスを含む）","20171019","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/19 15:06:43","clsComPolicyMed","2023/04/19 15:12:57","com_policy_med_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_update.csv index 68d07075..35151deb 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_regn_critic_pass/expect_com_regn_critic_pass_update.csv @@ -1,4 +1,4 @@ "regn_co_critic_pass_cd","disease_name_kanji","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "01","頸部骨折","20230423","20230423","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper" "55","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこくけこあいうえおかきくけこあいうえおかき","20230423","20230423","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","com_regn_critic_pass_mapper","2023/03/24 10:04:58","com_regn_critic_pass_mapper" -"99","不明","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","clsComRegnCriticPass","2023/03/24 10:04:58","clsComRegnCriticPass" +"99","","20171024","20230423","NULL","NULL","NULL","NULL","NULL","2023/03/24 10:04:58","clsComRegnCriticPass","2023/03/24 10:04:58","com_regn_critic_pass_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_delete.csv index fa1a79eb..e2554dc6 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_delete.csv @@ -1,5 +1,5 @@ "rehabili_cd","rehabili_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","脳血管疾患等リハビリテーション","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2017/10/19 14:44:23","clsComRehabili" +"01","","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2017/10/19 14:44:23","com_rehabili_mapper" "02","運動器リハビリテーション","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 15:01:11","com_rehabili_mapper" "03","呼吸器リハビリテーション","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 15:01:11","com_rehabili_mapper" "04","廃用症候群リハビリテーション","20171019","20171019","20230423","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 15:01:11","com_rehabili_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_update.csv index f39d0ed8..00891218 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_rehabili/expect_com_rehabili_update.csv @@ -1,5 +1,5 @@ "rehabili_cd","rehabili_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"01","脳血管疾患等リハビリテーション","20171019","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2017/10/19 14:44:23","clsComRehabili" +"01","","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2017/10/19 14:44:23","com_rehabili_mapper" "02","運動器リハビリテーション","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 14:51:32","com_rehabili_mapper" "03","呼吸器リハビリテーション","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 14:51:32","com_rehabili_mapper" "04","廃用症候群リハビリテーション","20171019","20230423","NULL","NULL","NULL","NULL","NULL","2017/10/19 14:44:23","clsComRehabili","2022/10/19 14:51:32","com_rehabili_mapper" From 34c260d96fc371dfbf9d95d258b640c5b9808c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 17 May 2023 11:44:32 +0900 Subject: [PATCH 17/25] =?UTF-8?q?=E7=89=A9=E7=90=86=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E5=87=A6=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_cop_hp/test_com_cop_hp_mapper.py | 6 ++- .../expect_com_dr_trt_course_update.csv | 11 ++++-- .../table_mapper/com_dr/test_com_dr_mapper.py | 4 ++ .../test_com_dr_sosiety_mapper.py | 8 ++-- .../com_inst/db_com_trt_before_update.csv | 6 +-- .../com_inst/expect_com_trt_update.csv | 37 +++++++++++++++++++ .../com_inst/test_com_inst_mapper.py | 4 ++ .../com_inst_att/test_com_inst_att_mapper.py | 6 ++- .../test_com_prefc_med_base_mapper.py | 6 ++- .../test_com_prefc_med_dis_treat_mapper.py | 6 ++- .../test_com_prefc_med_equpment_mapper.py | 6 ++- .../test_com_prefc_med_sojourn_ope_mapper.py | 6 ++- .../test_com_prefc_med_sp_outpat_mapper.py | 6 ++- .../com_sp_field/com_sp_field_delete.csv | 11 +++--- .../db_com_sp_field_before_delete.csv | 8 ++-- .../expect_com_sp_field_delete.csv | 4 -- .../com_sp_field/test_com_sp_field_mapper.py | 6 ++- 17 files changed, 102 insertions(+), 39 deletions(-) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_cop_hp/test_com_cop_hp_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_cop_hp/test_com_cop_hp_mapper.py index 29b840e2..553c4261 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_cop_hp/test_com_cop_hp_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_cop_hp/test_com_cop_hp_mapper.py @@ -173,10 +173,10 @@ class TestComCopHpMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_臨床研修病院テーブルのレコードを1件論理削除する + COM_臨床研修病院テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -213,6 +213,8 @@ class TestComCopHpMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_cop_hp_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_cop_hp')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_cophp_cd = [{'cophp_cd': columns['cophp_cd']} for columns in expect_data_list] primary_keys_openyear = [{'openyear': columns['openyear']} for columns in expect_data_list] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_trt_course_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_trt_course_update.csv index fa2ab558..6141d0cc 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_trt_course_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_trt_course_update.csv @@ -1,14 +1,19 @@ "trt_course_cd","dcf_pcf_dr_cd","sequence","regist_ymd","update_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"A01","0199578300","1","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","com_dr_mapper","2017/10/08 20:57:12","com_dr_mapper" "A01","0199768200","1","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/09 18:06:51","com_dr_mapper","2017/10/09 18:06:51","com_dr_mapper" -"A01","9999999900","1","20141125","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" -"A03","9999999900","3","20141125","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" -"A05","9999999900","5","20141125","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" +"A01","9999999900","1","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" "A01","9999999999","4","20141125","NULL","NULL","NULL","NULL","NULL","2014/12/03 16:26:05","PKG_03_1_F1101_011","2014/12/03 16:26:05","PKG_03_1_F1101_011" +"A03","9999999900","3","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" +"A05","9999999900","5","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 16:26:05","com_dr_mapper","2023/04/12 16:26:05","com_dr_mapper" "A26","0122222233","1","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper" "A58","0199768200","2","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/09 18:06:51","com_dr_mapper","2017/10/09 18:06:51","com_dr_mapper" +"C04","0199578300","4","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","com_dr_mapper","2017/10/08 20:57:12","com_dr_mapper" "C27","0122222233","2","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper" +"E02","0199578300","3","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","com_dr_mapper","2017/10/08 20:57:12","com_dr_mapper" "I28","0122222233","3","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper" "K29","0122222233","4","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper" +"L01","0199578300","2","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","com_dr_mapper","2017/10/08 20:57:12","com_dr_mapper" +"L03","0199578300","5","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","com_dr_mapper","2017/10/08 20:57:12","com_dr_mapper" "L30","0122222233","5","20230427","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_dr_mapper","2023/04/12 00:00:00","com_dr_mapper" "U91","0199790600","1","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/09 18:06:51","com_dr_mapper","2017/10/09 18:06:51","com_dr_mapper" "U92","0199790600","2","20230427","NULL","NULL","NULL","NULL","NULL","2017/10/09 18:06:51","com_dr_mapper","2017/10/09 18:06:51","com_dr_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/test_com_dr_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/test_com_dr_mapper.py index 5d45b49b..528a8ef1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/test_com_dr_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/test_com_dr_mapper.py @@ -107,6 +107,8 @@ class TestComDrMapper: # 期待値ファイルを読み込む(医師診察科目) expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_dr_trt_course_insert.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_dr_trt_course')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_course_cd = [{'trt_course_cd': columns['trt_course_cd']} for columns in expect_data_list] primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] actual_data_list = [] @@ -218,6 +220,8 @@ class TestComDrMapper: # 期待値ファイルを読み込む(医師診察科目) expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_dr_trt_course_update.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_dr_trt_course')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_course_cd = [{'trt_course_cd': columns['trt_course_cd']} for columns in expect_data_list] primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_sosiety/test_com_dr_sosiety_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_sosiety/test_com_dr_sosiety_mapper.py index d577cfa1..4e8dbad8 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_sosiety/test_com_dr_sosiety_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr_sosiety/test_com_dr_sosiety_mapper.py @@ -169,10 +169,10 @@ class TestComDrSosietyMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_所属学会テーブルのレコードを1件論理削除する + COM_所属学会テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -209,6 +209,8 @@ class TestComDrSosietyMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_dr_sosiety_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_dr_sosiety')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] primary_keys_sosiety_cd = [{'sosiety_cd': columns['sosiety_cd']} for columns in expect_data_list] actual_data_list = [] @@ -219,7 +221,7 @@ class TestComDrSosietyMapper: AND dcf_pcf_dr_cd = :dcf_pcf_dr_cd \ - """ + """ for param_dcf_pcf_dr_cd, param_sosiety_cd in zip(primary_keys_sosiety_cd, primary_keys_dcf_pcf_dr_cd): dr_sosiety_data = self.db.execute_select( dr_sosiety_select_sql, diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/db_com_trt_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/db_com_trt_before_update.csv index 46080fbc..0873cb36 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/db_com_trt_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/db_com_trt_before_update.csv @@ -9,6 +9,9 @@ "009900146","E02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-01-31 11:38:26","clsComInstInfo" "009900194","O01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-01-31 11:38:26","clsComInstInfo" "009900194","O02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-01-31 11:38:26","clsComInstInfo" +"009929798","A01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009929798","A57","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009929798","I01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" "009904439","A01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" "009904439","A03","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" "009904439","A12","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" @@ -43,6 +46,3 @@ "009904439","O01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" "009904439","P02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" "009904439","P03","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" -"009929798","A01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" -"009929798","A57","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" -"009929798","I01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_trt_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_trt_update.csv index 8d4e9a35..9adf2bb7 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_trt_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_trt_update.csv @@ -3,6 +3,43 @@ "009900194","U18","20220201","NULL","NULL","NULL","NULL","NULL","2023/05/01 14:52:43","com_inst_mapper","2023/05/01 14:52:43","com_inst_mapper" "009900194","U21","20220201","NULL","NULL","NULL","NULL","NULL","2023/05/01 14:52:43","com_inst_mapper","2023/05/01 14:52:43","com_inst_mapper" "009900194","U23","20220201","NULL","NULL","NULL","NULL","NULL","2023/05/01 14:52:43","com_inst_mapper","2023/05/01 14:52:43","com_inst_mapper" +"009904439","A01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","A03","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A12","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","A22","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","A34","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","A41","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A56","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A57","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A58","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A61","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A65","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","A81","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","B01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","B04","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","B11","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","B22","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","B31","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","C01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","C04","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","C05","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","D02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","E02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","F01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","F08","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","G06","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","H02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009904439","I01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","J01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","K01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","M01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","N03","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","O01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","P02","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-01-31 11:38:27","clsComInstInfo" +"009904439","P03","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009929798","A01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009929798","A57","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" +"009929798","I01","20220131","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-01-31 11:38:28","clsComInstInfo" "223333344","100","20230427","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","com_inst_mapper","2023/05/01 16:16:43","com_inst_mapper" "223333344","101","20230427","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","com_inst_mapper","2023/05/01 16:16:43","com_inst_mapper" "223333344","102","20230427","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","com_inst_mapper","2023/05/01 16:16:43","com_inst_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py index 4c4058d8..2643f734 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py @@ -112,6 +112,8 @@ class TestComInstMapper: # 期待値ファイルを読み込む(施設診療科目) expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_trt_insert.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_inst_trt_course')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_trt_course_cd = [{'trt_course_cd': columns['trt_course_cd']} for columns in expect_data_list] actual_data_list = [] @@ -263,6 +265,8 @@ class TestComInstMapper: # 期待値ファイルを読み込む(施設診療科目) expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_trt_update.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_inst_trt_course')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_trt_course_cd = [{'trt_course_cd': columns['trt_course_cd']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py index 0721905d..ac83cbcf 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst_att/test_com_inst_att_mapper.py @@ -167,10 +167,10 @@ class TestComInstAttMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_施設属性テーブルのレコードを1件論理削除する + COM_施設属性テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -207,6 +207,8 @@ class TestComInstAttMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_inst_att_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_inst_att')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys = [f"'{primary_key['dcf_dsf_inst_cd']}'" for primary_key in expect_data_list] actual_select_sql = f"SELECT * FROM src05.com_inst_att WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/test_com_prefc_med_base_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/test_com_prefc_med_base_mapper.py index ab6fca06..84905c02 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/test_com_prefc_med_base_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_base/test_com_prefc_med_base_mapper.py @@ -138,10 +138,10 @@ class TestComPrefcMedBaseMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_都道府県医療機能情報(基本)テーブルのレコードを1件論理削除する + COM_都道府県医療機能情報(基本)テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -178,6 +178,8 @@ class TestComPrefcMedBaseMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_prefc_med_base_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_prefc_med_base')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys = [f"'{primary_key['dcf_dsf_inst_cd']}'" for primary_key in expect_data_list] actual_select_sql = f"SELECT * FROM src05.com_prefc_med_base WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_dis_treat/test_com_prefc_med_dis_treat_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_dis_treat/test_com_prefc_med_dis_treat_mapper.py index a0597df9..003b87b1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_dis_treat/test_com_prefc_med_dis_treat_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_dis_treat/test_com_prefc_med_dis_treat_mapper.py @@ -175,10 +175,10 @@ class TestComPrefcMedDisTreatMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_都道府県医療機能情報(疾患治療)テーブルのレコードを1件論理削除する + COM_都道府県医療機能情報(疾患治療)テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -215,6 +215,8 @@ class TestComPrefcMedDisTreatMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_prefc_med_dis_treat_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_prefc_med_dis_treat')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_treatment_code = [{'treatment_code': columns['treatment_code']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/test_com_prefc_med_equpment_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/test_com_prefc_med_equpment_mapper.py index 78d33244..5372b7cd 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/test_com_prefc_med_equpment_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_equpment/test_com_prefc_med_equpment_mapper.py @@ -174,10 +174,10 @@ class TestComPrefcMedEqupmentMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_都道府県医療機能情報(施設設備)テーブルのレコードを1件論理削除する + COM_都道府県医療機能情報(施設設備)テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -214,6 +214,8 @@ class TestComPrefcMedEqupmentMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_prefc_med_equpment_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_prefc_med_equpment')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_equipment_code = [{'equipment_code': columns['equipment_code']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sojourn_ope/test_com_prefc_med_sojourn_ope_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sojourn_ope/test_com_prefc_med_sojourn_ope_mapper.py index ad87a43a..f08193a6 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sojourn_ope/test_com_prefc_med_sojourn_ope_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sojourn_ope/test_com_prefc_med_sojourn_ope_mapper.py @@ -166,10 +166,10 @@ class TestComPrefcMedSojournOpeMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_都道府県医療機能情報(短期滞在手術)テーブルのレコードを1件論理削除する + COM_都道府県医療機能情報(短期滞在手術)テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -206,6 +206,8 @@ class TestComPrefcMedSojournOpeMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_prefc_med_sojourn_ope_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_prefc_med_sojourn_ope')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_cos_surgery_code = [{'cos_surgery_code': columns['cos_surgery_code']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sp_outpat/test_com_prefc_med_sp_outpat_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sp_outpat/test_com_prefc_med_sp_outpat_mapper.py index 04932cf8..54d034a3 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sp_outpat/test_com_prefc_med_sp_outpat_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_prefc_med_sp_outpat/test_com_prefc_med_sp_outpat_mapper.py @@ -166,10 +166,10 @@ class TestComPrefcMedSpOutpatMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_都道府県医療機能情報(専門外来)テーブルのレコードを1件論理削除する + COM_都道府県医療機能情報(専門外来)テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -206,6 +206,8 @@ class TestComPrefcMedSpOutpatMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_prefc_med_sp_outpat_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_prefc_med_sp_outpat')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_dsf_inst_cd = [{'dcf_dsf_inst_cd': columns['dcf_dsf_inst_cd']} for columns in expect_data_list] primary_keys_specialclinic_name = [{'specialclinic_name': columns['specialclinic_name']} for columns in expect_data_list] actual_data_list = [] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv index 350bb655..11bd1155 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/com_sp_field_delete.csv @@ -1,6 +1,5 @@ -"511","01","994301","00","B","0003","1","20161113","20161114","1","20170401","@","","","" -"511","01","995783","00","C","0003","2","20161113","20161114","1","20170221","1","20140810","","" -"511","01","997906","00","B","0032","2","","","","","","","","" -"511","01","997906","99","B","0032","2","","","","","","","","" -"511","01","994301","99","B","0003","1","","","","","","","","" -"511","01","995783","99","C","0003","","","","","","","","","" +"511","01","994301","00","B","0003","1","20141211","20141213","","","","","","" +"511","01","995783","00","B","0003","1","20141211","20141213","","","","","","" +"511","01","997682","00","B","0004","1","20141211","20141213","","","","","","" +"511","01","997906","00","B","0032","1","20141211","20141213","","","","","","" +"511","01","999613","00","B","0056","1","20141211","20141213","","","","","","" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv index e88fa5e0..2329287f 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv @@ -1,7 +1,7 @@ "dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0199430100","0003","2","1","20170401","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" -"0199578300","0003","2","1","20170221","1","20140810","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" +"0199430100","0003","2","1","20170401","NULL","NULL","","","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" +"0199578300","0003","2","1","20170221","1","20140810","","","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" "0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" -"0199790600","0032","2","","","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" -"0199961300","0056","2","1","20180706","1","20170101","1","20180706","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" +"0199790600","0032","2","NULL","NULL","","","NULL","NULL","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" +"0199961300","0056","2","1","20180706","1","20170101","1","20180706","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" "0199961300","9999","2","1","20140706","1","20140401","1","20140706","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv index 20feb37e..eab607dc 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv @@ -1,6 +1,2 @@ "dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0199578300","0003","2","1","20170221","1","20140810","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" -"0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" -"0199790600","0032","2","","","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" -"0199961300","0056","2","1","20180706","1","20170101","1","20180706","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199961300","9999","2","1","20140706","1","20140401","1","20140706","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py index 44798884..bc9eda78 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py @@ -165,10 +165,10 @@ class TestComSpFieldMapper: else: assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{line_number}行目:{actual_col_name}が、期待値以降であること' - def test_logical_delete(self): + def test_physical_delete(self): """ Cases: - COM_専門分野テーブルのレコードを1件論理削除する + COM_専門分野テーブルのレコードを1件物理削除する Arranges: - CSVデータを用意し、読み込む - 削除対象となるレコードを登録する @@ -205,6 +205,8 @@ class TestComSpFieldMapper: # Assert # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_sp_field_delete.csv')) + actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_sp_field')[0]['count_num'] + assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] primary_keys_specialst_cd = [{'specialst_cd': columns['specialst_cd']} for columns in expect_data_list] actual_data_list = [] From 052e6c5408b83544919a6f45a58447ad66e614e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Wed, 17 May 2023 13:45:00 +0900 Subject: [PATCH 18/25] =?UTF-8?q?=E3=80=8Cmake=5Fupsert=5Fquery=E3=80=8D?= =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 8be2741b..54ff1ca2 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -138,27 +138,29 @@ class ComPharmMapper(UltmarcTableMapper): 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: - self.queries.append(self.INSERT_QUERY) - return + return self.INSERT_QUERY # 更新の場合 update_columns = ','.join(self.__make_update_query()) # 何も更新項目が無い場合はNoneとする（更新処理は行わない） if len(update_columns) == 0: - self.queries.append(None) - return + return None else: # 末尾にカンマを付けてSET句を完成させる update_columns += ',' update_query = self.UPDATE_QUERY.format( update_columns=update_columns ) - self.queries.append(update_query) - return + return update_query def __make_update_query(self): set_clauses = [] # 設定項目 From e625a030c7aed62f81b3e86aab8e98fc126299c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 18 May 2023 09:48:49 +0900 Subject: [PATCH 19/25] =?UTF-8?q?NULL=E5=AF=BE=E5=BF=9C=EF=BC=88=E4=BD=9C?= =?UTF-8?q?=E6=A5=AD=E4=B8=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_dr_mapper.py | 44 +++++----- .../table_mapper/concrete/com_inst_mapper.py | 48 +++++------ .../concrete/com_sp_field_mapper.py | 12 +-- .../com_dr/expect_com_dr_update.csv | 12 +-- .../com_inst/expect_com_inst_update.csv | 14 ++-- .../com_inst/test_com_inst_mapper.py | 83 ++++--------------- .../expect_com_sp_field_update.csv | 4 +- 7 files changed, 84 insertions(+), 133 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py index ac2bd53a..394bb47b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_mapper.py @@ -248,13 +248,13 @@ class ComDrMapper(UltmarcTableMapper): if len(self.record.drdel_code) > 0: set_clauses.append('delete_sche_reason_cd = :drdel_code') if self.record.drdel_code == '@': - self.query_parameter['drdel_code'] = '' + self.query_parameter['drdel_code'] = None # 重複時相手先ｺｰﾄﾞ if len(self.record.opp_dup_code) > 0: set_clauses.append('opp_dup_cd = :opp_dup_code') if self.record.reptdr_id == '@': - self.query_parameter['opp_dup_code'] = '' + self.query_parameter['opp_dup_code'] = None # 医師名(漢字) if len(self.record.dr_name) > 0: @@ -276,11 +276,11 @@ class ComDrMapper(UltmarcTableMapper): set_clauses.append('birthday_day = :birthday_day') set_clauses.append('birthday = :birth_day') if self.record.birthday_era == '@': - self.query_parameter['birthday_era'] = '' - self.query_parameter['birthday_year'] = '' - self.query_parameter['birthday_month'] = '' - self.query_parameter['birthday_day'] = '' - self.query_parameter['birth_day'] = '' + self.query_parameter['birthday_era'] = None + self.query_parameter['birthday_year'] = None + self.query_parameter['birthday_month'] = None + self.query_parameter['birthday_day'] = None + self.query_parameter['birth_day'] = None # 出身都道府県ｺｰﾄﾞ if len(self.record.home_town_code) > 0: @@ -296,9 +296,9 @@ class ComDrMapper(UltmarcTableMapper): set_clauses.append('grad_era = :grad_yearera') set_clauses.append('grad_y = :grad_y') if self.record.grad_yearera == '@': - self.query_parameter['grad_yearera'] = '' - self.query_parameter['grad_year'] = '' - self.query_parameter['grad_y'] = '' + self.query_parameter['grad_yearera'] = None + self.query_parameter['grad_year'] = None + self.query_parameter['grad_y'] = None # 出身校ｺｰﾄﾞ if len(self.record.graduniv_code) > 0: @@ -314,15 +314,15 @@ class ComDrMapper(UltmarcTableMapper): set_clauses.append('drday_year = :drday_year') set_clauses.append('drday_y = :drday_y') if self.record.drda_yera == '@': - self.query_parameter['drda_yera'] = '' - self.query_parameter['drday_year'] = '' - self.query_parameter['drday_y'] = '' + self.query_parameter['drda_yera'] = None + self.query_parameter['drday_year'] = None + self.query_parameter['drday_y'] = None # 住所不明 if len(self.record.dr_addr_lost_code) > 0: set_clauses.append('addr_unknown_reason_cd = :dr_addr_lost_code') if self.record.dr_addr_lost_code == '@': - self.query_parameter['dr_addr_lost_code'] = '' + self.query_parameter['dr_addr_lost_code'] = None # 住所 # 集合項目のいずれかに入力がある場合に更新 @@ -341,31 +341,31 @@ class ComDrMapper(UltmarcTableMapper): if len(self.record.dr_tel) > 0: set_clauses.append('home_phone_number = :dr_tel') if self.record.dr_tel == '@': - self.query_parameter['dr_tel'] = '' + self.query_parameter['dr_tel'] = None # 利用停止区分 if len(self.record.use_stop_flag) > 0: set_clauses.append('use_stop_div = :use_stop_flag') if self.record.use_stop_flag == '@': - self.query_parameter['use_stop_flag'] = '' + self.query_parameter['use_stop_flag'] = None # 利用停止理由 if len(self.record.use_stopc_ode) > 0: set_clauses.append('use_stop_reason_cd = :use_stopc_ode') if self.record.use_stopc_ode == '@': - self.query_parameter['use_stopc_ode'] = '' + self.query_parameter['use_stopc_ode'] = None # 利用停止登録年月日 if len(self.record.cre_stop_date) > 0: set_clauses.append('use_stop_regist_ymd = :cre_stop_date') if self.record.cre_stop_date == '@': - self.query_parameter['cre_stop_date'] = '' + self.query_parameter['cre_stop_date'] = None # 利用停止解除年月日 if len(self.record.release_date) > 0: set_clauses.append('use_stop_cancel_ymd = :release_date') if self.record.release_date == '@': - self.query_parameter['release_date'] = '' + self.query_parameter['release_date'] = None # 開勤区分 if len(self.record.pract_class_code) > 0: @@ -377,9 +377,9 @@ class ComDrMapper(UltmarcTableMapper): set_clauses.append('estab_year = :pract_year') set_clauses.append('estab_y = :estab_y') if self.record.pract_yearera == '@': - self.query_parameter['pract_yearera'] = '' - self.query_parameter['pract_year'] = '' - self.query_parameter['estab_y'] = '' + self.query_parameter['pract_yearera'] = None + self.query_parameter['pract_year'] = None + self.query_parameter['estab_y'] = None # 一括登録ﾌﾗｸﾞ if len(self.record.bskregst_flag) > 0: diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_mapper.py index a7146b42..3802ed62 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_mapper.py @@ -345,83 +345,83 @@ class ComInstMapper(UltmarcTableMapper): if len(self.record.uncheck_flag) > 0: set_clauses.append('unconf_flg = :uncheck_flag') if self.record.uncheck_flag == '@': - self.query_parameter['uncheck_flag'] = '' + self.query_parameter['uncheck_flag'] = None # 削除予定理由コード if len(self.record.hpdel_code) > 0: set_clauses.append('delete_sche_reason_cd = :hpdel_code') if self.record.hpdel_code == '@': - self.query_parameter['hpdel_code'] = '' + self.query_parameter['hpdel_code'] = None # 重複時相手先コード if len(self.record.dup_opp_code) > 0: set_clauses.append('dup_opp_cd = :dup_opp_code') if self.record.duphp_id == '@': - self.query_parameter['dup_opp_code'] = '' + self.query_parameter['dup_opp_code'] = None # 住所不明理由コード if len(self.record.hp_addr_lost_code) > 0: set_clauses.append('addr_unknown_reason_cd = :hp_addr_lost_code') if self.record.hp_addr_lost_code == '@': - self.query_parameter['hp_addr_lost_code'] = '' + self.query_parameter['hp_addr_lost_code'] = None # 電話番号なしフラグ if len(self.record.tel_nothing_flag) > 0: set_clauses.append('phone_number_non_flg = :tel_nothing_flag') if self.record.tel_nothing_flag == '@': - self.query_parameter['tel_nothing_flag'] = '' + self.query_parameter['tel_nothing_flag'] = None # 電話番号 if len(self.record.hp_tel) > 0: set_clauses.append('inst_phone_number = :hp_tel') if self.record.hp_tel == '@': - self.query_parameter['hp_tel'] = '' + self.query_parameter['hp_tel'] = None # 施設代表者コード if len(self.record.inst_repre_code) > 0: set_clauses.append('inst_repre_cd = :inst_repre_code') if self.record.president_id == '@': - self.query_parameter['inst_repre_code'] = '' + self.query_parameter['inst_repre_code'] = None # 代表者(ｶﾅ) if len(self.record.president_kana) > 0: set_clauses.append('inst_repre_kana = :president_kana') if self.record.president_kana == '@': - self.query_parameter['president_kana'] = '' + self.query_parameter['president_kana'] = None # 代表者(漢字) ※「＠」が大文字 if len(self.record.president) > 0: set_clauses.append('inst_repre = :president') if self.record.president == '＠': - self.query_parameter['president'] = '' + self.query_parameter['president'] = None # 開業予定ﾌﾗｸﾞ・開業予定年月 if len(self.record.open_flag + self.record.open_year_month) > 0: set_clauses.append('estab_sche_flg = :open_flag') set_clauses.append('estab_sche_ym = :open_year_month') if self.record.open_flag == '@': - self.query_parameter['open_flag'] = '' - self.query_parameter['open_year_month'] = '' + self.query_parameter['open_flag'] = None + self.query_parameter['open_year_month'] = None # 休院ﾌﾗｸﾞ・休院開始年月 if len(self.record.close_flag + self.record.close_year_month) > 0: set_clauses.append('close_flg = :close_flag') set_clauses.append('close_start_ym = :close_year_month') if self.record.close_flag == '@': - self.query_parameter['close_flag'] = '' - self.query_parameter['close_year_month'] = '' + self.query_parameter['close_flag'] = None + self.query_parameter['close_year_month'] = None # 関連大学親コード if len(self.record.univ_prnt_code) > 0: set_clauses.append('rltd_univ_prnt_cd = :univ_prnt_code') if self.record.assoc_parrent_id == '@': - self.query_parameter['univ_prnt_code'] = '' + self.query_parameter['univ_prnt_code'] = None # 病棟閉鎖フラグ if len(self.record.close_flag2) > 0: set_clauses.append('ward_abolish_flg = :close_flag2') if self.record.close_flag2 == '@': - self.query_parameter['close_flag2'] = '' + self.query_parameter['close_flag2'] = None # 病床数(定員) if self.record.bed_num is not None: @@ -433,7 +433,7 @@ class ComInstMapper(UltmarcTableMapper): if len(self.record.bed_class_maint_date) > 0: set_clauses.append('prmit_bed_maint_ymd = :bed_class_maint_date') if self.record.bed_class_maint_date == '@': - self.query_parameter['bed_class_maint_date'] = '' + self.query_parameter['bed_class_maint_date'] = None # 許可ベッド数（合計、精神、結核、感染、その他、一般病床、療養病床） if not self.record.prmit_bed.count(None) == len(self.record.prmit_bed): @@ -463,13 +463,13 @@ class ComInstMapper(UltmarcTableMapper): set_clauses.append('insp_item_biochem = :inspect_code6') set_clauses.append('insp_item_ri = :inspect_code7') if self.record.inspect_code1 == '@': - self.query_parameter['inspect_code1'] = '' - self.query_parameter['inspect_code2'] = '' - self.query_parameter['inspect_code3'] = '' - self.query_parameter['inspect_code4'] = '' - self.query_parameter['inspect_code5'] = '' - self.query_parameter['inspect_code6'] = '' - self.query_parameter['inspect_code7'] = '' + self.query_parameter['inspect_code1'] = None + self.query_parameter['inspect_code2'] = None + self.query_parameter['inspect_code3'] = None + self.query_parameter['inspect_code4'] = None + self.query_parameter['inspect_code5'] = None + self.query_parameter['inspect_code6'] = None + self.query_parameter['inspect_code7'] = None update_columns = ','.join(set_clauses) # 何も更新項目が無い場合は更新処理は行わない @@ -521,7 +521,7 @@ class ComInstMapper(UltmarcTableMapper): # 存在する場合はUpdate if self.record.dcfhp_92id == "@": - self.query_parameter['dcf_prnt_inst_code'] = '' + self.query_parameter['dcf_prnt_inst_code'] = None self.query_parameter['delete_ymd'] = self.query_parameter['execute_date_str_ymd'] else: self.query_parameter['delete_ymd'] = None diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py index 18b4c64f..efa11062 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py @@ -116,22 +116,22 @@ class ComSpFieldMapper(UltmarcTableMapper): set_clauses.append('specialst_flg = :specialst_flg') set_clauses.append('specialst_publsh_ymd = :specialst_publsh_ymd') if self.record.specialst_flg == '@': - self.query_parameter['specialst_flg'] = '' - self.query_parameter['specialst_publsh_ymd'] = '' + self.query_parameter['specialst_flg'] = None + self.query_parameter['specialst_publsh_ymd'] = None if len(self.record.ackn_med_flg) > 0: set_clauses.append('ackn_med_flg = :ackn_med_flg') set_clauses.append('ackn_med_publsh_ymd = :ackn_med_publsh_ymd') if self.record.ackn_med_flg == '@': - self.query_parameter['ackn_med_flg'] = '' - self.query_parameter['ackn_med_publsh_ymd'] = '' + self.query_parameter['ackn_med_flg'] = None + self.query_parameter['ackn_med_publsh_ymd'] = None if len(self.record.guide_med_flg) > 0: set_clauses.append('guide_med_flg = :guide_med_flg') set_clauses.append('guide_med_publsh_ymd = :guide_med_publsh_ymd') if self.record.guide_med_flg == '@': - self.query_parameter['guide_med_flg'] = '' - self.query_parameter['guide_med_publsh_ymd'] = '' + self.query_parameter['guide_med_flg'] = None + self.query_parameter['guide_med_publsh_ymd'] = None update_columns = ','.join(set_clauses) # 何も更新項目が無い場合はNoneとする（更新処理は行わない） diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_update.csv index 882e4c9e..24ac98c0 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_dr/expect_com_dr_update.csv @@ -1,9 +1,9 @@ "dcf_pcf_dr_cd","dr_name_kana","dr_name","birthday_era","birthday_year","birthday_month","birthday_day","birthday","hometown_cd","estab_era","estab_year","estab_y","home_phone_number","home_addr_kana","home_addr","home_postal_number","addr_village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","dr_circle_cd","estab_div_cd","sex_cd","delete_sche_reason_cd","addr_unknown_reason_cd","alma_cd","depart_disc_cd","grad_era","grad_year","grad_y","lump_regist_flg","opp_dup_cd","dr_ph_div","use_stop_div","use_stop_reason_cd","use_stop_regist_ymd","use_stop_cancel_ymd","drday_era","drday_year","drday_y","cor_dnfdr_cd","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0122222233","12","11","4","15","06","17","20030617","18","4","55","2043","045-625-2048","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","7","1","022","3","1","21","1888","6","8910","1","49","50","20200501","20200502","4","25","2013","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper" -"0199430100","ｶﾝﾏ ｾｲｷ","菅間　正気","3","16","01","14","19410114","37","","","NULL","045-999-9999","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾆﾝｷﾞﾖｳﾁﾖｳ 2-7-10-10","東京都中央区日本橋人形町２－７－１０－１０","103-0013","13102022002","13","102","2-7-10-10","09090909","09090909","37","1","2","","","022","2","3","44","1969","1","0199809900","1","03","B06","20160831","20161125","3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" -"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越　正信","3","29","01","06","19540106","53","4","04","1992","","","","","00000000000","00","000","","00000000","00000000","55","2","1","5","7","039","1","3","53","1978","","NULL","1","02","A05","20051003","","3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" -"0199768200","ﾖｺﾊﾏ ﾐｷｺ","横浜　三紀子","4","3","11","12","19911112","99","","","NULL","03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2","","","057","1","3","52","1977","1","NULL","1","","","","","3","10","1935","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" -"0199790600","ｵｶ ﾓﾘﾏｻ","丘　守正","","","","","","99","","","","","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２−４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1","","5","799","1","","","","","NULL","1","","","","","","","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" -"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田　茜","4","2","09","22","19900922","37","","","NULL","","ｶﾅｶﾞﾜｹﾝ ｶﾏｸﾗｼ ﾀﾏﾅﾜ 2-8-30","神奈川県鎌倉市玉縄２－８－３０","555-6666","01002033444","01","002","2-8-30","00000000","00000000","11","9","2","","","799","1","","","NULL","","0148106500","1","","","","","","","","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" -"9999999990","12","11","","","","","","18","","","","","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","","","022","3","","","","6","","1","","","","","","","","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper" +"0199430100","ｶﾝﾏ ｾｲｷ","菅間　正気","3","16","01","14","19410114","37",,,"NULL","045-999-9999","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾆﾝｷﾞﾖｳﾁﾖｳ 2-7-10-10","東京都中央区日本橋人形町２－７－１０－１０","103-0013","13102022002","13","102","2-7-10-10","09090909","09090909","37","1","2",,,"022","2","3","44","1969","1","0199809900","1","03","B06","20160831","20161125","3","44","1969","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" +"0199578300","ﾌﾅｺｼ ﾏｻﾉﾌﾞ","船越　正信","3","29","01","06","19540106","53","4","04","1992",,,,,"00000000000","00","000",,"00000000","00000000","55","2","1","5","7","039","1","3","53","1978",,"NULL","1","02","A05","20051003",,"3","53","1978","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" +"0199768200","ﾖｺﾊﾏ ﾐｷｺ","横浜　三紀子","4","3","11","12","19911112","99",,,"NULL","03-3579-1698","ﾄｳｷﾖｳﾄ ｲﾀﾊﾞｼｸ ﾎﾝﾁﾖｳ 6-3-301","東京都板橋区本町６－３－３０１","173-0001","13119047000","13","119","6-3-301","07070600","03030200","99","2","2",,,"057","1","3","52","1977","1","NULL","1",,,,,"3","10","1935","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" +"0199790600","ｵｶ ﾓﾘﾏｻ","丘　守正","NULL","NULL","NULL","NULL","NULL","99","NULL","NULL","NULL","NULL","ｲﾊﾞﾗｷｹﾝ ﾋﾀﾁﾅｶｼ ｵｵｱｻﾞﾐﾀﾝﾀﾞ 3892-4","茨城県ひたちなか市大字三反田３８９２−４","312-0021","08221095000","08","221","3892-4","08071100","03060500","31","1","1",,"5","799","1","NULL","NULL","NULL",,"NULL","1",,,,,,,"NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" +"0199961300","ﾌｼﾞﾀ ｱｶﾈ","藤田　茜","4","2","09","22","19900922","37",,,"NULL",,"ｶﾅｶﾞﾜｹﾝ ｶﾏｸﾗｼ ﾀﾏﾅﾜ 2-8-30","神奈川県鎌倉市玉縄２－８－３０","555-6666","01002033444","01","002","2-8-30","00000000","00000000","11","9","2","NULL","NULL","799","1",,,"NULL",,"0148106500","1",,,,,"NULL","NULL","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 20:57:12","clsComDrInfo","2017/10/09 18:06:51","com_dr_mapper" +"9999999990","12","11","NULL","NULL","NULL","NULL","NULL","18","NULL","NULL","NULL","NULL","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","NULL","NULL","022","3","NULL","NULL","NULL","6","NULL","1","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_dr_mapper" "9999999999","12","11","4","15","06","17","20030617","18","4","55","2043","045-625-2048","38","３７","231-0036","32033034035","32","033","126-1-39","44454647","40414243","19","3","1","7","1","022","3","1","21","1888","6","8910","1","49","50","20200501","20200502","4","25","2013","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","aaaa" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_inst_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_inst_update.csv index f2aa0ac2..3353e7ae 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_inst_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_inst_update.csv @@ -1,11 +1,11 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","rltd_univ_prnt_cd","bed_num","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","ward_abolish_flg","inst_repre_cd","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","hp_assrt_cd","dup_opp_cd","insp_item_micrb","insp_item_serum","insp_item_blood","insp_item_patho","insp_item_paras","insp_item_biochem","insp_item_ri","re_exam_cd","prmit_bed_num_other","prmit_bed_num_mental","prmit_bed_num_tuber","prmit_bed_num_infection","prmit_bed_num_sum","prmit_bed_num_gen","prmit_bed_num_rcup","prmit_bed_maint_ymd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"009900146","10","","ﾃｽﾄｲﾘﾖｳﾎｳｼﾞﾝｹｲﾛｳｶｲﾓﾘｵｶﾅｲｶ","ﾓﾘｵｶﾅｲｶ ｲﾘﾖｳ","医療法人敬老会森岡内科","森岡内科　医療","","NULL","","","","","","01092029","ﾊﾞﾝﾄﾞｳ ｼﾖｳｼﾞ","板東　章二","","","088-623-6161","ﾄｸｼﾏｹﾝ ﾄｸｼﾏｼ ﾄｸｼﾏﾎﾝﾁﾖｳ 2-31","徳島県徳島市徳島本町２－３１","770-0854","36201117002","36","201","2-31","07061002","03030402","221","2","7","003631462","","","","","","","","3","NULL","NULL","NULL","NULL","NULL","NULL","NULL","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:28","com_inst_mapper" -"009900194","10","","ｲﾁｺﾞｻﾞｷｲｲﾝ","ｲﾁｺﾞｻﾞｷｲｲﾝ","一期崎医院","一期崎医院","","0","","","","","","","","","1","","","ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 1-5-18 ｶ-ﾄﾌﾞﾗﾝｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 3F","東京都港区麻布十番１－５－１８　カートブラン麻布十番３Ｆ","106-0045","11222333444","11","222","1-5-18-10-3","07051302","03020402","472","","7","","","","","","","","","6","0","0","0","0","0","0","0","20090430","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" -"009901649","60","","ｼﾔﾌｸﾒｲﾜｶｲﾄｸﾍﾞﾂﾖｳｺﾞﾛｳｼﾞﾝﾎ-ﾑｱﾂﾞｷ","ｱﾂﾞｷ ｼﾔﾌｸ","社会福祉法人明和会特別養護老人ホームあづき","あづき（てすと）","","50","","1","","201801","","","","","","","0879-62-7707","ｶｶﾞﾜｹﾝ ｼﾖｳｽﾞｸﾞﾝ ﾄﾉｼﾖｳﾁﾖｳ ｱｻﾞﾊﾝﾉｲｹｺｳ 1360-143","香川県小豆郡土庄町字半ノ池甲１３６０－１４３","761-4100","37322000000","37","322","","07180000","03060000","435","","1","","","","","","","","","9","","","","","","","","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" -"009901679","60","","ｶｺﾞｼﾏｼｲｼｶｲﾘﾝｼﾖｳｹﾝｻｾﾝﾀ-","ｶｺﾞｼﾏﾃｽﾄ","鹿児島市医師会臨床検査センター","鹿児島市医師会臨床検査センター","","0","","","","","1","01148013","ｶｲｴﾀﾞ ﾀｹﾙ","海江田　健","","","","ｶｺﾞｼﾏｹﾝ ｶｺﾞｼﾏｼ ｶｼﾞﾔﾁﾖｳ 3-10","鹿児島県鹿児島市加治屋町３－１０","892-0846","46201017000","46","201","3-10","08070800","04040400","470","","9","","","","","","","","","9","","","","","","","","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" -"009904439","01","","ｶﾜｻｷｼﾘﾂｲﾀﾞﾋﾞﾖｳｲﾝ","ｲﾀﾞﾋﾞﾖｳｲﾝ ｼﾘﾂ","川崎市立テスト病院","井田病院　市立","111234567","370","","","","","","","","","","","044-766-2188","ｶﾅｶﾞﾜｹﾝ ｶﾜｻｷｼ ﾅｶﾊﾗｸ ｲﾀﾞ 2-27-1","神奈川県川崎市中原区井田２－２７－１","211-0035","14133001002","14","133","2-27-1","08120402","04060202","221","","1","","3","","1","","2","","3","3","343","0","27","0","370","343","0","20140811","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" -"009929798","10","6","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","パーソナルヘルス学びのクリニック","パーソナルヘルス学びのＣＬ","","0","","","","","","","","","","","","ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ﾐﾅﾐｱｵﾔﾏ 2-2-1 ｳｲﾝｱｵﾔﾏ 405","東京都港区南青山２－２－１５　ウイン青山４０５","107-0062","13103025002","13","103","2-2-15-405","07050802","03020302","472","","7","","","","","","","","","6","95","92","93","94","91","96","97","20130415","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-02-01 11:08:30","com_inst_mapper" +"009900146","10",,"ﾃｽﾄｲﾘﾖｳﾎｳｼﾞﾝｹｲﾛｳｶｲﾓﾘｵｶﾅｲｶ","ﾓﾘｵｶﾅｲｶ ｲﾘﾖｳ","医療法人敬老会森岡内科","森岡内科　医療","NULL","NULL","NULL",,"NULL",,"NULL","01092029","ﾊﾞﾝﾄﾞｳ ｼﾖｳｼﾞ","板東　章二",,,"088-623-6161","ﾄｸｼﾏｹﾝ ﾄｸｼﾏｼ ﾄｸｼﾏﾎﾝﾁﾖｳ 2-31","徳島県徳島市徳島本町２－３１","770-0854","36201117002","36","201","2-31","07061002","03030402","221","2","7","003631462",,,,,,,,"3","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:28","com_inst_mapper" +"009900194","10","NULL","ｲﾁｺﾞｻﾞｷｲｲﾝ","ｲﾁｺﾞｻﾞｷｲｲﾝ","一期崎医院","一期崎医院",,"0",,,,,,,,,"1","NULL",,"ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 1-5-18 ｶ-ﾄﾌﾞﾗﾝｱｻﾞﾌﾞｼﾞﾕｳﾊﾞﾝ 3F","東京都港区麻布十番１－５－１８　カートブラン麻布十番３Ｆ","106-0045","11222333444","11","222","1-5-18-10-3","07051302","03020402","472","NULL","7","NULL",,,,,,,,"6","0","0","0","0","0","0","0","20090430","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" +"009901649","60",,"ｼﾔﾌｸﾒｲﾜｶｲﾄｸﾍﾞﾂﾖｳｺﾞﾛｳｼﾞﾝﾎ-ﾑｱﾂﾞｷ","ｱﾂﾞｷ ｼﾔﾌｸ","社会福祉法人明和会特別養護老人ホームあづき","あづき（てすと）",,"50",,"1",,"201801",,,,,,,"0879-62-7707","ｶｶﾞﾜｹﾝ ｼﾖｳｽﾞｸﾞﾝ ﾄﾉｼﾖｳﾁﾖｳ ｱｻﾞﾊﾝﾉｲｹｺｳ 1360-143","香川県小豆郡土庄町字半ノ池甲１３６０－１４３","761-4100","37322000000","37","322",,"07180000","03060000","435",,"1",,,,,,,,,"9",,,,,,,,,"1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:26","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" +"009901679","60",,"ｶｺﾞｼﾏｼｲｼｶｲﾘﾝｼﾖｳｹﾝｻｾﾝﾀ-","ｶｺﾞｼﾏﾃｽﾄ","鹿児島市医師会臨床検査センター","鹿児島市医師会臨床検査センター",,"0",,"NULL",,"NULL","1","01148013","ｶｲｴﾀﾞ ﾀｹﾙ","海江田　健",,,"NULL","ｶｺﾞｼﾏｹﾝ ｶｺﾞｼﾏｼ ｶｼﾞﾔﾁﾖｳ 3-10","鹿児島県鹿児島市加治屋町３－１０","892-0846","46201017000","46","201","3-10","08070800","04040400","470",,"9",,"NULL","NULL","NULL","NULL","NULL","NULL","NULL","9",,,,,,,,,"1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" +"009904439","01",,"ｶﾜｻｷｼﾘﾂｲﾀﾞﾋﾞﾖｳｲﾝ","ｲﾀﾞﾋﾞﾖｳｲﾝ ｼﾘﾂ","川崎市立テスト病院","井田病院　市立","111234567","370",,,,,,,,,,,"044-766-2188","ｶﾅｶﾞﾜｹﾝ ｶﾜｻｷｼ ﾅｶﾊﾗｸ ｲﾀﾞ 2-27-1","神奈川県川崎市中原区井田２－２７－１","211-0035","14133001002","14","133","2-27-1","08120402","04060202","221",,"1",,"3",,"1",,"2",,"3","3","343","0","27","0","370","343","0","20140811","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:27","clsComInstInfo","2022-02-01 11:08:29","com_inst_mapper" +"009929798","10","6","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","ﾊﾟ-ｿﾅﾙﾍﾙｽﾏﾅﾋﾞﾉｸﾘﾆﾂｸ","パーソナルヘルス学びのクリニック","パーソナルヘルス学びのＣＬ",,"0",,,,,,"NULL","NULL","NULL","NULL",,,"ﾄｳｷﾖｳﾄ ﾐﾅﾄｸ ﾐﾅﾐｱｵﾔﾏ 2-2-1 ｳｲﾝｱｵﾔﾏ 405","東京都港区南青山２－２－１５　ウイン青山４０５","107-0062","13103025002","13","103","2-2-15-405","07050802","03020302","472",,"7",,,,,,,,,"6","95","92","93","94","91","96","97","20130415","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2022-01-31 11:38:28","clsComInstInfo","2022-02-01 11:08:30","com_inst_mapper" "223333344","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_inst_mapper","2023/04/12 00:00:00","com_inst_mapper" "223333399","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","com_inst_mapper","2023/04/12 00:00:00","com_inst_mapper" "993333344","37","7","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","81011","113","5","3","202306","202304","2","383940","アイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこ","4","8","35","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","9","7","101112","2","3","4","5","6","7","8","8","9","6","7","8","115","0","1","20230114","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","aaaa" -"999999999","37","","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","","NULL","","","","","","","","","","","","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","","7","","","","","","","","","8","NULL","NULL","NULL","NULL","NULL","NULL","NULL","","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_inst_mapper" +"999999999","37","NULL","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","アイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","あいうえおかきくけこあいうえおかきくけこあいうえお","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","アイウエオカクキケコアイウエオカクキケコアイウエオカクキケコ","あいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこあいうえおかきくけこ","123-4522","18192021","18","19","25","30313233","26272829","36","NULL","7","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","8","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","1","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/12 00:00:00","aaaa","2023/04/12 00:00:00","com_inst_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py index 4c4058d8..15bc42a1 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/test_com_inst_mapper.py @@ -21,6 +21,17 @@ class TestComInstMapper: batch_context: BatchContext test_file_path: str = path.dirname(__file__) + smallint_columns = [ + 'bed_num', + 'prmit_bed_num_other', + 'prmit_bed_num_mental', + 'prmit_bed_num_tuber', + 'prmit_bed_num_infection', + 'prmit_bed_num_sum', + 'prmit_bed_num_gen', + 'prmit_bed_num_rcup' + ] + @pytest.fixture(autouse=True, scope='function') def pre_test(self, database: Database): """テスト実行前後処理""" @@ -76,19 +87,7 @@ class TestComInstMapper: actual_select_sql = f"SELECT * FROM src05.com_inst WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup', - 'regist_ymd', - 'regist_ymd', - 'sys_update_date', - 'sys_regist_date'] + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + self.smallint_columns assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 @@ -96,15 +95,7 @@ class TestComInstMapper: line_number += 1 for actual_col_name, expect_col_name in zip(actual_row, expect_row): if actual_col_name in ignore_columns: - if actual_col_name in [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup']: + if actual_col_name in self.smallint_columns: if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0: assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること' else: @@ -224,19 +215,7 @@ class TestComInstMapper: actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 # 期待値検査 - ignore_columns = [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup', - 'regist_ymd', - 'regist_ymd', - 'sys_update_date', - 'sys_regist_date'] + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + self.smallint_columns assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 @@ -247,15 +226,7 @@ class TestComInstMapper: if expect_row[expect_col_name] is None: assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' else: - if actual_col_name in [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup']: + if actual_col_name in self.smallint_columns: if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0: assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること' else: @@ -379,19 +350,7 @@ class TestComInstMapper: actual_select_sql = f"SELECT * FROM src05.com_inst WHERE dcf_dsf_inst_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - ignore_columns = [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup', - 'regist_ymd', - 'regist_ymd', - 'sys_update_date', - 'sys_regist_date'] + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + self.smallint_columns assert_table_results(actual_data_list, expect_data_list, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 line_number = 0 @@ -402,15 +361,7 @@ class TestComInstMapper: if expect_row[expect_col_name] is None: assert actual_row[actual_col_name] is None, f'{line_number}行目:{actual_col_name}が、登録されていないこと' else: - if actual_col_name in [ - 'bed_num', - 'prmit_bed_num_other', - 'prmit_bed_num_mental', - 'prmit_bed_num_tuber', - 'prmit_bed_num_infection', - 'prmit_bed_num_sum', - 'prmit_bed_num_gen', - 'prmit_bed_num_rcup']: + if actual_col_name in self.smallint_columns: if expect_row[expect_col_name] is not None and len(expect_row[expect_col_name]) > 0: assert actual_row[actual_col_name] == int(expect_row[expect_col_name]), f'{line_number}行目:{actual_col_name}が、期待値と一致すること' else: diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv index 73bf0e1b..4a120687 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv @@ -1,6 +1,6 @@ "dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0199430100","0003","2","1","20170401","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" +"0199430100","0003","2","1","20170401","NULL","NULL","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199578300","0003","2","1","20170221","1","20140810","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" -"0199790600","0032","2","","","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" +"0199790600","0032","2","NULL","NULL","","","NULL","NULL","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199961300","0056","2","1","20180706","1","20170101","1","20180706","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" From d6e631bb6a7c936117288f8907b413e707112f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 18 May 2023 10:52:48 +0900 Subject: [PATCH 20/25] =?UTF-8?q?=EF=BC=A0=E3=83=9E=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E6=99=82=E3=81=AENULL=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table_mapper/concrete/com_pharm_mapper.py | 36 +++++----- .../ultmarc/utmp_tables/tables/com_pharm.py | 6 +- .../com_inst/expect_com_spcare_update.csv | 4 +- .../com_pharm/expect_com_pharm_update.csv | 66 +++++++++---------- 4 files changed, 55 insertions(+), 57 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py index 54ff1ca2..5b6a423d 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_pharm_mapper.py @@ -175,7 +175,7 @@ class ComPharmMapper(UltmarcTableMapper): # 住所不明理由コード if self.record.hp_addr_lost_code != '': set_clauses.append('addr_unknown_reason_cd = :hp_addr_lost_code') - self.query_parameter['hp_addr_lost_code'] = '' if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code + self.query_parameter['hp_addr_lost_code'] = None if self.record.hp_addr_lost_code == '@' else self.record.hp_addr_lost_code # 正式施設名カナ if self.record.hp_name_kana != '': @@ -198,41 +198,41 @@ class ComPharmMapper(UltmarcTableMapper): set_clauses.append('close_flg = :close_flg') set_clauses.append('close_start_ym = :close_yearmonth') if self.record.close_flg == '@': - self.query_parameter['close_flg'] = '' - self.query_parameter['close_yearmonth'] = '' + self.query_parameter['close_flg'] = None + self.query_parameter['close_yearmonth'] = None # 開業予定フラグ、開業予定年月 if len(self.record.open_flag + self.record.open_yearmonth) > 0: set_clauses.append('estab_sche_flg = :open_flag') set_clauses.append('estab_sche_ym = :open_yearmonth') if self.record.open_flag == '@': - self.query_parameter['open_flag'] = '' - self.query_parameter['open_yearmonth'] = '' + self.query_parameter['open_flag'] = None + self.query_parameter['open_yearmonth'] = None # 施設代表者カナ if self.record.president_Kana != '': set_clauses.append('inst_repre_kana = :president_Kana') - self.query_parameter['president_Kana'] = '' if self.record.president_Kana == '@' else self.record.president_Kana + self.query_parameter['president_Kana'] = None if self.record.president_Kana == '@' else self.record.president_Kana # 施設代表者　※＠が大文字 if self.record.president != '': set_clauses.append('inst_repre = :president') - self.query_parameter['president'] = '' if self.record.president == '＠' else self.record.president + self.query_parameter['president'] = None if self.record.president == '＠' else self.record.president # 電話番号なしフラグ if self.record.tel_nothing_flag != '': set_clauses.append('phone_number_non_flg = :tel_nothing_flag') - self.query_parameter['tel_nothing_flag'] = '' if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag + self.query_parameter['tel_nothing_flag'] = None if self.record.tel_nothing_flag == '@' else self.record.tel_nothing_flag # 未確認フラグ if self.record.unconf_flg != '': set_clauses.append('unconf_flg = :unconf_flg') - self.query_parameter['unconf_flg'] = '' if self.record.unconf_flg == '@' else self.record.unconf_flg + self.query_parameter['unconf_flg'] = None if self.record.unconf_flg == '@' else self.record.unconf_flg # 施設電話番号 if self.record.tel_number != '': set_clauses.append('inst_phone_number = :tel_number') - self.query_parameter['tel_number'] = '' if self.record.tel_number == '@' else self.record.tel_number + self.query_parameter['tel_number'] = None if self.record.tel_number == '@' else self.record.tel_number # 施設住所カナ if self.record.addr_kana != '': @@ -255,7 +255,7 @@ class ComPharmMapper(UltmarcTableMapper): # 住所表示番号 if self.record.addr_number != '': set_clauses.append('addr_display_number = :addr_number') - self.query_parameter['addr_number'] = '' if self.record.addr_number == '@' else self.record.addr_number + self.query_parameter['addr_number'] = None if self.record.addr_number == '@' else self.record.addr_number # 住所カウント(集合項目である県コードが入っていればカウントをセットする) if len(self.record.prefc_cd) > 0: @@ -265,34 +265,32 @@ class ComPharmMapper(UltmarcTableMapper): # 経営体コード if self.record.mgtclass_code != '': set_clauses.append('manage_cd = :mgtclass_code') - self.query_parameter['mgtclass_code'] = '' if self.record.mgtclass_code == '@' else self.record.mgtclass_code + self.query_parameter['mgtclass_code'] = None if self.record.mgtclass_code == '@' else self.record.mgtclass_code # 削除予定理由コード if self.record.del_cd != '': set_clauses.append('delete_sche_reason_cd = :del_cd') - self.query_parameter['del_cd'] = '' if self.record.del_cd == '@' else self.record.del_cd + self.query_parameter['del_cd'] = None if self.record.del_cd == '@' else self.record.del_cd # 重複時相手先コード if self.record.dup_opp_cd != '': set_clauses.append('dup_opp_cd = :dup_opp_cd') - self.query_parameter['dup_opp_cd'] = '' if self.record.dup_opp_cd == '@' else self.record.dup_opp_cd + self.query_parameter['dup_opp_cd'] = None if self.record.dup_opp_cd == '@' else self.record.dup_opp_cd # 管理薬剤師名(漢字)※＠が大文字 if self.record.pharmacist != '': set_clauses.append('supervising_pharmacist = :pharmacist') - self.query_parameter['pharmacist'] = '' if self.record.pharmacist == '＠' else self.record.pharmacist + self.query_parameter['pharmacist'] = None if self.record.pharmacist == '＠' else self.record.pharmacist # 管理薬剤師名(カナ) if self.record.pharmacist_kana != '': set_clauses.append('supervising_pharmacist_kana = :pharmacist_kana') - self.query_parameter['pharmacist_kana'] = '' if self.record.pharmacist_kana == '@' else self.record.pharmacist_kana + self.query_parameter['pharmacist_kana'] = None if self.record.pharmacist_kana == '@' else self.record.pharmacist_kana # チェーン店本部コード if self.record.franchise_hq_id != '': set_clauses.append('franchise_hq_cd = :franchise_hq_cd') if self.record.franchise_hq_id == '@': - self.query_parameter['franchise_hq_id'] = '' - self.query_parameter['franchise_hq_cd'] = '' - self.query_parameter['franchise_hq_yobi'] = '' + self.query_parameter['franchise_hq_cd'] = None return set_clauses diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py index bca8175a..977e8f0b 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_pharm.py @@ -48,7 +48,7 @@ class ComPharm(UltmarcTable): pharmacist: str # 管理薬剤師名(漢字) pharmacist_kana: str # 管理薬剤師名(カナ) franchise_hq_id: str # チェーン店本部コード(レコードID) - franchise_hq_cd: str # チェーン店本部コード(施設コード) + franchise_hq_code: str # チェーン店本部コード(施設コード) franchise_hq_yobi: str # チェーン店本部コード(予備) dcfdsf_inst_cd: str # 施設コード @@ -105,7 +105,7 @@ class ComPharm(UltmarcTable): self.pharmacist = record[43] self.pharmacist_kana = record[44] self.franchise_hq_id = record[45] - self.franchise_hq_cd = record[46] + self.franchise_hq_code = record[46] self.franchise_hq_yobi = record[47] # 施設コード(2+3+4) @@ -124,4 +124,4 @@ class ComPharm(UltmarcTable): self.dup_opp_cd = ''.join([self.duphp_id, self.duphp_cd, self.duphp_yobi]) # チェーン店本部コード(46+47+48) - self.franchise_hq_cd = ''.join([self.franchise_hq_id, self.franchise_hq_cd, self.franchise_hq_yobi]) + self.franchise_hq_cd = ''.join([self.franchise_hq_id, self.franchise_hq_code, self.franchise_hq_yobi]) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_spcare_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_spcare_update.csv index b85d46c8..4b14fe3d 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_spcare_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_inst/expect_com_spcare_update.csv @@ -1,7 +1,7 @@ "dcf_chld_inst_cd","dcf_prnt_inst_cd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "009900146","09912345","20220201","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/01 11:08:29","com_inst_mapper","2023/05/01 14:52:43","com_inst_mapper" -"009901649","","20220131","20230508","20230508","NULL","NULL","NULL","NULL","2023/05/01 11:38:27","clsComInstInfo","2023/05/01 14:52:43","com_inst_mapper" +"009901649","NULL","20220131","20230508","20230508","NULL","NULL","NULL","NULL","2023/05/01 11:38:27","clsComInstInfo","2023/05/01 14:52:43","com_inst_mapper" "223333344","9933333311","20230508","20230508","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","com_inst_mapper","2023/05/01 16:16:43","com_inst_mapper" "223333399","9933333311","20230508","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","com_inst_mapper","2023/05/01 16:16:43","com_inst_mapper" "993333344","9933333311","20230508","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","aaaa","2023/05/01 16:16:43","aaaa" -"999999999","","20230508","20230508","20230508","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","aaaa","2023/05/01 16:16:43","com_inst_mapper" +"999999999","NULL","20230508","20230508","20230508","NULL","NULL","NULL","NULL","2023/05/01 16:16:43","aaaa","2023/05/01 16:16:43","com_inst_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv index dccf6b06..9dc7e113 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_pharm/expect_com_pharm_update.csv @@ -1,37 +1,37 @@ "dcf_dsf_inst_cd","inst_div_cd","addr_unknown_reason_cd","form_inst_name_kana","inst_name_kana","form_inst_name_kanji","inst_name_kanji","close_flg","estab_sche_flg","close_start_ym","estab_sche_ym","inst_repre_kana","inst_repre","phone_number_non_flg","unconf_flg","inst_phone_number","inst_addr_kana","inst_addr","postal_number","village_cd","prefc_cd","city_cd","addr_display_number","addr_cnt_kana","addr_cnt","manage_cd","delete_sche_reason_cd","dup_opp_cd","supervising_pharmacist","supervising_pharmacist_kana","franchise_hq_cd","inst_pharm_div","abolish_ymd","delete_flg","filler_1","filler_2","filler_3","filler_4","filler_5","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"033673002","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03A01B-01","ﾘﾔｸｼｷ03A01B-01","正式店舗名０３Ａ０１ｂ－０１","略式０３Ａ０１ｂ－０１","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03A01B","東京都中央区日本橋浜町２－４５－１　０３Ａ０１ｂ","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","5","033673003","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673011","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B01A","ﾘﾔｸｼｷ03B01A","正式店舗名０３Ｂ０１ａ","略式０３Ｂ０１ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B01A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０１ａ","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673012","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02A","ﾘﾔｸｼｷ03B02A","正式店舗名０３Ｂ０２ａ","略式０３Ｂ０２ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ａ","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","1","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673013","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02B","ﾘﾔｸｼｷ03B02B","正式店舗名０３Ｂ０２ｂ","略式０３Ｂ０２ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｂ","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","2","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673014","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02C-01","ﾘﾔｸｼｷ03B02C-01","正式店舗名０３Ｂ０２ｃ－０１","略式０３Ｂ０２ｃ－０１","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｃ","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","5","033673015","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673016","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02D-01","ﾘﾔｸｼｷ03B02D-01","正式店舗名０３Ｂ０２ｄ－０１","略式０３Ｂ０２ｄ－０１","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02D","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｄ","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673020","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02D-02","ﾘﾔｸｼｷ03B02D-02","正式店舗名０３Ｂ０２ｄ－０２","略式０３Ｂ０２ｄ－０２","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02D","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｄ","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673022","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02E","ﾘﾔｸｼｷ03B02E","正式店舗名０３Ｂ０２ｅ","略式０３Ｂ０２ｅ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02E","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｅ","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673023","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B03Aｻﾌﾞﾝ","ﾘﾔｸｼｷ03B03Aｻﾌﾞﾝ","正式店舗名０３Ｂ０３ａ差分","略式０３Ｂ０３ａ差分","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B03A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０３ａ","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673024","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B03B---2----+----3----+----4----+----5----+----6----+----7----+----8","ﾘﾔｸｼｷ03B03B---+----2----+----3----+----4","正式店舗名０３Ｂ０３ｂ－－－＋－－－－２－－－－＋－－－－３－－－－＋－－－－４－－－－＋－－－－５","略式０３Ｂ０３ｂ－１－－－－＋","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B03B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０３ｂ","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673025","85","1","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04A","ﾘﾔｸｼｷ03B04A","正式店舗名０３Ｂ０４ａ","略式０３Ｂ０４ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ａ","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673026","85","2","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04B","ﾘﾔｸｼｷ03B04B","正式店舗名０３Ｂ０４ｂ","略式０３Ｂ０４ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ｂ","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673030","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04C","ﾘﾔｸｼｷ03B04C","正式店舗名０３Ｂ０４ｃ","略式０３Ｂ０４ｃ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ｃ","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673032","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B05B","ﾘﾔｸｼｷ03B05B","正式店舗名０３Ｂ０５ｂ","略式０３Ｂ０５ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B05B4----+----5----+----6","東京都中央区日本橋浜町２－４５－１　０３Ｂ０５ｂ＋－－－－３－－－－＋－－－－４－－－－＋－－－－５","103-0007","13102024002","13","102","2-45-1-03B05B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673033","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06A","ﾘﾔｸｼｷ03B06A","正式店舗名０３Ｂ０６ａ","略式０３Ｂ０６ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ａ","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673034","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06B","ﾘﾔｸｼｷ03B06B","正式店舗名０３Ｂ０６ｂ","略式０３Ｂ０６ｂ","","","","","","","","","03-3249-8232","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ｂ","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673035","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06C","ﾘﾔｸｼｷ03B06C","正式店舗名０３Ｂ０６ｃ","略式０３Ｂ０６ｃ","","","","","","","1","","","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ｃ","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673036","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B07A","ﾘﾔｸｼｷ03B07A","正式店舗名０３Ｂ０７ａ","略式０３Ｂ０７ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B07A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０７ａ","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","472","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673040","86","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B08A","ﾘﾔｸｼｷ03B08A","正式店舗名０３Ｂ０８ａ","略式０３Ｂ０８ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B08A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０８ａ","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673041","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09A","ﾘﾔｸｼｷ03B09A","正式店舗名０３Ｂ０９ａ","略式０３Ｂ０９ａ","","","","","ﾀﾞｲﾋﾖｳｼﾔﾒｲ 03B09A","代表者名　０３Ｂ０９ａ","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ａ","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673042","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09B","ﾘﾔｸｼｷ03B09B","正式店舗名０３Ｂ０９ｂ","略式０３Ｂ０９ｂ","","","","","ﾀﾞｲﾋﾖｳｼﾔﾒｲ 03B09B--2","代表者名　０３Ｂ０９ｂ－－－＋－－－－２","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ｂ","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673043","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09C","ﾘﾔｸｼｷ03B09C","正式店舗名０３Ｂ０９ｃ","略式０３Ｂ０９ｃ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ｃ","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673044","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B10A","ﾘﾔｸｼｷ03B10A","正式店舗名０３Ｂ１０ａ","略式０３Ｂ１０ａ","","1","","201301","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B10A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１０ａ","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673045","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B10B","ﾘﾔｸｼｷ03B10B","正式店舗名０３Ｂ１０ｂ","略式０３Ｂ１０ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B10B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１０ｂ","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673046","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11A","ﾘﾔｸｼｷ03B11A","正式店舗名０３Ｂ１１ａ","略式０３Ｂ１１ａ","1","","201210","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ａ","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673047","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11B","ﾘﾔｸｼｷ03B11B","正式店舗名０３Ｂ１１ｂ","略式０３Ｂ１１ｂ","1","","201209","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ｂ","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673048","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11C","ﾘﾔｸｼｷ03B11C","正式店舗名０３Ｂ１１ｃ","略式０３Ｂ１１ｃ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11C","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ｃ","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673051","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12A","ﾘﾔｸｼｷ03B12A","正式店舗名０３Ｂ１２ａ","略式０３Ｂ１２ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ａ","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471","","","管理薬剤師名　０３Ｂ１２ａ","ｶﾝﾘﾔｸｻﾞｲｼﾒｲ 03B12A","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673052","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12B","ﾘﾔｸｼｷ03B12B","正式店舗名０３Ｂ１２ｂ","略式０３Ｂ１２ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ｂ","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471","","","管理薬剤師名　０３Ｂ１２ｂ－＋－－－－２","ｶﾝﾘﾔｸｻﾞｲｼﾒｲ 03B12B-2","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673053","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12C","ﾘﾔｸｼｷ03B12C","正式店舗名０３Ｂ１２ｃ","略式０３Ｂ１２ｃ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12C","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ｃ","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673055","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B13A","ﾘﾔｸｼｷ03B13A","正式店舗名０３Ｂ１３ａ","略式０３Ｂ１３ａ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B13A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１３ａ","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471","","","","","033673054","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" -"033673061","85","","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B13B","ﾘﾔｸｼｷ03B13B","正式店舗名０３Ｂ１３ｂ","略式０３Ｂ１３ｂ","","","","","","","","","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B13B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１３ｂ","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471","","","","","033673060","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673002","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03A01B-01","ﾘﾔｸｼｷ03A01B-01","正式店舗名０３Ａ０１ｂ－０１","略式０３Ａ０１ｂ－０１",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03A01B","東京都中央区日本橋浜町２－４５－１　０３Ａ０１ｂ","103-0007","13102242","13","102","2-45-1-03A01B","77122","3352","471","5","033673003",,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673011","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B01A","ﾘﾔｸｼｷ03B01A","正式店舗名０３Ｂ０１ａ","略式０３Ｂ０１ａ",,,,,,,,"NULL","03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B01A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０１ａ","103-0007","13102242","13","102","2-45-1-03B01A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673012","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02A","ﾘﾔｸｼｷ03B02A","正式店舗名０３Ｂ０２ａ","略式０３Ｂ０２ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ａ","103-0007","13102242","13","102","2-45-1-03B02A","77122","3352","471","1",,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673013","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02B","ﾘﾔｸｼｷ03B02B","正式店舗名０３Ｂ０２ｂ","略式０３Ｂ０２ｂ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｂ","103-0007","13102242","13","102","2-45-1-03B02B","77122","3352","471","2",,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673014","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02C-01","ﾘﾔｸｼｷ03B02C-01","正式店舗名０３Ｂ０２ｃ－０１","略式０３Ｂ０２ｃ－０１",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｃ","103-0007","13102242","13","102","2-45-1-03B02C","77122","3352","471","5","033673015",,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673016","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02D-01","ﾘﾔｸｼｷ03B02D-01","正式店舗名０３Ｂ０２ｄ－０１","略式０３Ｂ０２ｄ－０１",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02D","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｄ","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021",,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673020","85","6","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02D-02","ﾘﾔｸｼｷ03B02D-02","正式店舗名０３Ｂ０２ｄ－０２","略式０３Ｂ０２ｄ－０２",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02D","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｄ","103-0007","13102242","13","102","2-45-1-03B02D","77122","3352","471","7","033673021",,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673022","85","NULL","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B02E","ﾘﾔｸｼｷ03B02E","正式店舗名０３Ｂ０２ｅ","略式０３Ｂ０２ｅ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B02E","東京都中央区日本橋浜町２－４５－１　０３Ｂ０２ｅ","103-0007","13102242","13","102","2-45-1-03B02E","77122","3352","471","NULL",,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673023","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B03Aｻﾌﾞﾝ","ﾘﾔｸｼｷ03B03Aｻﾌﾞﾝ","正式店舗名０３Ｂ０３ａ差分","略式０３Ｂ０３ａ差分",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B03A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０３ａ","103-0007","13102242","13","102","2-45-1-03B03A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673024","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B03B---2----+----3----+----4----+----5----+----6----+----7----+----8","ﾘﾔｸｼｷ03B03B---+----2----+----3----+----4","正式店舗名０３Ｂ０３ｂ－－－＋－－－－２－－－－＋－－－－３－－－－＋－－－－４－－－－＋－－－－５","略式０３Ｂ０３ｂ－１－－－－＋",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B03B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０３ｂ","103-0007","13102242","13","102","2-45-1-03B03B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673025","85","1","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04A","ﾘﾔｸｼｷ03B04A","正式店舗名０３Ｂ０４ａ","略式０３Ｂ０４ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ａ","103-0007","13102242","13","102","2-45-1-03B04A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673026","85","2","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04B","ﾘﾔｸｼｷ03B04B","正式店舗名０３Ｂ０４ｂ","略式０３Ｂ０４ｂ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ｂ","103-0007","13102242","13","102","2-45-1-03B04B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673030","85","NULL","ｾｲｼｷﾃﾝﾎﾟﾒｲ03B04C","ﾘﾔｸｼｷ03B04C","正式店舗名０３Ｂ０４ｃ","略式０３Ｂ０４ｃ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B04C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０４ｃ","103-0007","13102242","13","102","2-45-1-03B04C","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673032","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B05B","ﾘﾔｸｼｷ03B05B","正式店舗名０３Ｂ０５ｂ","略式０３Ｂ０５ｂ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B05B4----+----5----+----6","東京都中央区日本橋浜町２－４５－１　０３Ｂ０５ｂ＋－－－－３－－－－＋－－－－４－－－－＋－－－－５","103-0007","13102024002","13","102","2-45-1-03B05B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673033","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06A","ﾘﾔｸｼｷ03B06A","正式店舗名０３Ｂ０６ａ","略式０３Ｂ０６ａ",,,,,,,"NULL",,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ａ","103-0007","13102242","13","102","2-45-1-03B06A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673034","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06B","ﾘﾔｸｼｷ03B06B","正式店舗名０３Ｂ０６ｂ","略式０３Ｂ０６ｂ",,,,,,,,,"03-3249-8232","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ｂ","103-0007","13102242","13","102","2-45-1-03B06B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673035","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B06C","ﾘﾔｸｼｷ03B06C","正式店舗名０３Ｂ０６ｃ","略式０３Ｂ０６ｃ",,,,,,,"1",,"NULL","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B06C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０６ｃ","103-0007","13102242","13","102","2-45-1-03B06C","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673036","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B07A","ﾘﾔｸｼｷ03B07A","正式店舗名０３Ｂ０７ａ","略式０３Ｂ０７ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B07A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０７ａ","103-0007","13102242","13","102","2-45-1-03B07A","77122","3352","472",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673040","86",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B08A","ﾘﾔｸｼｷ03B08A","正式店舗名０３Ｂ０８ａ","略式０３Ｂ０８ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B08A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０８ａ","103-0007","13102242","13","102","2-45-1-03B08A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673041","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09A","ﾘﾔｸｼｷ03B09A","正式店舗名０３Ｂ０９ａ","略式０３Ｂ０９ａ",,,,,"ﾀﾞｲﾋﾖｳｼﾔﾒｲ 03B09A","代表者名　０３Ｂ０９ａ",,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09A","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ａ","103-0007","13102242","13","102","2-45-1-03B09A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673042","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09B","ﾘﾔｸｼｷ03B09B","正式店舗名０３Ｂ０９ｂ","略式０３Ｂ０９ｂ",,,,,"ﾀﾞｲﾋﾖｳｼﾔﾒｲ 03B09B--2","代表者名　０３Ｂ０９ｂ－－－＋－－－－２",,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09B","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ｂ","103-0007","13102242","13","102","2-45-1-03B09B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673043","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B09C","ﾘﾔｸｼｷ03B09C","正式店舗名０３Ｂ０９ｃ","略式０３Ｂ０９ｃ",,,,,"NULL","NULL",,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B09C","東京都中央区日本橋浜町２－４５－１　０３Ｂ０９ｃ","103-0007","13102242","13","102","2-45-1-03B09C","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673044","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B10A","ﾘﾔｸｼｷ03B10A","正式店舗名０３Ｂ１０ａ","略式０３Ｂ１０ａ",,"1",,"201301",,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B10A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１０ａ","103-0007","13102242","13","102","2-45-1-03B10A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673045","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B10B","ﾘﾔｸｼｷ03B10B","正式店舗名０３Ｂ１０ｂ","略式０３Ｂ１０ｂ",,"NULL",,"NULL",,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B10B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１０ｂ","103-0007","13102242","13","102","2-45-1-03B10B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673046","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11A","ﾘﾔｸｼｷ03B11A","正式店舗名０３Ｂ１１ａ","略式０３Ｂ１１ａ","1",,"201210",,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ａ","103-0007","13102242","13","102","2-45-1-03B11A","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673047","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11B","ﾘﾔｸｼｷ03B11B","正式店舗名０３Ｂ１１ｂ","略式０３Ｂ１１ｂ","1",,"201209",,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ｂ","103-0007","13102242","13","102","2-45-1-03B11B","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673048","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B11C","ﾘﾔｸｼｷ03B11C","正式店舗名０３Ｂ１１ｃ","略式０３Ｂ１１ｃ","NULL",,"NULL",,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B11C","東京都中央区日本橋浜町２－４５－１　０３Ｂ１１ｃ","103-0007","13102242","13","102","2-45-1-03B11C","77122","3352","471",,,,,,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673051","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12A","ﾘﾔｸｼｷ03B12A","正式店舗名０３Ｂ１２ａ","略式０３Ｂ１２ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ａ","103-0007","13102242","13","102","2-45-1-03B12A","77122","3352","471",,,"管理薬剤師名　０３Ｂ１２ａ","ｶﾝﾘﾔｸｻﾞｲｼﾒｲ 03B12A",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673052","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12B","ﾘﾔｸｼｷ03B12B","正式店舗名０３Ｂ１２ｂ","略式０３Ｂ１２ｂ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ｂ","103-0007","13102242","13","102","2-45-1-03B12B","77122","3352","471",,,"管理薬剤師名　０３Ｂ１２ｂ－＋－－－－２","ｶﾝﾘﾔｸｻﾞｲｼﾒｲ 03B12B-2",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673053","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B12C","ﾘﾔｸｼｷ03B12C","正式店舗名０３Ｂ１２ｃ","略式０３Ｂ１２ｃ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B12C","東京都中央区日本橋浜町２－４５－１　０３Ｂ１２ｃ","103-0007","13102242","13","102","2-45-1-03B12C","77122","3352","471",,,"NULL","NULL",,"2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673055","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B13A","ﾘﾔｸｼｷ03B13A","正式店舗名０３Ｂ１３ａ","略式０３Ｂ１３ａ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B13A","東京都中央区日本橋浜町２－４５－１　０３Ｂ１３ａ","103-0007","13102242","13","102","2-45-1-03B13A","77122","3352","471",,,,,"033673054","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" +"033673061","85",,"ｾｲｼｷﾃﾝﾎﾟﾒｲ03B13B","ﾘﾔｸｼｷ03B13B","正式店舗名０３Ｂ１３ｂ","略式０３Ｂ１３ｂ",,,,,,,,,"03-3249-8231","ﾄｳｷﾖｳﾄ ﾁﾕｳｵｳｸ ﾆﾎﾝﾊﾞｼﾊﾏﾁﾖｳ 2-45-1 03B13B","東京都中央区日本橋浜町２－４５－１　０３Ｂ１３ｂ","103-0007","13102242","13","102","2-45-1-03B13B","77122","3352","471",,,,,"033673060","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/19 00:00:00","com_pharm_mapper","2023/04/19 00:00:00","com_pharm_mapper" "123","2","6","13","15","12","14","1","9","204201","204001","38","37","3","6","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/19 08:27:33","com_pharm_mapper" "456","66","0","正カナ","略カナ","正漢字","略漢字","8","4","204812","204411","代カナ","代漢","0","6","119991234","住所カナ","住所漢字","001-6234","61626364","61","62","11","ケシトチ","県市通丁目","11","7","555657","薬剤師漢字","薬剤師カナ","998877","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" -"789","66","","正カナ","略カナ","正漢字","略漢字","","","","","","","","6","","住所カナ","住所漢字","001-6234","61626364","61","62","","ケシトチ","県市通丁目","","","","","","","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" +"789","66","NULL","正カナ","略カナ","正漢字","略漢字","NULL","NULL","NULL","NULL","NULL","NULL","NULL","6","NULL","住所カナ","住所漢字","001-6234","61626364","61","62","NULL","ケシトチ","県市通丁目","NULL","NULL","NULL","NULL","NULL","NULL","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/4/18 10:27:00","com_pharm_mapper","2023/4/19 08:27:00","com_pharm_mapper" "999","2","6","13","15","12","14","1","9","204201","204001","38","37","3","7","34","23","22","221-000","17181920","17","18","24","29303132","25262728","35","8","91011","43","44","454647","2","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2023/04/18 10:27:33","com_pharm_mapper","2023/04/18 10:27:33","com_pharm_mapper" From 12ed6a50e07d1e533cabfbd288e5fedd90ff3e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 18 May 2023 14:29:48 +0900 Subject: [PATCH 21/25] =?UTF-8?q?SPECIALIST=E9=A0=85=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../concrete/com_dr_sosiety_mapper.py | 2 +- .../concrete/com_sp_field_mapper.py | 40 +++++++------- ...er.py => com_specialist_license_mapper.py} | 32 +++++------ .../utmp_tables/tables/com_dr_sosiety.py | 4 +- .../utmp_tables/tables/com_sp_field.py | 16 +++--- ...t_license.py => com_specialist_license.py} | 10 ++-- .../ultmarc_table_mapper_factory.py | 6 +-- .../db_com_sp_field_before_delete.csv | 2 +- .../db_com_sp_field_before_update.csv | 2 +- .../expect_com_sp_field_delete.csv | 2 +- .../expect_com_sp_field_insert.csv | 2 +- .../expect_com_sp_field_update.csv | 2 +- .../com_sp_field/test_com_sp_field_mapper.py | 24 ++++----- .../__init__.py | 0 .../com_specialist_license_delete.csv} | 0 .../com_specialist_license_insert.csv} | 0 .../com_specialist_license_update.csv} | 0 ..._com_specialist_license_before_delete.csv} | 2 +- ..._com_specialist_license_before_update.csv} | 2 +- .../expect_com_specialist_license_delete.csv} | 16 +++--- .../expect_com_specialist_license_insert.csv | 8 +++ .../expect_com_specialist_license_update.csv} | 14 ++--- .../test_com_specialist_license_mapper.py} | 54 +++++++++---------- .../expect_com_specialst_license_insert.csv | 8 --- 24 files changed, 124 insertions(+), 124 deletions(-) rename ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/{com_specialst_license_mapper.py => com_specialist_license_mapper.py} (76%) rename ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/{com_specialst_license.py => com_specialist_license.py} (55%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license => com_specialist_license}/__init__.py (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/com_specialst_license_delete.csv => com_specialist_license/com_specialist_license_delete.csv} (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/com_specialst_license_insert.csv => com_specialist_license/com_specialist_license_insert.csv} (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/com_specialst_license_update.csv => com_specialist_license/com_specialist_license_update.csv} (100%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/db_com_specialst_license_before_delete.csv => com_specialist_license/db_com_specialist_license_before_delete.csv} (82%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/db_com_specialst_license_before_update.csv => com_specialist_license/db_com_specialist_license_before_update.csv} (84%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/expect_com_specialst_license_delete.csv => com_specialist_license/expect_com_specialist_license_delete.csv} (56%) create mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_insert.csv rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/expect_com_specialst_license_update.csv => com_specialist_license/expect_com_specialist_license_update.csv} (65%) rename ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/{com_specialst_license/test_com_specialst_license_mapper.py => com_specialist_license/test_com_specialist_license_mapper.py} (77%) delete mode 100644 ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_sosiety_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_sosiety_mapper.py index 309362e6..51ee1c63 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_sosiety_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_dr_sosiety_mapper.py @@ -78,7 +78,7 @@ class ComDrSosietyMapper(UltmarcTableMapper): def make_query(self): # 削除『修正区分がB(修正)かつ追加削除区分が1(退職)』 - if self.record.maint_flag == 'B' and self.record.specialst_maint_div == '1': + if self.record.maint_flag == 'B' and self.record.cont_flag == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py index 18b4c64f..5cb5a0d4 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_sp_field_mapper.py @@ -15,17 +15,17 @@ class ComSpFieldMapper(UltmarcTableMapper): WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd and - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ # データ登録用SQL INSERT_QUERY = """\ INSERT INTO src05.com_sp_field ( dcf_pcf_dr_cd, - specialst_cd, - specialst_maint_div, - specialst_flg, - specialst_publsh_ymd, + specialist_cd, + specialist_maint_div, + specialist_flg, + specialist_publsh_ymd, ackn_med_flg, ackn_med_publsh_ymd, guide_med_flg, @@ -39,10 +39,10 @@ class ComSpFieldMapper(UltmarcTableMapper): ) VALUES ( :dcf_pcf_dr_cd, - :specialst_cd, - :specialst_maint_div, - :specialst_flg, - :specialst_publsh_ymd, + :specialist_cd, + :specialist_maint_div, + :specialist_flg, + :specialist_publsh_ymd, :ackn_med_flg, :ackn_med_publsh_ymd, :guide_med_flg, @@ -67,7 +67,7 @@ class ComSpFieldMapper(UltmarcTableMapper): WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd and - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 @@ -77,7 +77,7 @@ class ComSpFieldMapper(UltmarcTableMapper): WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd and - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ record: ComSpField @@ -91,7 +91,7 @@ class ComSpFieldMapper(UltmarcTableMapper): def make_query(self): # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 - if self.record.maint_flag == 'B' and self.record.specialst_maint_div == '1': + if self.record.maint_flag == 'B' and self.record.specialist_maint_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return @@ -109,15 +109,15 @@ class ComSpFieldMapper(UltmarcTableMapper): return self.INSERT_QUERY # 存在する場合ではUpdate - if len(self.record.specialst_maint_div) > 0: - set_clauses.append('specialst_maint_div = :specialst_maint_div') + if len(self.record.specialist_maint_div) > 0: + set_clauses.append('specialist_maint_div = :specialist_maint_div') - if len(self.record.specialst_flg) > 0: - set_clauses.append('specialst_flg = :specialst_flg') - set_clauses.append('specialst_publsh_ymd = :specialst_publsh_ymd') - if self.record.specialst_flg == '@': - self.query_parameter['specialst_flg'] = '' - self.query_parameter['specialst_publsh_ymd'] = '' + if len(self.record.specialist_flg) > 0: + set_clauses.append('specialist_flg = :specialist_flg') + set_clauses.append('specialist_publsh_ymd = :specialist_publsh_ymd') + if self.record.specialist_flg == '@': + self.query_parameter['specialist_flg'] = '' + self.query_parameter['specialist_publsh_ymd'] = '' if len(self.record.ackn_med_flg) > 0: set_clauses.append('ackn_med_flg = :ackn_med_flg') diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py similarity index 76% rename from ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py rename to ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py index bf5ac147..1c55e406 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialst_license_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_specialist_license_mapper.py @@ -1,9 +1,9 @@ from src.batch.ultmarc.utmp_tables.table_mapper.ultmarc_table_mapper import \ UltmarcTableMapper -from src.batch.ultmarc.utmp_tables.tables.com_specialst_license import ComSpecialstLicense +from src.batch.ultmarc.utmp_tables.tables.com_specialist_license import ComSpecialistLicense -class ComSpecialstLicenseMapper(UltmarcTableMapper): +class ComSpecialistLicenseMapper(UltmarcTableMapper): """レイアウト区分010: COM_専門医資格 登録処理""" # レコード存在確認SQL @@ -11,16 +11,16 @@ class ComSpecialstLicenseMapper(UltmarcTableMapper): SELECT COUNT(*) AS count_num FROM - src05.com_specialst_license + src05.com_specialist_license WHERE - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ # データ登録用SQL INSERT_QUERY = """\ - INSERT INTO src05.com_specialst_license + INSERT INTO src05.com_specialist_license ( - specialst_cd, - specialst_licens_name, + specialist_cd, + specialist_license_name, regist_ymd, sys_regist_date, regist_prgm_id, @@ -28,8 +28,8 @@ class ComSpecialstLicenseMapper(UltmarcTableMapper): update_prgm_id ) VALUES ( - :specialst_cd, - :specialst_licens_name, + :specialist_cd, + :specialist_license_name, :execute_date_str_ymd, :execute_datetime, :program_name, @@ -41,31 +41,31 @@ class ComSpecialstLicenseMapper(UltmarcTableMapper): # 変更用SQL UPDATE_QUERY = """\ UPDATE - src05.com_specialst_license + src05.com_specialist_license SET - specialst_licens_name = :specialst_licens_name, + specialist_license_name = :specialist_license_name, update_ymd = :execute_date_str_ymd, sys_update_date = :execute_datetime, update_prgm_id = :program_name WHERE - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ # 修正区分が「C(削除)」の場合の更新SQL LOGICAL_DELETE_QUERY = """\ UPDATE - src05.com_specialst_license + src05.com_specialist_license SET delete_ymd = :execute_date_str_ymd, sys_update_date = :execute_date_str_ymd, update_prgm_id = :program_name WHERE - specialst_cd = :specialst_cd + specialist_cd = :specialist_cd """ - record: ComSpecialstLicense + record: ComSpecialistLicense def __init__(self, record: list[str], db) -> None: - super().__init__(record, db, ComSpecialstLicense) + super().__init__(record, db, ComSpecialistLicense) program_name = __name__.split('.')[-1] # 当モジュール名(現行から変わっている) # モジュール名をクエリパラメータに設定 self.query_parameter['program_name'] = program_name diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_dr_sosiety.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_dr_sosiety.py index 53284e4d..c2e44d8e 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_dr_sosiety.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_dr_sosiety.py @@ -8,7 +8,7 @@ class ComDrSosiety(UltmarcTable): dcf_dr_yobi: str # 個人コード(予備) maint_flag: str # 修正区分 sosiety_cd: str # 学会コード - specialst_maint_div: str # 予備／専門医メンテ区分 + cont_flag: str # 予備／所属学会メンテ区分 sosiety_f: str # 学会年度 dcf_pcf_dr_cd: str # DCFPCF医師コード @@ -21,7 +21,7 @@ class ComDrSosiety(UltmarcTable): self.dcf_dr_yobi = record[3].strip() self.maint_flag = record[4] self.sosiety_cd = record[5] - self.specialst_maint_div = record[6] + self.cont_flag = record[6] self.sosiety_f = record[9] # DCFPCF医師コード(レコードID + 個人コード + 個人コード(予備)) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sp_field.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sp_field.py index cc761c54..d26fe53e 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sp_field.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_sp_field.py @@ -8,10 +8,10 @@ class ComSpField(UltmarcTable): dcf_dr_code: str # 個人コード dcf_dr_yobi: str # 個人コード(予備) maint_flag: str # 修正区分 - specialst_cd: str # 専門医コード - specialst_maint_div: str # 予備／専門医メンテ区分 - specialst_flg: str # 専門医フラグ - specialst_publsh_ymd: str # 専門医掲載年月日 + specialist_cd: str # 専門医コード + specialist_maint_div: str # 予備／専門医メンテ区分 + specialist_flg: str # 専門医フラグ + specialist_publsh_ymd: str # 専門医掲載年月日 ackn_med_flg: str # 認定医フラグ ackn_med_publsh_ymd: str # 認定医掲載年月日 guide_med_flg: str # 指導医フラグ @@ -26,11 +26,11 @@ class ComSpField(UltmarcTable): self.dcf_dr_code = record[2].strip() self.dcf_dr_yobi = record[3].strip() self.maint_flag = record[4].strip() - self.specialst_cd = record[5].strip() - self.specialst_maint_div = record[6].strip() + self.specialist_cd = record[5].strip() + self.specialist_maint_div = record[6].strip() - self.specialst_flg = record[9].strip() - self.specialst_publsh_ymd = record[10].strip() + self.specialist_flg = record[9].strip() + self.specialist_publsh_ymd = record[10].strip() self.ackn_med_flg = record[11].strip() self.ackn_med_publsh_ymd = record[12].strip() diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialist_license.py similarity index 55% rename from ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py rename to ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialist_license.py index 98ce930f..f79acceb 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialst_license.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_specialist_license.py @@ -1,14 +1,14 @@ from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable -class ComSpecialstLicense(UltmarcTable): +class ComSpecialistLicense(UltmarcTable): """レイアウト区分010: COM_専門医資格""" - specialst_cd: str # 専門医コード - specialst_licens_name: str # 専門医資格名 + specialist_cd: str # 専門医コード + specialist_license_name: str # 専門医資格名 maint_flag: str # 修正区分 def __init__(self, record: list[str]): super().__init__(record) - self.specialst_cd = record[1] + self.specialist_cd = record[1] self.maint_flag = record[2] - self.specialst_licens_name = record[5] + self.specialist_license_name = record[5] 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 b5adf693..ecd1f111 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 @@ -68,8 +68,8 @@ from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_blng_sec_mapper imp ComBlngSecMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_sosiety_mapper import \ ComSosietyMapper -from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_specialst_license_mapper import \ - ComSpecialstLicenseMapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_specialist_license_mapper import \ + ComSpecialistLicenseMapper from src.batch.ultmarc.utmp_tables.table_mapper.concrete.com_inst_div_mapper import \ ComInstDivMapper @@ -121,7 +121,7 @@ COM_TABLE_LIST = { # COM_学会 "009": ComSosietyMapper, # COM_専門医資格 - "010": ComSpecialstLicenseMapper, + "010": ComSpecialistLicenseMapper, # COM_施設区分 "011": ComInstDivMapper, # COM_高度先進医療 diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv index 2329287f..978f2a55 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_delete.csv @@ -1,4 +1,4 @@ -"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"dcf_pcf_dr_cd","specialist_cd","specialist_maint_div","specialist_flg","specialist_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0199430100","0003","2","1","20170401","NULL","NULL","","","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" "0199578300","0003","2","1","20170221","1","20140810","","","20171008","20171011","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/11 21:20:37","clsComSpField" "0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_update.csv index 9167aa40..5c48b4e0 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/db_com_sp_field_before_update.csv @@ -1,4 +1,4 @@ -"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"dcf_pcf_dr_cd","specialist_cd","specialist_maint_div","specialist_flg","specialist_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0199430100","0003","2","","","1","20140401","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" "0199578300","0003","2","","","1","20140401","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" "0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv index eab607dc..f5423592 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_delete.csv @@ -1,2 +1,2 @@ -"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"dcf_pcf_dr_cd","specialist_cd","specialist_maint_div","specialist_flg","specialist_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0199961300","9999","2","1","20140706","1","20140401","1","20140706","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_insert.csv index f8720d26..b52c8c90 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_insert.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_insert.csv @@ -1,4 +1,4 @@ -"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"dcf_pcf_dr_cd","specialist_cd","specialist_maint_div","specialist_flg","specialist_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0199430100","0003","2","","","1","20140401","","","20230425","NULL","NULL","NULL","NULL","NULL","NULL","2023/01/08 17:05:14","com_sp_field_mapper","2023/01/08 17:05:14","com_sp_field_mapper" "0199578300","0003","2","","","1","20140401","","","20230425","NULL","NULL","NULL","NULL","NULL","NULL","2023/01/08 17:05:14","com_sp_field_mapper","2023/01/08 17:05:14","com_sp_field_mapper" "0199768200","0004","2","1","20131112","","","","","20230425","NULL","NULL","NULL","NULL","NULL","NULL","2023/01/08 17:05:14","com_sp_field_mapper","2023/01/08 17:05:14","com_sp_field_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv index 73bf0e1b..64c17858 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/expect_com_sp_field_update.csv @@ -1,4 +1,4 @@ -"dcf_pcf_dr_cd","specialst_cd","specialst_maint_div","specialst_flg","specialst_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"dcf_pcf_dr_cd","specialist_cd","specialist_maint_div","specialist_flg","specialist_publsh_ymd","ackn_med_flg","ackn_med_publsh_ymd","guide_med_flg","guide_med_publsh_ymd","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0199430100","0003","2","1","20170401","","","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199578300","0003","2","1","20170221","1","20140810","","","20171008","20230425","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/09 20:21:51","com_sp_field_mapper" "0199768200","0004","2","1","20131112","","","","","20171008","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/08 17:05:14","clsComSpField","2017/10/08 17:05:14","clsComSpField" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py index bc9eda78..3f9a4d1f 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_sp_field/test_com_sp_field_mapper.py @@ -69,18 +69,18 @@ class TestComSpFieldMapper: # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_sp_field_insert.csv')) primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] - primary_keys_specialst_cd = [{'specialst_cd': columns['specialst_cd']} for columns in expect_data_list] + primary_keys_specialist_cd = [{'specialist_cd': columns['specialist_cd']} for columns in expect_data_list] actual_data_list = [] sp_field_select_sql = """\ SELECT * FROM src05.com_sp_field WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd - AND specialst_cd = :specialst_cd\ + AND specialist_cd = :specialist_cd\ """ - for param_dcf_pcf_dr_cd, param_specialst_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialst_cd): + for param_dcf_pcf_dr_cd, param_specialist_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialist_cd): sp_field_data = self.db.execute_select( sp_field_select_sql, - {**param_dcf_pcf_dr_cd, **param_specialst_cd}) + {**param_dcf_pcf_dr_cd, **param_specialist_cd}) assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) @@ -136,18 +136,18 @@ class TestComSpFieldMapper: # 期待値ファイルを読み込む expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_sp_field_update.csv')) primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] - primary_keys_specialst_cd = [{'specialst_cd': columns['specialst_cd']} for columns in expect_data_list] + primary_keys_specialist_cd = [{'specialist_cd': columns['specialist_cd']} for columns in expect_data_list] actual_data_list = [] sp_field_select_sql = """\ SELECT * FROM src05.com_sp_field WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd - AND specialst_cd = :specialst_cd\ + AND specialist_cd = :specialist_cd\ """ - for param_dcf_pcf_dr_cd, param_specialst_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialst_cd): + for param_dcf_pcf_dr_cd, param_specialist_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialist_cd): sp_field_data = self.db.execute_select( sp_field_select_sql, - {**param_dcf_pcf_dr_cd, **param_specialst_cd}) + {**param_dcf_pcf_dr_cd, **param_specialist_cd}) assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) @@ -208,18 +208,18 @@ class TestComSpFieldMapper: actual_record_count = self.db.execute_select('SELECT COUNT(*) AS count_num FROM src05.com_sp_field')[0]['count_num'] assert actual_record_count == len(expect_data_list), 'DBのレコード件数が期待値の件数と一致すること' primary_keys_dcf_pcf_dr_cd = [{'dcf_pcf_dr_cd': columns['dcf_pcf_dr_cd']} for columns in expect_data_list] - primary_keys_specialst_cd = [{'specialst_cd': columns['specialst_cd']} for columns in expect_data_list] + primary_keys_specialist_cd = [{'specialist_cd': columns['specialist_cd']} for columns in expect_data_list] actual_data_list = [] sp_field_select_sql = """\ SELECT * FROM src05.com_sp_field WHERE dcf_pcf_dr_cd = :dcf_pcf_dr_cd - AND specialst_cd = :specialst_cd\ + AND specialist_cd = :specialist_cd\ """ - for param_dcf_pcf_dr_cd, param_specialst_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialst_cd): + for param_dcf_pcf_dr_cd, param_specialist_cd in zip(primary_keys_dcf_pcf_dr_cd, primary_keys_specialist_cd): sp_field_data = self.db.execute_select( sp_field_select_sql, - {**param_dcf_pcf_dr_cd, **param_specialst_cd}) + {**param_dcf_pcf_dr_cd, **param_specialist_cd}) assert len(sp_field_data) == 1, '1件取得できていること' actual_data_list.append(sp_field_data[0]) diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/__init__.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/__init__.py similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/__init__.py rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/__init__.py diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_delete.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_delete.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_insert.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_insert.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_insert.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_update.csv similarity index 100% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/com_specialst_license_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/com_specialist_license_update.csv diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_delete.csv similarity index 82% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_delete.csv index 60f3d7fb..b1732476 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_delete.csv @@ -1,4 +1,4 @@ -"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"specialist_cd","specialist_license_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0001","","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" "0002","整形外科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" "0003","麻酔科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:46:19","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_update.csv similarity index 84% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_update.csv index 96ec417b..bac063fe 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/db_com_specialst_license_before_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/db_com_specialist_license_before_update.csv @@ -1,4 +1,4 @@ -"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"specialist_cd","specialist_license_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" "0001","皮膚科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" "0002","整形外科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" "0003","麻酔科専門医","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_delete.csv similarity index 56% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_delete.csv index b4d4506a..74e4b021 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_delete.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_delete.csv @@ -1,8 +1,8 @@ -"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0002","整形外科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0005","放射線科専門医","20171024","20171024","20230515","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialst_license_mapper" -"0007","耳鼻咽喉科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:47:40","com_specialst_license_mapper","2023/05/15 12:47:40","com_specialst_license_mapper" +"specialist_cd","specialist_license_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0002","整形外科専門医","20171024","20171024","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0005","放射線科専門医","20171024","20171024","20230515","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:47:40","com_specialist_license_mapper" +"0007","耳鼻咽喉科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:47:40","com_specialist_license_mapper","2023/05/15 12:47:40","com_specialist_license_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_insert.csv new file mode 100644 index 00000000..92acbfc8 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_insert.csv @@ -0,0 +1,8 @@ +"specialist_cd","specialist_license_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","皮膚科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"0002","整形外科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"0003","麻酔科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"0004","産婦人科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"0005","眼科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"0006","放射線科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" +"9999","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialist_license_mapper","2023/05/15 12:03:03","com_specialist_license_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_update.csv similarity index 65% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_update.csv index 8125f178..6a33cc35 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_update.csv +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/expect_com_specialist_license_update.csv @@ -1,8 +1,8 @@ -"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" -"0002","整形外科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" -"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" -"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" -"0005","放射線科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" -"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialst_license_mapper" +"specialist_cd","specialist_license_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" +"0001","","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" +"0002","整形外科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" +"0003","麻酔科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" +"0004","産婦人科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" +"0005","放射線科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" +"0006","眼科専門医","20171024","20230515","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2023/05/15 12:46:19","com_specialist_license_mapper" "9999","ああああ","20171024","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/24 12:03:03","clsComSpLicens","2017/10/24 12:03:03","clsComSpLicens" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/test_com_specialist_license_mapper.py similarity index 77% rename from ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py rename to ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/test_com_specialist_license_mapper.py index d8693046..857e1c65 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/test_com_specialst_license_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialist_license/test_com_specialist_license_mapper.py @@ -4,7 +4,7 @@ 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_specialst_license_mapper +from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_specialist_license_mapper from src.db.database import Database from tests.testing_utility import (assert_table_results, create_db_data_from_csv, @@ -14,7 +14,7 @@ from tests.testing_utility import (assert_table_results, create_ultmarc_test_data_from_csv) -class TestComSpecialstLicenseMapper: +class TestComSpecialistLicenseMapper: """レイアウト区分010: COM_専門医資格""" db: Database @@ -52,24 +52,24 @@ class TestComSpecialstLicenseMapper: # 処理日設定 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_specialst_license_insert.csv')) + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_specialist_license_insert.csv')) # 一旦全データをDBから削除 - delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'1': '1'}) + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialist_license', {'1': '1'}) self.db.execute(delete_sql, delete_parameter) # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_specialist_license_mapper.ComSpecialistLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialist_license_mapper.ComSpecialistLicenseMapper, 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_specialst_license_insert.csv')) - primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] - actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_cd IN ({','.join(primary_keys)})" + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_specialist_license_insert.csv')) + primary_keys = [f"'{primary_key['specialist_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialist_license WHERE specialist_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'] @@ -97,16 +97,16 @@ class TestComSpecialstLicenseMapper: # 処理日設定 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_specialst_license_update.csv')) + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_specialist_license_update.csv')) # 一旦全データをDBから削除 - delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'1': '1'}) + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialist_license', {'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_specialst_license_before_update.csv')) + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_specialist_license_before_update.csv')) for test_data in test_sql_data_list: insert_sql, insert_parameter = create_insert_sql_with_parameter( - 'src05.com_specialst_license', + 'src05.com_specialist_license', test_data.keys(), test_data.values() ) @@ -114,16 +114,16 @@ class TestComSpecialstLicenseMapper: # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_specialist_license_mapper.ComSpecialistLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialist_license_mapper.ComSpecialistLicenseMapper, 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_specialst_license_update.csv')) - primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] - actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_cd IN ({','.join(primary_keys)})" + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_specialist_license_update.csv')) + primary_keys = [f"'{primary_key['specialist_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialist_license WHERE specialist_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'] @@ -154,16 +154,16 @@ class TestComSpecialstLicenseMapper: # 処理日設定 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_specialst_license_delete.csv')) + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_specialist_license_delete.csv')) # 一旦全データをDBから削除 - delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialst_license', {'1': '1'}) + delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_specialist_license', {'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_specialst_license_before_delete.csv')) + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_specialist_license_before_delete.csv')) for test_data in test_sql_data_list: insert_sql, insert_parameter = create_insert_sql_with_parameter( - 'src05.com_specialst_license', + 'src05.com_specialist_license', test_data.keys(), test_data.values() ) @@ -171,16 +171,16 @@ class TestComSpecialstLicenseMapper: # Act for line_number, line in enumerate(test_dat_file, start=1): - sut: com_specialst_license_mapper.ComSpecialstLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_specialst_license_mapper.ComSpecialstLicenseMapper, f'{line_number}行目:マッパークラスが期通りか' + sut: com_specialist_license_mapper.ComSpecialistLicenseMapper = create_ultmarc_table_mapper_sut(line, self.db) + assert type(sut) is com_specialist_license_mapper.ComSpecialistLicenseMapper, 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_specialst_license_delete.csv')) - primary_keys = [f"'{primary_key['specialst_cd']}'" for primary_key in expect_data_list] - actual_select_sql = f"SELECT * FROM src05.com_specialst_license WHERE specialst_cd IN ({','.join(primary_keys)})" + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_specialist_license_delete.csv')) + primary_keys = [f"'{primary_key['specialist_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_specialist_license WHERE specialist_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'] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv deleted file mode 100644 index ef609890..00000000 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_specialst_license/expect_com_specialst_license_insert.csv +++ /dev/null @@ -1,8 +0,0 @@ -"specialst_cd","specialst_licens_name","regist_ymd","update_ymd","delete_ymd","regist_date","create_user","update_date","update_user","sys_regist_date","regist_prgm_id","sys_update_date","update_prgm_id" -"0001","皮膚科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"0002","整形外科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"0003","麻酔科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"0004","産婦人科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"0005","眼科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"0006","放射線科専門医","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" -"9999","あいうえおかきくけこあいうえおかきくけこあいうえお","20230515","NULL","NULL","NULL","NULL","NULL","NULL","2023/05/15 12:03:03","com_specialst_license_mapper","2023/05/15 12:03:03","com_specialst_license_mapper" From 0267d7cd792480e58b40b5596825c8c73960414e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 18 May 2023 16:01:15 +0900 Subject: [PATCH 22/25] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utmp_tables/table_mapper/concrete/com_inst_att_mapper.py | 4 ++-- .../table_mapper/concrete/com_prefc_med_base_mapper.py | 4 ++-- .../table_mapper/concrete/com_prefc_med_dis_treat_mapper.py | 4 ++-- .../table_mapper/concrete/com_prefc_med_equpment_mapper.py | 4 ++-- .../table_mapper/concrete/com_prefc_med_sojourn_ope_mapper.py | 4 ++-- .../table_mapper/concrete/com_prefc_med_sp_outpat_mapper.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py index f1b52afd..b6deaef0 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_inst_att_mapper.py @@ -646,7 +646,7 @@ class ComInstAttMapper(UltmarcTableMapper): dcf_dsf_inst_cd = :dcfdsf_inst_code """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_inst_att @@ -665,7 +665,7 @@ class ComInstAttMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py index 7605fc30..2c8bd8e0 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_base_mapper.py @@ -179,7 +179,7 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper): dcf_dsf_inst_cd = :dcfdsf_inst_code """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_prefc_med_base @@ -198,7 +198,7 @@ class ComPrefcMedBaseMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_dis_treat_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_dis_treat_mapper.py index 6298160b..0cc65001 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_dis_treat_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_dis_treat_mapper.py @@ -58,7 +58,7 @@ class ComPrefcMedDisTreatMapper(UltmarcTableMapper): treatment_code = :treatment_code """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_prefc_med_dis_treat @@ -79,7 +79,7 @@ class ComPrefcMedDisTreatMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py index ed9cf467..4d345900 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_equpment_mapper.py @@ -58,7 +58,7 @@ class ComPrefcMedEqupmentMapper(UltmarcTableMapper): equipment_code = :equipment_code """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_prefc_med_equpment @@ -79,7 +79,7 @@ class ComPrefcMedEqupmentMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sojourn_ope_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sojourn_ope_mapper.py index f2c84587..d1883e68 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sojourn_ope_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sojourn_ope_mapper.py @@ -54,7 +54,7 @@ class ComPrefcMedSojournOpeMapper(UltmarcTableMapper): cos_surgery_code = :cos_surgery_code """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_prefc_med_sojourn_ope @@ -75,7 +75,7 @@ class ComPrefcMedSojournOpeMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sp_outpat_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sp_outpat_mapper.py index 182616d5..149b2c76 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sp_outpat_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_prefc_med_sp_outpat_mapper.py @@ -59,7 +59,7 @@ class ComPrefcMedSpOutpatMapper(UltmarcTableMapper): specialclinic_name = :specialclinic_name """ - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 PHYSICAL_DELETE_QUERY = """\ DELETE FROM src05.com_prefc_med_sp_outpat @@ -80,7 +80,7 @@ class ComPrefcMedSpOutpatMapper(UltmarcTableMapper): self.query_parameter = {**self.query_parameter, **self.record.to_sql_parameter()} def make_query(self): - # 『修正区分がB(修正)かつ専門医メンテナンス区分が1(退職)』の場合、物理削除 + # 『修正区分がB(修正)かつ追加削除区分が1(退職)』の場合、物理削除 if self.record.maint_flag == 'B' and self.record.adddel_div == '1': self.queries.append(self.PHYSICAL_DELETE_QUERY) return From c46b4ad552b55d503e883ee2e659dbee9575e6b8 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 19 May 2023 14:47:14 +0900 Subject: [PATCH 23/25] =?UTF-8?q?feat:=20=E8=87=AA=E5=8B=95=E9=96=8B?= =?UTF-8?q?=E5=A7=8B=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/start-rds/start-rds.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 lambda/start-rds/start-rds.py diff --git a/lambda/start-rds/start-rds.py b/lambda/start-rds/start-rds.py new file mode 100644 index 00000000..a077cb88 --- /dev/null +++ b/lambda/start-rds/start-rds.py @@ -0,0 +1,29 @@ +import os + +import boto3 + +#環境変数 +client = boto3.client('rds') + +AUTO_START_TAG_TAGKEY = 'AUTO_START' +AUTO_START_ENABLE = 'true' + +def lambda_handler(event, context): + #クラスターを停止 + clusters = client.describe_db_clusters() + for cluster in clusters['DBClusters']: + if cluster['Status'] == "stopped": + tags = client.list_tags_for_resource(ResourceName=cluster['DBClusterArn']) + for tag in tags['TagList']: + if tag['Key'] == AUTO_START_TAG_TAGKEY and tag['Value'] == AUTO_START_ENABLE: + client.start_db_cluster(DBClusterIdentifier=cluster['DBClusterIdentifier']) + + #インスタンスを停止 + instances = client.describe_db_instances() + for instance in instances['DBInstances']: + if instance['DBInstanceStatus'] == "stopped": + tags = client.list_tags_for_resource(ResourceName=instance['DBInstanceArn']) + for tag in tags['TagList']: + if tag['Key'] == AUTO_START_TAG_TAGKEY and tag['Value'] == AUTO_START_ENABLE: + client.start_db_instance(DBInstanceIdentifier=instance['DBInstanceIdentifier']) + From 509fb61218c86ea7b507e0d8de4f779cad82c0ee Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 19 May 2023 14:50:30 +0900 Subject: [PATCH 24/25] =?UTF-8?q?fix:=20=E3=82=BF=E3=82=B0=E5=90=8D?= =?UTF-8?q?=E3=81=A8=E5=80=A4=E3=81=AF=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=81=8B=E3=82=89=E5=8F=96=E3=82=8B=EF=BC=88stop=E3=82=92?= =?UTF-8?q?=E8=B8=8F=E8=A5=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/start-rds/start-rds.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lambda/start-rds/start-rds.py b/lambda/start-rds/start-rds.py index a077cb88..b35d7650 100644 --- a/lambda/start-rds/start-rds.py +++ b/lambda/start-rds/start-rds.py @@ -5,8 +5,8 @@ import boto3 #環境変数 client = boto3.client('rds') -AUTO_START_TAG_TAGKEY = 'AUTO_START' -AUTO_START_ENABLE = 'true' +AUTO_START_TAG_TAGKEY = os.environ['AUTO_START_TAG_TAGKEY'] +AUTO_START_ENABLE = os.environ['AUTO_START_ENABLE'] def lambda_handler(event, context): #クラスターを停止 From 0e643c21ba9e0a4199841bb0f719939267f4a01a Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 19 May 2023 14:51:25 +0900 Subject: [PATCH 25/25] =?UTF-8?q?style:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=8C=E5=98=98=E4=BB=98=E3=81=84=E3=81=A6=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lambda/start-rds/start-rds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/start-rds/start-rds.py b/lambda/start-rds/start-rds.py index b35d7650..ee4f4b9b 100644 --- a/lambda/start-rds/start-rds.py +++ b/lambda/start-rds/start-rds.py @@ -2,9 +2,9 @@ import os import boto3 -#環境変数 client = boto3.client('rds') +#環境変数 AUTO_START_TAG_TAGKEY = os.environ['AUTO_START_TAG_TAGKEY'] AUTO_START_ENABLE = os.environ['AUTO_START_ENABLE']