Merge pull request #414 from bakaphp/feat-add-user-app-preferences-function

Improve user authentication flow

Author: rwhite27

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.32.0",
+  "version": "0.32.1",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/modules/messages/index.ts

@@ -15,6 +15,7 @@ import {
   MessageSearchSuggestions,
   AllLikedMessagesByUser,
   AllForYouMessages,
+  AllFollowingFeedMessages,
   AllChannelMessages,
   MessageWithFileInputInterface,
 } from '../../types';
@@ -42,6 +43,7 @@ import {
   GET_MESSAGES_GROUP_BY_DATE_QUERY,
   GET_MESSAGES_LIKED_BY_USER,
   GET_MESSAGES_QUERY,
+  GET_FOLLOWING_FEED_QUERY
 } from '../../queries';
 
 import { MessagesComments } from '../messages-comments';
@@ -264,6 +266,52 @@ export class Messages {
     return response.data;
   }
 
+  public async getFollowingFeedMessages(
+    options: {
+      where?: WhereCondition;
+      orderBy?: Array<OrderByMessage>;
+      search?: string;
+      first?: number;
+      page?: number;
+      hasTags?: WhereCondition;
+      hasType?: WhereCondition;
+      childrenOptions?: {
+        alias?: string; // Alias for the children field
+        first?: number; // Limit for children
+      };
+    } = {}
+  ): Promise<AllFollowingFeedMessages> {
+    const {
+      search,
+      hasTags,
+      hasType,
+      where,
+      orderBy,
+      first = 25,
+      page,
+      childrenOptions = {},
+    } = options;
+
+    const { alias = 'children', first: childrenFirst } = childrenOptions;
+
+    const response = await this.client.query({
+      query: GET_FOLLOWING_FEED_QUERY(childrenFirst !== undefined, alias),
+      variables: {
+        where,
+        hasTags,
+        hasType,
+        orderBy,
+        search,
+        first,
+        page,
+        ...(childrenFirst !== undefined && { childrenFirst }),
+      },
+      fetchPolicy: 'no-cache',
+    });
+
+    return response.data;
+  }
+
   public async getChannelMessages(
     options: {
       channel_uuid?: string;

src/queries/messages.query.ts

@@ -520,3 +520,105 @@ export const GET_MESSAGES_LIKED_BY_USER = gql`
     }
   }
 `;
+
+export const GET_FOLLOWING_FEED_QUERY = (includeChildren: boolean, alias: string) => gql`
+  query followingFeedMessages(
+    $where: QueryFollowingFeedMessagesWhereWhereConditions
+    $hasTags: QueryFollowingFeedMessagesHasTagsWhereHasConditions
+    $hasType: QueryFollowingFeedMessagesHasTypeWhereHasConditions
+    $orderBy: [QueryFollowingFeedMessagesOrderByOrderByClause!]
+    $first: Int! = 25
+    $page: Int
+    ${includeChildren ? `$childrenFirst: Int!` : ''}
+  ) {
+    followingFeedMessages(
+      where: $where
+      hasTags: $hasTags
+      hasType: $hasType
+      orderBy: $orderBy
+      first: $first
+      page: $page
+    ) {
+      data {
+        id
+        uuid
+        message
+        parent_id
+        slug
+        user {
+          id
+          firstname
+          lastname
+          displayname
+          photo {
+            url
+          }
+          social {
+            is_blocked
+            is_following
+          }
+        }
+        appModuleMessage {
+          entity_id
+          system_modules
+        }
+        message_types_id
+        message
+        reactions_count
+        comment_count
+        total_liked
+        total_disliked
+        total_saved
+        total_shared
+        total_view
+        total_children
+        is_public
+        tags {
+          data {
+              id
+              name
+              slug
+          }
+        }
+        parent {
+          id
+          uuid
+        },
+        myInteraction {
+            is_liked
+            is_disliked
+            is_saved
+            is_shared
+            is_reported
+            is_purchased
+        }
+        ${includeChildren ? `${alias}: children(first: $childrenFirst) {
+          data {
+            id
+            uuid
+            message
+            slug
+            user {
+              id
+              firstname
+              lastname
+              displayname
+              photo {
+                url
+              }
+              social {
+                is_blocked
+                is_following
+              }
+            }
+          }
+        }` : ''}
+        created_at
+      }
+      paginatorInfo {
+        currentPage
+        lastPage
+      }
+    }
+  }
+`;

src/types/messages.ts

@@ -52,6 +52,13 @@ export interface AllForYouMessages {
     paginatorInfo?: PaginatorInfo;
   };
 }
+
+export interface AllFollowingFeedMessages {
+  followingFeedMessages: {
+    data: MessagesInterface[];
+    paginatorInfo?: PaginatorInfo;
+  };
+}
 export interface AllChannelMessages {
   channelMessages: {
     data: MessagesInterface[];
@@ -141,6 +148,7 @@ export interface HasAppModuleMessageWhereConditions {
   value: string;
 }
 
+
 export interface OrderByMessage {
   column: string;
   order: string;

test/message.test.ts

@@ -379,13 +379,34 @@ describe('Test the Social Messages', () => {
         const recentMessages = await messages.getForYouMessages({
             orderBy: [{ column: 'CREATED_AT', order: 'DESC' }],
             first: 25,
-            page: 1
+            page: 1,
+            childrenOptions: {
+                alias: "children",
+                first: 10,
+            }
         });
         expect(recentMessages).toBeDefined();
         expect(recentMessages.forYouMessages.data).toBeDefined();
         expect(recentMessages.forYouMessages.data.length).toBeGreaterThan(0);
     });
 
+    it('get following feed messages', async () => {
+        const client = getClient();
+        const messages = client.messages;
+        const recentMessages = await messages.getFollowingFeedMessages({
+            orderBy: [{ column: 'CREATED_AT', order: 'DESC' }],
+            first: 25,
+            page: 1,
+            childrenOptions: {
+                alias: "children",
+                first: 10,
+            }
+        });
+        expect(recentMessages).toBeDefined();
+        expect(recentMessages.followingFeedMessages.data).toBeDefined();
+        expect(recentMessages.followingFeedMessages.data.length).toBeGreaterThan(0);
+    });
+
     it('get message from channel', async () => {
         const client = getClient();
         const messages = client.messages;