IO-1551 Refactor messaging.

client/src/graphql/conversations.queries.js

@@ -1,15 +1,54 @@
 import { gql } from "@apollo/client";
 
-export const CONVERSATION_LIST_SUBSCRIPTION = gql`
-  subscription CONVERSATION_LIST_SUBSCRIPTION {
+// export const CONVERSATION_LIST_SUBSCRIPTION = gql`
+//   subscription CONVERSATION_LIST_SUBSCRIPTION {
+//     conversations(
+//       order_by: { updated_at: desc }
+//       limit: 50
+//       where: { archived: { _eq: false } }
+//     ) {
+//       phone_num
+//       id
+//       updated_at
+//       unreadcnt
+//       messages_aggregate(
+//         where: { read: { _eq: false }, isoutbound: { _eq: false } }
+//       ) {
+//         aggregate {
+//           count
+//         }
+//       }
+//       job_conversations {
+//         job {
+//           id
+//           ro_number
+//           ownr_fn
+//           ownr_ln
+//           ownr_co_nm
+//         }
+//       }
+//     }
+//   }
+// `;
+
+export const CONVERSATION_LIST_QUERY = gql`
+  query CONVERSATION_LIST_QUERY {
     conversations(
       order_by: { updated_at: desc }
-      limit: 100
+      limit: 50
       where: { archived: { _eq: false } }
     ) {
       phone_num
       id
       updated_at
+      unreadcnt
+      messages_aggregate(
+        where: { read: { _eq: false }, isoutbound: { _eq: false } }
+      ) {
+        aggregate {
+          count
+        }
+      }
       job_conversations {
         job {
           id
@@ -17,17 +56,6 @@ export const CONVERSATION_LIST_SUBSCRIPTION = gql`
           ownr_fn
           ownr_ln
           ownr_co_nm
-          owner {
-            id
-            allow_text_message
-          }
-        }
-      }
-      messages_aggregate(
-        where: { read: { _eq: false }, isoutbound: { _eq: false } }
-      ) {
-        aggregate {
-          count
         }
       }
     }
@@ -36,24 +64,26 @@ export const CONVERSATION_LIST_SUBSCRIPTION = gql`
 
 export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
   subscription CONVERSATION_SUBSCRIPTION_BY_PK($conversationId: uuid!) {
+    messages(
+      order_by: { created_at: asc_nulls_first }
+      where: { conversationid: { _eq: $conversationId } }
+    ) {
+      id
+      status
+      text
+      isoutbound
+      image
+      image_path
+      userid
+      created_at
+      read
+    }
+  }
+`;
+
+export const GET_CONVERSATION_DETAILS = gql`
+  query GET_CONVERSATION_DETAILS($conversationId: uuid!) {
     conversations_by_pk(id: $conversationId) {
-      messages(order_by: { created_at: asc_nulls_first }) {
-        id
-        status
-        text
-        isoutbound
-        image
-        image_path
-        userid
-        created_at
-      }
-      messages_aggregate(
-        where: { read: { _eq: false }, isoutbound: { _eq: false } }
-      ) {
-        aggregate {
-          count
-        }
-      }
       id
       phone_num
       archived

client/src/graphql/messages.queries.js

@@ -8,6 +8,8 @@ export const MARK_MESSAGES_AS_READ_BY_CONVERSATION = gql`
     ) {
       returning {
         id
+        read
+        isoutbound
       }
     }
   }