@google-cloud/nodejs-common 1.5.7-beta → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/nodejs-common",
-  "version": "1.5.7-beta",
+  "version": "1.6.0",
   "description": "A NodeJs common library for solutions based on Cloud Functions",
   "author": "Google Inc.",
   "license": "Apache-2.0",
@@ -16,21 +16,21 @@
   },
   "homepage": "https://github.com/GoogleCloudPlatform/cloud-for-marketing/blob/master/marketing-analytics/activation/common-libs/nodejs-common/README.md",
   "dependencies": {
-    "@google-cloud/aiplatform": "^2.3.0",
-    "@google-cloud/automl": "^3.1.0",
-    "@google-cloud/bigquery": "^6.0.3",
-    "@google-cloud/datastore": "^7.0.0",
-    "@google-cloud/firestore": "^6.3.0",
-    "@google-cloud/logging-winston": "^5.1.5",
-    "@google-cloud/pubsub": "^3.2.0",
-    "@google-cloud/storage": "^6.5.2",
-    "@google-cloud/scheduler": "^3.0.4",
-    "@google-cloud/secret-manager": "^4.1.3",
+    "@google-cloud/aiplatform": "^2.5.0",
+    "@google-cloud/automl": "^3.1.2",
+    "@google-cloud/bigquery": "^6.1.0",
+    "@google-cloud/datastore": "^7.1.0",
+    "@google-cloud/firestore": "^6.4.2",
+    "@google-cloud/logging-winston": "^5.3.0",
+    "@google-cloud/pubsub": "^3.3.0",
+    "@google-cloud/storage": "^6.9.2",
+    "@google-cloud/scheduler": "^3.2.0",
+    "@google-cloud/secret-manager": "^4.2.0",
     "gaxios": "^5.0.2",
-    "google-ads-api": "^11.1.0",
-    "google-ads-node": "^9.1.0",
-    "google-auth-library": "^8.5.2",
-    "googleapis": "^108.0.0",
+    "google-ads-api": "^12.0.1",
+    "google-ads-node": "^10.0.0",
+    "google-auth-library": "^8.7.0",
+    "googleapis": "^110.0.0",
     "winston": "^3.8.2",
     "lodash": "^4.17.21"
   },

package/src/apis/dfa_reporting.js

