Merge branch 'yifan' of ASJ_ADS/sync_amz_data into master

start_sync_amz.py

@@ -87,7 +87,7 @@ if __name__ == '__main__':
     sched.start()
 
 
-    # list_date = ["2023-10-09",]
+    # list_date = ['2023-10-08']
     # for date_ in list_date:
     #     print(date_)
     #     print(date_.replace("-",""))

sync_amz_data/DataTransform/Data_ETL.py

@@ -1,3 +1,4 @@
+import logging
 from sync_amz_data.public.amz_ad_client import SPClient, Account, SBClient, SDClient, BaseClient
 import pandas as pd
 import numpy as np
@@ -121,6 +122,12 @@ class Common_ETLMethod(BaseClient):
         # df_report.to_excel("df.xlsx")
         return df_report
 
+    def today_(self):
+        timeZone_ = self.timeZone()
+        today_ = datetime.now(tz=pytz.timezone(timeZone_))
+        logging.info(f"timezone:{timeZone_},today:{today_}")
+        print(timeZone_,today_)
+        return timeZone_,today_
 
 class Acount_ETL(Account, Common_ETLMethod):
     def portfolio_ETL(self):
@@ -172,8 +179,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return self.columnsName_modify(df_budget)
 
     def reportV3_campaign_spCampaignsETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -209,8 +215,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_adGroup_spCampaignsETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -247,8 +252,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
 
     #
     def reportV3_campaignPlacement_spCampaignsETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -287,8 +291,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_targeting_spTargetingETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -328,8 +331,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_searchTerm_spSearchTermETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -369,8 +371,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_advertiser_spAdvertisedProductETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -407,8 +408,7 @@ class SP_ETL(SPClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_asin_spPurchasedProductETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -487,8 +487,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return self.columnsName_modify(df_budget)
 
     def reportV3_campaign_sbCampaigns_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -527,8 +526,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
 
 
     def reportV3_purchasedAsinRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -559,8 +557,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
 
     def reportV2_campaignsRecord_ETL(self, conn, params={}):
         print(params)
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
 
@@ -592,8 +589,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
 
     def reportV2_campaignsVideo_ETL(self, conn, params={}):
         print(params)
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'campaigns'
@@ -626,8 +622,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
 
     def reportV2_placementRecord_ETL(self, conn, params={}):
         print(params)
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'campaigns'
@@ -655,8 +650,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_placementVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'campaigns'
@@ -687,8 +681,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adGroupsRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'adGroups'
@@ -718,8 +711,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adGroupsVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'adGroups'
@@ -749,8 +741,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_targetsRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'targets'
@@ -780,8 +771,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_targetsVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'targets'
@@ -812,8 +802,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_keywordsRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'keywords'
@@ -843,8 +832,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_keywordsVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'keywords'
@@ -875,8 +863,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_searchtermsRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'keywords'
@@ -901,8 +888,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_searchtermsVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'keywords'
@@ -930,8 +916,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adsRecord_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'ads'
@@ -959,8 +944,7 @@ class SB_ETL(SBClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adsVideo_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'ads'
@@ -1029,8 +1013,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return self.columnsName_modify(df_budget)
 
     def reportV3_campaign_sdCampaigns_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1066,8 +1049,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_campaignMT_sdCampaigns_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1103,8 +1085,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_adgroup_sdAdGroup_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1141,8 +1122,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_adgroupMT_sdAdGroup_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1179,8 +1159,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_targeting_sdTargeting_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1221,8 +1200,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_targetingMT_sdTargeting_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1264,8 +1242,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_advertiser_sdAdvertisedProduct_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1304,8 +1281,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[params['columns']]
 
     def reportV3_asin_sdPurchasedProduct_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("endDate") == None:
             params["endDate"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y-%m-%d")
         if params.get("startDate") == None:
@@ -1353,8 +1329,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_campaignsRecord_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'campaigns'
@@ -1375,8 +1350,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_campaignsRecord_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'campaigns'
@@ -1414,8 +1388,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_adGroupsRecord_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'adGroups'
@@ -1434,8 +1407,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adGroupsRecord_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'adGroups'
@@ -1470,8 +1442,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_productAds_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'productAds'
@@ -1491,8 +1462,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_productAds_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")
         params['record_type'] = 'productAds'
@@ -1528,8 +1498,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_targets_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1551,8 +1520,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_targets_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1587,8 +1555,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_asins_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1610,8 +1577,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_asins_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1650,8 +1616,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]  # 'matchedTarget'
 
     def reportV2_campaign_matchedTarget_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1674,8 +1639,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_campaign_matchedTarget_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1712,8 +1676,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]  # , 'matchedTarget'
 
     def reportV2_adGroups_matchedTarget_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1735,8 +1698,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_adGroups_matchedTarget_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1771,8 +1733,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
     ]
 
     def reportV2_targets_matchedTarget_t2_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime(
@@ -1793,8 +1754,7 @@ class SD_ETL(SDClient, Common_ETLMethod):
         return df_report[metric]
 
     def reportV2_targets_matchedTarget_t3_ETL(self, conn, params={}):
-        timeZone_ = self.timeZone()
-        today = datetime.now(tz=pytz.timezone(timeZone_))
+        timeZone_,today = self.today_()
         if params.get("date") == None:
             params["date"] = (
                     datetime(today.year, today.month, today.day) - timedelta(days=1)).strftime("%Y%m%d")