Merge pull request #27 from CedricProfessionnel/FixAvaTest

Fix ava test

Author: CedricProfessionnel

package.json

@@ -8,12 +8,12 @@
     "udt-collaboration-server": "./bin/cli.js"
   },
   "scripts": {
-    "start": "micro-dev --watch src ./app.js",
+    "start": " micro-dev --watch src ./app.js",
     "start:prod": "micro ./app.js",
-    "test": " yarn test:ava && yarn lint && yarn test:prettier",
-    "prettier": "prettier --write \"src/**/*.js\"",
+    "test": "yarn run test:ava && yarn run lint && yarn run test:prettier",
+    "write:prettier": "prettier --write \"src/**/*.js\"",
     "test:prettier": "prettier --check \"src/**/*.js\"",
-    "test:ava": "yarn ava tests/**/*.test.js",
+    "test:ava": "ava tests/**/*.test.js",
     "lint": "eslint src tests"
   },
   "dependencies": {
@@ -41,6 +41,6 @@
     "test-listen": "^1.1.0"
   },
   "ava": {
-    "timeout": "60s"
+    "timeout": "120s"
   }
 }

src/utils/apply-sample-patch.js

@@ -1,5 +1,5 @@
 const fjp = require("fast-json-patch")
-const samplePathRe = "\\/(sample|samples)\\/([^/]+)(.*)"
+const samplePathRe = "\\/(sample|samples)\\/([^\\/]+)(.*)"
 const applyRemoveSample = require("./apply-remove-sample")
 const getSampleIndexAndId = require("./get-sample-index-and-id")
 
@@ -40,16 +40,25 @@ module.exports = async ({ db, patch, sessionId, workingSummaryObject }) => {
   ]).newDocument
 
   // Update sample in database with new content and new version
-
-  db.prepare(
-    "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
-  )
+  if (newSampleContent._id)
+    db.prepare(
+      "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
+    )
+  else
+    db.prepare(
+      "UPDATE sample_state SET sample_version=?, content=? WHERE session_short_id=? AND sample_ref_id=?"
+    ).run(
+      sample.sample_version + 1,
+      JSON.stringify(newSampleContent),
+      sessionId,
+      sampleId
+    )
 
   workingSummaryObject.summary.samples[sampleIndex] = {
     hasAnnotation: Boolean(newSampleContent.annotation),

yarn.lock

@@ -4120,7 +4120,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@^20.2.2, yargs-parser@^20.2.7:
+yargs-parser@^20.2.2:
   version "20.2.7"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
   integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==