diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py index 31049812..5963aa3f 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/table_mapper/concrete/com_alma_mapper.py @@ -4,7 +4,7 @@ from src.batch.ultmarc.utmp_tables.tables.com_alma import ComAlma class ComAlmaMapper(UltmarcTableMapper): - """COM_出身校 登録処理""" + """レイアウト区分004: COM_出身校 登録処理""" # レコード存在確認SQL RECORD_EXISTS_QUERY = """\ diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_alma.py b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_alma.py index 07d2af8f..80940b09 100644 --- a/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_alma.py +++ b/ecs/jskult-batch-daily/src/batch/ultmarc/utmp_tables/tables/com_alma.py @@ -2,7 +2,7 @@ from src.batch.ultmarc.utmp_tables.tables.ultmarc_table import UltmarcTable class ComAlma(UltmarcTable): - """COM_出身校""" + """レイアウト区分004: COM_出身校""" maint_flag: str # 修正区分 alma_cd: str # 出身校コード alma: str # 出身校 @@ -10,5 +10,5 @@ class ComAlma(UltmarcTable): def __init__(self, record: list[str]): super().__init__(record) self.maint_flag = record[2] - self.alma_cd = record[1] - self.alma = record[5] + self.alma_cd = record[1] + self.alma = record[5] diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_delete.csv new file mode 100644 index 00000000..dac5bd09 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_delete.csv @@ -0,0 +1,7 @@ +"004","001","A","20141113","20141114","北大","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","002","A","20141113","20141114","札幌医","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","003","A","20141113","20141114","弘大","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","004","A","20141113","20141114","","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","005","A","20141113","20141114","東北大","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","006","C","20141113","20141114","福島医","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" +"004","007","A","20141113","20141114","群馬大","1","2014/11/21 22:53","VANLOAD","","","2014/11/21 22:53" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_update.csv new file mode 100644 index 00000000..368cb15d --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/com_alma_update.csv @@ -0,0 +1,6 @@ +"004","001","B","20141113","20141114","北大","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" +"004","002","B","20141113","20141114","札幌医","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" +"004","003","B","20141113","20141114","弘大","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" +"004","004","B","20141113","20141114",,"1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" +"004","005","B","20141113","20141114","福島医","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" +"004","006","B","20141113","20141114","東北大","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv new file mode 100644 index 00000000..259afa23 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_delete.csv @@ -0,0 +1,7 @@ +"alma_cd","alma","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 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"004",,"20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"005","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" +"006","福島医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","clsComAlma" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_update.csv new file mode 100644 index 00000000..5284785e --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/db_com_alma_before_update.csv @@ -0,0 +1,7 @@ +"alma_cd","alma","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 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" +"002","札幌医","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" +"003","弘大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" +"004","岩手医","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" +"005","東北大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" +"006","福島医","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:27:33","clsComAlma" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv new file mode 100644 index 00000000..6cb36d4b --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_delete.csv @@ -0,0 +1,8 @@ +"alma_cd","alma","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 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"004","","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"005","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"006","福島医","20171020","20171020","20171020","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:43:15","com_alma_mapper" +"007","群馬大","20171020","NULL","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:43:15","com_alma_mapper","2017/10/20 10:43:15","com_alma_mapper" diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv new file mode 100644 index 00000000..1242b1d7 --- /dev/null +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/expect_com_alma_update.csv @@ -0,0 +1,7 @@ +"alma_cd","alma","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 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"002","札幌医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"003","弘大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"004",,"20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"005","福島医","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" +"006","東北大","20171020","20171020","NULL","NULL","NULL","NULL","NULL","2017/10/20 10:27:33","clsComAlma","2017/10/20 10:35:27","com_alma_mapper" \ No newline at end of file diff --git a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/test_com_alma_mapper.py b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/test_com_alma_mapper.py index 174aca65..0d292f8e 100644 --- a/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/test_com_alma_mapper.py +++ b/ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/com_alma/test_com_alma_mapper.py @@ -7,15 +7,11 @@ from src.batch.common.batch_config import BatchConfig from src.batch.ultmarc.utmp_tables.table_mapper.concrete import com_alma_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_expect_data_from_csv, create_insert_sql_with_parameter, - create_ultmarc_common_column_names, - create_ultmarc_common_column_values, create_ultmarc_table_mapper_sut, - create_ultmarc_test_csv, - create_ultmarc_test_data_from_csv, - get_module_name) + create_ultmarc_test_data_from_csv) class TestComAlmaMapper: @@ -24,7 +20,6 @@ class TestComAlmaMapper: db: Database batch_config: BatchConfig test_file_path: str = path.dirname(__file__) - table_columns = ["alma_cd", "alma"] + create_ultmarc_common_column_names() @pytest.fixture(autouse=True, scope='function') def pre_test(self, database: Database): @@ -72,24 +67,25 @@ class TestComAlmaMapper: # Assert # 期待値ファイルを読み込む - expect_data_list = create_expect_data_from_csv(path.join(self.test_file_path, 'expect_com_alma_insert.csv')) + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_alma_insert.csv')) primary_keys = [f"'{primary_key['alma_cd']}'" for primary_key in expect_data_list] actual_select_sql = f"SELECT * FROM src05.com_alma WHERE alma_cd IN ({','.join(primary_keys)})" actual_data_list = self.db.execute_select(actual_select_sql) # 期待値検査 - assert_table_results(actual_data_list, expect_data_list, line_number=i, ignore_col_name=['regist_ymd', 'sys_update_date', 'sys_regist_date']) + ignore_columns = ['regist_ymd', 'sys_update_date', 'sys_regist_date'] + assert_table_results(actual_data_list, expect_data_list, line_number=i, ignore_col_name=ignore_columns) # 動的日付項目の個別確認 for actual_row, expect_row in zip(actual_data_list, expect_data_list): 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'{i}行目:{actual_col_name}が、期待値の以降であること' + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値以降であること' - def test_update_record(self, expect_datetime: datetime, expect_date_str: str): + def test_update_record(self): """ Cases: COM_出身校テーブルのレコードを更新する Arranges: - - CSVデータを用意する + - CSVデータを用意し、読み込む - 追加対象となるレコードを登録する Expects: - 登録内容が期待値と一致すること @@ -98,93 +94,50 @@ class TestComAlmaMapper: # Arrange # 処理日設定 self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') - # テストデータ作成 - csv_floating_data_lst = [ - ['001', '北大', 'B'], - ['002', '札幌医', 'B'], - ['003', '弘大', 'B'], - ['004', '', 'B'], - ['005', '福島医', 'B'], - ['006', '東北大', 'A'] - ] - test_data_list = [ - f'"004","{data[0]}","{data[2]}","20141113","20141114","{data[1]}","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53"' - for data in csv_floating_data_lst - ] - test_dat_file = create_ultmarc_test_csv(test_data_list) - + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_alma_update.csv')) # 一旦全データをDBから削除 delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_alma', {'1': '1'}) self.db.execute(delete_sql, delete_parameter) - - db_floating_data_list = [ - ['001', '北大'], - ['002', '札幌医'], - ['003', '弘大'], - ['004', '岩手医'], - ['005', '東北大'], - ['006', '福島医'] - ] - # モジュール名 - module_name = get_module_name(com_alma_mapper) - # テスト対象のデータをDBに登録 - for row in db_floating_data_list: - code, name = row - # DBに登録するテストデータ - test_sql_data = [code, name] + create_ultmarc_common_column_values( - regist_ymd=expect_date_str, - sys_regist_date=expect_datetime, - regist_prgm_id=module_name, - sys_update_date=expect_datetime, - update_prgm_id=module_name - ) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_alma_before_update.csv')) + for test_data in test_sql_data_list: insert_sql, insert_parameter = create_insert_sql_with_parameter( 'src05.com_alma', - self.table_columns, - test_sql_data + test_data.keys(), + test_data.values() ) self.db.execute(insert_sql, insert_parameter) - # sut(system under test)作成 + # Act for i, line in enumerate(test_dat_file, start=1): sut: com_alma_mapper.ComAlmaMapper = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_alma_mapper.ComAlmaMapper, f'{i}行目: マッパークラスが期待通りか' - - # Act + assert type(sut) is com_alma_mapper.ComAlmaMapper, f'{i}行目:マッパークラスが期通りか' sut.make_query() sut.execute_queries() - # Assert - # 期待値作成 + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_alma_update.csv')) + primary_keys = [f"'{primary_key['alma_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_alma WHERE alma_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, line_number=i, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + 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'{i}行目:{actual_col_name}が、期待値以降であること' - expect_data = csv_floating_data_lst[i - 1] - expect_row = [expect_data[0], expect_data[1]] + create_ultmarc_common_column_values( - regist_ymd=expect_date_str, - update_ymd=expect_date_str, # 更新日が登録される - sys_regist_date=expect_datetime, - regist_prgm_id=module_name, - sys_update_date=datetime.now(), - update_prgm_id=module_name - ) - expect_rows = [{c: r for c, r in zip(self.table_columns, expect_row)}] - actual_rows = self.db.execute_select(f"SELECT * FROM src05.com_alma WHERE alma_cd = '{expect_data[0]}'") - - # 期待値検査 - assert_table_results(actual_rows, expect_rows, line_number=i, ignore_col_name=['sys_update_date', 'sys_regist_date']) - # 動的日付項目の個別確認 - for actual_row, expect_row in zip(actual_rows, expect_rows): - for actual_col_name, expect_col_name in zip(actual_row, expect_row): - if actual_col_name == 'sys_regist_date': - assert actual_row[actual_col_name] == expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値の日時と一致すること' - if actual_col_name == 'sys_update_date': - assert actual_row[actual_col_name] < expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値の日時以前であること' - - def test_logical_delete_record_one(self, expect_datetime: datetime, expect_date_str: str): + def test_logical_delete(self): """ Cases: COM_出身校テーブルのレコードを1件論理削除する Arranges: - - CSVデータを用意する + - CSVデータを用意し、読み込む - 追加対象となるレコードを登録する Expects: - 登録内容が期待値と一致すること @@ -193,83 +146,43 @@ class TestComAlmaMapper: # Arrange # 処理日設定 self.batch_config.syor_date = datetime.strftime(datetime.now(), '%Y/%m/%d') - # テストデータ作成 - # 3カラム目、論理削除されるかどうか - csv_floating_data_lst = [ - ['001', '北大', 'A'], - ['002', '札幌医', 'A'], - ['003', '弘大', 'A'], - ['004', '岩手医', 'A'], - ['005', '東北大', 'A'], - ['006', '福島医', 'C'] - ] - test_data_list = [ - f'"004","{data[0]}","{data[2]}","20141113","20141114","{data[1]}","1","2014/11/21 22:53","VANLOAD",,,"2014/11/21 22:53"' - for data in csv_floating_data_lst - ] - test_dat_file = create_ultmarc_test_csv(test_data_list) + # テスト用のCSVを読み込む + test_dat_file = create_ultmarc_test_data_from_csv(path.join(self.test_file_path, 'com_alma_delete.csv')) # 一旦全データをDBから削除 delete_sql, delete_parameter = create_delete_sql_with_parameter('src05.com_alma', {'1': '1'}) self.db.execute(delete_sql, delete_parameter) - - # テスト対象のデータをDBに登録 - db_floating_data_list = [ - ['001', '北大'], - ['002', '札幌医'], - ['003', '弘大'], - ['004', ''], - ['005', '東北大'], - ['006', '福島医'] - ] - # モジュール名 - module_name = get_module_name(com_alma_mapper) - for row in db_floating_data_list: - code, name = row - # DBに登録するテストデータ - test_sql_data = [code, name] + create_ultmarc_common_column_values( - regist_ymd=expect_date_str, - sys_regist_date=expect_datetime, - regist_prgm_id=module_name, - sys_update_date=expect_datetime, - update_prgm_id=module_name - ) + # テストデータをDBに登録 + # DBデータを読み込む + test_sql_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'db_com_alma_before_delete.csv')) + for test_data in test_sql_data_list: insert_sql, insert_parameter = create_insert_sql_with_parameter( 'src05.com_alma', - self.table_columns, - test_sql_data + test_data.keys(), + test_data.values() ) self.db.execute(insert_sql, insert_parameter) - # sut(system under test)作成 + # Act for i, line in enumerate(test_dat_file, start=1): sut: com_alma_mapper.ComAlmaMapper = create_ultmarc_table_mapper_sut(line, self.db) - assert type(sut) is com_alma_mapper.ComAlmaMapper, f'{i}行目: マッパークラスが期待通りか' - - # Act + assert type(sut) is com_alma_mapper.ComAlmaMapper, f'{i}行目:マッパークラスが期通りか' sut.make_query() sut.execute_queries() - # Assert - # 期待値作成 - expect_data = csv_floating_data_lst[i - 1] - expect_row = [expect_data[0], expect_data[1]] + create_ultmarc_common_column_values( - regist_ymd=expect_date_str, - update_ymd=expect_date_str if expect_data[2] != 'C' else None, # メンテナンス区分!=C 更新日が登録される - delete_ymd=expect_date_str if expect_data[2] == 'C' else None, # メンテナンス区分==C 削除日が登録される - sys_regist_date=expect_datetime, - regist_prgm_id=module_name, - sys_update_date=datetime.now(), - update_prgm_id=module_name - ) - expect_rows = [{c: r for c, r in zip(self.table_columns, expect_row)}] - actual_rows = self.db.execute_select(f"SELECT * FROM src05.com_alma WHERE alma_cd = '{expect_data[0]}'") - - # 期待値検査 - assert_table_results(actual_rows, expect_rows, line_number=i, ignore_col_name=['sys_update_date', 'sys_regist_date']) - # 動的日付項目の個別確認 - for actual_row, expect_row in zip(actual_rows, expect_rows): - for actual_col_name, expect_col_name in zip(actual_row, expect_row): - if actual_col_name == 'sys_regist_date': - assert actual_row[actual_col_name] == expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値の日時と一致すること' - if actual_col_name == 'sys_update_date': - assert actual_row[actual_col_name] < expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値の日時以前であること' + # Assert + # 期待値ファイルを読み込む + expect_data_list = create_db_data_from_csv(path.join(self.test_file_path, 'expect_com_alma_delete.csv')) + primary_keys = [f"'{primary_key['alma_cd']}'" for primary_key in expect_data_list] + actual_select_sql = f"SELECT * FROM src05.com_alma WHERE alma_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, line_number=i, ignore_col_name=ignore_columns) + # 動的日付項目の個別確認 + for actual_row, expect_row in zip(actual_data_list, expect_data_list): + 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'{i}行目:{actual_col_name}が、登録されていないこと' + else: + assert actual_row[actual_col_name] >= expect_row[expect_col_name], f'{i}行目:{actual_col_name}が、期待値以降であること' diff --git a/ecs/jskult-batch-daily/tests/testing_utility.py b/ecs/jskult-batch-daily/tests/testing_utility.py index 032cb53a..a321f343 100644 --- a/ecs/jskult-batch-daily/tests/testing_utility.py +++ b/ecs/jskult-batch-daily/tests/testing_utility.py @@ -33,7 +33,7 @@ def create_ultmarc_test_data_from_csv(file_path: str) -> DatFile: return dat_file -def create_expect_data_from_csv(file_path: str) -> list[dict]: +def create_db_data_from_csv(file_path: str) -> list[dict]: """ファイルから、DBの期待値データを作成する Args: @@ -44,8 +44,8 @@ def create_expect_data_from_csv(file_path: str) -> list[dict]: """ with open(file_path, encoding='utf8') as csv_file: - # ヘッダ行を取得 - header = csv_file.readline().replace('"', '').split(',') + # ヘッダ行を取得し、改行とクォートを取り除く。 + header = csv_file.readline().strip('\n').replace('"', '').split(',') reader = csv.DictReader(csv_file, fieldnames=header) rows = [r for r in reader]