@messenger-box/platform-server 10.0.3-alpha.7 → 10.0.3-alpha.74

package/lib/graphql/resolvers/channel.js

@@ -1,9 +1,24 @@
-import {RoomType}from'common';const channelResolvers = () => ({
+import {RoomType}from'common/server';const channelResolvers = options => ({
   Channel: {
     creator(src, args, {
       accountService
     }) {
+      options.logger.trace('(Channel.creator) src.creator [%s]', src.creator);
+      // Check if creator exists and is not null/undefined before calling service
+      if (!src.creator || src.creator === null || src.creator === undefined) {
+        return null;
+      }
       return accountService.findAccountById(src.creator.toString());
+    },
+    lastMessage(src, args, {
+      postService
+    }) {
+      options.logger.trace('(Channel.lastMessage) src.id [%s]', src.id);
+      // Check if src.id exists before calling service
+      if (!src.id || src.id === null || src.id === undefined) {
+        return null;
+      }
+      return postService.getLastMessage(src.id);
     }
   },
   Query: {
@@ -13,27 +28,47 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.channelByName) name [%s]', name);
+      if (!name) {
+        options.logger.warn('Missing channel name');
+        return null;
+      }
       return channelService.getByName(name);
-      // return channelService.getByName(userContext.teamId, name) as Promise<IChannel>;
+      // return channelService.getByName(userContext.teamId, name) as unknown as Promise<IChannel>;
     },
     channels(src, _, {
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.channels) userContext [%j]', {
+        accountId: userContext.accountId,
+        teamId: userContext.teamId,
+        orgId: userContext.orgId
+      });
       const {
         accountId,
         teamId,
         orgId
       } = userContext;
+      if (!accountId || !teamId) {
+        options.logger.warn('Missing required user context');
+        return [];
+      }
       return channelService.getChannels(teamId, accountId, false, new Date().getTime(), orgId);
     },
-    channelsByUser(src, args, {
+    async channelsByUser(src, args, {
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.channelsByUser) args [%j]', args);
       const {
         accountId
       } = userContext;
+      console.log('accountId__channelsByUser', accountId);
+      if (!accountId) {
+        options.logger.warn('Missing accountId in user context');
+        return [];
+      }
       const {
         criteria,
         role,
@@ -41,25 +76,113 @@ import {RoomType}from'common';const channelResolvers = () => ({
       } = args || {
         criteria: {}
       };
-      return channelService.getAll({
-        ...rest,
-        criteria: {
-          ...criteria,
-          members: criteria?.members ?? {
-            $elemMatch: {
-              user: accountId,
-              ...(role ? {
-                roles: role
-              } : {})
+      console.log('criteria', criteria);
+      console.log('role', role);
+      try {
+        // Check if Service type is included in the query
+        const includesService = criteria?.type === RoomType.Service || Array.isArray(criteria?.type) && criteria.type.includes(RoomType.Service) || criteria?.type?.$in && criteria.type.$in.includes(RoomType.Service);
+        if (includesService) {
+          // If Service type is included, fetch SERVICE and non-SERVICE channels separately
+          const {
+            type,
+            ...restCriteria
+          } = criteria;
+          // Build non-service types from original query
+          let nonServiceTypes;
+          if (Array.isArray(type)) {
+            nonServiceTypes = type.filter(t => t !== RoomType.Service);
+          } else if (type?.$in) {
+            nonServiceTypes = type.$in.filter(t => t !== RoomType.Service);
+          } else {
+            // Single type that's not Service (shouldn't happen in this branch but for safety)
+            nonServiceTypes = type !== RoomType.Service ? [type] : [];
+          }
+          // Fetch SERVICE channels separately (no orgName restriction)
+          const serviceChannels = await channelService.getAll({
+            ...rest,
+            criteria: {
+              type: RoomType.Service
             }
+          });
+          // Fetch non-SERVICE channels separately (with orgName and member restrictions)
+          let otherChannels = [];
+          if (nonServiceTypes.length > 0) {
+            otherChannels = await channelService.getAll({
+              ...rest,
+              criteria: {
+                ...restCriteria,
+                type: nonServiceTypes.length === 1 ? nonServiceTypes[0] : {
+                  $in: nonServiceTypes
+                },
+                members: criteria?.members ?? {
+                  $elemMatch: {
+                    user: accountId,
+                    ...(role ? {
+                      roles: role
+                    } : {})
+                  }
+                }
+              }
+            });
+          }
+          // Sort each group separately
+          const sortedServiceChannels = serviceChannels.sort((a, b) => (a.title || '').localeCompare(b.title || ''));
+          const sortedOtherChannels = otherChannels.sort((a, b) => {
+            const aTime = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+            const bTime = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+            return bTime - aTime;
+          });
+          options.logger.trace('SERVICE channels count: %d', sortedServiceChannels.length);
+          options.logger.trace('Other channels count: %d', sortedOtherChannels.length);
+          if (sortedServiceChannels.length > 0) {
+            options.logger.trace('First SERVICE channel: %s', sortedServiceChannels[0].title);
           }
+          // GUARANTEE: SERVICE channels first, then others
+          const finalResult = [...sortedServiceChannels, ...sortedOtherChannels];
+          options.logger.trace('Final result order: %j', finalResult.map(ch => `${ch.type}: ${ch.title}`));
+          return finalResult;
+        } else {
+          // No Service type - apply member filter to all channels
+          const querycriteria = {
+            ...criteria,
+            members: criteria?.members ?? {
+              $elemMatch: {
+                user: accountId,
+                ...(role ? {
+                  roles: role
+                } : {})
+              }
+            }
+          };
+          const results = await channelService.getAll({
+            ...rest,
+            criteria: querycriteria
+          });
+          // Sort results to put SERVICE channels first
+          return results.sort((a, b) => {
+            // SERVICE channels always come first
+            if (a.type === RoomType.Service && b.type !== RoomType.Service) return -1;
+            if (a.type !== RoomType.Service && b.type === RoomType.Service) return 1;
+            // If both are SERVICE channels, sort by title/name
+            if (a.type === RoomType.Service && b.type === RoomType.Service) {
+              return (a.title || '').localeCompare(b.title || '');
+            }
+            // For non-SERVICE channels, sort by updatedAt (most recent first)
+            const aTime = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+            const bTime = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+            return bTime - aTime;
+          });
         }
-      });
+      } catch (error) {
+        options.logger.error('Error in channelsByUser: %o', error);
+        return [];
+      }
     },
     supportServiceChannels(src, args, {
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.supportServiceChannels) args [%j]', args);
       const {
         accountId
       } = userContext;
@@ -70,12 +193,17 @@ import {RoomType}from'common';const channelResolvers = () => ({
       } = args || {
         criteria: {}
       };
-      return channelService.getAll({
-        ...rest,
-        criteria: {
-          ...criteria
-        }
-      });
+      try {
+        return channelService.getAll({
+          ...rest,
+          criteria: {
+            ...criteria
+          }
+        });
+      } catch (error) {
+        options.logger.error('Error in supportServiceChannels: %o', error);
+        return [];
+      }
     },
     directChannel(src, {
       id
@@ -83,6 +211,15 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.directChannel) id [%s]', id);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        return null;
+      }
+      if (!userContext.accountId) {
+        options.logger.warn('Missing accountId in user context');
+        return null;
+      }
       return channelService.get({
         criteria: {
           id,
@@ -97,6 +234,11 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
+      options.logger.trace('(Query.viewChannelDetail) id [%s]', id);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        return null;
+      }
       return channelService.get(id);
     }
   },
@@ -110,27 +252,52 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
-      const {
-        accountId,
-        teamId,
-        orgId
-      } = userContext;
-      const formatedName = name[0].toUpperCase() + name.slice(1).toLowerCase();
-      const title = formatedName?.replace(/-/g, ' ') ?? '';
-      // const channelDetail = await channelService.getByName(userContext.teamId, title);
-      const channelDetail = await channelService.getByName(title);
-      if (channelDetail) return;
-      const channel = channelService.saveChannel({
-        type: type || RoomType.Channel,
-        orgName: orgId,
-        creator: accountId,
-        title: title,
-        displayName: name?.toLowerCase(),
-        topic: name?.toLowerCase(),
-        team: team || teamId,
-        description
+      options.logger.trace('(Mutation.createChannel) args [%j]', {
+        name,
+        description,
+        type,
+        team
       });
-      return channel;
+      try {
+        if (!name) {
+          options.logger.warn('Missing channel name');
+          throw new Error('Channel name is required');
+        }
+        if (!userContext.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          throw new Error('User not authenticated');
+        }
+        const {
+          accountId,
+          teamId,
+          orgId
+        } = userContext;
+        const formatedName = name[0].toUpperCase() + name.slice(1).toLowerCase();
+        const title = formatedName?.replace(/-/g, ' ') ?? '';
+        // const channelDetail = await channelService.getByName(userContext.teamId, title);
+        const channelDetail = await channelService.getByName(title);
+        if (channelDetail) {
+          options.logger.warn('Channel already exists with name: %s', title);
+          return null;
+        }
+        const orgName = orgId || '';
+        const organization = orgId || '';
+        const channel = channelService.saveChannel({
+          type: type || RoomType.Channel,
+          orgName,
+          organization,
+          creator: accountId,
+          title: title,
+          displayName: name?.toLowerCase(),
+          topic: name?.toLowerCase(),
+          team: team || teamId,
+          description
+        });
+        return channel;
+      } catch (error) {
+        options.logger.error('Error creating channel: %o', error);
+        throw error;
+      }
     },
     addMemberToChannel(src, {
       channelId,
@@ -139,6 +306,11 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
+      options.logger.trace('(Mutation.addMemberToChannel) channelId [%s], memberId [%s]', channelId, memberId);
+      if (!channelId || !memberId) {
+        options.logger.warn('Missing channelId or memberId');
+        throw new Error('Channel ID and Member ID are required');
+      }
       return channelService.addMemberToChannel(channelId, memberId);
     },
     saveMembersToChannel(src, {
@@ -148,6 +320,11 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
+      options.logger.trace('(Mutation.saveMembersToChannel) channelId [%s], membersIds [%j]', channelId, membersIds);
+      if (!channelId || !membersIds) {
+        options.logger.warn('Missing channelId or membersIds');
+        throw new Error('Channel ID and Members IDs are required');
+      }
       return channelService.saveMembersToChannel({
         membersIds,
         channelId
@@ -161,23 +338,43 @@ import {RoomType}from'common';const channelResolvers = () => ({
       channelService,
       userContext
     }) {
-      const {
-        accountId,
-        orgId
-      } = userContext;
-      return channelService.createDirectChannel({
-        sender: accountId,
-        receiver: receiver,
-        displayName,
-        orgName: orgId,
-        channelOptions
-      });
+      options.logger.trace('(Mutation.createDirectChannel) receiver [%s], displayName [%s]', receiver, displayName);
+      try {
+        if (!receiver || !displayName) {
+          options.logger.warn('Missing receiver or displayName');
+          throw new Error('Receiver and display name are required');
+        }
+        if (!userContext.accountId || !userContext.orgId) {
+          options.logger.warn('Missing user context');
+          throw new Error('User context required');
+        }
+        const {
+          accountId,
+          orgId
+        } = userContext;
+        return channelService.createDirectChannel({
+          sender: accountId,
+          receiver: receiver,
+          displayName,
+          orgName: orgId,
+          organization: orgId,
+          channelOptions
+        });
+      } catch (error) {
+        options.logger.error('Error creating direct channel: %o', error);
+        throw error;
+      }
     },
     hideChannel(src, {
       id
     }, {
       channelService
     }) {
+      options.logger.trace('(Mutation.hideChannel) id [%s]', id);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        throw new Error('Channel ID is required');
+      }
       return channelService.hideChannel(id);
     },
     leaveChannel(src, {
@@ -185,6 +382,11 @@ import {RoomType}from'common';const channelResolvers = () => ({
     }, {
       channelService
     }) {
+      options.logger.trace('(Mutation.leaveChannel) id [%s]', id);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        throw new Error('Channel ID is required');
+      }
       return channelService.leaveChannel(id);
     },
     deleteChannel(src, {
@@ -192,6 +394,11 @@ import {RoomType}from'common';const channelResolvers = () => ({
     }, {
       channelService
     }) {
+      options.logger.trace('(Mutation.deleteChannel) id [%s]', id);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        throw new Error('Channel ID is required');
+      }
       return channelService.deleteChannel(id);
     },
     viewChannel(src, {
@@ -200,6 +407,15 @@ import {RoomType}from'common';const channelResolvers = () => ({
       userContext,
       channelService
     }) {
+      options.logger.trace('(Mutation.viewChannel) id [%s], accountId [%s]', id, userContext.accountId);
+      if (!id) {
+        options.logger.warn('Missing channel id');
+        throw new Error('Channel ID is required');
+      }
+      if (!userContext.accountId) {
+        options.logger.warn('Missing accountId in user context');
+        throw new Error('User context required');
+      }
       return channelService.viewChannel(id, userContext.accountId);
     },
     async sendNotificationOfUnreadMessages(src, {
@@ -208,8 +424,47 @@ import {RoomType}from'common';const channelResolvers = () => ({
     }, {
       messengerNotificationService
     }) {
-      await messengerNotificationService.sendNotificationOfUnreadMessages(unit, value);
-      return true;
+      options.logger.trace('(Mutation.sendNotificationOfUnreadMessages) unit [%s], value [%s]', unit, value);
+      try {
+        if (!unit || value === undefined || value === null) {
+          options.logger.warn('Missing unit or value');
+          throw new Error('Unit and value are required');
+        }
+        await messengerNotificationService.sendNotificationOfUnreadMessages(unit, value);
+        return true;
+      } catch (error) {
+        options.logger.error('Error sending notification: %o', error);
+        return false;
+      }
+    },
+    async createChannelWithProjectId(src, {
+      projectId,
+      channelInput
+    }, {
+      channelService,
+      userContext
+    }) {
+      options.logger.trace('(Mutation.createChannelWithProjectId) projectId [%s], channelInput [%j]', projectId, channelInput);
+      const {
+        accountId,
+        teamId,
+        orgId
+      } = userContext;
+      // channelInput.createdBy = channelInput.createdBy || accountId;
+      // channelInput.orgName = orgId;
+      // channelInput.organization = orgId;
+      // channelInput.team = teamId;
+      const channelInputData = {
+        ...channelInput,
+        createdBy: accountId,
+        orgName: orgId,
+        organization: orgId,
+        team: teamId,
+        accountId: accountId,
+        teamId: teamId,
+        orgId: orgId
+      };
+      return await channelService.createChannelWithProjectId(projectId, channelInputData);
     }
   }
 });export{channelResolvers};//# sourceMappingURL=channel.js.map

package/lib/graphql/resolvers/channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel.js","sources":["../../../src/graphql/resolvers/channel.ts"],"sourcesContent":[null],"names":[],"mappings":"8BAEa,MAAA,gBAAgB,GAAG,OAAmB;AAC/C,EAAA,OAAA,EAAO;AACH,IAAA,OAAA,CAAA,GAAO,EAAI,IAAE;;;AAGhB,MAAA,OAAA,cAAA,CAAA,eAAA,CAAA,GAAA,CAAA,OAAA,CAAA,QAAA,EAAA,CAAA;AACD;;AAEQ,EAAA,KAAA,EAAA;iBACkF,CAAA,GAAA,EAAA;;;oBAG1E;AACR,MAAA;;aAIU,cAAM,CAAA,SAAQ,CAAA,IAAA,CAAA;AACxB;AACA,KAAA;YACA,CAAO,GAAA,EAAA,CAAA,EAAA;AACH,MAAA,cAAgB;AAChB,MAAA;AACI,KAAA,EAAA;AACA,MAAA,MAAA;AACI,QAAA,SAAA;AACI,QAAA,MAAA;AACA,QAAA;AACH,OAAA,GAAA,WAAA;AACJ,MAAA,OAAA,cAAA,CAAA,WAAA,CAAA,MAAA,EAAA,SAAA,EAAA,KAAA,EAAA,IAAA,IAAA,EAAA,CAAA,OAAA,EAAA,EAAA,KAAA,CAAA;AACJ,KAAA;AACJ,IAAA,cAAyB,CAAA,GAAA,EAAA,IAAA,EAAA;oBAC7B;;AAEG,KAAA,EAAA;AACA,MAAA,MAAA;;AAEI,OAAA,GAAA,WAAgB;AAChB,MAAA,MAAA;AACI,QAAA,QAAA;AACH,QAAA,IAAA;AACJ,QAAA,GAAA;UACJ,IAAA,IAAA;QACD,QAAa,EAAA;;AAEL,MAAA,OAAA,cAAU,CAAA,MAAA,CAAA;;;qBAGF;AACP,UAAA,OAAA,EAAA,QAAA,EAAA,OAAA,IAAA;AACJ,YAAA,UAAuB,EAAA;cAC3B,IAAA,EAAA,SAAA;cACgB,IAAA,IAAA,GAAA;AACb,gBAAA;eACH,GAAA,EAAA;AACJ;AACD;AACI;;AAEI,KAAA;AACA,IAAA,sBAAc,CAAY,GAAA,EAAA,IAAA,EAAA;oBACyD;;AAEnF,KAAA,EAAA;;AACA,QAAA;AACI,OAAA,GAAA,WAAM;AACN,MAAA,MAAA;AACA,QAAA,QAAA;AACA,QAAA,IAAA;AACA,QAAA,GAAA;AACA,OAAA,GAAA,IAAA,IAAA;gBACA,EAAI;;AAEP,MAAA,OAAA,cAAE,CAAA,MAAA,CAAA;AACH,QAAA,GAAA,IAAA;QACJ,QAAC,EAAA;AAED,UAAA,GAAA;;QAEA;AAEA,KAAA;iBACW,CAAA,GAAA,EAAA;;AAGX,KAAA,EAAA;AACI,MAAA,cAAQ;;AAEJ,KAAA,EAAA;AACA,MAAA,OAAA,cAAyB,CAAA,GAAA,CAAA;gBACzB,EAAW;AACX,UAAA,EAAA;gBACA,WAAc,CAAA,SAAA;AACjB,UAAA,IAAsB,EAAC,QAAA,CAAA;;QAE5B;AACI,KAAA;qBACH,CAAA,GAAA,EAAA;;AAEG,KAAA,EAAA;oBACH;;AAEG,KAAA,EAAA;aACH,cAAA,CAAA,GAAA,CAAA,EAAA,CAAA;;;UAGA,EAAA;AACD,IAAA,MAAA,aAAM,CAAA,GAAA,EAAA;;AAKF,MAAA,WAAA;UACH;AACJ,MAAA;AACJ,KAAE,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"channel.js","sources":["../../../src/graphql/resolvers/channel.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/graphql/resolvers/extended-token-account.d.ts

@@ -1,2 +1,3 @@
-import { IResolvers } from 'common';
-export declare const resolver: () => IResolvers;
+import { IResolverOptions } from '@common-stack/server-core';
+import { IResolvers } from 'common/server';
+export declare const resolver: (options: IResolverOptions) => IResolvers;

package/lib/graphql/resolvers/extended-token-account.js

@@ -1,7 +1,14 @@
-const resolver = () => ({
+const resolver = options => ({
   // UserAccount: {
-  //     async deviceToken(src:IUserAccount, args,{extendedTokenAccountService,userContext}){
-  //        return extendedTokenAccountService.getDeviceToken(src);
+  //     async deviceToken(src: IUserAccount, args, { extendedTokenAccountService, userContext }) {
+  //         options.logger.trace('(UserAccount.deviceToken) src.id [%s]', src.id);
+  //
+  //         // Check if src exists before calling service
+  //         if (!src || !src.id) {
+  //             return null;
+  //         }
+  //
+  //         return extendedTokenAccountService.getDeviceToken(src.id) as any;
   //     },
   // },
   Query: {
@@ -10,9 +17,20 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      // const user = await accountService.findAccountById(userContext.accountId);
-      // return extendedTokenAccountService.getDeviceToken(user);
-      return extendedTokenAccountService.getDeviceToken(userContext.accountId);
+      options.logger.trace('(Query.getDeviceToken) userContext.accountId [%s]', userContext?.accountId);
+      try {
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          return null;
+        }
+        // const user = await accountService.findAccountById(userContext.accountId);
+        // return extendedTokenAccountService.getDeviceToken(user);
+        const result = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        return result;
+      } catch (error) {
+        options.logger.error('Error getting device token: %o', error);
+        return null;
+      }
     },
     async getAccountByAuth0Id(_, {
       auth0Id
@@ -21,9 +39,20 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      // const user = await accountService.findAccountById(userContext.accountId);
-      // return extendedTokenAccountService.getDeviceToken(user);
-      return extendedTokenAccountService.getAccountByAuth0Id(auth0Id);
+      options.logger.trace('(Query.getAccountByAuth0Id) auth0Id [%s]', auth0Id);
+      try {
+        if (!auth0Id) {
+          options.logger.warn('Missing auth0Id parameter');
+          return null;
+        }
+        // const user = await accountService.findAccountById(userContext.accountId);
+        // return extendedTokenAccountService.getDeviceToken(user);
+        const result = await extendedTokenAccountService.getAccountByAuth0Id(auth0Id);
+        return result;
+      } catch (error) {
+        options.logger.error('Error getting account by Auth0 ID: %o', error);
+        return null;
+      }
     }
   },
   Mutation: {
@@ -34,27 +63,65 @@ const resolver = () => ({
       userContext,
       accountService
     }) {
-      const user = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
-      const expoTokens = user?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token != deviceToken);
-      if (expoTokens && expoTokens?.length > 0) {
-        expoTokens.forEach(async t => {
-          await extendedTokenAccountService.removeDeviceToken(t?.token, userContext.accountId);
-        });
-      }
-      const checkUserToken = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
-      let expoNotificationToken = checkUserToken?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token == deviceToken);
-      if (expoNotificationToken && expoNotificationToken?.length > 0) return checkUserToken;else {
-        await extendedTokenAccountService.setDeviceToken(deviceToken, userContext.accountId);
-        return extendedTokenAccountService.getDeviceToken(userContext.accountId);
+      options.logger.trace('(Mutation.setDeviceToken) deviceToken [%s], accountId [%s]', deviceToken ? '***' : 'null', userContext?.accountId);
+      try {
+        if (!deviceToken) {
+          options.logger.warn('Missing deviceToken parameter');
+          throw new Error('Device token is required');
+        }
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          throw new Error('User not authenticated');
+        }
+        const user = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        // Filter out existing EXPO_NOTIFICATION_TOKEN that are different from the new one
+        const expoTokens = user?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token != deviceToken);
+        // Remove existing different expo tokens
+        if (expoTokens && expoTokens?.length > 0) {
+          options.logger.debug('Removing %d existing expo tokens', expoTokens.length);
+          for (const t of expoTokens) {
+            await extendedTokenAccountService.removeDeviceToken(t?.token, userContext.accountId);
+          }
+        }
+        // Check if the token already exists
+        const checkUserToken = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+        let expoNotificationToken = checkUserToken?.tokens?.filter(t => t?.type === 'EXPO_NOTIFICATION_TOKEN' && t?.token == deviceToken);
+        if (expoNotificationToken && expoNotificationToken?.length > 0) {
+          options.logger.debug('Device token already exists for user');
+          return checkUserToken;
+        } else {
+          options.logger.debug('Adding new device token for user');
+          await extendedTokenAccountService.setDeviceToken(deviceToken, userContext.accountId);
+          const result = await extendedTokenAccountService.getDeviceToken(userContext.accountId);
+          return result;
+        }
+      } catch (error) {
+        options.logger.error('Error setting device token: %o', error);
+        throw error;
       }
     },
-    removeDeviceToken(_, {
+    async removeDeviceToken(_, {
       deviceToken
     }, {
       extendedTokenAccountService,
       userContext
     }) {
-      return extendedTokenAccountService.removeDeviceToken(deviceToken, userContext.accountId);
+      options.logger.trace('(Mutation.removeDeviceToken) deviceToken [%s], accountId [%s]', deviceToken ? '***' : 'null', userContext?.accountId);
+      try {
+        if (!deviceToken) {
+          options.logger.warn('Missing deviceToken parameter');
+          throw new Error('Device token is required');
+        }
+        if (!userContext?.accountId) {
+          options.logger.warn('Missing accountId in user context');
+          throw new Error('User not authenticated');
+        }
+        const result = await extendedTokenAccountService.removeDeviceToken(deviceToken, userContext.accountId);
+        return result;
+      } catch (error) {
+        options.logger.error('Error removing device token: %o', error);
+        throw error;
+      }
     }
   }
 });export{resolver};//# sourceMappingURL=extended-token-account.js.map