bugfix: MD-712 special key prefix M for masters and V for versions

Work in progress

lib/algos/list/delimiterMaster.js

@@ -3,7 +3,7 @@
 const Delimiter = require('./delimiter').Delimiter;
 const Version = require('../../versioning/Version').Version;
 const VSConst = require('../../versioning/constants').VersioningConstants;
-const { FILTER_ACCEPT, FILTER_SKIP, SKIP_NONE } = require('./tools');
+const { inc, FILTER_ACCEPT, FILTER_SKIP, SKIP_NONE } = require('./tools');
 
 const VID_SEP = VSConst.VersionId.Separator;
 
@@ -31,6 +31,26 @@ class DelimiterMaster extends Delimiter {
         this.prvPHDKey = undefined;
     }
 
+    genMDParams() {
+        const params = {};
+        if (this.prefix) {
+            params.gte = `M${this.prefix}`;
+            params.lt = `M${inc(this.prefix)}`;
+        } else {
+            params.gte = `M`;
+            params.lt = `N`; // stop after the last master key
+        }
+        const startVal = this[this.continueMarker] || this[this.startMarker];
+        if (startVal) {
+            if (params.gte > `M${startVal}`) {
+                return params;
+            }
+            delete params.gte;
+            params.gt = `M${startVal}`;
+        }
+        return params;
+    }
+
     /**
      *  Filter to apply on each iteration, based on:
      *  - prefix
@@ -129,9 +149,9 @@ class DelimiterMaster extends Delimiter {
             const index = this[this.nextContinueMarker].
                 lastIndexOf(this.delimiter);
             if (index === this[this.nextContinueMarker].length - 1) {
-                return this[this.nextContinueMarker];
+                return `M${this[this.nextContinueMarker]}`;
             }
-            return this[this.nextContinueMarker] + VID_SEP;
+            return `M${this[this.nextContinueMarker]}${VID_SEP}`;
         }
         return SKIP_NONE;
     }

lib/algos/list/delimiterVersions.js

@@ -9,7 +9,7 @@ const { inc, FILTER_END, FILTER_ACCEPT, FILTER_SKIP, SKIP_NONE } =
 const VID_SEP = VSConst.VersionId.Separator;
 
 function formatVersionKey(key, versionId) {
-    return `${key}${VID_SEP}${versionId}`;
+    return `V${key}${VID_SEP}${versionId}`;
 }
 
 /**
@@ -41,11 +41,14 @@ class DelimiterVersions extends Delimiter {
     genMDParams() {
         const params = {};
         if (this.parameters.prefix) {
-            params.gte = this.parameters.prefix;
+            params.gte = `V${this.parameters.prefix}`;
-            params.lt = inc(this.parameters.prefix);
+            params.lt = `V${inc(this.parameters.prefix)}`;
+        } else {
+            params.gte = `V`;
+            params.lt = `W`; // stop after the last version key
         }
         if (this.parameters.keyMarker) {
-            if (params.gte && params.gte > this.parameters.keyMarker) {
+            if (params.gte > `V${this.parameters.keyMarker}`) {
                 return params;
             }
             delete params.gte;
@@ -55,7 +58,7 @@ class DelimiterVersions extends Delimiter {
                 params.gt = formatVersionKey(this.parameters.keyMarker,
                         this.parameters.versionIdMarker);
             } else {
-                params.gt = inc(this.parameters.keyMarker + VID_SEP);
+                params.gt = `V${inc(this.parameters.keyMarker + VID_SEP)}`;
             }
         }
         return params;
@@ -137,7 +140,7 @@ class DelimiterVersions extends Delimiter {
         if (this.NextMarker) {
             const index = this.NextMarker.lastIndexOf(this.delimiter);
             if (index === this.NextMarker.length - 1) {
-                return this.NextMarker;
+                return `V${this.NextMarker}`;
             }
         }
         return SKIP_NONE;