From cb47f7d18653eabcc6179c89cae8e8f78b9690af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 1 Aug 2023 14:11:49 +0900 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E5=AE=9F=E8=A1=8CSQL=E3=81=AE?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=BE=E3=83=BC=E3=83=B3=E3=82=92?= =?UTF-8?q?JST=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B=E3=83=A1?= =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/laundering/sales_results_laundering.py | 1 + ecs/jskult-batch-laundering/src/db/database.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py b/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py index ac2c79f7..1b11fa91 100644 --- a/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py +++ b/ecs/jskult-batch-laundering/src/batch/laundering/sales_results_laundering.py @@ -12,6 +12,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() logger.debug('処理開始') # 卸販売実績テーブル(洗替後)作成 _call_sales_lau_upsert(db) diff --git a/ecs/jskult-batch-laundering/src/db/database.py b/ecs/jskult-batch-laundering/src/db/database.py index 280a9d8b..02904db0 100644 --- a/ecs/jskult-batch-laundering/src/db/database.py +++ b/ecs/jskult-batch-laundering/src/db/database.py @@ -180,6 +180,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): From 9dbec78cd66acf12fa852fc93c11b420aed690ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 1 Aug 2023 14:43:16 +0900 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20python=E3=81=AE=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E5=86=85=E3=81=A7=E5=91=BC=E3=81=B0=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8BSQL=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0?= =?UTF-8?q?=E3=82=BE=E3=83=BC=E3=83=B3=E3=82=92JST=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= 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 + .../src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py | 1 + .../src/batch/laundering/emp_chg_inst_laundering.py | 1 + .../src/batch/laundering/sales_results_laundering.py | 1 + ecs/jskult-batch-daily/src/db/database.py | 3 +++ ecs/jskult-webapp/src/db/database.py | 3 +++ .../model/internal/master_mainte_emp_chg_inst_function.py | 1 + .../src/repositories/emp_chg_inst_repository.py | 5 ++++- ecs/jskult-webapp/src/services/master_mainte_service.py | 1 + 9 files changed, 16 insertions(+), 1 deletion(-) 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 96d66ad7..294fe004 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 @@ -20,6 +20,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() db.begin() logger.debug('DCF施設統合マスタ作成処理開始') # COM施設からDCF施設統合マスタに登録 diff --git a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py index 816a0545..85de15ed 100644 --- a/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py +++ b/ecs/jskult-batch-daily/src/batch/dcf_inst_merge/integrate_dcf_inst_merge.py @@ -14,6 +14,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() db.begin() logger.debug('DCF施設統合マスタ日次更新処理開始') # DCF施設統合マスタ移行先コードのセット(無効フラグが『0(有効)』) diff --git a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py index f78ece9b..8ec3b84e 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py @@ -13,6 +13,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() logger.debug('##########################') logger.debug('START Changing Employee in charge of institution PGM.') # `emp_chg_inst_lau`をTruncate diff --git a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py index 7f6d4259..58755f36 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/sales_results_laundering.py @@ -11,6 +11,7 @@ def exec(): db = Database.get_instance(autocommit=True) try: db.connect() + db.to_jst() logger.debug('処理開始') # 卸販売実績テーブル(洗替後)過去5年以前のデータ削除 _call_sales_lau_delete(db) diff --git a/ecs/jskult-batch-daily/src/db/database.py b/ecs/jskult-batch-daily/src/db/database.py index 280a9d8b..5ddaba4e 100644 --- a/ecs/jskult-batch-daily/src/db/database.py +++ b/ecs/jskult-batch-daily/src/db/database.py @@ -180,6 +180,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-webapp/src/db/database.py b/ecs/jskult-webapp/src/db/database.py index f700c016..971c859e 100644 --- a/ecs/jskult-webapp/src/db/database.py +++ b/ecs/jskult-webapp/src/db/database.py @@ -180,6 +180,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py b/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py index 4f4f6165..d4379a43 100644 --- a/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py +++ b/ecs/jskult-webapp/src/model/internal/master_mainte_emp_chg_inst_function.py @@ -30,6 +30,7 @@ class MasterMainteEmpChgInstFunction(metaclass=ABCMeta): error_list = [] try: self.emp_chginst_repository.connect() + self.emp_chginst_repository.to_jst() self.emp_chginst_repository.begin() (result_message, error_list) = self.write_emp_chg_inst_table() if len(error_list) > 0: diff --git a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py index 404d7bca..ce32a244 100644 --- a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py @@ -13,6 +13,9 @@ class EmpChgInstRepository(BaseRepository): def connect(self): self._database.connect() + + def to_jst(self): + self._database.to_jst() def begin(self): self._database.begin() @@ -110,7 +113,7 @@ class EmpChgInstRepository(BaseRepository): SET emp_cd = :emp_cd, updater = :update_user_name, - update_date = now() + update_date = NOW() where inst_cd = :inst_cd and ta_cd = :ta_cd diff --git a/ecs/jskult-webapp/src/services/master_mainte_service.py b/ecs/jskult-webapp/src/services/master_mainte_service.py index e9620eda..57ba896d 100644 --- a/ecs/jskult-webapp/src/services/master_mainte_service.py +++ b/ecs/jskult-webapp/src/services/master_mainte_service.py @@ -149,6 +149,7 @@ class MasterMainteService(BaseService): def copy_data_real_to_dummy(self) -> TableOverrideViewModel: try: self.emp_chginst_repository.connect() + self.emp_chginst_repository.to_jst() self.emp_chginst_repository.begin() self.emp_chginst_repository.delete_dummy_table() self.emp_chginst_repository.copy_real_to_dummy() From 2f8698769606d3643c2e06ed6894fdf772c032fe Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 16:39:12 +0900 Subject: [PATCH 03/12] =?UTF-8?q?fix:=20gzip=E3=81=8C=E3=81=86=E3=81=BE?= =?UTF-8?q?=E3=81=8F=E8=A7=A3=E5=87=8D=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/src/aws/s3.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ecs/jskult-batch-daily/src/aws/s3.py b/ecs/jskult-batch-daily/src/aws/s3.py index a4ebc30a..3a5fe240 100644 --- a/ecs/jskult-batch-daily/src/aws/s3.py +++ b/ecs/jskult-batch-daily/src/aws/s3.py @@ -1,6 +1,7 @@ +import gzip import os import os.path as path -import tarfile +import shutil import tempfile import boto3 @@ -134,14 +135,14 @@ class VjskReceiveBucket(S3Bucket): return temporary_file_path def unzip_data_file(self, filename: str): - ret = [] - with tarfile.open(filename) as tar: - temp_dir = os.path.dirname(filename) - tar.extractall(path=temp_dir) - extracted_files = tar.getnames() - for extracted_file in extracted_files: - file = os.path.join(temp_dir, extracted_file) - ret.append(file) + temp_dir = os.path.dirname(filename) + decompress_filename = os.path.basename(filename).replace('.gz', '') + decompress_file_path = os.path.join(temp_dir, decompress_filename) + with gzip.open(filename, 'rb') as gz: + with open(decompress_file_path, 'wb') as decompressed_file: + shutil.copyfileobj(gz, decompressed_file) + + ret = [decompress_file_path] return ret def backup_dat_file(self, target_files: list, datetime_key: str): From 90d9a204f8e84b44925ff690c39f576457401edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 1 Aug 2023 16:43:54 +0900 Subject: [PATCH 04/12] =?UTF-8?q?*=20feat:=20python=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=86=85=E3=81=A7=E5=91=BC=E3=81=B0=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8BSQL=E3=81=AE=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=A0=E3=82=BE=E3=83=BC=E3=83=B3=E3=82=92JST=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4(=E3=82=A2=E3=83=AB=E3=83=88=E3=83=9E?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=80=81arisj)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/src/batch/batch_functions.py | 2 ++ .../src/batch/laundering/ult_ident_presc_laundering.py | 1 + .../src/batch/vjsk/vjsk_data_load_manager.py | 1 + .../src/batch/output_arisj_file_process.py | 2 ++ ecs/jskult-batch-monthly/src/db/database.py | 3 +++ ecs/jskult-dbdump/src/batch/batch_functions.py | 3 +++ ecs/jskult-dbdump/src/db/database.py | 3 +++ 7 files changed, 15 insertions(+) diff --git a/ecs/jskult-batch-daily/src/batch/batch_functions.py b/ecs/jskult-batch-daily/src/batch/batch_functions.py index 87a7793d..43c4760c 100644 --- a/ecs/jskult-batch-daily/src/batch/batch_functions.py +++ b/ecs/jskult-batch-daily/src/batch/batch_functions.py @@ -60,6 +60,7 @@ def update_batch_processing_flag_in_processing() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) except DBException as e: raise BatchOperationException(e) @@ -87,6 +88,7 @@ def update_batch_process_complete() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'batch_complete': constants.BATCH_ACTF_BATCH_UNPROCESSED, 'dump_unprocessed': constants.DUMP_STATUS_KBN_UNPROCESSED diff --git a/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py index b7434967..9776eb8d 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py @@ -13,6 +13,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() logger.debug('納入先処方元マスタの洗替処理開始') # ult_ident_presc_lauをTruncate _truncate_ult_ident_presc_lau(db) diff --git a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py index 6006c030..b693bd07 100644 --- a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py +++ b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py @@ -37,6 +37,7 @@ class VjskDataLoadManager: try: # データベース接続 db.connect() + db.to_jst() db.execute("SET SESSION sql_mode = 'TRADITIONAL';") # orgをtruncate diff --git a/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py b/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py index d3f81597..1b375d3f 100644 --- a/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py +++ b/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py @@ -30,6 +30,8 @@ def exec(): except Exception as e: logger.info('DB接続エラーです') raise e + # タイムゾーンをJSTに変更 + db.to_jst() # トランザクションの開始 db.begin() diff --git a/ecs/jskult-batch-monthly/src/db/database.py b/ecs/jskult-batch-monthly/src/db/database.py index d2171fb5..aa350012 100644 --- a/ecs/jskult-batch-monthly/src/db/database.py +++ b/ecs/jskult-batch-monthly/src/db/database.py @@ -167,6 +167,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-dbdump/src/batch/batch_functions.py b/ecs/jskult-dbdump/src/batch/batch_functions.py index e51f336b..eece0536 100644 --- a/ecs/jskult-dbdump/src/batch/batch_functions.py +++ b/ecs/jskult-dbdump/src/batch/batch_functions.py @@ -55,6 +55,7 @@ def update_dump_status_kbn_in_processing() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) except DBException as e: raise BatchOperationException(e) @@ -80,6 +81,7 @@ def update_dump_status_kbn_error() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'dump_unprocessed': constants.DUMP_STATUS_KBN_ERROR }) @@ -107,6 +109,7 @@ def update_dump_status_kbn_complete() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'dump_unprocessed': constants.DUMP_STATUS_KBN_COMPLETE }) diff --git a/ecs/jskult-dbdump/src/db/database.py b/ecs/jskult-dbdump/src/db/database.py index b675381c..24bb6061 100644 --- a/ecs/jskult-dbdump/src/db/database.py +++ b/ecs/jskult-dbdump/src/db/database.py @@ -165,6 +165,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): From ac99c40ad0635cf49c42739e421afb5ec40c1a62 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 16:59:59 +0900 Subject: [PATCH 05/12] =?UTF-8?q?fix:=20=E3=83=AD=E3=83=BC=E3=82=AB?= =?UTF-8?q?=E3=83=AB=E3=81=AEgz=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=8C=E3=80=81tar.gz=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=80=81=E7=B4=94=E7=B2=8B=E3=81=AAgz=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?= =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=81=AB=E4=BC=B4=E3=81=84=E3=80=81=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=82=E5=A4=89=E6=9B=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../batch/vjsk/vjsk_load/test_vjsk_load.py | 2 +- .../bio_slip_data_202304270000.gz | Bin 2868 -> 2859 bytes .../fcl_mst_202304270000.gz | Bin 2009 -> 1959 bytes .../hld_mst_202304270000.gz | Bin 500 -> 423 bytes .../lot_num_mst_202304270000.gz | Bin 303 -> 239 bytes .../mdb_conv_mst_202304270000.gz | Bin 426 -> 360 bytes .../mkr_org_horizon_202304270000.gz | Bin 729 -> 641 bytes .../org_cnv_mst_202304270000.gz | Bin 402 -> 331 bytes .../phm_prd_mst_202304270000.gz | Bin 1134 -> 1082 bytes .../phm_price_mst_202304270000.gz | Bin 413 -> 347 bytes .../slip_data_202304270000.gz | Bin 3134 -> 3142 bytes .../stock_slip_data_202304270000.gz | Bin 899 -> 828 bytes .../tran_kbn_mst_202304270000.gz | Bin 419 -> 346 bytes .../vop_hco_merge_202304270000.gz | Bin 286 -> 203 bytes .../whs_customer_mst_202304270000.gz | Bin 1307 -> 1215 bytes .../whs_mst_202304270000.gz | Bin 499 -> 428 bytes 16 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/bio_slip_data_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/fcl_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/hld_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/lot_num_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mdb_conv_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mkr_org_horizon_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/org_cnv_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_prd_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_price_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/slip_data_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/stock_slip_data_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/tran_kbn_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/vop_hco_merge_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/whs_customer_mst_202304270000.gz mode change 100644 => 100755 ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/whs_mst_202304270000.gz diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py index 6b45f96e..c15f39b7 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py @@ -1159,7 +1159,7 @@ class TestImportFileToDb: _import_file_to_db(received_s3_files) # 検証 - assert str(e.value) == "file could not be opened successfully" + assert str(e.value) == "Not a gzipped file (b'7z')" # teardown for test_file in test_files: diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/bio_slip_data_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/bio_slip_data_202304270000.gz old mode 100644 new mode 100755 index 36d1af4593f1b83a34e64c586b11a47eb6cae724..6ea16a9ceea5b86bc660588943821cfd42a1d3bd GIT binary patch literal 2859 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 Ju`S6w007Lpq^SS^ literal 2868 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 literal 2009 zcmV;~2PXI*iwFoutX*UT0A^!sUu|=AUotQDp3ewGX9H`Nnka<;OX0$$w)$i zmRc_C3X|KNp1$Y4Z*#iuLgr#Nmk~_p%n&xiIF`#^J@6X`zfPR+50Z1AV6sA3U7Baxyb;353*1E^{ge zvVY)|BKj^|%Jw(ufs1&YAIQ*m_DrrtM2i>C52`cIWzT0W4_@laoIg2$>FJBP%!yN{ z28op0quJ$4*_?Xg^5E$f)jYcIZ0@?EHCPdoMnQbx4)E!~sJ%&F)PRk_sGzQ#PlKAYr z84gD7Hl{1}l@EgTY!5qjg2@bY1GHLRAxsvB0<<zumqcx)14z&jj)QBH4J; z#C{XZQa>)a1Z^m+mQx*Za?R325(r3LK4Lr(-GYRb?x>h!387nt<`cV~!`56uOk$=*>i4)^c~! z+7`XKhPSzC>l)XL;|ZkFy3!?Lz@U?uG5uNC%uXA^Ff4A<;exX+u4X%?p~Jb-yw^@JdP+m5%qnEvo8LY)40G_DVr%9r7wd>ik0mM1B4}a@_W-uaGX1 zaU$~jGLCE2^Bfq_b|)L0B9rj_cu17eP2nWnIWN#}?z zrQAvD4ikoD8j1EyFjKTE9cdNGwY{JRPu<47kziw~zO?D*S5;+ijIN;jsFhcO#nr~l z@Xp)|oS?F%s>?r9*0->krsFD9)K1E~Bh4z0O{#k$y{^!4U+CyjY>k3pO(oWLa4M5R zp18j6|G?A{1-Px&!<{v*Gb^Pu1S=}WWhyE?pRO8i?;MHxkHZuM{jw8VZ_nty) z@Rs_*Bxq`CCZaSKHwnXWztw8#BNv`mv7d@|P0G1<2Tz+hnw?-T6)bCC5(TD7AeeT+ z!el5L+;JQ_N+@3t9SsMo3ESp^8T&U}eSTzTZX#;3zRFIj_`)yVj$4%WMKZ(#3YSe4 z(XBSB73p)KHwAm`Ze6pfo?t33Tih|3VS~jt zwaSC2)=eg=-0WVRkDGJ~CCg0`_zQj342?VZBv^N9dSVcud*Wca4uf(l>U&t4?AO`) zmSOA2^p4T1+JfiK>@qdb1=T&1-VtqXz5Ki}^gb@Hk!)Ke_kHR+pQt_KM<$@{&P;zZ^I9OcXDc(a}jg^dNe2t-Sd))?QER~#t z^RB9)8s81IL{J}tP}K!~py??8#}gQ(Ib^uSP(in&#p3<}GYkEI&P?Xe;aoU-H3j%* z4Yw^DotxG3e>OjV>H137ny)Hcf7cajg03|a?HOVhzg;(`yqaZc7#_5I5qh6Rt-V9EBfG!0A-x rV_=~7kBu3Qa2$CRQuUtcZHeQ+|M7qPAOFYyksRLv3aT>602}}ShH~>@ diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/hld_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/hld_mst_202304270000.gz old mode 100644 new mode 100755 index efedd921426c1148d8eee36540901f014c0e1cc0..20c194a271956bc46d767b6f845ba81f03a3dfd0 GIT binary patch literal 423 zcmV;Y0a*SYiwFo;Hd4NZEjp0dZUS(QX#`ek=N<_`9cT!L~aK3$d^$ z3v(?DwJ_AeycUL9m}7wu3q)DKwE$`X)B;`$pcZf}JjBAIEZntl)WT5<_gXk=;f_Uw zSVWXXxE6t01Zojpi$E>HTE70ze=IEO?6Z)wpQ4u3Ye`W{YAq0EfhY@vSTfX-c`X@g z$*hHkS$LF%hgfpdl6x&VYRRodgjqzCMTA%i)KYjY1!^g*B@MHrQI<5oLJ4NswtFq~ RcMG=deF9TP=_O+b002U3!Eyiq literal 500 zcmVgiwFoqtX*UT0BCGvUu|=AUotQjGz?i?+QbkJ`-ZXd z>#rprSO=G}7|B#%zyv7fpmUnadGL<`1i(2DV4dANMU(`HQXEo35azlcQQdw5!5%V` z>G?E(y?oaJ=KJHTH5bKG(2H9~EjjCoWUL3tNWTpevAWAax*in2RVw0C5Bo{H9>j7Y z#_?2-rv09fsT9L*qCZ_Ea@{bStU8ZdNdMVL7m91ScvJa}%0E^9sPZe7-KqRVWzQ;m zUtTW&wTmW|J*fOiWv_p=s{B@E_qy9`SuQP}=QbeyIzjjh;0(5_D=F3wE(!FN@i-Tw1kYs|D9uu+@UMEX2h^yewwRa%t5~i))t0k+k0F}~94#FT12H>@x!mw{LGe95i>cS(q zB|d62v8@4WyqgP; zCPf*`@PR>?m<)?pMg*9gcq}6WOhH*Jllrp)aAXiD`faiRgCt^^Jiw4|gBYgxGUJCk Z#9uXn@s0MwkgxGS^9E!uUP%W7008iNV1NJs delta 288 zcmV+*0pI@b0j~lIABzYGKdfD31OSl=8h>GO0PT}OO2jY}hO^aE4B3zT?cSj`;N`iz1`!M>{k+=TY;a7+R#Iw;go<#8YK>}*dd0ZZ={XGF zZsXl!PQw|Ep{i7)CJkZMSZYc&I-{vsm1?StreRyEG2>hf`qHEVF5VlP(WJXqs;M&? m29;`>Ni!cfBUKb?2pJ8d{#hdy77Z2_{u`eegbHf_3IG5;dV@~@ diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mdb_conv_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mdb_conv_mst_202304270000.gz old mode 100644 new mode 100755 index 994a80b8a85b0584205bb4462905127b34fb3780..9b177904b8cc5cfc3babafa1184230e540a61355 GIT binary patch delta 344 zcmV-e0jK_|1Ly(@ABzYGfHqoW00WT<8-H_l0G-lHZo)7S2H3So4jx8ocG03(eA3e-dOQgS9w`m zv3*`Oi>g^Q-A8}kEw){*yTidUw_TfGtF`T#b$e{@-s`@Y73zT~`T&3!U1W52ihs5M zSP+DyuWby96|`*H`$Yj)+4TqY{`yuvj^}ArS1GN^o3dGs(tm8O z#X1?47K?{TeLt!vb^D@S{#v@_kW!aCs=%Hw&!D}i5K+N?ESMP(zO@*=P2PEAGdtA z;^7DWGpm!&4A!v|@`m^Rl`XpE68|O=L^kL6xZ^w4m%98PSlxWj&Kgp_Kgv(g|IQcX zN5knOyK{Wp@{w(jPX7m1Ctn~~1S5jhANxlExy(OtBr0!h*v10SLg)Yr_Bx F00366$;AKw diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mkr_org_horizon_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/mkr_org_horizon_202304270000.gz old mode 100644 new mode 100755 index 835d236007b3aa749ac63f3d9bf9ef9681cf26f4..9eb2cd3406253a10554427eebe057aa5a9da6996 GIT binary patch delta 624 zcmV-$0+0RK1%U+$ABzYGk2YFl00WT<9)ELo0PWasZ_+><2k^)GDi)qExj+5On`v}i zB3Zxo?weF;PfL;@lSA{pWYVga!Pv40Ge z1S$e55>#ZUCQubnm7pp^ErFVVnglf&>Iu{Z)Fr6P&`6*mpdmp+hGqgy0Zj>-GK63> z;^2D7fjs7-``IIh5!Q6d4@zarF0Bp0@U*=%46fV zj6lqTOe?!l{bR7#4r{0VUUP7^A&2FUJBB7-c+pWk@_x`pH9YQyt!CJH5r1CPGMkE> zRUB?wG7vAU^zfMOA56}825$jpw)hpk(-N;qyqCm1AnpnAPA0B=6knJXilFnIxEI9j z5ziyu8(Qgx@7#>vDW997z*8l5ve5VYmz62m&v<%#cBO>3SseL8OdOD~(+)QMu}=`% zh>wDmsee*qrZjGv7~En?Z(X`OKogG=7}UPe%iWAjBx9$Jb>K8BHosK={5fs4{;JSq zJUu=)yE?yt@aJ~W^XSHhLB*Z&(=whOpO=h4{*`oRi&hV5dy_q`PWj^__P`1OSl=9)DqS0PWUYZ_-d02k_qNr&ze3IWK*oe3?ea z;s_ZmlwsnPqbBOc#x9U)WQ(}DX@(e?6Zm(GBc!u>u zh(d@sL;^%2#395SVgX_isv%T4R0XJtPz#~Pp(a30gn9^d4s`+QA~Zs1aA*k75MeZg zQ4XU5jEc|YY}Zluy04AG}Jf=e#4EXY>#~o5&&i z^WFD{-ExhbZ1-MN`j=11t36WO>R&#Se5M=$UPjPE6R3bqP?Hu!7=BaGoPP)EJcM%) z#xRI!Cet|BhvuLW(@+dYzsm^3EXbs=(<{I6b{l@_q|>f;PuIn;{B*_8WD~D^jH4o%tv@FR~_@q|sku$Spi`Odo vO!-a82xLD=wl_)ffHXGf>#BIIlFyWnH6w~FS+Zow`p@bsCB`z%03HAUlzLsy diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/org_cnv_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/org_cnv_mst_202304270000.gz old mode 100644 new mode 100755 index 89eb4a65c860810433383f7aec3b85d0c884d501..72b636f57ecd0c88079d9a351d50900eaa19126c GIT binary patch delta 316 zcmV-C0mJ^11Iq#mABzYGoHkly00WT<8h>+k0IiZuYQr!Ph1cyVg7=1*(Z4PunmDwj zUu#Cp2Eki;b*UqT~*NmVLy^CYUhIY=SSqEp<- zAU?Pn9kw8HbkZy5rCEZE=l`Gz!YOsoR&;skRUox+ME7tcTpfh#plwIOT?aA?NAezy Oh(SLln9a?Q1ONb91CA{K delta 387 zcmV-}0et?;0+Is?ABzYGGpt=?1OSl=8h>GO0PT`rPQx$^#`_AVnD#zoJO7$oCSvOZ z2+>VVHx9=GN8$=N2{2YNu}RakhkjC1+fDt`XL;2<_(i+*FQNAYBtVh@)?FXA)tLkc zV2r6CYxpK2s8CAMQV0@~?~_ovnm}~{Z9;$FRd5m373$;defs(s{GyrOq#$hOIe+2J z$U&^MD-O2)rxu6S`=;k`*)}<7!rHHzj-zh5@SzX>dERpN)P{Uvvrac}r@UmG0`ehr zT#lHHi?Y8j|td=%hVibllWB z5~bPzq!9N;r??X9F~)k(hNbyNh*V|2s&zXvFULjHE=}da3pLQgug+j hIuiCckQq3V=Ws*}sz!|(HEPsF^a-ywcvJuk006miwF&?L diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_prd_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_prd_mst_202304270000.gz old mode 100644 new mode 100755 index 169f6761a19b359dec7013fb730d8675dbeffc6d..7d864d6f888221b0cae601f62787c53c74c104a3 GIT binary patch delta 1073 zcmV-11kU^J2)YOgABzYGrZ!q+00WT<8h>+k0Ns|~Zxcrl$DiB3VwER&aI||rd_KQ9 z!ggI@`(#occsW7rKnOlZw!#Gk)|pV6x23qs0s~t{bRO(`gH$7XJ+?o zb2cO~;-yj|&&_>jZuWC?vzr|Jy|mSD`)lo`&z1(;7yO_H26}?7Hag1eZuXT5jem_` z-4|1~f!a%5e`DBHA~Yxrjlrd%x>)b^^?kC)ceQs#xzHfbS}zzX7g?&1&5O!~hEfGr z{a_od%Y#jSFg)KM`t6~vd2s$p$KSjV=(}6}-kQFg5_W>NGTMVJzt`@A)$go9s)5#S z1Op}5-Xi7aOO~5AxDbMa6aSMaPJiO>llW#5Jx$_=?BAQaudhF1%;w#T%;c-36%fH+ z#SjM1moP+*4rKU?4DZU(V;Sya2*~SIxOJx7YIM}cF@{{;DE@q=K z$iw`coA9F^Ph!s1lh1PQ!VeY%KOW}}{G^qcT9huw;Jm;EJqVWRa+d_cN`LPQCnrRX z7nsNwZKG(RP`Ekn=7h_HC|cmNCzuT9e~ZcC)(j?l0Zb;;OWkA;roWPSCyBpKqP--( zpG40A8GHNS*MDAo`)2=165mSVACMm~WosG3EVC}6Z_h*Bz7)3b7hi9}7iXy!9MixctFM+nSIytz(mQXM1(!sAOH9B@3QUOBSKHAJMa7F4@AIo)twto&v%Yb~-F! zOd>ipFCQn-D?rSk-q(BA^wd;D`Po|Ov}S5KPC7Vo*<%oY0$hyMLAa(?vr;-!V|7-l zd&}f!^zrNQY0S-mfq$AI3dYrB=uulu9;JYf3l&G3qxpsAs43`Or37)Kxu3*g5oR ztVlt_jA>~zO*ao&VIg9cpfRF|-N2p$O6s$YUeL$=9dUd3VSjG<3Aa1AYWSu{dop}V z1ok16IC{PK4uKA|9WKMESYHF>&Oq%2|+;@jgy`KBxZxR`SMJj12$)T(J~o delta 1125 zcmV-r1e*K02<`|9ABzYGFRWc;1OSl=8h>GO0PU7p@6tdJz;_BJowV6;7uWvzaN0AiD%-2@rqY8@rwG7M?9$?rXKOBU%{E(Eg+yG9x>*>fpj{Z znVtQ0cDkMYEw|HcxGlfu8r0xa7&e8G>G?-eziCiLscqXSs>bBivY1FQAq-1!Zhr_1 z>?#JO(^7-_Q4<~LDV$#+=!s)jBdN6|D zMuQpD%A-rve-i}{qu_khzY_&d(FM%QMR>HeP_NcD6)FV+jv3IBaxp{Ja(}uGr=x7z z8=YzxpHdDNH9Z=`P&4nK)PV~o1eY4@M7SiGacz_=$DlL|yOl|iIno~j?hsWZcw`6~% zN!HFWI!)FTBeGolG+Af5R@cu<7JR=Z3(@{CSqH)VLd~+7WV17BmgVTM3oy=19TzwP zx};y;i3e{1F@bzPEPo%>T~iUIJ4*R2nyIjD-8gaCBM>hDF8YE~vZi`A7);wuuPG2r`>fOXiY%HXbBh@2srQ8#UWR!$N&qsZy<%iGRF>H}@SEw6Fabn|$}S znLxvcNos5!WZ8v?3C6NRVkfcY2FrR|4_?a6eNl3|`h9NJh}$_>HSX#DaunQ`1fGJc zS{Qiqj=!P$#| z1AlG|kArXG!BP`>D7-dFD#Lke-`A)N0j*7)>YmF^kBdboX|0Zg`O;26gkDk!C&J-Z r!kX|z^PNA&M3J*fXF*QJw>Z(+oKh=eWvq;q@fXJz*{QBh02BZK_%s}M diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_price_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/phm_price_mst_202304270000.gz old mode 100644 new mode 100755 index f7658c881481cbb9771445ba2363a3d98c559899..7cf9f449ef435d52888d7d87a161289d713a1702 GIT binary patch delta 330 zcmV-Q0k!^}1KR=$ABzYGur^v`00WT<9Dj3m0IicdI>1~*-n|#=GZVueo+lw1~G&Hpxr_r8IojywB$PBb0G9*JzGtdlmhG;k$A-5n*$StM7vk7fgfj4p{GgIhq6#mS zEYyE*i}-JCL-;|+H?+&7eq{sz076NXk^lez delta 396 zcmV;70dxM_0-Xa2ABzYGDy&^(1OSl=9DiYQ0PRvsZi6roW!s(tu?Nj~4E|ikYC@z& zQ3%4Mm+PWO>J>VMq(Ky7>}cnkY^Y|qp4bN#+|b+cV>+}^iNfFO`U0V8YuM|2ke z0w|>-=rNuJ$~;0TMInhq!F3dcl2HuN190^1TNA-Uw4M;(pI=G;2THdtlb7W3A%Aw; zDir*2<*EaduF7+Gu-26=(@j!_X0(0;Qm0FqX)Y3N@30NzufJR*;oyN`<;Eg49{X zux8jW3>1XFD&vmQLOxX+tI*KPym=Lxv|_B(*I1#Um3b%hKPN@#b4i7p6(Wj=F$Eo? qvS@5hBMp+4#8^X|E_2(A)U1fOQ6yThV8Ma~&xRim5A^{63;+P%Znk*< diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/slip_data_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/slip_data_202304270000.gz old mode 100644 new mode 100755 index 5a90e676071f48c7770adae0f2ddbe740f5e423f..82465aea7e928e4736e57aec6c6965d45f3b7d51 GIT binary patch literal 3142 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 literal 3134 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 delta 884 zcmV-)1B?8;27?C*ABzYGBCK6x1OSl=9)DqS0PUAaZ__{&$8&{G5#?SqtDW>(s!FXQ zBvMu4WVvZtLbFt{)0P|Sfu)=PQI_%*5c}rgBh6Rfy_v+0i%LQqk{z;Ig$u?#xE^@bt${+&-ApQAz<7HNzgp{+?Et#j z?EhbFH=9XozZn{DAKUGEt+p4`cUrxw8-6Qkx!tMNyn0w`+H&uWf#0avfm!wOO=h5O z*P*i2>=&CmA-otLYae*6F4or$v42Y;dYz89-Poat%MzC-u1H*&xK84_iCawE(m)6j zXC&};H?foTRsbq`PB-WjE*35ehdUewJ1MoTywxHOX@|EK9lX?0Jl zS6bcD(R<^cXmwkwXFB?zqn}zm)#^F;JC#X%d6_gqct${RQPEWGKl^vbel}+!*JC zNm5=~$qP;wTaI4zn3m+XU5ug!Y@)hzrEz&9zmV~@K!`erhBTq1DlMRT=!0*%Il1i`_# z@zandD}NYk55j7t zO$LN;t0e6a5CaGnI1C_hn#^1Qr!f%Vw+BnV|7S~|WPiNAXGc49wX@qMJIngR#=4yk z?t0n{bvM{%@UeBx9GZS_cTMM0*KTb;^!94w{O;2A^MS+ubaIsmA`-rs)wod# zd3<{s?_S2+oAL3UL_UoqNzQ#HaW3SVXidwOf3?%1@2SqI`hRC`IkZ0v8D~hykdPsh z3<()>!QeQ9A%h`o>N z1~N>NVIac<2B#PtVHA*2BpC%{6gPpPQVbPgl#o#-86{+tfuU0j9br_EQ6(7_WK@A+ cQVfF`f)L}>Mj7I7%b{I;0uf3w1)&810EuIa6aWAK delta 404 zcmV;F0c-x+0;2;8ABzYG9jsks1OSl=8-HPP0PWH-PQx%12H>pp6jk=3XFoemdJtBt zZ89L#w2IRn0WpAJfx`e2r^(C}a9S%3;n@>Z4EYtu&awiNR ztn&CGHoK)RH+E63?XCSbwa#n1EXw@2$jw%7^2)BNVx>)O+V-(e*QGfg*liCdCo!`> zm)Sx)u8Ly6XdYjh_vhyRwYj@(o*sbB+O4+hX29$0x9fBMUMzl94$^5@IAYgTa7ts{UkjyF-SnPNFem#*F!!d;xuB%U}Qu0098HdqyX ziN@TX`lD!slE0_QDM4$gjdU`VeBI~w^;XuZHE7Lh4cdSfljPWRV!Kb(to9dbYXG;?b1PN!!Qs9P;Hx21RtP`q_Jh4 zMwrI5g|;@fYv>ue?M1q67rjg&%UmIonBY&MWe9=jZ!{V`kU%pwZFqWU!fV|<*1?dm z#Kw_ic|Y`{I!8zoIp-8jIa=jZYo(b@!IrI&zLpoTT9Udz-ut2I6kX)5E6nEiFMHel z|MYKN0k?F%1%8`e9KSw!vDgS>y*I(b#owWgN zqS}DAplwuJ&oABzYG_c&T)00WTplWAkVcC02 zB_AMF`2f_NSjpAp@CvX}l_x+Iz2lqJ^iEq-NW10Ge7^Bj?X4$zQ93x;i+fLE~GQ_FXmF7C8m?}Vvu=~%74TY z85qtb6W(Ax^@G1EH5>06$ro^Wo{Z!FCy7MLGyTyo&t7`VGIKw9PfpFv#?zT}{Q1)) zSkIDa@8JtC@ms!}QIsf{3V{nz6sjxYC1&7{iZQ`^I=l#FxXimS@-?L~#)$ZQ&uZH% zdH2uP_Q|@PFNs01eN)@-EG~}!hJWX9E5}WPTf5xKbMus&=V(^BdB&|3Fhe+d%B=>h zzNuW;AJ*J@5kA~COWjtrd)=^GId^BpT|9C(uehr}QHD~#all|B=c7{XeO}bn8`^brah~RHa zBx~a818Z=ziD9^uL%7=J=!$p$PLW08qiYBW%`sfxxB?H!hOv*{lG+Ix2;CJRA+ z+#^_8o7`IGrio?==Np5?{<7)_gq~NBgh&pU)ev5p8`bF~;T?|wpm_|w`ru-e`rsI0 zQN|_%7aJQKMR1f7b_d)|w%l!Jy$rO=S^J_freuB&+%m>vI4wmghJVnOakT2==%}-| zS<)NX@9T3eE^(K;^N6l%dhR@q|NrBvvt^SKV;3?oLbt51UF@7`$(uB z#s~`_3I<33fgf^|D3bxvf&fwb+UL{@H?H zje{{lQi1I~;#L_YP?l*3i3r9i^2%X)!F=oc@4g+CKYRQ3*?);7C90EGqoyZtn^>Aw zhXf8H&iaYNWa22Xs7@x~L=+ZC;h>pe_~bjygl6vURZ*PZOgPWEr9e;fB?QB$_G>)a}W z8OCyCgulWV6yesR5Q<6>b>)`&(NWrWxND!C_xp1M7azDp1qA0GB-Z=jB(i9%U!ZhV Qiv~mXFFpVR%o4 zu-xI~edxIE$|S}z&>c^XiO&7h&GxL+jf8I`@4?|tGQq#Ejg6&*+3r2L{Xk61jNcVk zPL1D4q%-Nno$E=kZYR^?;twD2yMLTMgOCCy!f=2GifH`l0mJq(+uSTO zV~d$j!HmMF`!TC9`>?cQ{g`tqv+(1lQE1l7&4a2{&pB_NIumQo!XDFKF@Jrj?~Qvd zXd3S7F38wt#tt)f;nq=Zn9Q8xCv?8dO&H+|&x-X%i3Y!q%PN8>bRDY6ill)HHP5>= zhNKvlq8MM0=>;tPY3vvwSqedj@B_w|sDx!1%U}WzXDMfIm705dur+(?t)2bZ)ZcWv zP7FGW(|;oe*Wu28?ID?iqkjji%8VL!!>&hev(ryqXU!Kd(u?54nmto*Z9ixFLbINA z-mb$0p!sVCfWBmUsV}=h2||C08GFKvN`TSZTa*Eb5n5;ODe=|DtrJnn@a_6SM}IDE9w zi=)s4gG9#(E?RTTc7N%IWqh<&%EKo*casy$e9p{8*9C!Y?t(8uCpu3ifswD2KuY92 zfF<-Y)Ph0*>Xyj>6DC?bhJB5ceT{?)b+k~^aA;7(1w|wxG_qE+=06Pq=ZIfCS*eTM z9)^njdevTB^~(=0XD#%--OyAZzzs3aM?y4kYa0lJP8$e3$bSk(qXAI|0V4U@XIJuv zO9jw7XT@|2kWcHaZwFR>rBzEEvj`ICZx>v`ow3Pz<-k{b zyngk{X(VVs)&`Z&gwfT_&jYZc2t3dzUvr*&?JloE0wzn zK?;>160k5 zOrNpee`9*y-E#Jzk^R}oe)sh6)nB5h=9RSb%$x-?#?z4=JIj4A3#ZOSK~#8m=7{={ z9^fFXtgUUoJ_m3^q^JSGwO=IWeQ+K!CGICEO;VM?kVQ_~NjqsL?Z0Wi0k@?%2LKoV E08T`GMF0Q* diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/whs_mst_202304270000.gz b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/testdata/TestImportFileToDb/whs_mst_202304270000.gz old mode 100644 new mode 100755 index 013eae2c62f0bfb9f266764326f68b0f53937fb4..d41f560a15b675a7cc2f53a89f50777b08809e18 GIT binary patch literal 428 zcmV;d0aN}TiwFn+Ia*`@19xb1Uu|=AUotQ&8gn%QQeqAmAW$VB*a#(HMdr44QZ#f?Py7h%pf*@?oBva`G!!)(sF!T$V`F zZLj~n*ZuO|>-XD4spEq@#aW{4D72QrW|XRE2|YS-Fx3 ztmAx%_=j2Ps)dQg&74VuL1+b+y@+Zqi>XC%F=O&o!KA{WR`EP{6-^aGE1^|{XH%5pwuVcs!FMchpCfixX?s=tjAF*P1T#vV$fG$W>QNEnQp6FkSKiuSKh196X(OPN>stXeq@d3n1=t|q`?cH( WR^pHRt!M84;eG%}TmeUj1^@v3yv_gs literal 499 zcmVS5XW=X zr;y&2oy|w7FSDpARJ3X7rWL%o0YysnAXV^CZ0*Hr4=REm#Xij1YEQm`n{0@sjaY*Q z5Bal6W@l%1f9y=Qa+Kt$O)$bL(r_9HE!ni9{Gt#bluoA=BsKX}F(3sr4I7%OX|5kY z2SZsvN(?Gfd!?kHSkC%~dVlJtD#Y!AH8VArqUBX$6@+2s#cRVN-k0WVX>6|-W!#Es zmSli$+1X7mQEZmmG-Z%`voaM?2$WVrgP^W+puM3`a7v;?i4rA>RUa~aF$@3>004!C=xqQ1 From 4bb0ddb359ca88b5472a8636ee9264a720aaf01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 1 Aug 2023 19:20:35 +0900 Subject: [PATCH 06/12] =?UTF-8?q?DockerFile=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-dbdump/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-dbdump/Dockerfile b/ecs/jskult-dbdump/Dockerfile index 3c410b72..9c6838cb 100644 --- a/ecs/jskult-dbdump/Dockerfile +++ b/ecs/jskult-dbdump/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.9-bullseye ENV TZ="Asia/Tokyo" From 4a346a3f5c496a9003ef1ce33dce534545f72dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 1 Aug 2023 19:22:00 +0900 Subject: [PATCH 07/12] =?UTF-8?q?DockerFile=20=E4=BF=AE=E6=AD=A3=EF=BC=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-restore-backup/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-restore-backup/Dockerfile b/ecs/jskult-restore-backup/Dockerfile index 3c410b72..9c6838cb 100644 --- a/ecs/jskult-restore-backup/Dockerfile +++ b/ecs/jskult-restore-backup/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.9-bullseye ENV TZ="Asia/Tokyo" From 0fb9fd58e9188e6db10afd9dd5b78da4026deb49 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 19:29:32 +0900 Subject: [PATCH 08/12] =?UTF-8?q?feat:=20JST=E5=AF=BE=E5=BF=9C=E3=81=AB?= =?UTF-8?q?=E4=BC=B4=E3=81=86=E3=83=86=E3=82=B9=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/batch/vjsk/vjsk_load/test_vjsk_load.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py index c15f39b7..a4f6383e 100644 --- a/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py +++ b/ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/test_vjsk_load.py @@ -39,6 +39,7 @@ class TestImportFileToDb: self.db = database self.db.connect() self.db.execute("set sql_mode = 'TRADITIONAL';") + self.db.to_jst() # self.db.begin() # testing From 1a8c44b9baccdbe2d7f642e7f297125fbbe4caec Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 1 Aug 2023 21:30:34 +0900 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E5=AE=9F=E6=B6=88=E5=8C=96?= =?UTF-8?q?=E5=8F=96=E3=82=8A=E8=BE=BC=E3=81=BF=20upd=5Fdt=E3=82=82NULL?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=E5=87=A6=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/vjsk/vjsk_recv_file_mapper.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py index 21264c42..4ffaa652 100644 --- a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py +++ b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_recv_file_mapper.py @@ -333,7 +333,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.hld_mst_v AS t ON DUPLICATE KEY UPDATE @@ -347,7 +347,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,dwh_upd_dt=SYSDATE() ; """) @@ -397,7 +397,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.whs_mst_v AS t ON DUPLICATE KEY UPDATE @@ -416,7 +416,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -526,7 +526,7 @@ class VjskReceiveFileMapper: ,t.end_date ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.mkr_org_horizon_v AS t ON DUPLICATE KEY UPDATE @@ -575,7 +575,7 @@ class VjskReceiveFileMapper: ,end_date=t.end_date ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -615,7 +615,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.org_cnv_mst_v AS t ON DUPLICATE KEY UPDATE @@ -629,7 +629,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -665,7 +665,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.tran_kbn_mst_v AS t ON DUPLICATE KEY UPDATE @@ -677,7 +677,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -743,7 +743,7 @@ class VjskReceiveFileMapper: ,t.fcl_type ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.fcl_mst_v AS t ON DUPLICATE KEY UPDATE @@ -770,7 +770,7 @@ class VjskReceiveFileMapper: ,fcl_type=t.fcl_type ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -844,7 +844,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.phm_prd_mst_v AS t ON DUPLICATE KEY UPDATE @@ -875,7 +875,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -913,7 +913,7 @@ class VjskReceiveFileMapper: ,t.dsp_odr ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.phm_price_mst_v AS t ON DUPLICATE KEY UPDATE @@ -926,7 +926,7 @@ class VjskReceiveFileMapper: ,dsp_odr=t.dsp_odr ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -1011,7 +1011,7 @@ class VjskReceiveFileMapper: ,t.tel_num ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.whs_customer_mst_v AS t ON DUPLICATE KEY UPDATE @@ -1031,7 +1031,7 @@ class VjskReceiveFileMapper: ,tel_num=t.tel_num ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) @@ -1065,7 +1065,7 @@ class VjskReceiveFileMapper: ,t.start_date ,t.rec_sts_kbn ,nullif(t.ins_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する - ,t.upd_dt + ,nullif(t.upd_dt, 0) -- 受領データがブランクだった場合にゼロ日付で取得されるので明示的にNULL値に変換する ,SYSDATE() FROM org05.mdb_cnv_mst_v AS t ON DUPLICATE KEY UPDATE @@ -1076,7 +1076,7 @@ class VjskReceiveFileMapper: ,start_date=t.start_date ,rec_sts_kbn=t.rec_sts_kbn ,ins_dt=nullif(t.ins_dt, 0) - ,upd_dt=t.upd_dt + ,upd_dt=nullif(t.upd_dt, 0) ,dwh_upd_dt=SYSDATE() ; """) From 4ac2f6f2f764c207843c09aedf329403894a3b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 3 Aug 2023 10:21:28 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BB=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-dbdump/src/jobctrl_dbdump.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-dbdump/src/jobctrl_dbdump.py b/ecs/jskult-dbdump/src/jobctrl_dbdump.py index 3dac256f..ba1454db 100644 --- a/ecs/jskult-dbdump/src/jobctrl_dbdump.py +++ b/ecs/jskult-dbdump/src/jobctrl_dbdump.py @@ -94,17 +94,20 @@ def exec(): _, error = mysqldump_process.communicate() if mysqldump_process.returncode != 0: logger.error(f'`mysqldump`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise ValueError("error!") + # return constants.BATCH_EXIT_CODE_SUCCESS _, error = gzip_process.communicate() if gzip_process.returncode != 0: logger.error(f'`gzip`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise ValueError("error!") + # return constants.BATCH_EXIT_CODE_SUCCESS _, error = s3_cp_process.communicate() if s3_cp_process.returncode != 0: logger.error(f'`aws s3 cp`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise ValueError("error!") + # return constants.BATCH_EXIT_CODE_SUCCESS # dump処理状態区分を正常終了に更新 try: From e2bb2a3aa795e375cb156edb9ac8425b95ef1b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 3 Aug 2023 10:43:55 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-dbdump/src/jobctrl_dbdump.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/ecs/jskult-dbdump/src/jobctrl_dbdump.py b/ecs/jskult-dbdump/src/jobctrl_dbdump.py index ba1454db..1cc5a89b 100644 --- a/ecs/jskult-dbdump/src/jobctrl_dbdump.py +++ b/ecs/jskult-dbdump/src/jobctrl_dbdump.py @@ -23,8 +23,7 @@ def exec(): # 日次バッチ処置中フラグ、dump処理状態区分を取得 batch_processing_flag, dump_status_kbn = get_batch_statuses() except BatchOperationException as e: - logger.exception(f'日付テーブル取得エラー(異常終了):{e}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'日付テーブル取得エラー(異常終了):{e}') # 日次バッチ処理中の場合、処理は行わない if batch_processing_flag == constants.BATCH_ACTF_BATCH_IN_PROCESSING: @@ -45,8 +44,7 @@ def exec(): try: update_dump_status_kbn_in_processing() except BatchOperationException as e: - logger.exception(f'dump処理状態区分更新(未処理→処理中) エラー(異常終了):{e}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'dump処理状態区分更新(未処理→処理中) エラー(異常終了):{e}') # MySQL接続情報を作成する my_cnf_file_content = f""" @@ -93,28 +91,21 @@ def exec(): # パイプラインを実行し、エラーハンドリング _, error = mysqldump_process.communicate() if mysqldump_process.returncode != 0: - logger.error(f'`mysqldump`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - raise ValueError("error!") - # return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'`mysqldump`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') _, error = gzip_process.communicate() if gzip_process.returncode != 0: - logger.error(f'`gzip`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - raise ValueError("error!") - # return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'`gzip`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') _, error = s3_cp_process.communicate() if s3_cp_process.returncode != 0: - logger.error(f'`aws s3 cp`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') - raise ValueError("error!") - # return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'`aws s3 cp`実行時にエラーが発生しました。{"" if error is None else error.decode("utf-8")}') # dump処理状態区分を正常終了に更新 try: update_dump_status_kbn_complete() except BatchOperationException as e: - logger.exception(f'dump処理状態区分更新(処理中→正常終了) エラー(異常終了):{e}') - return constants.BATCH_EXIT_CODE_SUCCESS + raise BatchOperationException(f'dump処理状態区分更新(処理中→正常終了) エラー(異常終了):{e}') logger.info('日次バッチ処理前DBダンプ取得:終了(正常終了)') logger.info(f'出力ファイルパス: {s3_file_path}') From 01c27978f9a2e2a45fa8ecdb008fb56e491305d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Thu, 3 Aug 2023 11:40:27 +0900 Subject: [PATCH 12/12] =?UTF-8?q?Dockerfile=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-dbdump/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs/jskult-dbdump/Dockerfile b/ecs/jskult-dbdump/Dockerfile index 3c410b72..9c6838cb 100644 --- a/ecs/jskult-dbdump/Dockerfile +++ b/ecs/jskult-dbdump/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.9-bullseye ENV TZ="Asia/Tokyo"