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

fix: マージ競合解決

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2022-08-16 15:24:04 +09:00
parent 2547513850
commit f220a8e1c0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/crm-datafetch/src/prepare_data_fetch_process.py
View File

@ -1,7 +1,7 @@
from src.aws.s3 import ConfigBucket
from src.config.objects import FetchTargetObjects
from src.error.exceptions import FileNotFoundException, InvalidConfigException
from src.parser.json_parse import JsonParser
from src.parser.json_parser import JsonParser
from src.system_var.constants import PRE_JP_NAME
from src.system_var.environments import (CRM_CONFIG_BUCKET,
OBJECT_INFO_FILENAME,

2
ecs/crm-datafetch/src/set_datetime_period_process.py
View File

@ -1,7 +1,7 @@
from src.aws.s3 import ConfigBucket
from src.config.objects import LastFetchDatetime, TargetObject
from src.error.exceptions import FileNotFoundException, InvalidConfigException
from src.parser.json_parse import JsonParser
from src.parser.json_parser import JsonParser
from src.system_var.constants import DATE_JP_NAME
from src.system_var.environments import (CRM_CONFIG_BUCKET,
LAST_FETCH_DATE_FOLDER)

2
ecs/crm-datafetch/tests/config/test_objects_fetch_target_objects.py
View File

@ -1,6 +1,6 @@
import pytest
from src.config.objects import FetchTargetObjects
from src.parser.json_parse import JsonParser
from src.parser.json_parser import JsonParser
class TestFetchTargetObjects():

16
ecs/crm-datafetch/tests/test_controller.py
View File

@ -19,17 +19,17 @@ COMMON_OBJECT_INFOS = {
'objects': [
{
'object_name': 'Account',
'columns': [],
'columns': ['Id'],
'upload_file_name': 'Account_YYYYMMDDHHMMSS'
},
{
'object_name': 'Contact',
'columns': [],
'columns': ['Id'],
'upload_file_name': 'Contact_YYYYMMDDHHMMSS'
},
{
'object_name': 'Call2_vod__c',
'columns': [],
'columns': ['Id'],
'upload_file_name': 'Call2_vod__c_YYYYMMDDHHMMSS'
}
]
@ -254,7 +254,7 @@ class TestController:
"""
mock_check_object_info = {
'object_name': 'Account',
'columns': [],
'columns': ['id'],
'is_skip': True
}
mock_return_values = [TargetObject(mock_check_object_info, COMMON_EXECUTE_DATETIME)]
@ -307,17 +307,17 @@ class TestController:
'objects': [
{
'object_name': 'Account',
'columns': [],
'columns': ['id'],
'is_skip': False
},
{
'object_name': 'Contact',
'columns': [],
'columns': ['id'],
'is_skip': True
},
{
'object_name': 'Call2_vod__c',
'columns': [],
'columns': ['id'],
'is_skip': False
}
]
@ -380,7 +380,7 @@ class TestController:
'objects': [
{
'object_name': 'Account',
'columns': [],
'columns': ['id'],
'is_skip': False
}
]