Merge branch 'STRATCONN-6646/other-trait-groups-support' into staging

Author: monutwilio

packages/destination-actions/src/destinations/aampe/constants.ts

@@ -1,4 +1,3 @@
-
 export const SingaporeURL = 'https://ingestion-service-asia-southeast1-toqowp62ka-as.a.run.app/v1/'
 export const GermanyURL = 'https://ingestion-service-europe-west3-toqowp62ka-ey.a.run.app/v1/'
-export const FranceURL = 'https://ingestion-service-europe-west9-toqowp62ka-ey.a.run.app/v1/'
+export const UsURL = 'https://ingestion.us-east1.api.aampe.com/v1/'

packages/destination-actions/src/destinations/aampe/index.ts

@@ -2,7 +2,7 @@ import { DestinationDefinition, defaultValues } from '@segment/actions-core'
 import type { Settings } from './generated-types'
 import sendEvent from './sendEvent'
 import upsertUserProfile from './upsertUserProfile'
-import { SingaporeURL, GermanyURL, FranceURL } from './constants'
+import { SingaporeURL, GermanyURL, UsURL } from './constants'
 
 const destination: DestinationDefinition<Settings> = {
   name: 'Aampe (Actions)',
@@ -26,7 +26,7 @@ const destination: DestinationDefinition<Settings> = {
         choices: [
           { label: 'Singapore', value: SingaporeURL },
           { label: 'Germany', value: GermanyURL },
-          { label: 'France', value: FranceURL }
+          { label: 'US', value: UsURL }
         ],
         default: SingaporeURL
       }

packages/destination-actions/src/destinations/display-video-360/__tests__/index.test.ts

@@ -1,6 +1,7 @@
 import nock from 'nock'
 import { createTestIntegration, IntegrationError } from '@segment/actions-core'
 import Destination from '../index'
+import { enable_batching } from '../properties'
 import { GET_AUDIENCE_URL, CREATE_AUDIENCE_URL, OAUTH_URL } from '../constants'
 
 const advertiserId = '424242'
@@ -48,6 +49,12 @@ const getAudienceResponse = [
 ]
 
 describe('Display Video 360', () => {
+  describe('field definitions', () => {
+    it('enable_batching description should reference Display & Video 360', () => {
+      expect(enable_batching.description).toContain('Display & Video 360')
+    })
+  })
+
   beforeEach(() => {
     process.env.ACTIONS_DISPLAY_VIDEO_360_CLIENT_ID = 'Clientz'
     process.env.ACTIONS_DISPLAY_VIDEO_360_CLIENT_SECRET = 'Scretz'

packages/destination-actions/src/destinations/display-video-360/addToAudience/generated-types.ts

@@ -34,7 +34,7 @@ export const partner_provided_id: InputField = {
 
 export const enable_batching: InputField = {
   label: 'Enable Batching',
-  description: 'Enable batching of requests to the TikTok Audiences.',
+  description: 'Enable batching of requests to the Display & Video 360.',
   type: 'boolean',
   default: true,
   required: true,

packages/destination-actions/src/destinations/display-video-360/properties.ts

@@ -235,6 +235,7 @@ register('699d98d1efa22d864e451400', './klime')
 register('699d9cfc7ddca5bfc98344dc', './amplitude-cohorts')
 register('69a6caedee3c3617ae42dde8', './pendo-audiences')
 register('69a6cb5fda60c0bec5994df4', './avo-v2')
+register('69b9249b38dabe2f2f1f528a', './youappi-audiences')
 
 function register(id: MetadataId, destinationPath: string) {
   // eslint-disable-next-line @typescript-eslint/no-var-requires

packages/destination-actions/src/destinations/display-video-360/removeFromAudience/generated-types.ts

@@ -1033,7 +1033,7 @@ describe('Memora.upsertProfile', () => {
       it('should fetch and return traits from all trait groups', async () => {
         // Mock listing trait groups (includes traits in response)
         nock(BASE_URL)
-          .get(`/${API_VERSION}/ControlPlane/Stores/test-store-id/TraitGroups?pageSize=100`)
+          .get(`/${API_VERSION}/ControlPlane/Stores/test-store-id/TraitGroups?pageSize=100&includeTraits=true`)
           .matchHeader('X-Pre-Auth-Context', 'AC1234567890')
           .reply(200, {
             traitGroups: [
@@ -1146,7 +1146,7 @@ describe('Memora.upsertProfile', () => {
 
       it('should return error message when API call fails', async () => {
         nock(BASE_URL)
-          .get(`/${API_VERSION}/ControlPlane/Stores/test-store-id/TraitGroups?pageSize=100`)
+          .get(`/${API_VERSION}/ControlPlane/Stores/test-store-id/TraitGroups?pageSize=100&includeTraits=true`)
           .reply(500, { message: 'Internal server error' })
 
         const result = (await testDestination.testDynamicField('upsertProfile', 'profile_traits.__keys__', {

packages/destination-actions/src/destinations/index.ts

@@ -268,7 +268,7 @@ async function fetchAllTraits(request: RequestClient, settings: Settings, storeI
   try {
     // Fetch list of all trait groups (includes traits in the response)
     const traitGroupsResponse = await request<TraitGroupsListResponse>(
-      `${BASE_URL}/${API_VERSION}/ControlPlane/Stores/${storeId}/TraitGroups?pageSize=100`,
+      `${BASE_URL}/${API_VERSION}/ControlPlane/Stores/${storeId}/TraitGroups?pageSize=100&includeTraits=true`,
       {
         method: 'GET',
         headers: {

packages/destination-actions/src/destinations/memora/upsertProfile/__tests__/index.test.ts

@@ -12,7 +12,10 @@ export const fields: Record<string, InputField> = {
     default: {
       '@path': '$.context.personas.computation_class'
     },
-    choices: [{ label: 'audience', value: 'audience' },{ label: 'journey_step', value: 'journey_step' }]
+    choices: [
+      { label: 'audience', value: 'audience' },
+      { label: 'journey_step', value: 'journey_step' }
+    ]
   },
   external_audience_id: {
     type: 'string',
@@ -130,7 +133,7 @@ export const fields: Record<string, InputField> = {
         description: `The contact's city.`,
         type: 'string'
       },
-      state_province_region: {  
+      state_province_region: {
         label: 'State/Province/Region',
         description: `The contact's state, province, or region.`,
         type: 'string'
@@ -147,68 +150,68 @@ export const fields: Record<string, InputField> = {
       }
     },
     default: {
-      first_name: {       
+      first_name: {
         '@if': {
           exists: { '@path': '$.traits.first_name' },
           then: { '@path': '$.traits.first_name' },
           else: { '@path': '$.properties.first_name' }
-        } 
+        }
       },
-      last_name: {       
+      last_name: {
         '@if': {
           exists: { '@path': '$.traits.last_name' },
           then: { '@path': '$.traits.last_name' },
           else: { '@path': '$.properties.last_name' }
-        } 
+        }
       },
-      phone_number: {       
+      phone_number: {
         '@if': {
           exists: { '@path': '$.traits.phone' },
           then: { '@path': '$.traits.phone' },
           else: { '@path': '$.properties.phone' }
-        } 
+        }
       },
-      address_line_1: {       
+      address_line_1: {
         '@if': {
           exists: { '@path': '$.traits.street' },
           then: { '@path': '$.traits.street' },
           else: { '@path': '$.properties.street' }
-        } 
+        }
       },
-      address_line_2: {       
+      address_line_2: {
         '@if': {
           exists: { '@path': '$.traits.address_line_2' },
           then: { '@path': '$.traits.address_line_2' },
           else: { '@path': '$.properties.address_line_2' }
-        } 
+        }
       },
-      city: {       
+      city: {
         '@if': {
           exists: { '@path': '$.traits.city' },
           then: { '@path': '$.traits.city' },
           else: { '@path': '$.properties.city' }
-        } 
+        }
       },
-      state_province_region: {       
+      state_province_region: {
         '@if': {
           exists: { '@path': '$.traits.state' },
           then: { '@path': '$.traits.state' },
           else: { '@path': '$.properties.state' }
-        } 
+        }
       },
-      country: {       
+      country: {
         '@if': {
           exists: { '@path': '$.traits.country' },
           then: { '@path': '$.traits.country' },
           else: { '@path': '$.properties.country' }
-        } 
+        }
       },
-      postal_code: {       
+      postal_code: {
         '@if': {
           exists: { '@path': '$.traits.postal_code' },
           then: { '@path': '$.traits.postal_code' },
           else: { '@path': '$.properties.postal_code' }
-        } 
+        }
       }
     }
   },
@@ -253,7 +256,7 @@ export const fields: Record<string, InputField> = {
   batch_size: {
     type: 'number',
     label: 'Max batch size',
-    description: 'The maximum number of events to batch when sending data to Reddit.',
+    description: 'The maximum number of events to batch when sending data to SendGrid.',
     unsafe_hidden: true,
     required: false,
     default: MAX_BATCH_SIZE