Merge branch 'main' into improve-gettextdescription

sipgate · Nov 6, 2024 · 10c9926 · 10c9926
2 parents a2f24bd + 9561dcd
commit 10c9926
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sipgate/integration-bridge",
-  "version": "1.0.4",
+  "version": "1.0.9",
   "description": "sipgate Integration Bridge Framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/models/adapter.model.ts b/src/models/adapter.model.ts
@@ -55,7 +55,7 @@ export interface Adapter {
   createCallLogForPhoneNumber?: (
     config: Config,
     body: CallEvent,
-  ) => Promise<LoggedIntegrationEntity>;
+  ) => Promise<LoggedIntegrationEntity | null>;
   getCallLogMetadata?: (config: Config) => Promise<IntegrationDefinedOptions>;
   getEntity?: (
     providerConfig: Config,

diff --git a/src/models/call-event.model.ts b/src/models/call-event.model.ts
@@ -26,11 +26,11 @@ export enum CallState {
 export interface CallEvent {
   id: string;
   startTime: number;
-  endTime: number;
   direction: CallDirection;
   participants: CallParticipant[];
   note: string;
   state: CallState;
+  endTime?: number;
   outcome?: string;
 }
 

diff --git a/src/schemas/contacts.ts b/src/schemas/contacts.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { IntegrationEntityType } from '../models/integration-entity.model';
+import { IntegrationEntityType } from '../models/integration-entity.model'; // export const contactsSchema: ValidationSchema = {
 
 // export const contactsSchema: ValidationSchema = {
 //   title: 'Contacts',
@@ -70,8 +70,8 @@ const integrationEntitySchema = z.object({
   id: z.string(),
   type: z.nativeEnum(IntegrationEntityType),
   source: z.string(),
-  label: z.string().optional(),
-  logId: z.string().optional(),
+  label: z.string().optional().nullable(),
+  logId: z.string().optional().nullable(),
 });
 
 export const contactSchema = z.object({

diff --git a/src/util/callEventHelper.ts b/src/util/callEventHelper.ts
@@ -50,8 +50,9 @@ const getGermanTextDescriptionForCallEvent = (
   locale: string,
 ): string => {
   const date = new Date(callEvent.startTime);
+
   const duration = formatDuration(
-    callEvent.endTime - callEvent.startTime,
+    callEvent.endTime ? callEvent.endTime - callEvent.startTime : 0,
     locale,
   );
 
@@ -84,7 +85,7 @@ const getEnglishTextDescriptionForCallEvent = (
 ): string => {
   const date = new Date(callEvent.startTime);
   const duration = formatDuration(
-    callEvent.endTime - callEvent.startTime,
+    callEvent.endTime ? callEvent.endTime - callEvent.startTime : 0,
     locale,
   );
 

diff --git a/src/util/logger.util.ts b/src/util/logger.util.ts
@@ -8,7 +8,10 @@ function addMessageToTraceSpan(
 ) {
   const span = trace.getSpan(context.active());
   if (span) {
-    span.addEvent(method, { message, args: args ? args.join(',') : '' });
+    span.addEvent(method, {
+      message,
+      args: args ? args.map((arg) => JSON.stringify(arg)).join(',') : '',
+    });
   }
 }