fix: redo IdAssigner initialisation logic

src/MongooseIdAssigner.ts

@@ -4,18 +4,14 @@ import { Collection } from 'mongodb';
 import { Document, Model, Schema } from 'mongoose';
 import { AssignerOptions, FieldConfig } from './assigner.interfaces';
 import { localStateStore, SchemaState } from './LocalStateStore';
-import {
-  initialiseOptions,
-  normaliseOptions,
-  throwPluginError,
-  waitPromise,
-} from './utils';
+import { initialiseOptions, normaliseOptions, throwPluginError } from './utils';
 import { refreshOptions } from './utils/assign-fields-ids';
 import { configureSchema } from './utils/configure-schema';
 
 export interface NormalisedOptions {
   modelName: string;
   network: boolean;
+  timestamp?: number | null;
   fields?: Map<string, FieldConfig>;
 }
 
@@ -53,7 +49,6 @@ export class MongooseIdAssigner extends EventEmitter {
     this.options = normaliseOptions(options);
     this.modelName = this.options.modelName;
     this._saveState();
-    this._modelNameIndex();
     configureSchema(this);
   }
 
@@ -110,20 +105,4 @@ export class MongooseIdAssigner extends EventEmitter {
       idAssigner: this,
     });
   }
-
-  private _modelNameIndex() {
-    this.on('ready', async () => {
-      if (!this.options.fields) {
-        return;
-      }
-
-      try {
-        await waitPromise(1); // nextTick
-
-        await this.collection.createIndex('modelName');
-      } catch (e) {
-        throw e;
-      }
-    });
-  }
 }

src/__mocks__/mongoose.config.ts

@@ -40,12 +40,18 @@ export function getMongoose() {
     return mongoose;
   } else {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-    mongoose.connect(
-      'mongodb://localhost:27017/test_ia',
-      {
+    /*const originalConnect = mongoose.connect;
+
+    (mongoose as any).connect = () => {
+      originalConnect.bind(mongoose)('mongodb://localhost:27017/test_ia', {
         useNewUrlParser: true,
-      },
+      });
+    };*/
+    mongoose.connect(
+      'mongodb://localhost:27017/demoDB',
+      { useNewUrlParser: true },
     );
+
     return mongoose;
   }
 }

src/utils/__tests__/initialise-options.spec.ts

@@ -0,0 +1,30 @@
+import { AssignerOptions, FieldConfigTypes } from '../../assigner.interfaces';
+import { checkAndUpdateOptions } from '../initialise-options';
+import { normaliseOptions } from '../normalise-options';
+
+describe('initialise-options ->', () => {
+  const options: AssignerOptions = {
+    modelName: 'Person',
+    fields: {
+      _id: true,
+      clientId: true,
+      withUUID: 'UUID',
+      String: '5555',
+      Number: 5555,
+      last: {
+        type: FieldConfigTypes.Number,
+        nextId: 5641,
+      },
+    },
+  };
+
+  const normalised = normaliseOptions(options);
+
+  describe('checkAndUpdateOptions()', () => {
+    it('should return current option if freshUnAvailable', async () => {
+      expect(checkAndUpdateOptions(normalised, '' as any).options).toEqual(
+        normalised,
+      );
+    });
+  });
+});

src/utils/get-next-ids/get-next-id-number.ts

@@ -1,6 +1,6 @@
 import { NumberFieldConfig } from '../../assigner.interfaces';
 import { MongooseIdAssigner } from '../../MongooseIdAssigner';
-import { waitPromise } from '../index';
+import { throwPluginError, waitPromise } from '../index';
 
 export async function getNextIdNumber(
   field: string,
@@ -31,7 +31,10 @@ export async function getNextIdNumber(
         modelName: idAssigner.modelName,
         [updateField]: nextId,
       },
-      { $set: { [updateField]: afterNextId } },
+      {
+        $set: { [updateField]: afterNextId },
+        $currentDate: { timestamp: true },
+      },
       { projection: { value: 1 } },
     );
 
@@ -40,6 +43,12 @@ export async function getNextIdNumber(
       await waitPromise(idAssigner.retryMillis * multiplier);
       await idAssigner.refreshOptions();
       return getNextIdNumber(field, idAssigner, fieldConfig, ++retries);
+    } else if (!update.value && retries > idAssigner.retryTime) {
+      throwPluginError(
+        `Maximum retryTime to set value attained!`,
+        idAssigner.modelName,
+        field,
+      );
     }
   } catch (e) {
     return Promise.reject(e);

src/utils/get-next-ids/get-next-id-string.ts

@@ -1,6 +1,6 @@
 import { StringFieldConfig } from '../../assigner.interfaces';
 import { MongooseIdAssigner } from '../../MongooseIdAssigner';
-import { waitPromise } from '../index';
+import { throwPluginError, waitPromise } from '../index';
 import { stringIncrementer } from './utils/string-incrementer';
 
 export async function getNextIdString(
@@ -31,7 +31,10 @@ export async function getNextIdString(
         modelName: idAssigner.modelName,
         [updateField]: nextId,
       },
-      { $set: { [updateField]: afterNextId } },
+      {
+        $set: { [updateField]: afterNextId },
+        $currentDate: { timestamp: true },
+      },
       { projection: { value: 1 } },
     );
 
@@ -40,6 +43,12 @@ export async function getNextIdString(
       await waitPromise(idAssigner.retryMillis * multiplier);
       await idAssigner.refreshOptions();
       return getNextIdString(field, idAssigner, fieldConfig, ++retries);
+    } else if (!update.value && retries > idAssigner.retryTime) {
+      throwPluginError(
+        `Maximum retryTime to set value attained!`,
+        idAssigner.modelName,
+        field,
+      );
     }
   } catch (e) {
     return Promise.reject(e);