nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #230 feature-NEWDWH2021-1065-2 into develop

Browse Source
This commit is contained in:
下田雅人 2023-07-11 13:26:36 +09:00
commit f8149e6de8
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/jskult-batch-daily/.env.example
View File

@ -15,7 +15,7 @@ JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt
VJSK_DATA_SEND_FOLDER=send
VJSK_DATA_BUCKET=*************
JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME=jskult_wholesaler_stock_input_day_list.txt
JSKULT_DATA_FOLDER_RECV=**********************
VJSK_DATA_RECEIVE_FOLDER=**********************
# 連携データ抽出期間
SALES_LAUNDERING_EXTRACT_DATE_PERIOD=0
# 洗替対象テーブル名

2
ecs/jskult-batch-daily/src/aws/s3.py
View File

@ -117,7 +117,7 @@ class VjskBackupBucket(JskUltBackupBucket):
class VjskReceiveBucket(S3Bucket):
_bucket_name = environment.VJSK_DATA_BUCKET
_recv_folder = environment.JSKULT_DATA_FOLDER_RECV
_recv_folder = environment.VJSK_DATA_RECEIVE_FOLDER
_s3_file_list = None

2
ecs/jskult-batch-daily/src/system_var/environment.py
View File

@ -19,7 +19,7 @@ JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME = os.environ['JSKULT_CONFIG_CALEND
VJSK_DATA_SEND_FOLDER = os.environ['VJSK_DATA_SEND_FOLDER']
VJSK_DATA_BUCKET = os.environ['VJSK_DATA_BUCKET']
JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME = os.environ['JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME']
JSKULT_DATA_FOLDER_RECV = os.environ['JSKULT_DATA_FOLDER_RECV']
VJSK_DATA_RECEIVE_FOLDER = os.environ['VJSK_DATA_RECEIVE_FOLDER']
# 初期値がある環境変数
LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO')

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_file_check/conftest.py
View File

@ -15,12 +15,12 @@ def s3_client():
@pytest.fixture
def bucket_name():
return os.environ["JSKULT_DATA_BUCKET"]
return os.environ["VJSK_DATA_BUCKET"]
@pytest.fixture
def receive_folder():
return os.environ["JSKULT_DATA_FOLDER_RECV"]
return os.environ["VJSK_DATA_RECEIVE_FOLDER"]
# TODO 共通fixtureにして15個固定でput/delete、各個別fixtureで15個から引き算でdeleteする

4
ecs/jskult-batch-daily/tests/batch/vjsk/vjsk_load/conftest.py
View File

@ -15,12 +15,12 @@ def s3_client():
@pytest.fixture
def bucket_name():
return os.environ["JSKULT_DATA_BUCKET"]
return os.environ["VJSK_DATA_BUCKET"]
@pytest.fixture
def receive_folder():
return os.environ["JSKULT_DATA_FOLDER_RECV"]
return os.environ["VJSK_DATA_RECEIVE_FOLDER"]
@pytest.fixture

3
s3/config/jskult/task_settings/batch_daily_task_settings.env
View File

@ -7,10 +7,11 @@ ULTMARC_BACKUP_FOLDER=ultmarc
VJSK_BACKUP_FOLDER=vjsk
JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar
JSKULT_CONFIG_CALENDAR_HOLIDAY_LIST_FILE_NAME=jskult_holiday_list.txt
JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILENAME=jskult_wholesaler_stock_input_day_list.txt
JSKULT_CONFIG_CALENDAR_WHOLESALER_STOCK_FILE_NAME=jskult_wholesaler_stock_input_day_list.txt
SALES_LAUNDERING_EXTRACT_DATE_PERIOD=0
SALES_LAUNDERING_TARGET_TABLE_NAME=src05.sales_lau
DB_CONNECTION_MAX_RETRY_ATTEMPT=4
DB_CONNECTION_RETRY_INTERVAL_INIT=5
DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS=5
DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS=50
SALES_LAUNDERING_TARGET_YEAR_OFFSET=5