@amityco/ts-sdk 0.0.1-beta.39 → 0.0.1-beta.40

package/src/channel/api/tests/createChannel.test.ts

@@ -4,11 +4,13 @@ import {
   client,
   conversationChannelPayload,
   liveChannelPayload,
+  rawChannelPayload,
 } from '~/utils/tests';
 import { prepareChannelPayload } from '~/channel/utils';
+
 import { createChannel } from '../createChannel';
 
-const resPayload = { data: channelPayload };
+const resPayload = { data: rawChannelPayload };
 
 describe('createChannel', () => {
   // integration_test_id: 9d80fd54-9e6d-454d-8344-6f9436b8e495
@@ -18,7 +20,7 @@ describe('createChannel', () => {
     const res = await createChannel({ type: 'community' });
 
     expect(res).toBeDefined();
-    expect(res.data).toStrictEqual(prepareChannelPayload(channelPayload).channels[0]);
+    expect(res.data).toStrictEqual(prepareChannelPayload(rawChannelPayload).channels[0]);
   });
 
   // integration_test_id: cef520ab-027d-4c5b-836c-a7f63ddc5146
@@ -51,7 +53,7 @@ describe('createChannel', () => {
     const data = pullFromCache(['channel', 'get', channelId]);
 
     expect(data).toBeDefined();
-    expect(data?.data).toStrictEqual(prepareChannelPayload(channelPayload).channels[0]);
+    expect(data?.data).toStrictEqual(prepareChannelPayload(rawChannelPayload).channels[0]);
 
     disableCache();
   });

package/src/channel/api/tests/getChannel.test.ts

@@ -5,9 +5,10 @@ import { client, channelQueryResponse } from '~/utils/tests';
 import { pushToTombstone } from '~/cache/api/pushToTombstone';
 import { isInTombstone } from '~/cache/api/isInTombstone';
 
-import { getChannel } from '../getChannel';
 import { prepareChannelPayload } from '~/channel/utils';
 
+import { getChannel } from '../getChannel';
+
 const { channelId } = channelQueryResponse.data.channels[0];
 const channel = prepareChannelPayload(channelQueryResponse.data).channels[0];
 

package/src/channel/api/tests/joinChannel.test.ts

@@ -8,8 +8,8 @@ import {
   disconnectClient,
   channel1,
   user11,
-  rawChannelUser,
   channelUserQueryResponse,
+  channelUser,
 } from '~/utils/tests';
 
 import { joinChannel } from '../joinChannel';
@@ -32,7 +32,7 @@ describe('joinChannel', () => {
   test('it should update cache', async () => {
     enableCache();
 
-    const expected = rawChannelUser;
+    const expected = channelUser;
     client.http.post = jest.fn().mockResolvedValueOnce(channelUserQueryResponse);
 
     const didJoinChannel = await joinChannel(channelId);

package/src/channel/api/tests/leaveChannel.test.ts

@@ -8,8 +8,8 @@ import {
   disconnectClient,
   channel1,
   user11,
-  rawChannelUser,
   channelUserQueryResponse,
+  channelUser,
 } from '~/utils/tests';
 
 import { leaveChannel } from '../leaveChannel';
@@ -32,7 +32,7 @@ describe('leaveChannel', () => {
   test('it should update cache', async () => {
     enableCache();
 
-    const expected = rawChannelUser;
+    const expected = channelUser;
     client.http.delete = jest.fn().mockResolvedValueOnce(channelUserQueryResponse);
 
     const didleaveChannel = await leaveChannel(channelId);

package/src/channel/api/tests/queryChannelMembers.test.ts

@@ -4,7 +4,6 @@ import { disableCache, enableCache, pushToCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
 import { prepareChannelPayload } from '~/channel/utils';
-import { prepareMembershipPayload } from '~/group/utils';
 import { client, channelUserQueryResponse, channelUserModel } from '~/utils/tests';
 
 import { queryChannelMembers } from '../queryChannelMembers';
@@ -63,8 +62,7 @@ describe('queryChannelMembers.locally', () => {
     enableCache();
 
     const { paging, ...payload } = channelUserQueryResponse.data;
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);
@@ -91,8 +89,7 @@ describe('queryChannelMembers.locally', () => {
     enableCache();
 
     const { paging, ...payload } = channelUserQueryResponse.data;
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channelUsers } = preparedPayload;
 
     // ingest incomplete data

package/src/channel/api/tests/queryChannels.test.ts

@@ -126,11 +126,12 @@ describe('queryChannels.locally', () => {
     enableCache();
 
     const { data } = channelQueryResponse;
-    const { channels: expected, paging } = data;
+    const { paging, ...payload } = data;
+    const { channels: expected } = prepareChannelPayload(payload);
 
-    ingestInCache(data as Amity.ChannelPayload);
+    ingestInCache(prepareChannelPayload(data));
 
-    pushToCache(cacheKey, { channels: expected.map(getResolver('channel')), paging });
+    pushToCache(cacheKey, { channels: payload.channels.map(getResolver('channel')), paging });
 
     const { data: received } = queryChannels.locally()!;
     const received2 = queryChannels.locally({ displayName: 'test' })!;

package/src/channel/api/tests/removeChannelMembers.test.ts

@@ -8,12 +8,23 @@ import {
   rawChannelUser,
   rawChannelUser3,
   channel1,
+  channelUser,
+  channelUser3,
+  connectClient,
+  disconnectClient,
 } from '~/utils/tests';
 
 import { onChannelMemberRemoved } from '~/channel/events';
+
 import { removeChannelMembers } from '../removeChannelMembers';
 
 describe('removeChannelMembers', () => {
+  beforeAll(connectClient);
+  afterAll(disconnectClient);
+
+  beforeEach(enableCache);
+  afterEach(disableCache);
+
   const { channelId } = channelUserQueryResponse.data.channels[0];
   const { userId } = rawChannelUser;
 
@@ -36,15 +47,15 @@ describe('removeChannelMembers', () => {
     });
 
     const recieved = await removeChannelMembers(channelId, [userId]);
-    const channelUser = pullFromCache<Amity.Membership<'channel'>>([
+    const recievedCache = pullFromCache<Amity.Membership<'channel'>>([
       'channelUsers',
       'get',
       channelUserCacheKey,
     ])?.data;
 
     expect(recieved).toBe(true);
-    expect(channelUser).toBeDefined();
-    expect(channelUser).toBe(rawChannelUser);
+    expect(recievedCache).toBeDefined();
+    expect(recievedCache).toEqual(channelUser);
 
     disableCache();
   });
@@ -81,8 +92,8 @@ describe('removeChannelMembers', () => {
      * Assertion below is required to check if the event handler is called with the right
      * params. It's not enough to check if the handler does not throw
      */
-    expect(callback).toHaveBeenNthCalledWith(1, channel1, rawChannelUser);
-    expect(callback).toHaveBeenNthCalledWith(2, channel1, rawChannelUser3);
+    expect(callback).toHaveBeenNthCalledWith(1, channel1, channelUser);
+    expect(callback).toHaveBeenNthCalledWith(2, channel1, channelUser3);
 
     unsub();
   });

package/src/channel/api/unbanChannelMembers.ts

@@ -1,7 +1,6 @@
 import { getActiveClient } from '~/client/api/activeClient';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { prepareMembershipPayload, withUsers } from '~/group/utils';
 
 import { prepareChannelPayload } from '../utils';
 
@@ -33,8 +32,7 @@ export const unbanChannelMembers = async (
     },
   );
 
-  const channelPayload = prepareChannelPayload(payload);
-  const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+  const preparedPayload = prepareChannelPayload(payload);
 
   const cachedAt = client.cache && Date.now();
   if (client.cache) ingestInCache(preparedPayload, { cachedAt });

package/src/channel/events/onChannelJoined.ts

@@ -3,7 +3,6 @@ import { createEventSubscriber } from '~/core/events';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
-import { prepareMembershipPayload } from '~/group/utils';
 import { prepareChannelPayload } from '../utils';
 
 /**
@@ -27,8 +26,7 @@ export const onChannelJoined = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/events/onChannelLeft.ts

@@ -3,7 +3,6 @@ import { createEventSubscriber } from '~/core/events';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
-import { prepareMembershipPayload } from '~/group/utils';
 import { prepareChannelPayload } from '../utils';
 
 /**
@@ -27,8 +26,7 @@ export const onChannelLeft = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/events/onChannelMemberAdded.ts

@@ -1,7 +1,6 @@
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
-import { prepareMembershipPayload } from '~/group/utils';
 
 import { prepareChannelPayload } from '../utils';
 
@@ -26,8 +25,7 @@ export const onChannelMemberAdded = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/events/onChannelMemberBanned.ts

@@ -2,7 +2,6 @@ import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { prepareMembershipPayload } from '~/group/utils';
 
 import { prepareChannelPayload } from '../utils';
 
@@ -27,8 +26,7 @@ export const onChannelMemberBanned = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/events/onChannelMemberRemoved.ts

@@ -2,7 +2,6 @@ import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { prepareMembershipPayload } from '~/group/utils';
 
 import { prepareChannelPayload } from '../utils';
 
@@ -27,8 +26,7 @@ export const onChannelMemberRemoved = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/events/onChannelMemberUnbanned.ts

@@ -2,7 +2,6 @@ import { getActiveClient } from '~/client/api';
 import { createEventSubscriber } from '~/core/events';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
-import { prepareMembershipPayload } from '~/group/utils';
 
 import { prepareChannelPayload } from '../utils';
 
@@ -27,8 +26,7 @@ export const onChannelMemberUnbanned = (
   const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelMembershipPayload) => {
-    const channelPayload = prepareChannelPayload(payload);
-    const preparedPayload = prepareMembershipPayload(channelPayload, 'channelUsers');
+    const preparedPayload = prepareChannelPayload(payload);
     const { channels, channelUsers } = preparedPayload;
 
     ingestInCache(preparedPayload);

package/src/channel/observers/tests/liveChannelMembers.test.ts

@@ -1,5 +1,4 @@
 import { disableCache, enableCache } from '~/cache/api';
-import { prepareMembershipPayload } from '~/group/utils';
 import {
   bannedChannelUser,
   channel1,
@@ -24,12 +23,13 @@ import {
   user13,
   user14,
 } from '~/utils/tests';
+
 import { liveChannelMembers } from '../liveChannelMembers';
 import { prepareChannelPayload } from '../../utils';
 
 const getSnapshot = (params?: Record<string, any>) => {
   return {
-    data: [] as Amity.MembershipRaw<'channel'>[],
+    data: [] as Amity.RawMembership<'channel'>[],
     loading: true,
     error: undefined as any,
     ...params,
@@ -117,15 +117,8 @@ describe('liveChannelMembers', () => {
     onNextPage();
     await pause();
 
-    const payload = prepareMembershipPayload(
-      prepareChannelPayload(channelUserQueryResponse.data),
-      'channelUsers',
-    );
-
-    const payload2 = prepareMembershipPayload(
-      prepareChannelPayload(channelUserQueryResponsePage2.data),
-      'channelUsers',
-    );
+    const payload = prepareChannelPayload(channelUserQueryResponse.data);
+    const payload2 = prepareChannelPayload(channelUserQueryResponsePage2.data);
 
     const snapshot = getSnapshot();
     snapshot.loading = false;
@@ -137,7 +130,7 @@ describe('liveChannelMembers', () => {
   const events: [
     string,
     keyof Amity.Events,
-    Amity.MembershipRaw<'channel'>,
+    Amity.RawMembership<'channel'>,
     Amity.User,
     Amity.Membership<'channel'>[],
   ][] = [

package/src/channel/observers/tests/liveChannels.test.ts

@@ -198,7 +198,7 @@ describe('liveChannels', () => {
   describe('events', () => {
     const rawNewChannel = generateRawChannel({ channelId: 'new-channel-id' });
 
-    const cases: [string, keyof Amity.Events, Amity.ChannelRaw, Amity.Channel[]][] = [
+    const cases: [string, keyof Amity.Events, Amity.RawChannel, Amity.Channel[]][] = [
       [
         'it should add new channel to collection onCreate',
         'channel.created',
@@ -445,6 +445,8 @@ describe('liveChannels', () => {
           segment: channelRaw1.messageCount + 1,
         }),
       ],
+      files: [],
+      users: [],
     });
     await pause(500);
 

package/src/channel/utils/index.ts

@@ -1,7 +1,8 @@
 import { pullFromCache } from '~/cache/api';
+import { withUsers } from '~/group/utils';
 
 export function convertFromRaw(
-  { _id, ...rest }: Amity.ChannelRaw,
+  { _id, ...rest }: Amity.RawChannel,
   params: Pick<
     Amity.Channel,
     | 'defaultSubChannelHasUnreadMention'
@@ -17,7 +18,7 @@ export function convertFromRaw(
   };
 }
 
-function getSegmentParams(rawChannel: Amity.ChannelRaw) {
+function getSegmentParams(rawChannel: Amity.RawChannel) {
   let cached;
 
   try {
@@ -44,11 +45,13 @@ function getSegmentParams(rawChannel: Amity.ChannelRaw) {
 }
 
 export const prepareChannelPayload = (
-  payload: Amity.ChannelPayload,
-): Amity.ChannelPayload<any, Amity.Channel> => {
-  const channels: Amity.Channel[] = payload.channels.map(channel =>
+  rawPayload: Amity.ChannelPayload,
+): Amity.ProcessedChannelPayload => {
+  const channels: Amity.Channel[] = rawPayload.channels.map(channel =>
     convertFromRaw(channel, getSegmentParams(channel)),
   );
 
-  return { ...payload, channels };
+  const channelUsers: Amity.Membership<'channel'>[] = withUsers(rawPayload.channelUsers);
+
+  return { ...rawPayload, channels, channelUsers };
 };

package/src/comment/api/createComment.ts

@@ -22,7 +22,13 @@ import { getPost } from '~/post/api/getPost';
 export const createComment = async (
   bundle: Pick<
     Amity.Comment<Amity.CommentContentType>,
-    'data' | 'referenceType' | 'referenceId' | 'parentId' | 'metadata' | 'mentionees'
+    | 'data'
+    | 'referenceType'
+    | 'referenceId'
+    | 'parentId'
+    | 'metadata'
+    | 'mentionees'
+    | 'attachments'
   >,
 ): Promise<Amity.Cached<Amity.Comment>> => {
   const client = getActiveClient();
@@ -35,7 +41,17 @@ export const createComment = async (
 
   const post = await getPost(bundle.referenceId);
 
-  fireEvent('post.updated', { posts: [post.data] });
+  fireEvent('post.updated', {
+    posts: [post.data],
+    categories: [],
+    comments: [],
+    communities: [],
+    communityUsers: [],
+    feeds: [],
+    files: [],
+    postChildren: [],
+    users: [],
+  });
   fireEvent('comment.created', data);
 
   const { comments } = data;

package/src/comment/api/deleteComment.ts

@@ -6,6 +6,7 @@ import { fireEvent } from '~/core/events';
 import { getPost } from '~/post/api/getPost';
 import { pushToTombstone } from '~/cache/api/pushToTombstone';
 import { scheduleTask } from '~/core/microtasks';
+
 import { getComment } from './getComment';
 
 /**
@@ -47,8 +48,24 @@ export const deleteComment = async (
 
   const post = await getPost(comment.data.referenceId);
 
-  fireEvent('post.updated', { posts: [post.data] });
-  fireEvent('comment.deleted', { comments: [deleted] });
+  fireEvent('post.updated', {
+    posts: [post.data],
+    categories: [],
+    comments: [],
+    communities: [],
+    communityUsers: [],
+    feeds: [],
+    files: [],
+    postChildren: [],
+    users: [],
+  });
+
+  fireEvent('comment.deleted', {
+    comments: [deleted],
+    commentChildren: [],
+    files: [],
+    users: [],
+  });
 
   if (permanent) {
     scheduleTask(() => pushToTombstone('comment', commentId));