@amityco/ts-sdk 7.4.1-0e170b02.0 → 7.4.1-18d364a3.0

package/dist/utils/linkedObject/joinRequestLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"joinRequestLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/joinRequestLinkedObject.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,gBACrB,MAAM,mBAAmB,KACrC,MAAM,WAkBR,CAAC"}
+{"version":3,"file":"joinRequestLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/joinRequestLinkedObject.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,gBACrB,MAAM,mBAAmB,KACrC,MAAM,WAsBR,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.4.1-0e170b02.0",
+  "version": "7.4.1-18d364a3.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/domains/joinRequest.ts

@@ -35,10 +35,10 @@ declare global {
       requestorInternalId: string;
       requestorPublicId: string;
 
-      respondedAt: Amity.timestamp;
-      responderId: string;
-      responderInternalId: string;
-      responderPublicId: string;
+      respondedAt: Amity.timestamp | null;
+      responderId: string | null;
+      responderInternalId: string | null;
+      responderPublicId: string | null;
 
       status: Amity.JoinRequestStatus;
       targetId: string;

package/src/@types/domains/notification.ts

@@ -10,6 +10,7 @@ declare global {
       POST_REACT = 'reaction_on_post',
       COMMENT_REACT = 'reaction_on_comment',
       REPLY_REACT = 'reaction_on_reply',
+      RESPONSE_JOIN_REQUEST = 'respond_on_join_request',
     }
 
     const enum TrayAction {
@@ -19,6 +20,7 @@ declare global {
       REACTION = 'reaction',
       MENTION = 'mention',
       REPLY = 'reply',
+      JOIN_REQUEST = 'join_request',
     }
 
     type RawNotificationTrayItem = {

package/src/communityRepository/internalAPI/joinCommunity.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api/activeClient';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { prepareCommunityJoinRequestPayload } from '~/communityRepository/utils';
 import { fireEvent } from '~/core/events';
-import { JoinResultStatusEnum } from '~/@types/domains/joinRequest';
+import { JoinRequestStatusEnum, JoinResultStatusEnum } from '~/@types/domains/joinRequest';
 import { joinRequestLinkedObject } from '~/utils/linkedObject/joinRequestLinkedObject';
 
 /* begin_public_function
@@ -40,7 +40,9 @@ export const joinRequest = async (
   fireEvent('local.community.join', data.joinRequests);
 
   const status =
-    data.joinRequests.length === 0 ? JoinResultStatusEnum.Success : JoinResultStatusEnum.Pending;
+    data.joinRequests[0].status === JoinRequestStatusEnum.Approved
+      ? JoinResultStatusEnum.Success
+      : JoinResultStatusEnum.Pending;
 
   return status === JoinResultStatusEnum.Success
     ? { status }

package/src/communityRepository/joinRequest/internalAPI/approveJoinRequest.ts

@@ -29,14 +29,10 @@ export const approveJoinRequest = async (
   const { data } = await client.http.post<{ success: boolean }>(
     `/api/v4/communities/${joinRequest.targetId}/join/approve`,
     {
-      params: {
-        userId: joinRequest.userId,
-      },
+      userId: joinRequest.requestorInternalId,
     },
   );
 
-  // TODO : Check cache id
-
   const joinRequestCache = pullFromCache<Amity.InternalJoinRequest>([
     'joinRequest',
     'get',

package/src/communityRepository/joinRequest/internalAPI/cancelJoinRequest.ts

@@ -27,11 +27,6 @@ export const cancelJoinRequest = async (
 
   const { data } = await client.http.delete<{ success: boolean }>(
     `/api/v4/communities/${joinRequest.targetId}/join`,
-    {
-      params: {
-        userId: joinRequest.userId,
-      },
-    },
   );
 
   const joinRequestCache = pullFromCache<Amity.InternalJoinRequest>([

package/src/communityRepository/joinRequest/internalAPI/rejectJoinRequest.ts

@@ -28,6 +28,9 @@ export const rejectJoinRequest = async (
 
   const { data } = await client.http.post<{ success: boolean }>(
     `/api/v4/communities/${joinRequest.targetId}/join/reject`,
+    {
+      userId: joinRequest.requestorInternalId,
+    },
   );
 
   const joinRequestCache = pullFromCache<Amity.InternalJoinRequest>([

package/src/core/model/index.ts

@@ -56,6 +56,7 @@ export const PAYLOAD2MODEL: Record<string, Amity.Domain> = {
   notificationTrayItems: 'notificationTrayItem',
 
   invitations: 'invitation',
+  joinRequests: 'joinRequest',
 };
 
 /** hidden */

package/src/utils/linkedObject/joinRequestLinkedObject.ts

@@ -9,10 +9,14 @@ export const joinRequestLinkedObject = (
 ): Amity.JoinRequest => {
   return {
     ...joinRequest,
-    get user() {
-      const cacheData = pullFromCache<Amity.User>(['user', 'get', joinRequest.userId]);
-      if (cacheData?.data) return userLinkedObject(cacheData.data);
-      return undefined;
+    get user(): Amity.User | undefined {
+      const user = pullFromCache<Amity.InternalUser>([
+        'user',
+        'get',
+        joinRequest.requestorPublicId,
+      ])?.data;
+      if (!user) return undefined;
+      return userLinkedObject(user);
     },
     cancel: async () => {
       await cancelJoinRequest(joinRequest);