Merge pull request #26 from CedricProfessionnel/avaToDevDependencie

Fix collaboration server

Author: seveibar

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 *.db
 .idea
-launch.json
+launch.json
+.vscode

releaserc.js

@@ -10,9 +10,7 @@ module.exports = {
       {
         assets: ["package.json"],
         message:
-          "chore(release): ${nextRelease.version} [skip ci]
-
-${nextRelease.notes}",
+          "chore(release): ${nextRelease.version} [skip ci] ${nextRelease.notes}",
       },
     ],
   ],

src/router.js

@@ -18,8 +18,6 @@ const welcome = (req, res) =>
 const notfound = (req, res) => micro.send(res, 404)
 
 module.exports = router(
-  post("/api/session", postSessionEndpoint),
-  options("/api/session", postSessionEndpoint),
   get("/api/session/:session_id/download", downloadEndpoint),
   get("/api/session/:session_id/diffs", getDiffsEndpoint),
   options("/api/session/:session_id/diffs", getDiffsEndpoint),
@@ -28,6 +26,8 @@ module.exports = router(
   get("/api/session/:session_id", getSessionEndpoint),
   patch("/api/session/:session_id", patchSessionEndpoint),
   options("/api/session/:session_id", patchSessionEndpoint),
+  post("/api/session", postSessionEndpoint),
+  options("/api/session", postSessionEndpoint),
   get("/", welcome),
   get("/*", notfound)
 )

src/utils/apply-add-sample-patch.js

@@ -1,8 +1,8 @@
 module.exports = async ({ db, patch, sessionId, workingSummaryObject }) => {
   const numSamples = workingSummaryObject.summary.samples.length
   db.prepare(
-    "INSERT INTO sample_state (sample_index, session_short_id, content) VALUES (?, ?, ?)"
-  ).run(numSamples, sessionId, JSON.stringify(patch.value))
+    "INSERT INTO sample_state (sample_index, sample_ref_id, session_short_id, content) VALUES (?, ?, ?, ?)"
+  ).run(numSamples, patch.value._id, sessionId, JSON.stringify(patch.value))
 
   const sample = db
     .prepare(

src/utils/apply-patch.js

@@ -16,7 +16,10 @@ module.exports = async ({ db, patch: patches, sessionId, userName = null }) => {
   for (const patch of patches) {
     if (patch.path.startsWith("/samples/") && patch.op === "add") {
       await applyAddSamplePatch({ db, patch, sessionId, workingSummaryObject })
-    } else if (patch.path.startsWith("/samples/")) {
+    } else if (
+      patch.path.startsWith("/sample/") ||
+      patch.path.startsWith("/samples/")
+    ) {
       await applySamplePatch({ db, patch, sessionId, workingSummaryObject })
     } else {
       await applySummaryPatch({ db, patch, sessionId, workingSummaryObject })

src/utils/apply-sample-patch.js

@@ -1,15 +1,15 @@
 const fjp = require("fast-json-patch")
-const samplePathRe = /\/samples\/([^/]+)(.*)/
+const samplePathRe = "\\/(sample|samples)\\/([^/]+)(.*)"
 const applyRemoveSample = require("./apply-remove-sample")
 const getSampleIndexAndId = require("./get-sample-index-and-id")
 
 module.exports = async ({ db, patch, sessionId, workingSummaryObject }) => {
   // Get relevant sample existing data
   const m = patch.path.match(samplePathRe)
-  if (!m[1]) throw new Error(`Invalid sample patch to path "${patch.path}"`)
+  if (!m[2]) throw new Error(`Invalid sample patch to path "${patch.path}"`)
 
-  let { sampleIndex, sampleId } = getSampleIndexAndId(sessionId, m[1])
-  let sampleChangePath = m[2]
+  let { sampleIndex, sampleId } = getSampleIndexAndId(sessionId, m[2])
+  let sampleChangePath = m[3]
 
   if (patch.op === "replace" && !sampleChangePath) {
     sampleChangePath = ""
@@ -42,9 +42,10 @@ module.exports = async ({ db, patch, sessionId, workingSummaryObject }) => {
   // Update sample in database with new content and new version
 
   db.prepare(
-    "UPDATE sample_state SET sample_version=?, content=? WHERE session_short_id=? AND sample_ref_id=?"
+    "UPDATE sample_state SET sample_version=?, sample_ref_id=?, content=? WHERE session_short_id=? AND sample_ref_id=?"
   ).run(
     sample.sample_version + 1,
+    newSampleContent._id,
     JSON.stringify(newSampleContent),
     sessionId,
     sampleId