From f220a8e1c0c364b52ac7da7acd616ba7fc3c90fb Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 16 Aug 2022 15:24:04 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=9E=E3=83=BC=E3=82=B8=E7=AB=B6?= =?UTF-8?q?=E5=90=88=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/prepare_data_fetch_process.py | 2 +- .../src/set_datetime_period_process.py | 2 +- .../config/test_objects_fetch_target_objects.py | 2 +- ecs/crm-datafetch/tests/test_controller.py | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ecs/crm-datafetch/src/prepare_data_fetch_process.py b/ecs/crm-datafetch/src/prepare_data_fetch_process.py index 03427265..f0ea9ab6 100644 --- a/ecs/crm-datafetch/src/prepare_data_fetch_process.py +++ b/ecs/crm-datafetch/src/prepare_data_fetch_process.py @@ -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, diff --git a/ecs/crm-datafetch/src/set_datetime_period_process.py b/ecs/crm-datafetch/src/set_datetime_period_process.py index bfebd5c2..062fac97 100644 --- a/ecs/crm-datafetch/src/set_datetime_period_process.py +++ b/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, 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) diff --git a/ecs/crm-datafetch/tests/config/test_objects_fetch_target_objects.py b/ecs/crm-datafetch/tests/config/test_objects_fetch_target_objects.py index 3e7df076..f626a6de 100644 --- a/ecs/crm-datafetch/tests/config/test_objects_fetch_target_objects.py +++ b/ecs/crm-datafetch/tests/config/test_objects_fetch_target_objects.py @@ -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(): diff --git a/ecs/crm-datafetch/tests/test_controller.py b/ecs/crm-datafetch/tests/test_controller.py index 8b9a464a..c142fcfd 100644 --- a/ecs/crm-datafetch/tests/test_controller.py +++ b/ecs/crm-datafetch/tests/test_controller.py @@ -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 } ]