From 77b389bbe21c3198c6c6126df2bf870897e0a373 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 12 Jun 2025 13:37:35 +0900 Subject: [PATCH] =?UTF-8?q?=E8=AA=A4=E5=88=A4=E5=AE=9A=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/update_business_day.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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: