fix:ファイル名変更、環境変数のパスを変更したものを一度コミット

ecs/crm-datafetch/.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "Python: Current File",
+        "type": "python",
+        "request": "launch",
+        // エントリーポイントのファイルに変更すること
+        "program": "main.py",
+        "console": "integratedTerminal",
+        "justMyCode": true,
+        // 環境変数が必要な場合に読み込む環境変数ファイル
+        "envFile": "${workspaceFolder}/.env",
+      }
+    ]
+}

ecs/crm-datafetch/main.py

@@ -1,4 +1,4 @@
-import src.process as process
+import src.controller as controller
 
 if __name__ == '__main__':
-    process.main()
+    controller.main()

ecs/crm-datafetch/src/aws/s3.py

@@ -1,8 +1,8 @@
 import json
 
 import boto3
-from src.constants import AWS_CLINET_S3, AWS_RESOURCE_S3, S3_RESPONSE_BODY
-from src.environments import (CRM_BACKUP_BUCKET, CRM_CONFIG_BUCKET,
+from src.system_var.constants import AWS_CLINET_S3, AWS_RESOURCE_S3, S3_RESPONSE_BODY
+from src.system_var.environments import (CRM_BACKUP_BUCKET, CRM_CONFIG_BUCKET,
                               CRM_IMPORT_DATA_BACKUP_FOLDER,
                               CRM_IMPORT_DATA_FOLDER, IMPORT_DATA_BUCKET,
                               LAST_FETCH_DATE_FOLDER, OBJECT_INFO_FILENAME,

ecs/crm-datafetch/src/backup_crm_csvdata_process.py

@@ -1,5 +1,5 @@
 from src.aws.s3 import BackupBucket
-from src.constants import CSVBK_JP_NAME
+from src.system_var.constants import CSVBK_JP_NAME
 from src.error.exceptions import FileUploadException
 from src.util.logger import logger_instance as logger
 

ecs/crm-datafetch/src/backup_crm_data_process.py

@@ -1,5 +1,5 @@
 from src.aws.s3 import BackupBucket
-from src.constants import RESBK_JP_NAME
+from src.system_var.constants import RESBK_JP_NAME
 from src.error.exceptions import FileUploadException
 from src.util.logger import logger_instance as logger
 

ecs/crm-datafetch/src/check_object_info_process.py

@@ -1,5 +1,5 @@
 from src.config.objects import TargetObject
-from src.constants import CHK_JP_NAME
+from src.system_var.constants import CHK_JP_NAME
 from src.error.exceptions import InvalidConfigException
 from src.util.logger import logger_instance as logger
 

ecs/crm-datafetch/src/config/objects.py

@@ -1,4 +1,4 @@
-from src.constants import DATE_PATTERN_YYYYMMDDTHHMMSSTZ
+from src.system_var.constants import DATE_PATTERN_YYYYMMDDTHHMMSSTZ
 from src.util.dict_checker import DictCheck
 
 

ecs/crm-datafetch/src/controller.py

@@ -1,14 +1,14 @@
-from src.chk import check_object_info  # オブジェクト情報形式チェック処理
-from src.conv import convert_crm_csvdata  # CSV変換処理
-from src.csvbk import backup_crm_csvdata  # CSVバックアップ処理
-from src.date import set_datetime_period  # データ取得期間設定処理
-from src.end import updload_result_data  # 取得処理実施結果アップロード処理
+from src.check_object_info_process import check_object_info  # オブジェクト情報形式チェック処理
+from src.convert_crm_csvdata_process import convert_crm_csvdata  # CSV変換処理
+from src.backup_crm_csvdata_process import backup_crm_csvdata  # CSVバックアップ処理
+from src.set_datetime_period_process import set_datetime_period  # データ取得期間設定処理
+from src.updload_result_data_process import updload_result_data  # 取得処理実施結果アップロード処理
 from src.error.exceptions import MeDaCaCRMDataFetchException
-from src.fetch import fetch_crm_data  # CRMデータ取得処理
-from src.pre import prepare_get_data  # データ取得準備処理
-from src.resbk import backup_crm_data  # CRM電文データバックアップ処理
-from src.upd import updload_last_fetch_datetime  # 前回取得日時ファイル更新
-from src.upld import copy_crm_csvdata  # CSVアップロード処理
+from src.fetch_crm_data_process import fetch_crm_data  # CRMデータ取得処理
+from src.prepare_get_data_process import prepare_get_data  # データ取得準備処理
+from src.backup_crm_data_process import backup_crm_data  # CRM電文データバックアップ処理
+from src.upload_last_fetch_datetime_process import upload_last_fetch_datetime  # 前回取得日時ファイル更新
+from src.copy_crm_csvdata_process import copy_crm_csvdata  # CSVアップロード処理
 from src.util.logger import logger_instance as logger
 
 
@@ -95,7 +95,7 @@ def main() -> None:
                 # 12. 前回取得日時ファイル更新処理を呼びだす
                 logger.info(
                     f'I-CTRL-15 [{target_object.object_name}] 前回取得日時ファイル更新処理呼び出し')
-                updload_last_fetch_datetime(target_object, last_fetch_datetime)
+                upload_last_fetch_datetime(target_object, last_fetch_datetime)
 
                 # 13. オブジェクト処理結果の更新
                 process_result[target_object.object_name] = 'success'

ecs/crm-datafetch/src/convert_crm_csvdata_process.py

@@ -1,4 +1,4 @@
-from src.constants import CONV_JP_NAME
+from src.system_var.constants import CONV_JP_NAME
 from src.converter.converter import CSVStringConverter
 from src.error.exceptions import DataConvertException
 from src.util.logger import logger_instance as logger

ecs/crm-datafetch/src/converter/converter.py

@@ -3,7 +3,7 @@ import io
 import re
 from datetime import datetime
 
-from src.constants import (CRM_DATETIME_FORMAT, CSV_FALSE_VALUE,
+from src.system_var.constants import (CRM_DATETIME_FORMAT, CSV_FALSE_VALUE,
                            CSV_TRUE_VALUE, YYYYMMDDHHMMSS)
 
 

ecs/crm-datafetch/src/copy_crm_csvdata_process.py

@@ -1,6 +1,6 @@
 from src.aws.s3 import S3ResourceNonBucket
-from src.constants import UPLD_JP_NAME
-from src.environments import (CRM_BACKUP_BUCKET, CRM_IMPORT_DATA_BACKUP_FOLDER,
+from src.system_var.constants import UPLD_JP_NAME
+from src.system_var.environments import (CRM_BACKUP_BUCKET, CRM_IMPORT_DATA_BACKUP_FOLDER,
                               CRM_IMPORT_DATA_FOLDER, IMPORT_DATA_BUCKET)
 from src.error.exceptions import FileUploadException
 from src.util.logger import logger_instance as logger

ecs/crm-datafetch/src/fetch_crm_data_process.py

@@ -2,8 +2,8 @@ from requests.exceptions import ConnectTimeout, ReadTimeout
 from tenacity import retry, stop_after_attempt
 from tenacity.wait import wait_exponential
 
-from src.constants import FETCH_JP_NAME
-from src.environments import (CRM_AUTH_TIMEOUT,
+from src.system_var.constants import FETCH_JP_NAME
+from src.system_var.environments import (CRM_AUTH_TIMEOUT,
                               CRM_FETCH_RECORD_MAX_RETRY_ATTEMPT,
                               CRM_FETCH_RECORD_RETRY_INTERVAL,
                               CRM_FETCH_RECORD_RETRY_MAX_INTERVAL,

ecs/crm-datafetch/src/parser/json_parse.py

@@ -1,7 +1,7 @@
 import json
 import re
 
-from src.constants import EXCLUDE_SYMBOL
+from src.system_var.constants import EXCLUDE_SYMBOL
 
 
 class JsonParser():

ecs/crm-datafetch/src/prepare_get_data_process.py

@@ -2,8 +2,8 @@ from datetime import datetime
 
 from src.aws.s3 import ConfigBucket
 from src.config.objects import FetchTargetObjects
-from src.constants import PRE_JP_NAME, YYYYMMDDTHHMMSSTZ
-from src.environments import (CRM_CONFIG_BUCKET, OBJECT_INFO_FILENAME,
+from src.system_var.constants import PRE_JP_NAME, YYYYMMDDTHHMMSSTZ
+from src.system_var.environments import (CRM_CONFIG_BUCKET, OBJECT_INFO_FILENAME,
                               OBJECT_INFO_FOLDER)
 from src.error.exceptions import FileNotFoundException, InvalidConfigException
 from src.parser.json_parse import JsonParser

ecs/crm-datafetch/src/salesforce/salesforce_api.py

@@ -1,5 +1,5 @@
 from simple_salesforce import Salesforce
-from src.environments import (CRM_AUTH_DOMAIN, CRM_AUTH_MAX_RETRY_ATTEMPT,
+from src.system_var.environments import (CRM_AUTH_DOMAIN, CRM_AUTH_MAX_RETRY_ATTEMPT,
                               CRM_AUTH_RETRY_INTERVAL,
                               CRM_AUTH_RETRY_MAX_INTERVAL,
                               CRM_AUTH_RETRY_MIN_INTERVAL, CRM_AUTH_TIMEOUT,

ecs/crm-datafetch/src/set_datetime_period_process.py

@@ -1,7 +1,7 @@
 from src.aws.s3 import ConfigBucket
 from src.config.objects import LastFetchDatetime
-from src.constants import DATE_JP_NAME
-from src.environments import CRM_CONFIG_BUCKET, LAST_FETCH_DATE_FOLDER
+from src.system_var.constants import DATE_JP_NAME
+from src.system_var.environments import CRM_CONFIG_BUCKET, LAST_FETCH_DATE_FOLDER
 from src.error.exceptions import FileNotFoundException, InvalidConfigException
 from src.parser.json_parse import JsonParser
 from src.util.logger import logger_instance as logger

ecs/crm-datafetch/src/system_var/environments.py

@@ -1,6 +1,6 @@
 import os
 
-import src.constants as constants
+import src.system_var.constants as constants
 
 # environments(task settings file)
 # ログ出力レベル。DEBUG, INFO, WARNING, ERRORの4つから指定する

ecs/crm-datafetch/src/updload_result_data_process.py

@@ -1,6 +1,6 @@
 from src.aws.s3 import BackupBucket
-from src.constants import END_JP_NAME
-from src.environments import PROCESS_RESULT_FILENAME
+from src.system_var.constants import END_JP_NAME
+from src.system_var.environments import PROCESS_RESULT_FILENAME
 from src.error.exceptions import FileUploadException
 from src.util.logger import logger_instance as logger
 

ecs/crm-datafetch/src/upload_last_fetch_datetime_process.py

@@ -1,7 +1,7 @@
 import json
 
 from src.aws.s3 import ConfigBucket
-from src.constants import UPD_JP_NAME
+from src.system_var.constants import UPD_JP_NAME
 from src.error.exceptions import FileUploadException
 from src.util.logger import logger_instance as logger
 

ecs/crm-datafetch/src/util/logger.py

@@ -1,6 +1,6 @@
 import logging
 
-from src.environments import LOG_LEVEL
+from src.system_var.environments import LOG_LEVEL
 
 for name in ["boto3", "botocore", "s3transfer", "urllib3"]:
     logging.getLogger(name).setLevel(logging.WARNING)