fix: add summary patching

Author: seveibar

package.json

@@ -8,8 +8,8 @@
     "udt-collaboration-server": "./bin/cli.js"
   },
   "scripts": {
-    "start": "micro-dev ./app.js",
-    "start:prod": "micro-dev ./app.js",
+    "start": "micro-dev --watch src ./app.js",
+    "start:prod": "micro ./app.js",
     "test": " npm run test:ava && npm run lint && npm run test:prettier",
     "prettier": "prettier --write \"src/**/*.js\"",
     "test:prettier": "prettier --check \"src/**/*.js\"",
@@ -26,7 +26,8 @@
     "micro-dev": "^3.0.0",
     "micro-query": "^0.3.0",
     "microrouter": "^3.1.3",
-    "randomstring": "^1.1.5"
+    "randomstring": "^1.1.5",
+    "rfc6902": "^4.0.1"
   },
   "devDependencies": {
     "@semantic-release/git": "^9.0.0",

src/utils/apply-patch.js

@@ -1,6 +1,7 @@
 const applySamplePatch = require("./apply-sample-patch")
 const applyAddSamplePatch = require("./apply-add-sample-patch")
 const applySummaryPatch = require("./apply-summary-patch")
+const rfc6902 = require("rfc6902")
 
 module.exports = async ({ db, patch: patches, sessionId, userName = null }) => {
   const session = db
@@ -9,10 +10,11 @@ module.exports = async ({ db, patch: patches, sessionId, userName = null }) => {
 
   if (!session) throw new Error("Session Not Found")
 
+  const originalSummaryObject = JSON.parse(session.summary_object)
   const workingSummaryObject = JSON.parse(session.summary_object)
 
   for (const patch of patches) {
-    if (patch.path === "/samples/-" && patch.op === "add") {
+    if (patch.path.startsWith("/samples/") && patch.op === "add") {
       await applyAddSamplePatch({ db, patch, sessionId, workingSummaryObject })
     } else if (patch.path.startsWith("/samples/")) {
       await applySamplePatch({ db, patch, sessionId, workingSummaryObject })
@@ -21,6 +23,13 @@ module.exports = async ({ db, patch: patches, sessionId, userName = null }) => {
     }
   }
 
+  // Create a summary patch
+  const summaryPatch = rfc6902.createPatch(
+    originalSummaryObject,
+    workingSummaryObject
+  )
+  patches.push(...summaryPatch)
+
   // Commit new summary / session_state
   db.prepare(
     `

src/utils/apply-sample-patch.js

@@ -9,13 +9,18 @@ module.exports = async ({ db, patch, sessionId, workingSummaryObject }) => {
   if (!m[1]) throw new Error(`Invalid sample patch to path "${patch.path}"`)
 
   let { sampleIndex, sampleId } = getSampleIndexAndId(sessionId, m[1])
-  const sampleChangePath = m[2]
+  let sampleChangePath = m[2]
+
+  if (patch.op === "replace" && !sampleChangePath) {
+    sampleChangePath = ""
+  }
 
   if (!sampleChangePath && patch.op === "remove") {
     applyRemoveSample({ sessionId, db, sampleId, workingSummaryObject })
     return
   }
-  if (!sampleChangePath) {
+
+  if (!sampleChangePath && typeof sampleChangePath !== "string") {
     throw new Error(`Unusual PATCH: ${JSON.stringify(patch)}`)
   }
 

yarn.lock

@@ -3264,6 +3264,11 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rfc6902@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/rfc6902/-/rfc6902-4.0.1.tgz#1a6474e1e9c17a3f812fabc68cb3df9d7e46cc34"
+  integrity sha512-RZOewbzE7AGAAPxxoTg137y4rCzA9w+5F9O+j+JdwnXH9uNNIpDPf8eH4sIViqgjfvOak+nlBRiy17TPDn+PLA==
+
 [email protected]:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"