Skip to content

Commit 08f89e1

Browse files
committed
refactor: Reorganize parameters
Translate constants and remove unnecessary metadata
1 parent 045e76a commit 08f89e1

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

megalist_dataflow/sources/firestore_execution_source.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020 Google LLC
1+
# Copyright 2021 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -57,12 +57,12 @@ def document_to_dict(doc):
5757

5858
if not account_data:
5959
raise Exception('Firestore collection is absent')
60-
google_ads_id = account_data.get('google_ads_id', 'chave_vazia')
60+
google_ads_id = account_data.get('google_ads_id', 'empty')
6161
mcc_trix = account_data.get('mcc_trix', 'FALSE')
6262
mcc = False if mcc_trix is None else bool(distutils.util.strtobool(mcc_trix))
63-
app_id = account_data.get('app_id', 'chave_vazia')
64-
google_analytics_account_id = account_data.get('google_analytics_account_id', 'chave_vazia')
65-
campaign_manager_account_id = account_data.get('campaign_manager_account_id', 'chave_vazia')
63+
app_id = account_data.get('app_id', 'empty')
64+
google_analytics_account_id = account_data.get('google_analytics_account_id', 'empty')
65+
campaign_manager_account_id = account_data.get('campaign_manager_account_id', 'empty')
6666

6767
account_config = AccountConfig(google_ads_id, mcc, google_analytics_account_id, campaign_manager_account_id, app_id)
6868
logging.getLogger("megalista.FirestoreExecutionSource").info(f"Loaded: {account_config}")
@@ -97,8 +97,8 @@ def create_metadata_list(entry):
9797
'ADS_OFFLINE_CONVERSION': ['gads_conversion_name'],
9898
'ADS_SSD_UPLOAD': ['gads_conversion_name', 'gads_external_upload_id'],
9999
'ADS_CUSTOMER_MATCH_CONTACT_INFO_UPLOAD': ['gads_audience_name', 'gads_operation', 'gads_hash'],
100-
'ADS_CUSTOMER_MATCH_MOBILE_DEVICE_ID_UPLOAD': ['gads_audience_name', 'gads_operation', 'gads_metadata3', 'gads_app_id'],
101-
'ADS_CUSTOMER_MATCH_USER_ID_UPLOAD': ['gads_audience_name', 'gads_operation', 'gads_metadata3'],
100+
'ADS_CUSTOMER_MATCH_MOBILE_DEVICE_ID_UPLOAD': ['gads_audience_name', 'gads_operation'],
101+
'ADS_CUSTOMER_MATCH_USER_ID_UPLOAD': ['gads_audience_name', 'gads_operation'],
102102
'GA_MEASUREMENT_PROTOCOL': ['google_analytics_property_id', 'google_analytics_non_interaction'],
103103
'CM_OFFLINE_CONVERSION': ['campaign_manager_floodlight_activity_id', 'campaign_manager_floodlight_configuration_id'],
104104
'APPSFLYER_S2S_EVENTS': ['appsflyer_app_id'],

megalist_dataflow/uploaders/google_ads/customer_match/abstract_uploader.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def process(self, batch: Batch, **kwargs) -> None:
114114

115115
rows = self.get_filtered_rows(
116116
batch.elements, self.get_row_keys())
117-
117+
118118
mutate_members_operation = {
119119
'operand': {
120120
'userListId': list_id,
@@ -126,7 +126,8 @@ def process(self, batch: Batch, **kwargs) -> None:
126126
utils.safe_call_api(self.call_api, logging, user_list_service, [mutate_members_operation])
127127

128128
def call_api(self, service, operations):
129-
service.mutateMembers(operations)
129+
r = service.mutateMembers(operations)
130+
print(f'\n\n{r}\n\n')
130131

131132
def get_filtered_rows(self, rows: List[Any],
132133
keys: List[str]) -> List[Dict[str, Any]]:

0 commit comments

Comments
 (0)