diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index 0bd720d4..8bcb0c9a 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -1,4 +1,5 @@ import json +import re from datetime import datetime import boto3 @@ -187,11 +188,10 @@ class UpdateBusinessDay(JskultBatchEntrypoint): """jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力 """ missing_files = [ - jsk_transfer_expected_data - for jsk_transfer_expected_data in jsk_transfer_expected_data_list + expected + for expected in jsk_transfer_expected_data_list if not any( - jsk_transfer_data.startswith( - jsk_transfer_expected_data) + re.match(f"{re.escape(expected)}_\\d{{14}}", jsk_transfer_data) for jsk_transfer_data in jsk_transfer_data_list ) ] @@ -206,9 +206,9 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jsk_transfer_data for jsk_transfer_data in jsk_transfer_data_list if not any( - jsk_transfer_data.startswith( - jsk_transfer_expected_data) - for jsk_transfer_expected_data in jsk_transfer_expected_data_list + re.match(f"{re.escape(expected)}_\\d{{14}}", + jsk_transfer_data) + for expected in jsk_transfer_expected_data_list ) ] if len(unexpected_data) != 0: