From 7cabf47d8504087841eee089f0c81c624388f518 Mon Sep 17 00:00:00 2001 From: nds-keisuke-matsushima Date: Thu, 19 Oct 2023 12:58:04 +0900 Subject: [PATCH] =?UTF-8?q?NEWDWH2021-1255=20=E3=80=90=E5=AE=9F=E8=A3=85?= =?UTF-8?q?=E3=83=BBUT=E3=80=91CRM=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=AE=E6=94=B9=E4=BF=AE=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE=E5=89=8A?= =?UTF-8?q?=E9=99=A4=20=E3=82=A2=E3=83=B3=E3=83=80=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=B3=E3=82=A2=E3=81=AE=E6=95=B0=E3=81=8C3=E3=81=A4?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/salesforce/test_salesforce.py | 63 +------------------ .../crm/object_info/crm_object_list_diff.json | 8 +-- 2 files changed, 5 insertions(+), 66 deletions(-) diff --git a/ecs/crm-datafetch/tests/salesforce/test_salesforce.py b/ecs/crm-datafetch/tests/salesforce/test_salesforce.py index d8df66f2..533a7a50 100644 --- a/ecs/crm-datafetch/tests/salesforce/test_salesforce.py +++ b/ecs/crm-datafetch/tests/salesforce/test_salesforce.py @@ -308,32 +308,8 @@ class TestSalesforceApiClient: sut = SalesforceApiClient() actual = sut.fetch_sf_data(soql) - assert len(actual) == 5 - - """ - expect = { - 'Id': 'a025i00000RleEHAAZ', - 'Name': 'A-0001', - 'RecordTypeId': '0125i000000RUqOAAW', - 'attributes': OrderedDict([('type', 'RelationshipTest__c'), - ('url', - '/services/data/v57.0/sobjects/RelationshipTest__c/a025i00000RleEHAAZ')]), - 'RecordType': OrderedDict([('attributes', - OrderedDict([ - ('type', 'RecordType'), - ('url', '/services/data/v57.0/sobjects/RecordType/0125i000000RUqOAAW')])), - ('DeveloperName', 'RecordTypeNormal'), - ]) - - } - assert dict(actual[0]) == expect - """ - + assert len(actual) > 0 assert dict(actual[0])["RecordType"]["DeveloperName"] == "RecordTypeNormal" - # assert dict(actual[1])["RecordType"]["DeveloperName"] == "RecordTypeNormal" - # assert dict(actual[2])["RecordType"]["DeveloperName"] == "RecordTypeNormal" - # assert dict(actual[3])["RecordType"]["DeveloperName"] == "RecordTypeSpecial" - # assert dict(actual[4])["RecordType"]["DeveloperName"] == "RecordTypeSpecial" def test_fetch_sf_data_relationship_object_depth_2(self): """ @@ -358,25 +334,6 @@ class TestSalesforceApiClient: actual = sut.fetch_sf_data(soql) assert len(actual) > 0 - """ - expect = OrderedDict([('attributes', - OrderedDict([ - ('type', 'RelationshipTest_Child__c'), - ('url', '/services/data/v57.0/sobjects/RelationshipTest_Child__c/a035i00000FW1qNAAT')])), - ('Id', 'a035i00000FW1qNAAT'), - ('Name', 'A-0001'), - ('RelationshipTest__r', - OrderedDict([ - ('attributes', OrderedDict( - [('type', 'RelationshipTest__c'), - ('url', '/services/data/v57.0/sobjects/RelationshipTest__c/a025i00000RleEHAAZ')])), - ('RecordType', - OrderedDict([('attributes', - OrderedDict([('type', 'RecordType'), - ('url', '/services/data/v57.0/sobjects/RecordType/0125i000000RUqOAAW')])), - ('DeveloperName', 'RecordTypeNormal')]))]))]) - assert dict(actual[0]) == expect - """ assert dict(actual[0])["RelationshipTest__r"]["RecordType"]["DeveloperName"] == "RecordTypeNormal" def test_fetch_sf_data_by_soql_builder_system_modstamp_to_ge(self): @@ -695,24 +652,6 @@ class TestSalesforceApiClient: actual = sut.fetch_sf_data(soql) assert len(actual) > 0 - """" - excepts = OrderedDict( - [('attributes', OrderedDict([ - ('type', 'RelationshipTest_Child__c'), - ('url', '/services/data/v57.0/sobjects/RelationshipTest_Child__c/a035i00000FW1qPAAT')])), - ('Id', 'a035i00000FW1qPAAT'), - ('Name', 'A-0009'), - ('RelationshipTest__r', OrderedDict([ - ('attributes', OrderedDict( - [('type', 'RelationshipTest__c'), - ('url', '/services/data/v57.0/sobjects/RelationshipTest__c/a025i00000RleESAAZ')])), - ('RecordType', OrderedDict([ - ('attributes', OrderedDict([ - ('type', 'RecordType'), - ('url', '/services/data/v57.0/sobjects/RecordType/0125i000000RUqTAAW')])), - ('DeveloperName', 'RecordTypeSpecial')]))]))]) - assert f"{actual[0]}" == "aaaaa" - """ assert dict(actual[0])["RelationshipTest__r"]["RecordType"]["DeveloperName"] == "RecordTypeSpecial" def test_raise_create_instance_cause_auth_failed(self, monkeypatch): diff --git a/s3/config/crm/object_info/crm_object_list_diff.json b/s3/config/crm/object_info/crm_object_list_diff.json index c0593425..3cb2aee6 100644 --- a/s3/config/crm/object_info/crm_object_list_diff.json +++ b/s3/config/crm/object_info/crm_object_list_diff.json @@ -38,7 +38,7 @@ "Clm_Presentation_Name_vod__c", "Clm_Presentation_Version_vod__c", "Clm_Presentation_vod__c", - "Call2_vod___r.RecordTypeId" + "Call2_vod__r.RecordTypeId" ], "is_skip": false, "is_update_last_fetch_datetime": true @@ -63,7 +63,7 @@ "Mobile_ID_vod__c", "Override_Lock_vod__c", "Type_vod__c", - "Call2_vod___r.RecordTypeId" + "Call2_vod__r.RecordTypeId" ], "is_skip": false, "is_update_last_fetch_datetime": true @@ -964,7 +964,7 @@ "AuxillaryId_vod__c", "ParentId_vod__c", "Revision_vod__c", - "Call2_vod___r.RecordTypeId" + "Call2_vod__r.RecordTypeId" ], "is_skip": false, "is_update_last_fetch_datetime": true @@ -1016,7 +1016,7 @@ "EMDS_Topic__c", "MSJ_Visit_Purpose__c", "MSJ_Insight_Count__c", - "Call2_vod___r.RecordTypeId" + "Call2_vod__r.RecordTypeId" ], "is_skip": false, "is_update_last_fetch_datetime": true