diff --git a/ecs/jskult-batch-laundering/.env.example b/ecs/jskult-batch-laundering/.env.example index 56ae6677..055fde91 100644 --- a/ecs/jskult-batch-laundering/.env.example +++ b/ecs/jskult-batch-laundering/.env.example @@ -4,11 +4,7 @@ DB_USERNAME=************ DB_PASSWORD=************ DB_SCHEMA=src05 -JSKULT_BACKUP_BUCKET=mbj-newdwh2021-staging-backup-jskult -JSKULT_CONFIG_BUCKET=mbj-newdwh2021-staging-config - LOG_LEVEL=INFO -JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar DB_CONNECTION_MAX_RETRY_ATTEMPT=************ DB_CONNECTION_RETRY_INTERVAL_INIT=************ DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=************ diff --git a/ecs/jskult-batch-laundering/Pipfile b/ecs/jskult-batch-laundering/Pipfile index fe0fdc38..65b30a51 100644 --- a/ecs/jskult-batch-laundering/Pipfile +++ b/ecs/jskult-batch-laundering/Pipfile @@ -4,7 +4,6 @@ verify_ssl = true name = "pypi" [packages] -boto3 = "*" sqlalchemy = "*" tenacity = "*" pymysql = "*" diff --git a/ecs/jskult-batch-laundering/Pipfile.lock b/ecs/jskult-batch-laundering/Pipfile.lock index 10d05022..0399cd6e 100644 --- a/ecs/jskult-batch-laundering/Pipfile.lock +++ b/ecs/jskult-batch-laundering/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "a2be870e254760b62220c10400b05fa66d24b2cc1bcd6f21044735e320a62e53" + "sha256": "e2e2efd7ebd6ad719931983f277105dd94c4ebb6363f7c00e75dd8ca05523713" }, "pipfile-spec": 6, "requires": { @@ -16,22 +16,6 @@ ] }, "default": { - "boto3": { - "hashes": [ - "sha256:908f9c277325d68963dfcfce963a05336f0eb19505fc239c0ab9d01f4cba0296", - "sha256:e1e535e9fb23977252f13652ed2fa9b4f2d59a53b04a5f2fad3ee415b6a3b2b0" - ], - "index": "pypi", - "version": "==1.27.0" - }, - "botocore": { - "hashes": [ - "sha256:b9cb5b78a289f0615a48d85066f01869029aa41b95993f2c0c55003df037c23f", - "sha256:cac1333f41ec98e6f75bbba3f2c74b9e76aa3847469ecea6e7773a0af0049bee" - ], - "markers": "python_version >= '3.7'", - "version": "==1.30.0" - }, "greenlet": { "hashes": [ "sha256:0a9dfcadc1d79696e90ccb1275c30ad4ec5fd3d1ab3ae6671286fac78ef33435", @@ -97,14 +81,6 @@ "markers": "platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))", "version": "==3.0.0a1" }, - "jmespath": { - "hashes": [ - "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980", - "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe" - ], - "markers": "python_version >= '3.7'", - "version": "==1.0.1" - }, "pymysql": { "hashes": [ "sha256:4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96", @@ -113,76 +89,52 @@ "index": "pypi", "version": "==1.1.0" }, - "python-dateutil": { - "hashes": [ - "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86", - "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.8.2" - }, - "s3transfer": { - "hashes": [ - "sha256:3c0da2d074bf35d6870ef157158641178a4204a6e689e82546083e31e0311346", - "sha256:640bb492711f4c0c0905e1f62b6aaeb771881935ad27884852411f8e9cacbca9" - ], - "markers": "python_version >= '3.7'", - "version": "==0.6.1" - }, - "six": { - "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.16.0" - }, "sqlalchemy": { "hashes": [ - "sha256:04383f1e3452f6739084184e427e9d5cb4e68ddc765d52157bf5ef30d5eca14f", - "sha256:125f9f7e62ddf8b590c069729080ffe18b68a20d9882eb0947f72e06274601d7", - "sha256:1822620c89779b85f7c23d535c8e04b79c517739ae07aaed48c81e591ed5498e", - "sha256:21583808d37f126a647652c90332ac1d3a102edf3c94bcc3319edcc0ea2300cc", - "sha256:218fb20c01e95004f50a3062bf4c447dcb360cab8274232f31947e254f118298", - "sha256:2269b1f9b8be47e52b70936069a25a3771eff53367aa5cc59bb94f28a6412e13", - "sha256:234678ed6576531b8e4be255b980f20368bf07241a2e67b84e6b0fe679edb9c4", - "sha256:28da17059ecde53e2d10ba813d38db942b9f6344360b2958b25872d5cb729d35", - "sha256:2c6ff5767d954f6091113fedcaaf49cdec2197ae4c5301fe83d5ae4393c82f33", - "sha256:36a87e26fe8fa8c466fae461a8fcb780d0a1cbf8206900759fc6fe874475a3ce", - "sha256:394ac3adf3676fad76d4b8fcecddf747627f17f0738dc94bac15f303d05b03d4", - "sha256:40a3dc52b2b16f08b5c16b9ee7646329e4b3411e9280e5e8d57b19eaa51cbef4", - "sha256:48111d56afea5699bab72c38ec95561796b81befff9e13d1dd5ce251ab25f51d", - "sha256:48b40dc2895841ea89d89df9eb3ac69e2950a659db20a369acf4259f68e6dc1f", - "sha256:513411d73503a6fc5804f01fae3b3d44f267c1b3a06cfeac02e9286a7330e857", - "sha256:51736cfb607cf4e8fafb693906f9bc4e5ee55be0b096d44bd7f20cd8489b8571", - "sha256:5f40e3a7d0a464f1c8593f2991e5520b2f5b26da24e88000bbd4423f86103d4f", - "sha256:6150560fcffc6aee5ec9a97419ac768c7a9f56baf7a7eb59cb4b1b6a4d463ad9", - "sha256:724355973297bbe547f3eb98b46ade65a67a3d5a6303f17ab59a2dc6fb938943", - "sha256:74ddcafb6488f382854a7da851c404c394be3729bb3d91b02ad86c5458140eff", - "sha256:7830e01b02d440c27f2a5be68296e74ccb55e6a5b5962ffafd360b98930b2e5e", - "sha256:7f31d4e7ca1dd8ca5a27fd5eaa0f9e2732fe769ff7dd35bf7bba179597e4df07", - "sha256:8741d3d401383e54b2aada37cbd10f55c5d444b360eae3a82f74a2be568a7710", - "sha256:910d45bf3673f0e4ef13858674bd23cfdafdc8368b45b948bf511797dbbb401d", - "sha256:aa995b21f853864996e4056d9fde479bcecf8b7bff4beb3555eebbbba815f35d", - "sha256:af7e2ba75bf84b64adb331918188dda634689a2abb151bc1a583e488363fd2f8", - "sha256:b0eaf82cc844f6b46defe15ad243ea00d1e39ed3859df61130c263dc7204da6e", - "sha256:b114a16bc03dfe20b625062e456affd7b9938286e05a3f904a025b9aacc29dd4", - "sha256:b47be4c6281a86670ea5cfbbbe6c3a65366a8742f5bc8b986f790533c60b5ddb", - "sha256:ba03518e64d86f000dc24ab3d3a1aa876bcbaa8aa15662ac2df5e81537fa3394", - "sha256:cc9c2630c423ac4973492821b2969f5fe99d9736f3025da670095668fbfcd4d5", - "sha256:cf07ff9920cb3ca9d73525dfd4f36ddf9e1a83734ea8b4f724edfd9a2c6e82d9", - "sha256:cf175d26f6787cce30fe6c04303ca0aeeb0ad40eeb22e3391f24b32ec432a1e1", - "sha256:d0aeb3afaa19f187a70fa592fbe3c20a056b57662691fd3abf60f016aa5c1848", - "sha256:e186e9e95fb5d993b075c33fe4f38a22105f7ce11cecb5c17b5618181e356702", - "sha256:e2d5c3596254cf1a96474b98e7ce20041c74c008b0f101c1cb4f8261cb77c6d3", - "sha256:e3189432db2f5753b4fde1aa90a61c69976f4e7e31d1cf4611bfe3514ed07478", - "sha256:e3a6b2788f193756076061626679c5c5a6d600ddf8324f986bc72004c3e9d92e", - "sha256:ead58cae2a089eee1b0569060999cb5f2b2462109498a0937cc230a7556945a1", - "sha256:f2f389f77c68dc22cb51f026619291c4a38aeb4b7ecb5f998fd145b2d81ca513", - "sha256:f593170fc09c5abb1205a738290b39532f7380094dc151805009a07ae0e85330" + "sha256:024d2f67fb3ec697555e48caeb7147cfe2c08065a4f1a52d93c3d44fc8e6ad1c", + "sha256:0bf0fd65b50a330261ec7fe3d091dfc1c577483c96a9fa1e4323e932961aa1b5", + "sha256:16a310f5bc75a5b2ce7cb656d0e76eb13440b8354f927ff15cbaddd2523ee2d1", + "sha256:1d90ccc15ba1baa345796a8fb1965223ca7ded2d235ccbef80a47b85cea2d71a", + "sha256:22bafb1da60c24514c141a7ff852b52f9f573fb933b1e6b5263f0daa28ce6db9", + "sha256:2c69ce70047b801d2aba3e5ff3cba32014558966109fecab0c39d16c18510f15", + "sha256:2e7b69d9ced4b53310a87117824b23c509c6fc1f692aa7272d47561347e133b6", + "sha256:314145c1389b021a9ad5aa3a18bac6f5d939f9087d7fc5443be28cba19d2c972", + "sha256:3afa8a21a9046917b3a12ffe016ba7ebe7a55a6fc0c7d950beb303c735c3c3ad", + "sha256:430614f18443b58ceb9dedec323ecddc0abb2b34e79d03503b5a7579cd73a531", + "sha256:43699eb3f80920cc39a380c159ae21c8a8924fe071bccb68fc509e099420b148", + "sha256:539010665c90e60c4a1650afe4ab49ca100c74e6aef882466f1de6471d414be7", + "sha256:57d100a421d9ab4874f51285c059003292433c648df6abe6c9c904e5bd5b0828", + "sha256:5831138f0cc06b43edf5f99541c64adf0ab0d41f9a4471fd63b54ae18399e4de", + "sha256:584f66e5e1979a7a00f4935015840be627e31ca29ad13f49a6e51e97a3fb8cae", + "sha256:5d6afc41ca0ecf373366fd8e10aee2797128d3ae45eb8467b19da4899bcd1ee0", + "sha256:61ada5831db36d897e28eb95f0f81814525e0d7927fb51145526c4e63174920b", + "sha256:6b54d1ad7a162857bb7c8ef689049c7cd9eae2f38864fc096d62ae10bc100c7d", + "sha256:7351c05db355da112e056a7b731253cbeffab9dfdb3be1e895368513c7d70106", + "sha256:77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f", + "sha256:851a37898a8a39783aab603c7348eb5b20d83c76a14766a43f56e6ad422d1ec8", + "sha256:89bc2b374ebee1a02fd2eae6fd0570b5ad897ee514e0f84c5c137c942772aa0c", + "sha256:8e712cfd2e07b801bc6b60fdf64853bc2bd0af33ca8fa46166a23fe11ce0dbb0", + "sha256:8f9eb4575bfa5afc4b066528302bf12083da3175f71b64a43a7c0badda2be365", + "sha256:8fc05b59142445a4efb9c1fd75c334b431d35c304b0e33f4fa0ff1ea4890f92e", + "sha256:96f0463573469579d32ad0c91929548d78314ef95c210a8115346271beeeaaa2", + "sha256:9deaae357edc2091a9ed5d25e9ee8bba98bcfae454b3911adeaf159c2e9ca9e3", + "sha256:a752b7a9aceb0ba173955d4f780c64ee15a1a991f1c52d307d6215c6c73b3a4c", + "sha256:ae7473a67cd82a41decfea58c0eac581209a0aa30f8bc9190926fbf628bb17f7", + "sha256:b15afbf5aa76f2241184c1d3b61af1a72ba31ce4161013d7cb5c4c2fca04fd6e", + "sha256:c896d4e6ab2eba2afa1d56be3d0b936c56d4666e789bfc59d6ae76e9fcf46145", + "sha256:cb4e688f6784427e5f9479d1a13617f573de8f7d4aa713ba82813bcd16e259d1", + "sha256:cda283700c984e699e8ef0fcc5c61f00c9d14b6f65a4f2767c97242513fcdd84", + "sha256:cf7b5e3856cbf1876da4e9d9715546fa26b6e0ba1a682d5ed2fc3ca4c7c3ec5b", + "sha256:d6894708eeb81f6d8193e996257223b6bb4041cb05a17cd5cf373ed836ef87a2", + "sha256:d8f2afd1aafded7362b397581772c670f20ea84d0a780b93a1a1529da7c3d369", + "sha256:dd4d410a76c3762511ae075d50f379ae09551d92525aa5bb307f8343bf7c2c12", + "sha256:eb60699de43ba1a1f77363f563bb2c652f7748127ba3a774f7cf2c7804aa0d3d", + "sha256:f469f15068cd8351826df4080ffe4cc6377c5bf7d29b5a07b0e717dddb4c7ea2", + "sha256:f82c310ddf97b04e1392c33cf9a70909e0ae10a7e2ddc1d64495e3abdc5d19fb", + "sha256:fa51ce4aea583b0c6b426f4b0563d3535c1c75986c4373a0987d84d22376585b" ], "index": "pypi", - "version": "==2.0.17" + "version": "==2.0.19" }, "tenacity": { "hashes": [ @@ -199,14 +151,6 @@ ], "markers": "python_version >= '3.7'", "version": "==4.7.1" - }, - "urllib3": { - "hashes": [ - "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f", - "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.26.16" } }, "develop": { diff --git a/ecs/jskult-batch-laundering/README.md b/ecs/jskult-batch-laundering/README.md index f6e7c2da..b520a3ca 100644 --- a/ecs/jskult-batch-laundering/README.md +++ b/ecs/jskult-batch-laundering/README.md @@ -1,8 +1,8 @@ -# 実消化&アルトマーク 月次バッチ +# 実績全件洗替処理 ## 概要 -実消化&アルトマークの月次バッチ処理。 +実績全件洗替処理の週次バッチ処理。 ## 環境情報 @@ -42,7 +42,32 @@ - VSCode 上で「F5」キーを押下すると、バッチ処理が起動する。 - 「entrypoint.py」が、バッチ処理のエントリーポイント。 -- 実際の処理は、「src/jobctrl_monthly.py」で行っている。 +- 実際の処理は、「src/jobctrl_laundering.py」で行っている。 -## フォルダ構成(工事中) +## フォルダ構成 +├── .env.example -- ローカル実行用の環境変数のサンプル値。 +├── .dockerignore -- docker build時のコンテキストに含めるファイルの抑制リスト +├── .gitignore -- Git差分管理除外リスト +├── Dockerfile -- Dockerイメージを作成するためのファイル +├── Pipfile -- Pythonモジュールの依存関係を管理するファイル +├── Pipfile.lock -- Pythonモジュールの依存関係バージョン固定用ファイル +├── README.md -- 当ファイル +├── entrypoint.py -- バッチ処理のエントリーポイントになるpythonファイル +└── src -- ソースコードの保管場所 + ├── batch -- バッチ処理関連ソース置き場 + │ ├── batch_functions.py -- バッチ処理共通関数置き場 + │ └── laundering -- 実績全件洗替関連処理 + │ ├── create_inst_merge_for_laundering.py -- 洗替用マスタ作成処理 + │ └── sales_results_laundering.py -- 卸販売実績全件洗替処理 + ├── db + │ └── database.py -- データベース操作共通処理 + ├── error + │ └── exceptions.py -- カスタム例外 + ├── jobctrl_laundering.py -- 実績全件洗替処理のエントリーポイント。「entrypoint.py」 から呼ばれる。 + ├── logging + │ └── get_logger.py -- ログ出力の共通処理 + └── system_var + ├── constants.py -- 定数ファイル + └── environment.py -- 環境変数ファイル + diff --git a/ecs/jskult-batch-laundering/entrypoint.py b/ecs/jskult-batch-laundering/entrypoint.py index 624e61da..a17fe8a8 100644 --- a/ecs/jskult-batch-laundering/entrypoint.py +++ b/ecs/jskult-batch-laundering/entrypoint.py @@ -1,4 +1,4 @@ -"""実消化&アルトマーク実績洗替処理のエントリーポイント""" +"""実績全件洗替処理のエントリーポイント""" from src import jobctrl_laundering if __name__ == '__main__': diff --git a/ecs/jskult-batch-laundering/src/aws/__init__.py b/ecs/jskult-batch-laundering/src/aws/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/ecs/jskult-batch-laundering/src/aws/s3.py b/ecs/jskult-batch-laundering/src/aws/s3.py deleted file mode 100644 index 17ed0fe9..00000000 --- a/ecs/jskult-batch-laundering/src/aws/s3.py +++ /dev/null @@ -1,95 +0,0 @@ -import os.path as path -import tempfile - -import boto3 - -from src.system_var import environment - - -class S3Client: - __s3_client = boto3.client('s3') - _bucket_name: str - - def list_objects(self, bucket_name: str, folder_name: str): - response = self.__s3_client.list_objects_v2(Bucket=bucket_name, Prefix=folder_name) - if response['KeyCount'] == 0: - return [] - contents = response['Contents'] - # 末尾がスラッシュで終わるものはフォルダとみなしてスキップする - objects = [{'filename': content['Key'], 'size': content['Size']} for content in contents if not content['Key'].endswith('/')] - return objects - - def copy(self, src_bucket: str, src_key: str, dest_bucket: str, dest_key: str) -> None: - copy_source = {'Bucket': src_bucket, 'Key': src_key} - self.__s3_client.copy(copy_source, dest_bucket, dest_key) - return - - def download_file(self, bucket_name: str, file_key: str, file): - self.__s3_client.download_fileobj( - Bucket=bucket_name, - Key=file_key, - Fileobj=file - ) - return - - def upload_file(self, local_file_path: str, bucket_name: str, file_key: str): - self.__s3_client.upload_file( - local_file_path, - Bucket=bucket_name, - Key=file_key - ) - - def delete_file(self, bucket_name: str, file_key: str): - self.__s3_client.delete_object( - Bucket=bucket_name, - Key=file_key - ) - - -class S3Bucket(): - _s3_client = S3Client() - _bucket_name: str = None - - -class ConfigBucket(S3Bucket): - _bucket_name = environment.JSKULT_CONFIG_BUCKET - - def download_arisj_output_day_list(self): - # 一時ファイルとして保存する - temporary_dir = tempfile.mkdtemp() - temporary_file_path = path.join(temporary_dir, environment.JSKULT_CONFIG_CALENDAR_ARISJ_OUTPUT_DAY_LIST_FILE_NAME) - arisj_output_day_list_key = f'{environment.JSKULT_CONFIG_CALENDAR_FOLDER}/{environment.JSKULT_CONFIG_CALENDAR_ARISJ_OUTPUT_DAY_LIST_FILE_NAME}' - with open(temporary_file_path, mode='wb') as f: - self._s3_client.download_file(self._bucket_name, arisj_output_day_list_key, f) - f.seek(0) - return temporary_file_path - - -class ArisjBucket(S3Bucket): - _bucket_name = environment.ARISJ_DATA_BUCKET - _folder = environment.ARISJ_BACKUP_FOLDER - - def upload_arisj_csv_file(self, arisj_create_csv: str, csv_file_path: str): - # s3にCSVファイルをUPする - Bucket = environment.ARISJ_DATA_BUCKET - folder = environment.ARISJ_DATA_FOLDER - csv_file_name = f'{folder}/{arisj_create_csv}' - s3_client = S3Client() - s3_client.upload_file(csv_file_path, Bucket, csv_file_name) - return - - def backup_arisj_csv_file(self, dat_file_key: str, datetime_key: str): - # バックアップバケットにコピー - arisj_backup_bucket = ArisjBackupBucket() - folder = environment.ARISJ_DATA_FOLDER - dat_file_key = f'{folder}/{dat_file_key}' - backup_key = f'{arisj_backup_bucket._folder}/{datetime_key}/{dat_file_key.replace(f"{self._folder}/", "")}' - self._s3_client.copy(self._bucket_name, dat_file_key, arisj_backup_bucket._bucket_name, backup_key) - - -class JskUltBackupBucket(S3Bucket): - _bucket_name = environment.JSKULT_BACKUP_BUCKET - - -class ArisjBackupBucket(JskUltBackupBucket): - _folder = environment.ARISJ_BACKUP_FOLDER diff --git a/ecs/jskult-batch-laundering/src/batch/batch_functions.py b/ecs/jskult-batch-laundering/src/batch/batch_functions.py index 87231e17..3028d84b 100644 --- a/ecs/jskult-batch-laundering/src/batch/batch_functions.py +++ b/ecs/jskult-batch-laundering/src/batch/batch_functions.py @@ -4,7 +4,6 @@ import textwrap from src.db.database import Database from src.error.exceptions import BatchOperationException, DBException -from src.system_var import constants def get_batch_statuses() -> tuple[str, str]: @@ -39,75 +38,6 @@ def get_batch_statuses() -> tuple[str, str]: return batch_processing_flag, dump_status_kbn -def update_dump_status_kbn_in_processing() -> None: - """dump取得状況区分を処理中に更新する - - Raises: - BatchOperationException: DB操作の何らかのエラー - """ - db = Database.get_instance() - sql = 'UPDATE src05.hdke_tbl SET dump_sts_kbn = :in_processing' - try: - db.connect() - db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - return - - -def update_dump_status_kbn_error() -> None: - """dump取得状況区分をエラーに更新する - - Raises: - BatchOperationException: DB操作の何らかのエラー - """ - db = Database.get_instance() - sql = """\ - UPDATE src05.hdke_tbl - SET - dump_sts_kbn = :dump_unprocessed - """ - try: - db.connect() - db.execute(sql, { - 'dump_unprocessed': constants.DUMP_STATUS_KBN_ERROR - }) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - return - - -def update_dump_status_kbn_complete() -> None: - """dump取得状況区分を正常終了に更新する - - Raises: - BatchOperationException: DB操作の何らかのエラー - """ - db = Database.get_instance() - sql = """\ - UPDATE src05.hdke_tbl - SET - dump_sts_kbn = :dump_unprocessed - """ - try: - db.connect() - db.execute(sql, { - 'dump_unprocessed': constants.DUMP_STATUS_KBN_COMPLETE - }) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - return - - def logging_sql(logger: logging.Logger, sql: str) -> None: """SQL文をデバッグログで出力する diff --git a/ecs/jskult-batch-laundering/src/batch/common/__init__.py b/ecs/jskult-batch-laundering/src/batch/common/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/ecs/jskult-batch-laundering/src/batch/common/batch_context.py b/ecs/jskult-batch-laundering/src/batch/common/batch_context.py deleted file mode 100644 index 8c8c12fb..00000000 --- a/ecs/jskult-batch-laundering/src/batch/common/batch_context.py +++ /dev/null @@ -1,29 +0,0 @@ -class BatchContext: - __instance = None - __syor_date: str # 処理日(yyyy/mm/dd形式) - __is_arisj_output_day: bool # 月次バッチ起動日フラグ - - def __init__(self) -> None: - self.__is_arisj_output_day = False - - @classmethod - def get_instance(cls): - if cls.__instance is None: - cls.__instance = cls() - return cls.__instance - - @property - def syor_date(self): - return self.__syor_date - - @syor_date.setter - def syor_date(self, syor_date_str: str): - self.__syor_date = syor_date_str - - @property - def is_arisj_output_day(self): - return self.__is_arisj_output_day - - @is_arisj_output_day.setter - def is_arisj_output_day(self, flag: bool): - self.__is_arisj_output_day = flag diff --git a/ecs/jskult-batch-laundering/src/jobctrl_laundering.py b/ecs/jskult-batch-laundering/src/jobctrl_laundering.py index c0735162..e8b05870 100644 --- a/ecs/jskult-batch-laundering/src/jobctrl_laundering.py +++ b/ecs/jskult-batch-laundering/src/jobctrl_laundering.py @@ -1,4 +1,4 @@ -"""実消化&アルトマーク実績洗替処理""" +"""実消化&アルトマーク実績全件洗替処理""" from src.batch.batch_functions import get_batch_statuses from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger @@ -6,7 +6,7 @@ from src.system_var import constants from src.batch.laundering import (sales_results_laundering, create_inst_merge_for_laundering) -logger = get_logger('実消化&アルトマーク実績洗替処理') +logger = get_logger('実消化&アルトマーク実績全件洗替処理') def exec(): @@ -21,12 +21,12 @@ def exec(): # 日次バッチ処理中の場合、後続の処理は行わない if batch_processing_flag == constants.BATCH_ACTF_BATCH_IN_PROCESSING: - logger.warning('日次バッチ処理中のため、実消化&アルトマーク実績洗替処理を終了します。') + logger.warning('日次バッチ処理中のため、実消化&アルトマーク実績全件洗替処理を終了します。') return constants.BATCH_EXIT_CODE_SUCCESS # dump取得が正常終了していない場合、後続の処理は行わない if dump_status_kbn != constants.DUMP_STATUS_KBN_UNPROCESSED: - logger.warning('dump取得が正常終了していないため、実消化&アルトマーク実績洗替処理を終了します。') + logger.warning('dump取得が正常終了していないため、実消化&アルトマーク実績全件洗替処理を終了します。') return constants.BATCH_EXIT_CODE_SUCCESS # 洗替用マスタ作成 @@ -35,5 +35,5 @@ def exec(): sales_results_laundering.exec() logger.info('週次バッチ:終了') except Exception as e: - logger.exception(f'実消化&アルトマーク実績洗替処理中に想定外のエラーが発生しました {e}') + logger.exception(f'実消化&アルトマーク実績全件洗替処理中に想定外のエラーが発生しました {e}') return constants.BATCH_EXIT_CODE_SUCCESS diff --git a/ecs/jskult-batch-laundering/src/system_var/environment.py b/ecs/jskult-batch-laundering/src/system_var/environment.py index 6755de11..0e08f06b 100644 --- a/ecs/jskult-batch-laundering/src/system_var/environment.py +++ b/ecs/jskult-batch-laundering/src/system_var/environment.py @@ -7,11 +7,6 @@ DB_USERNAME = os.environ['DB_USERNAME'] DB_PASSWORD = os.environ['DB_PASSWORD'] DB_SCHEMA = os.environ['DB_SCHEMA'] -# AWS -JSKULT_BACKUP_BUCKET = os.environ['JSKULT_BACKUP_BUCKET'] -JSKULT_CONFIG_BUCKET = os.environ['JSKULT_CONFIG_BUCKET'] -JSKULT_CONFIG_CALENDAR_FOLDER = os.environ['JSKULT_CONFIG_CALENDAR_FOLDER'] - # 初期値がある環境変数 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO') DB_CONNECTION_MAX_RETRY_ATTEMPT = int(os.environ.get('DB_CONNECTION_MAX_RETRY_ATTEMPT', 4)) diff --git a/ecs/jskult-batch-laundering/src/time/elapsed_time.py b/ecs/jskult-batch-laundering/src/time/elapsed_time.py deleted file mode 100644 index c1432e91..00000000 --- a/ecs/jskult-batch-laundering/src/time/elapsed_time.py +++ /dev/null @@ -1,22 +0,0 @@ -import time - - -class ElapsedTime: - """処理実行時間計測クラス""" - def __init__(self) -> None: - """このクラスの新たなインスタンスを初期化します。""" - self.__start = time.perf_counter() - - @property - def of(self): - """インスタンス化してからの経過時間をhh:mm:ssの形式にフォーマットして返す - Returns: - str: 時分秒形式の経過時間 - """ - elapsed_time = time.perf_counter() - self.__start - h, rem = divmod(elapsed_time, 3600) - m, s = divmod(rem, 60) - h_str = f'{h:02.0f} hour ' if h > 0.0 else '' - m_str = f'{m:02.0f} min ' if m > 0.0 else '' - s_str = f'{s:06.02f} sec' if s > 0.0 else '' - return f"{h_str}{m_str}{s_str}"