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

feat: 日付の比較を正確に

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-04-07 11:23:37 +09:00
parent d49188c1f0
commit cbf6c09025
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ecs/jskult-batch-daily/tests/batch/ultmarc/utmp_tables/table_mapper/test_com_alma_mapper.py
View File

@ -92,12 +92,7 @@ class TestComAlmaMapper:
actual_rows = self.db.execute_select("SELECT * FROM src05.com_alma WHERE alma_cd = '001'")
# 期待値検査
assert_table_results(actual_rows, expect_rows, line_number=i, ignore_col_name=['sys_regist_date', 'sys_update_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 in ['sys_regist_date', 'sys_update_date']:
assert actual_row[actual_col_name] < expect_row[expect_col_name], f'{actual_col_name}が、期待値の日時以前であること'
assert_table_results(actual_rows, expect_rows, line_number=i)
def test_update_record_one(self, expect_datetime: datetime, expect_date_str: str):
"""
@ -123,7 +118,7 @@ class TestComAlmaMapper:
# DBに登録するテストデータ
test_sql_data = ["001", "北大"] + create_ultmarc_common_column_values(
regist_ymd=expect_date_str,
sys_regist_date=expect_datetime.replace(microsecond=0),
sys_regist_date=expect_datetime,
regist_prgm_id=module_name,
sys_update_date=expect_datetime,
update_prgm_id=module_name
@ -164,7 +159,7 @@ class TestComAlmaMapper:
expect_row = ["001", "テスト大"] + create_ultmarc_common_column_values(
regist_ymd=expect_date_str,
update_ymd=expect_date_str, # 更新日時が登録される
sys_regist_date=expect_datetime.replace(microsecond=0),
sys_regist_date=expect_datetime,
regist_prgm_id=module_name,
sys_update_date=datetime.now(),
update_prgm_id=module_name
@ -206,7 +201,7 @@ class TestComAlmaMapper:
# DBに登録するテストデータ
test_sql_data = ["001", "北大"] + create_ultmarc_common_column_values(
regist_ymd=expect_date_str,
sys_regist_date=expect_datetime.replace(microsecond=0),
sys_regist_date=expect_datetime,
regist_prgm_id=module_name,
sys_update_date=expect_datetime,
update_prgm_id=module_name
@ -247,7 +242,7 @@ class TestComAlmaMapper:
expect_row = ["001", "北大"] + create_ultmarc_common_column_values(
regist_ymd=expect_date_str,
delete_ymd=expect_date_str, # 削除日が登録される
sys_regist_date=expect_datetime.replace(microsecond=0),
sys_regist_date=expect_datetime,
regist_prgm_id=module_name,
sys_update_date=datetime.now(),
update_prgm_id=module_name

2
ecs/jskult-batch-daily/tests/conftest.py
View File

@ -16,7 +16,7 @@ def database() -> Database:
@pytest.fixture
def expect_datetime() -> datetime:
"""テスト実行年月日時分秒を生成"""
return datetime.now()
return datetime.now().replace(microsecond=0)
@pytest.fixture