feat: updated document-drive dep (#70)

powerhouse-inc · Feb 6, 2024 · 2ce57e2 · 2ce57e2
1 parent 6cbdcc9
commit 2ce57e2
Show file tree

Hide file tree

Showing 10 changed files with 4,618 additions and 19 deletions.
diff --git a/api/package.json b/api/package.json
@@ -21,7 +21,7 @@
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "document-drive": "^0.0.27",
+    "document-drive": "powerhouse-inc/document-drive#ec00335",
     "document-model": "^1.0.24",
     "document-model-libs": "^1.1.37",
     "dotenv": "^16.0.3",

diff --git a/api/prisma/schema.prisma b/api/prisma/schema.prisma
@@ -59,6 +59,7 @@ model Document {
   operations   Operation[]
   initialState Json // json object with the scope as keys of the root object
   documentType String
+  syncronizationUnits SyncronizationUnit[]
 
   @@id([id, driveId])
 }
@@ -70,17 +71,36 @@ model Operation {
   scope      String
   branch     String
   index      Int
+  skip       Int
 
   hash        String
   timestamp   DateTime
   input       Json
   type        String
   attachments Attachment[]
 
+  syncId String?
+
+  SyncronizationUnit SyncronizationUnit? @relation(fields: [syncId, driveId], references: [id, driveId])
+
   @@id([driveId, documentId, scope, branch, index])
 }
 
+model SyncronizationUnit {
+  id         String
+  driveId    String
+  documentId String
+
+  Document   Document    @relation(fields: [documentId, driveId], references: [id, driveId])
+  scope      String
+  branch     String
+  operations Operation[]
+
+  @@id([id, driveId])
+}
+
 model Attachment {
+  id         String    @id @default(uuid())
   driveId    String
   documentId String
   scope      String
@@ -93,6 +113,16 @@ model Attachment {
   filename  String
   extension String
   hash      String
+}
+
+model Listener {
+  listenerId String @id @default(uuid())
+  driveId    String
+
+  label  String?
+  block  Boolean
+  system Boolean
 
-  @@id([driveId, documentId, scope, branch, index, hash])
+  filter   Json
+  callInfo Json
 }
diff --git a/api/src/generated/nexus.ts b/api/src/generated/nexus.ts
@@ -48,7 +48,7 @@ export interface NexusGenInputs {
     icon?: string | null; // String
     id: string; // ID!
     name: string; // String!
-    remoteUrl?: string | null; // String
+    slug?: string | null; // String
   }
   InputListenerFilter: { // input type
     branch?: Array<string | null> | null; // [String]
@@ -129,7 +129,7 @@ export interface NexusGenObjects {
     id: string; // ID!
     name: string; // String!
     nodes: Array<NexusGenRootTypes['Node'] | null>; // [Node]!
-    remoteUrl?: string | null; // String
+    slug?: string | null; // String
   }
   Listener: { // root type
     block: boolean; // Boolean!
@@ -242,7 +242,7 @@ export interface NexusGenFieldTypes {
     id: string; // ID!
     name: string; // String!
     nodes: Array<NexusGenRootTypes['Node'] | null>; // [Node]!
-    remoteUrl: string | null; // String
+    slug: string | null; // String
   }
   Listener: { // field return type
     block: boolean; // Boolean!
@@ -364,7 +364,7 @@ export interface NexusGenFieldTypeNames {
     id: 'ID'
     name: 'String'
     nodes: 'Node'
-    remoteUrl: 'String'
+    slug: 'String'
   }
   Listener: { // field return type name
     block: 'Boolean'

diff --git a/api/src/generated/schema.graphql b/api/src/generated/schema.graphql
@@ -42,14 +42,14 @@ type DocumentDriveState {
   id: ID!
   name: String!
   nodes: [Node]!
-  remoteUrl: String
+  slug: String
 }
 
 input DocumentDriveStateInput {
   icon: String
   id: ID!
   name: String!
-  remoteUrl: String
+  slug: String
 }
 
 input InputListenerFilter {

diff --git a/api/src/modules/DocumentDrive/definitions.ts b/api/src/modules/DocumentDrive/definitions.ts
@@ -32,7 +32,7 @@ export const DocumentDriveStateInput = inputObjectType({
     t.nonNull.id("id");
     t.nonNull.string("name");
     t.string("icon");
-    t.string("remoteUrl");
+    t.string("slug");
   },
 });
 
@@ -138,7 +138,7 @@ export const DocumentDriveState = objectType({
     t.nonNull.string("name");
     t.nonNull.list.field("nodes", { type: Node });
     t.string("icon");
-    t.string("remoteUrl");
+    t.string("slug");
   },
 });
 

diff --git a/api/src/modules/DocumentDrive/model.ts b/api/src/modules/DocumentDrive/model.ts
@@ -3,17 +3,15 @@ import {
   DocumentDriveServer,
   DriveInput,
   ListenerRevision,
-  MemoryStorage,
-  PrismaStorage,
   StrandUpdate,
   generateUUID,
+  PullResponderTransmitter
 } from "document-drive";
+import { PrismaStorage } from "document-drive/storage/prisma";
 import * as DocumentModelsLibs from "document-model-libs/document-models";
 import { module as DocumentModelLib } from "document-model/document-model";
 import { DocumentModel, Operation } from "document-model/document";
-import { PullResponderTransmitter } from "document-drive";
 import {
-  utils as DocumentDriveUtils,
   Listener,
   ListenerFilter,
   actions,
@@ -146,7 +144,7 @@ export function getDocumentDriveCRUD(prisma: Prisma.TransactionClient) {
       return result;
     },
 
-    acknowledgeStrands: async (
+    processAcknowledge: async (
       driveId: string,
       listenerId: string,
       revisions: ListenerRevision[]
@@ -158,7 +156,7 @@ export function getDocumentDriveCRUD(prisma: Prisma.TransactionClient) {
       if (!transmitter) {
         throw new Error(`Transmitter with id ${listenerId} not found`);
       }
-      return await transmitter.acknowledgeStrands(
+      return await transmitter.processAcknowledge(
         driveId,
         listenerId,
         revisions

diff --git a/api/src/modules/DocumentDrive/mutations/acknowledge.ts b/api/src/modules/DocumentDrive/mutations/acknowledge.ts
@@ -22,7 +22,7 @@ export const acknowledge = mutationField("acknowledge", {
           status: e!.status as UpdateStatus,
         }));
 
-      return await ctx.prisma.document.acknowledgeStrands(
+      return await ctx.prisma.document.processAcknowledge(
         ctx.driveId ?? "1",
         listenerId,
         validEntries

diff --git a/api/src/modules/DocumentDrive/mutations/addDrive.ts b/api/src/modules/DocumentDrive/mutations/addDrive.ts
@@ -29,7 +29,7 @@ export const addDrive = mutationField("addDrive", {
     await ctx;
     return await ctx.prisma.document.addDrive({
       global: { ...global, nodes: [] },
-      local: { ...local, listeners: [] },
+      local: { ...local, listeners: [], triggers: [] },
     });
   },
 });
diff --git a/api/src/modules/DocumentDrive/mutations/pushUpdates.ts b/api/src/modules/DocumentDrive/mutations/pushUpdates.ts
@@ -36,7 +36,6 @@ export const pushUpdates = mutationField("pushUpdates", {
             s.documentId ?? undefined
           );
 
-          console.log(result);
           listenerRevisions.push({
             branch: s.branch,
             documentId: s.documentId ?? "",