Merge branch 'master' into yifan

sync_amz_data/DataTransform/Data_ETL.py

@@ -73,7 +73,7 @@ class SP_ETL(SPClient,Common_ETLMethod):
         # print(df_campaign)
         return self.columnsName_modify(df_campaign)
 
-    def adGroup_ETL(self):
+    def adGroups_ETL(self):
         list_adGroup_SP = list(self.iter_adGroups(**{"includeExtendedDataFields":True}))
         df_adGroup_SP = pd.json_normalize(list_adGroup_SP)
         df_adGroup_SP = self.TZ_Deal(df_adGroup_SP,["extendedData.creationDateTime","extendedData.lastUpdateDateTime"])
@@ -112,7 +112,7 @@ class SB_ETL(SBClient,Common_ETLMethod):
         # print(df_campaign)
         return self.columnsName_modify(df_campaign)
 
-    def adGroup_ETL(self):
+    def adGroups_ETL(self):
         list_adGroup_SB = list(self.iter_adGroups(**{"includeExtendedDataFields":True}))
         df_adGroup_SP = pd.json_normalize(list_adGroup_SB)
         df_adGroup_SP = self.time_stamp_convert(df_adGroup_SP,["extendedData.creationDate","extendedData.lastUpdateDate"])
@@ -124,7 +124,7 @@ class SB_ETL(SBClient,Common_ETLMethod):
         df_adId_SP = self.time_stamp_convert(df_adId_SP,["extendedData.creationDate","extendedData.lastUpdateDate"])
         return self.columnsName_modify(df_adId_SP)
 
-    def keyword_ETL(self):
+    def keywords_ETL(self):
         list_keywords_SB = [row for _ in list(self.iter_keywords()) for row in _]
         df_keywords_SP = pd.json_normalize(list_keywords_SB)
         return self.columnsName_modify(df_keywords_SP)