From 10977cbe8be6ca4b2e3faedda943d0df36a8b1a3 Mon Sep 17 00:00:00 2001
From: shrouti1507 <shrouti.gangopadhyay@gmail.com>
Date: Tue, 4 Jun 2024 17:13:47 +0530
Subject: [PATCH] fix: bugsnag issue fix for zendesk

---
 src/v0/destinations/zendesk/transform.js      |  4 +
 .../destinations/zendesk/processor/data.ts    | 85 +++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/src/v0/destinations/zendesk/transform.js b/src/v0/destinations/zendesk/transform.js
index 5862014784..cadb1d3964 100644
--- a/src/v0/destinations/zendesk/transform.js
+++ b/src/v0/destinations/zendesk/transform.js
@@ -4,6 +4,7 @@ const {
   NetworkInstrumentationError,
   InstrumentationError,
   NetworkError,
+  isDefinedAndNotNull,
 } = require('@rudderstack/integrations-lib');
 const myAxios = require('../../../util/myAxios');
 
@@ -405,6 +406,9 @@ async function getUserMembershipPayload(message, headers, orgId, destinationConf
 }
 
 async function createOrganization(message, category, headers, destinationConfig, baseEndpoint) {
+  if (!isDefinedAndNotNull(message.traits)) {
+    throw new InstrumentationError('Organisation Traits are missing. Aborting.');
+  }
   await checkAndCreateUserFields(
     message.traits,
     category.organizationFieldsEndpoint,
diff --git a/test/integrations/destinations/zendesk/processor/data.ts b/test/integrations/destinations/zendesk/processor/data.ts
index 4dab6c5d5d..d84cdba15a 100644
--- a/test/integrations/destinations/zendesk/processor/data.ts
+++ b/test/integrations/destinations/zendesk/processor/data.ts
@@ -2370,4 +2370,89 @@ export const data = [
       },
     },
   },
+  {
+    name: 'zendesk',
+    description: 'Group Call : If message.traits are not present, aborting the call.',
+    feature: 'processor',
+    module: 'destination',
+    version: 'v0',
+    input: {
+      request: {
+        body: [
+          {
+            destination: {
+              Config: {
+                apiToken: 'myDummyApiToken4',
+                createUsersAsVerified: true,
+                domain: 'rudderlabshelp',
+                email: 'myDummyUserName1',
+                password: 'myDummyPwd1',
+                removeUsersFromOrganization: true,
+                sendGroupCallsWithoutUserId: true,
+              },
+              DestinationDefinition: {
+                DisplayName: 'Zendesk',
+                ID: '1YknZ1ENqB8UurJQJE2VrEA61tr',
+                Name: 'ZENDESK',
+              },
+              Enabled: true,
+              ID: 'xxxxxxxxxxxxxxxxxxxxxxxO51P',
+              Name: 'zendesk',
+              Transformations: [],
+            },
+            message: {
+              anonymousId: '297b0750-934b-4411-b66c-9b418cdbc0c9',
+              channel: 'web',
+              context: {
+                app: {
+                  build: '1.0.0',
+                  name: 'RudderLabs JavaScript SDK',
+                  namespace: 'com.rudderlabs.javascript',
+                  version: '1.1.0-beta.2',
+                },
+                ip: '0.0.0.0',
+                library: { name: 'RudderLabs JavaScript SDK', version: '1.1.0-beta.2' },
+                locale: 'en-GB',
+                os: { name: '', version: '' },
+                screen: { density: 2 },
+                traits: { email: 'example124@email.com', name: 'abcd124' },
+                userAgent:
+                  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36',
+              },
+              groupId: 'group-124',
+              integrations: { All: true },
+              messageId: '2d54ba80-ce5f-4bcb-b1d7-7587e7a865fc',
+              originalTimestamp: '2020-03-23T18:27:28.983Z',
+              receivedAt: '2020-03-23T23:57:29.022+05:30',
+              request_ip: '[::1]:51574',
+              sentAt: '2020-03-23T18:27:28.983Z',
+              timestamp: '2020-03-23T23:57:29.022+05:30',
+              type: 'group',
+              userId: 'abcd-124',
+            },
+          },
+        ],
+        method: 'POST',
+      },
+    },
+    output: {
+      response: {
+        status: 200,
+        body: [
+          {
+            error: 'Organisation Traits are missing. Aborting.',
+            statTags: {
+              destType: 'ZENDESK',
+              errorCategory: 'dataValidation',
+              errorType: 'instrumentation',
+              feature: 'processor',
+              implementation: 'native',
+              module: 'destination',
+            },
+            statusCode: 400,
+          },
+        ],
+      },
+    },
+  },
 ];