SWIK-2441 include_previous_revisions

slidewiki · Oct 17, 2018 · de8ccf7 · de8ccf7
1 parent de8d767
commit de8ccf7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/application/controllers/handler.js b/application/controllers/handler.js
@@ -131,14 +131,34 @@ let self = module.exports = {
             let slideIdArray = [];
             let deckIdArray = [];
 
-            const all_revisions = request.query.all_revisions;
+            const include_previous_revisions = request.query.include_previous_revisions;
             arrayOfDecksAndSlides.forEach((deckOrSlide) => {
-              const id = (all_revisions === 'true') ? new RegExp('^' + deckOrSlide.id.split('-')[0]) : deckOrSlide.id;
 
               if (deckOrSlide.type === 'slide') {
-                slideIdArray.push(id);
+                slideIdArray.push(deckOrSlide.id);
               } else {
-                deckIdArray.push(id);
+                deckIdArray.push(deckOrSlide.id);
+              }
+              if (include_previous_revisions === 'true') {
+                let idSplit = deckOrSlide.id.split('-');
+                let id = idSplit[0];
+                let revId = (idSplit.length > 1) ? parseInt(idSplit[1]) : 0;
+
+                //add id without revision
+                if (deckOrSlide.type === 'slide') {
+                  slideIdArray.push(id);
+                } else {
+                  deckIdArray.push(id);
+                }
+
+                //add ids for previous revisions
+                for (let i = 1; i < revId; i++) {
+                  if (deckOrSlide.type === 'slide') {
+                    slideIdArray.push(id + '-' + String(i));
+                  } else {
+                    deckIdArray.push(id + '-' + String(i));
+                  }
+                }
               }
             });
 

diff --git a/application/routes.js b/application/routes.js
@@ -21,7 +21,7 @@ module.exports = function(server) {
         },
         query: {
           metaonly: Joi.string().description('Set to true to return only metadata without the list of comments'),
-          all_revisions: Joi.string().description('Set to true to search for comments regardles of the content revision')
+          include_previous_revisions: Joi.string().description('Set to true to get comments for current and all previous revisions of content')
         }
       },
       tags: ['api'],