Merge pull request #29 from CodeWe-projet/dev

Dev
CodeWe-projet · Nov 26, 2020 · 9ffac65 · 9ffac65
2 parents 9a30345 + efecd76
commit 9ffac65
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 191 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "mongodb": "^3.6.3",
     "morgan": "^1.10.0",
     "mysql": "^2.18.1",
+    "nanoid": "^3.1.18",
     "nunjucks": "^3.2.2",
     "prom-client": "^12.0.0",
     "prometheus-api-metrics": "^3.1.0",

diff --git a/src/db/MongoDB.js b/src/db/MongoDB.js
@@ -1,5 +1,6 @@
 const { MongoClient, ObjectID } = require("mongodb");
 var crypto = require('crypto');
+const { nanoid } = require('nanoid');
 const configs = require('../config/config');
 const utils = require('../utils');
 
@@ -50,7 +51,7 @@ class MongoDB {
         try {
             let results = (await this.documentsCollection.insertOne(doc));
             const documentLink = utils.uuid(results.insertedId.toString());
-            const linkView = utils.uuid(documentLink);
+            const linkView = nanoid(5);
             this.documentsCollection.updateOne({_id: results.insertedId}, {$set: {documentLink: documentLink, linkView: linkView}});
             return documentLink;
         } catch (err) {
@@ -117,7 +118,7 @@ class MongoDB {
             let index = doc.content.findIndex(line => {
                 return line.uuid == previousUuid;
             });
-            if (index) {
+            if (index || index === 0) {
                 this.documentsCollection.updateOne({documentLink: documentLink}, {
                     $push: {
                         content: {