From 449d32f13647de812a2e80847aedae9e94ccefe8 Mon Sep 17 00:00:00 2001
From: Frank <frank.pfeift@protonmail.com>
Date: Sat, 25 May 2024 14:50:16 +0200
Subject: [PATCH] chore: scope of work listner improvements

---
 api/package.json                          |  4 ++--
 api/pnpm-lock.yaml                        | 14 ++++++------
 api/src/modules/scope-of-work/listener.ts | 26 +++++++++++------------
 api/src/utils.ts                          |  8 +++++++
 4 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 api/src/utils.ts

diff --git a/api/package.json b/api/package.json
index 5d1e2805..4b72c2d8 100644
--- a/api/package.json
+++ b/api/package.json
@@ -27,7 +27,7 @@
     "cors": "^2.8.5",
     "document-drive": "1.0.0-alpha.57",
     "document-model": "1.2.0",
-    "document-model-libs": "^1.53.1",
+    "document-model-libs": "^1.54.0-experimental",
     "dotenv": "^16.4.5",
     "esbuild": "^0.21.2",
     "ethers": "^5.7.2",
@@ -74,4 +74,4 @@
     "typescript": "^5.4.5",
     "vitest-mock-extended": "^1.3.1"
   }
-}
+}
\ No newline at end of file
diff --git a/api/pnpm-lock.yaml b/api/pnpm-lock.yaml
index 32519516..768718a9 100644
--- a/api/pnpm-lock.yaml
+++ b/api/pnpm-lock.yaml
@@ -34,13 +34,13 @@ dependencies:
     version: 2.8.5
   document-drive:
     specifier: 1.0.0-alpha.57
-    version: 1.0.0-alpha.57(document-model-libs@1.53.1)(document-model@1.2.0)(prisma@5.14.0)
+    version: 1.0.0-alpha.57(document-model-libs@1.54.0-experimental)(document-model@1.2.0)(prisma@5.14.0)
   document-model:
     specifier: 1.2.0
     version: 1.2.0
   document-model-libs:
-    specifier: ^1.53.1
-    version: link:../../document-model-libs
+    specifier: ^1.54.0-experimental
+    version: 1.54.0-experimental(graphql@16.8.1)(react-dom@18.2.0)(react@18.2.0)(vitest@0.32.4)
   dotenv:
     specifier: ^16.4.5
     version: 16.4.5
@@ -5366,14 +5366,14 @@ packages:
       esutils: 2.0.3
     dev: true
 
-  /document-drive@1.0.0-alpha.57(document-model-libs@1.53.1)(document-model@1.2.0)(prisma@5.14.0):
+  /document-drive@1.0.0-alpha.57(document-model-libs@1.54.0-experimental)(document-model@1.2.0)(prisma@5.14.0):
     resolution: {integrity: sha512-Mawdw0/dqRLi0ffTIWs2npyIIf81AR78Q1fRDsDEWWQbT4p3TC2wX+h6iMCXXbYdhjkEIHHZ36wGEb2b6Rzk4w==}
     peerDependencies:
       document-model: 1.2.0
       document-model-libs: ^1.53.1
     dependencies:
       document-model: 1.2.0
-      document-model-libs: 1.53.1(graphql@16.8.1)(react-dom@18.2.0)(react@18.2.0)(vitest@0.32.4)
+      document-model-libs: 1.54.0-experimental(graphql@16.8.1)(react-dom@18.2.0)(react@18.2.0)(vitest@0.32.4)
       exponential-backoff: 3.1.1
       graphql: 16.8.1
       graphql-request: 6.1.0(graphql@16.8.1)
@@ -5402,8 +5402,8 @@ packages:
       - tedious
     dev: false
 
-  /document-model-libs@1.53.1(graphql@16.8.1)(react-dom@18.2.0)(react@18.2.0)(vitest@0.32.4):
-    resolution: {integrity: sha512-56/labJOC7bIQfesLwR8iUlGA1WazgQgpmCMymQUlsWgLU20XgfMFedZg6xGiA4yQi10uzHhMhPZZ5AP4/5nMQ==}
+  /document-model-libs@1.54.0-experimental(graphql@16.8.1)(react-dom@18.2.0)(react@18.2.0)(vitest@0.32.4):
+    resolution: {integrity: sha512-yJFU+sRal0kAv+PSJfFUxOjJzf0thSKYRDbqa+gafmtTv+wYtfnRBezZTaHPdm9eb0SerUgsQ3lFFq5sVk0SRA==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^18.2.0
diff --git a/api/src/modules/scope-of-work/listener.ts b/api/src/modules/scope-of-work/listener.ts
index ba57dd25..1a453b66 100644
--- a/api/src/modules/scope-of-work/listener.ts
+++ b/api/src/modules/scope-of-work/listener.ts
@@ -4,8 +4,8 @@ import { getChildLogger } from "../../logger";
 import { Prisma } from "@prisma/client";
 import { Octokit } from "@octokit/rest";
 
-const GITHUB_REPO_OWNER = "powerhouse";
-const GITHUB_REPO_NAME = "rwa";
+const GITHUB_REPO_OWNER = "powerhouse-inc";
+const GITHUB_REPO_NAME = "powerhouse-mirror";
 const octokit = new Octokit({
     auth: process.env.GITHUB_TOKEN,
   });
@@ -48,22 +48,20 @@ async function handleScopeOfWorkDocument(strand: InternalTransmitterUpdate<Scope
 
 async function updateDeliverableInDb(driveId: string, documentId: string, deliverableId: string, prisma: Prisma.TransactionClient) {
     try {
-        await prisma.scopeOfWorkDeliverable.findUnique({
+        await prisma.scopeOfWorkDeliverable.findFirstOrThrow({
             where: {
-                id_driveId_documentId: {
-                    id: deliverableId,
-                    driveId: driveId,
-                    documentId: documentId,
-                }
+                id: deliverableId,
+                driveId: driveId,
+                documentId: documentId
             }
         })
-        return false;
+        return true;
     } catch (e) {
-        console.log("deliverable not found in db")
+        logger.info("deliverable not found in db")
     }
 
     try {
-        await createGitHubIssue("New Deliverable Created", "A new deliverable has been created in the scope of work document")
+        
         await prisma.scopeOfWorkDeliverable.create({
             data: {
                 id: deliverableId,
@@ -75,8 +73,10 @@ async function updateDeliverableInDb(driveId: string, documentId: string, delive
                 githubCreated: true
             }
         })
+
+        await createGitHubIssue("New Deliverable Created", "A new deliverable has been created in the scope of work document")
     } catch (e) {
-        console.log("   Error creating github issue")
+        console.log("Error creating github issue")
     }
 }
 
@@ -89,7 +89,7 @@ async function createGitHubIssue(title: string, body: string) {
             body: body,
         });
     } catch (error) {
-      logger.error("Error creating GitHub issue:", error);
+      logger.error({msg: "Error creating GitHub issue:", error});
       throw error;
     }
 }
diff --git a/api/src/utils.ts b/api/src/utils.ts
new file mode 100644
index 00000000..36783937
--- /dev/null
+++ b/api/src/utils.ts
@@ -0,0 +1,8 @@
+import logger from "./logger"
+
+export const logMemory = (name?: string) => {
+
+  logger.info({
+    msg: `${name ? name : "Memory"}: ${Math.round(process.memoryUsage().rss / 1024 / 1024 * 100) / 100} MB`
+  })
+}