@@ -284,6 +284,10 @@ class DfaReporting {
    * Runs a report and return the file Id. As an asynchronized process, the
    * returned file Id will be a placeholder until the status changes to
    * 'REPORT_AVAILABLE' in the response of `getFile`.
+   * Campaign Manager reports use a fixed timezone(America/Los Angeles) when it
+   * has a relative date range, e.g. YESTERDAY. To solve this, if there are
+   * `startDate` and `endDate` available in the given `config`, they will be
+   * used to update the report before the report is started to run.
    * @see https://developers.google.com/doubleclick-advertisers/rest/v4/reports/run
    *
    * @param {{
@@ -296,6 +300,24 @@ class DfaReporting {
   async runReport(config) {
     const profileId = await this.getProfileForOperation_(config);
     const dfareporting = await this.getApiClient_();
+    const { startDate, endDate } = config;
+    if (startDate && endDate) {
+      const { data: report } = await dfareporting.reports.get({
+        profileId,
+        reportId: config.reportId,
+      });
+      report.criteria.dateRange = { startDate, endDate };
+      const updated = await dfareporting.reports.update({
+        profileId,
+        reportId: config.reportId,
+        requestBody: report
+      });
+      if (updated.status >= 400) {
+        this.logger.error(
+          'Failed to update data range of CM360 report', config.reportId);
+        this.logger.error('Report to be updated', report);
+      }
+    }
     const response = await dfareporting.reports.run({
       profileId,
       reportId: config.reportId,

package/src/apis/google_ads.js

@@ -21,9 +21,12 @@ const {protos: {google: {ads: {googleads}}}} = require('google-ads-node');
 const googleAdsLib = googleads[Object.keys(googleads)[0]];
 const {
   common: {
+    CustomerMatchUserListMetadata,
+    StoreSalesMetadata,
+    TransactionAttribute,
+    UserAttribute,
     UserData,
     UserIdentifier,
-    CustomerMatchUserListMetadata,
   },
   resources: {
     GoogleAdsField,
@@ -31,24 +34,25 @@ const {
     UserList,
   },
   services: {
-    CreateOfflineUserDataJobRequest,
     AddOfflineUserDataJobOperationsRequest,
+    CreateOfflineUserDataJobRequest,
     RunOfflineUserDataJobRequest,
+    SearchGoogleAdsFieldsRequest,
     UploadCallConversionsRequest,
-    UploadClickConversionsRequest,
     UploadCallConversionsResponse,
+    UploadClickConversionsRequest,
     UploadClickConversionsResponse,
     UploadConversionAdjustmentsRequest,
     UploadConversionAdjustmentsResponse,
     UploadUserDataRequest,
     UploadUserDataResponse,
     UserDataOperation,
-    SearchGoogleAdsFieldsRequest,
   },
   errors: {
     GoogleAdsFailure,
   },
   enums: {
+    OfflineUserDataJobFailureReasonEnum: { OfflineUserDataJobFailureReason },
     OfflineUserDataJobTypeEnum: { OfflineUserDataJobType },
     OfflineUserDataJobStatusEnum: { OfflineUserDataJobStatus },
     UserListMembershipStatusEnum: { UserListMembershipStatus },
@@ -77,6 +81,8 @@ const PICKED_PROPERTIES = [
   'external_attribution_data',
   'cart_data',
   'user_identifiers',
+  'gbraid',
+  'wbraid',
   'gclid',
   'caller_id',
   'call_start_date_time',
@@ -105,6 +111,16 @@ const IDENTIFIERS = [
   'address_info',
 ];
 
+/**
+ * Additional attributes in user data for store sales data or customer match.
+ * @see https://developers.google.com/google-ads/api/reference/rpc/latest/UserData
+ * @type {Array<string>}
+ */
+const USERDATA_ADDITIONAL_ATTRIBUTES = [
+  'transaction_attribute',
+  'user_attribute',
+];
+
 /**
  * Maximum number of user identifiers in single UserData.
  * @see https://ads-developers.googleblog.com/2021/10/userdata-enforcement-in-google-ads-api.html
@@ -179,11 +195,17 @@ let CustomerMatchConfig;
  * Configuration for offline user data job, includes:
  * customer_id, login_customer_id, list_id, operation and type.
  * 'operation' should be one of the two: 'create' or 'remove',
- * 'type' is OfflineUserDataJobType, it can be 'CUSTOMER_MATCH_USER_LIST' or
- * 'STORE_SALES_UPLOAD_FIRST_PARTY'.
+ * 'type' is OfflineUserDataJobType, it can be 'CUSTOMER_MATCH_USER_LIST',
+ * 'CUSTOMER_MATCH_WITH_ATTRIBUTES' or 'STORE_SALES_UPLOAD_FIRST_PARTY'.
  * For job type 'CUSTOMER_MATCH_USER_LIST', if `list_id` is not present,
  * 'list_name' and 'upload_key_type' need to be there so they can be used to
  *  create a customer match user list.
+ * For job type 'CUSTOMER_MATCH_WITH_ATTRIBUTES', 'user_attribute' can be used
+ * to store shared additional user attributes.
+ * For job type 'STORE_SALES_UPLOAD_FIRST_PARTY', `store_sales_metadata` is
+ * required to offer StoreSalesMetadata. Besides that, for the store sales data,
+ * common data (e.g. `currency_code`, `conversion_action`) in
+ * `transaction_attribute` can be put here as well.
  * @see https://developers.google.com/google-ads/api/reference/rpc/latest/OfflineUserDataJob
  * @typedef {{
  *   customer_id: (string|number),
@@ -193,7 +215,9 @@ let CustomerMatchConfig;
  *   upload_key_type: ('CONTACT_INFO'|'CRM_ID'|'MOBILE_ADVERTISING_ID'|undefined),
  *   operation: ('create'|'remove'),
  *   type: !OfflineUserDataJobType,
- *   storeSalesMetadata: (undefined|object),
+ *   store_sales_metadata: (undefined|StoreSalesMetadata),
+ *   transaction_attribute: (undefined|TransactionAttribute),
+ *   user_attribute: (undefined|UserAttribute),
  * }}
  */
 let OfflineUserDataJobConfig;
@@ -802,10 +826,16 @@ class GoogleAds {
    * @see https://developers.google.com/google-ads/api/reference/rpc/latest/UserDataOperation
    * @param {string} operationType either 'create' or 'remove'
    * @param {Array<CustomerMatchRecord>} customerMatchRecords userIds
+   * @param {{
+   *   transaction_attribute: TransactionAttribute|undefined,
+   *   user_attribute: UserAttribute,
+   * }} additionalAttributes Additional attributes for 'UserData', includes
+   * 'transaction_attribute' or 'user_attribute'.
    * @return {Array<UserDataOperation>}
    * @private
    */
-  buildOperationsList_(operationType, customerMatchRecords) {
+  buildOperationsList_(operationType, customerMatchRecords,
+    additionalAttributes = {}) {
     return customerMatchRecords.map((customerMatchRecord) => {
       const userIdentifiers = [];
       IDENTIFIERS.forEach((idType) => {
@@ -820,17 +850,24 @@ class GoogleAds {
           }
         }
       });
-      let userData;
+      const userData = {};
       if (userIdentifiers.length <= MAX_IDENTIFIERS_PER_USER) {
-        userData = UserData.create({user_identifiers: userIdentifiers});
+        userData.user_identifiers = userIdentifiers;
       } else {
         this.logger.warn(
             `Too many user identifiers, will only send ${MAX_IDENTIFIERS_PER_USER}:`,
             JSON.stringify(customerMatchRecord));
-        userData = UserData.create({user_identifiers: userIdentifiers}.slice(0,
-            MAX_IDENTIFIERS_PER_USER));
+        userData.user_identifiers =
+          userIdentifiers.slice(0, MAX_IDENTIFIERS_PER_USER);
       }
-      return UserDataOperation.create({[operationType]: userData});
+      USERDATA_ADDITIONAL_ATTRIBUTES.forEach((attribute) => {
+        if (additionalAttributes[attribute] || customerMatchRecord[attribute]) {
+          userData[attribute] = lodash.merge(
+            {}, additionalAttributes[attribute], customerMatchRecord[attribute]);
+        }
+      })
+      return UserDataOperation.create(
+        { [operationType]: UserData.create(userData) });
     });
   }
 
@@ -885,7 +922,12 @@ class GoogleAds {
     if (jobs.length === 0) {
       throw new Error(`Can't find the OfflineUserDataJob: ${resourceName}`);
     }
-    return OfflineUserDataJobStatus[jobs[0].offline_user_data_job.status];
+    const { failure_reason: failure, status } = jobs[0].offline_user_data_job;
+    if (failure > 0) {
+      this.logger.warn(`Offline UserData Job [${resourceName}] failed: `,
+        OfflineUserDataJobFailureReason[failure])
+    }
+    return OfflineUserDataJobStatus[status];
   }
 
   /**
@@ -910,9 +952,10 @@ class GoogleAds {
       job.customer_match_user_list_metadata = metadata;
       // https://developers.google.com/google-ads/api/rest/reference/rest/latest/customers.offlineUserDataJobs?hl=en#StoreSalesMetadata
     } else if (type.startsWith('STORE_SALES')) {
-      // If there is StoreSalesMetadata in the config
-      if (config.storeSalesMetadata) {
-        job.store_sales_metadata = config.storeSalesMetadata;
+      // Support previous property 'StoreSalesMetadata' for compatibility.
+      if (config.store_sales_metadata || config.StoreSalesMetadata) {
+        job.store_sales_metadata = config.store_sales_metadata
+          || config.StoreSalesMetadata;
       }
     } else {
       throw new Error(`UNSUPPORTED OfflineUserDataJobType: ${type}.`);
@@ -943,7 +986,7 @@ class GoogleAds {
     const operation = config.operation;
     const customer = await this.getGoogleAdsApiCustomer_(
       loginCustomerId, customerId);
-    const operationsList = this.buildOperationsList_(operation, records);
+    const operationsList = this.buildOperationsList_(operation, records, config);
     const request = AddOfflineUserDataJobOperationsRequest.create({
       resource_name: jobResourceName,
       operations: operationsList,

package/src/components/firestore/datastore_mode_access.js

@@ -115,6 +115,7 @@ class DatastoreModeAccess {
         .save({
           key: key,
           data: data,
+          excludeLargeProperties: true,
         })
         .then((apiResponse) => {
           // Default key in Datastore is a number in response like following.