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

fix: 関数名の修正、タイムゾーンを環境変数から読むように修正

Browse Source
This commit is contained in:
Y_SAKAI 2022-08-02 15:55:39 +09:00
parent 070763ec8e
commit f1f7cb6bbf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecs/crm-datafetch/src/config/objects.py
View File

@ -106,8 +106,8 @@ class TargetObject():
@property @property
def upload_file_name(self) -> str: def upload_file_name(self) -> str:
if self.__dict_checker.check_key_exist(UPLOAD_FILE_NAME_KEY): if self.__dict_checker.check_key_exist(UPLOAD_FILE_NAME_KEY):
return self.__object_info[UPLOAD_FILE_NAME_KEY].format(execute_datetime=self.__execute_datetime.to_YYYYMMDDHHMMSS()) return self.__object_info[UPLOAD_FILE_NAME_KEY].format(execute_datetime=self.__execute_datetime.format_date())
return f'{self.__object_info[OBJECT_NAME_KEY]}_{self.__execute_datetime.to_YYYYMMDDHHMMSS()}' return f'{self.__object_info[OBJECT_NAME_KEY]}_{self.__execute_datetime.format_date()}'
@property @property
def datetime_column(self) -> str: def datetime_column(self) -> str:

5
ecs/crm-datafetch/src/converter/convert_strategy.py
View File

@ -2,10 +2,11 @@ import re
from datetime import datetime from datetime import datetime
from dateutil.tz import gettz from dateutil.tz import gettz
from src.system_var.constants import (CONVERT_TZ, CRM_DATETIME_FORMAT, from src.system_var.constants import (CRM_DATETIME_FORMAT, CSV_FALSE_VALUE,
CSV_FALSE_VALUE, CSV_TRUE_VALUE, CSV_TRUE_VALUE,
DATE_PATTERN_YYYYMMDDHHMMSSFFF_UTC, DATE_PATTERN_YYYYMMDDHHMMSSFFF_UTC,
YYYYMMDDHHMMSS) YYYYMMDDHHMMSS)
from src.system_var.environments import CONVERT_TZ
class ConvertStrategyFactory: class ConvertStrategyFactory:

2
ecs/crm-datafetch/src/util/execute_datetime.py
View File

@ -13,5 +13,5 @@ class ExecuteDateTime:
def to_path(self) -> str: def to_path(self) -> str:
return self.__execute_datetime.rstrip(MILLISEC_FORMAT).translate(str.maketrans({'-': '/', 'T': '/', ':': None, '.': None})) return self.__execute_datetime.rstrip(MILLISEC_FORMAT).translate(str.maketrans({'-': '/', 'T': '/', ':': None, '.': None}))
def to_YYYYMMDDHHMMSS(self) -> str: def format_date(self) -> str:
return self.__execute_datetime.rstrip(MILLISEC_FORMAT).translate(str.maketrans({'-': None, 'T': None, ':': None, '.': None})) return self.__execute_datetime.rstrip(MILLISEC_FORMAT).translate(str.maketrans({'-': None, 'T': None, ':': None, '.': None}))