chats: add URI to message; extract MessageDocumentQuery

Author: angelo-v

chats/rdflib/src/e2e-tests/read-chat.e2e.spec.ts

@@ -26,6 +26,7 @@ describe("read a chat", () => {
     );
     expect(chat.latestMessages).toEqual([
       {
+        uri: "http://localhost:3456/chats/eBIszJ/2024/07/01/chat.ttl#Msg1723225634153",
         text: "Hello visitor, welcome to my public chat lobby!",
         date: new Date("2024-07-01T17:47:14Z"),
         authorWebId: "http://localhost:3000/alice/profile/card#me",

chats/rdflib/src/index.ts

@@ -52,4 +52,9 @@ export interface Chat {
 /**
  * Represents a message in a chat
  */
-export interface Message {}
+export interface Message {
+  uri: string;
+  authorWebId: string;
+  text: string;
+  date: Date;
+}

chats/rdflib/src/module/ChatsModuleRdfLib.ts

@@ -1,12 +1,5 @@
 import { Chat, ChatsModule, CreateChatCommand } from "../index.js";
-import {
-  Fetcher,
-  IndexedFormula,
-  NamedNode,
-  Node,
-  sym,
-  UpdateManager,
-} from "rdflib";
+import { Fetcher, IndexedFormula, NamedNode, sym, UpdateManager } from "rdflib";
 
 import {
   ContainerQuery,
@@ -18,7 +11,7 @@ import {
 import { generateId } from "@solid-data-modules/rdflib-utils/identifier";
 import { createChat } from "./update-operations/index.js";
 import { ChatQuery } from "./queries/index.js";
-import { wf } from "./namespaces.js";
+import { MessagesDocumentQuery } from './queries/MessagesDocumentQuery.js';
 
 interface ModuleConfig {
   store: IndexedFormula;
@@ -70,22 +63,13 @@ export class ChatsModuleRdfLib implements ChatsModule {
 
     const latestMonth = await this.fetchLatestSubContainer(latestYear);
     const latestDay = await this.fetchLatestSubContainer(latestMonth);
-    const chatDocument = await this.fetchLatestDocument(latestDay);
+    const messagesDocument = await this.fetchLatestDocument(latestDay);
 
-    const messages: Node[] = this.store.each(
+    return new MessagesDocumentQuery(
       chatNode,
-      wf("message"),
-      undefined,
-      chatDocument,
-    );
-
-    // TODO query actual message
-    const latestMessages = messages.map((it) => ({
-      text: "Hello visitor, welcome to my public chat lobby!",
-      date: new Date("2024-07-01T17:47:14Z"),
-      authorWebId: "http://localhost:3000/alice/profile/card#me",
-    }));
-    return latestMessages;
+      messagesDocument,
+      this.store,
+    ).queryMessages();
   }
 
   private async fetchLatestSubContainer(container: NamedNode) {

chats/rdflib/src/module/_integration-tests/read-chat-integration.spec.ts

@@ -103,6 +103,7 @@ describe("read chat", () => {
     // then the message is part of the latest messages
     expect(chat.latestMessages).toEqual([
       {
+        uri: "https://pod.test/alice/chats/abc123/2024/07/01/chat.ttl#Msg1723225634153",
         authorWebId: "http://localhost:3000/alice/profile/card#me",
         date: new Date("2024-07-01T17:47:14Z"),
         text: "Hello visitor, welcome to my public chat lobby!",

chats/rdflib/src/module/queries/MessagesDocumentQuery.ts

@@ -0,0 +1,25 @@
+import { IndexedFormula, NamedNode } from "rdflib";
+import { Message } from '../../index.js';
+import { wf } from '../namespaces.js';
+
+export class MessagesDocumentQuery {
+  constructor(
+    private chatNode: NamedNode,
+    private messagesDocument: NamedNode,
+    private store: IndexedFormula,
+  ) {}
+
+  queryMessages(): Message[] {
+    const messages: NamedNode[] = this.store
+      .each(this.chatNode, wf("message"), undefined, this.messagesDocument)
+      .map((it) => it as NamedNode);
+
+    // TODO query actual message
+    return messages.map((it) => ({
+      uri: it.uri,
+      text: "Hello visitor, welcome to my public chat lobby!",
+      date: new Date("2024-07-01T17:47:14Z"),
+      authorWebId: "http://localhost:3000/alice/profile/card#me",
+    }));
+  }
+}