@vida-global/core 1.2.1 → 1.2.2

package/lib/active_record/baseRecord.js

@@ -4,7 +4,7 @@ const { logger }                          = require('../logger');
 const { Model, Op }                       = require('sequelize');
 const   nodeUtil                          = require('util');
 const { redisClientFactory }              = require('../redis');
-const { tableize }                        = require('inflection');
+const { camelize, tableize }              = require('inflection');
 const   utils                             = require('./utils');
 
 
@@ -53,6 +53,15 @@ class BaseRecord extends Model {
 
         if (this._initialized) return;
 
+        const { schema, options } = this.initializationOptions;
+        this.init(schema, options);
+        this.initializeHooks();
+
+        this._initialized = true;
+    }
+
+
+    static get initializationOptions() {
         const schema  = getActiveRecordSchema(this._tableName, this.databaseId, this.connection.dialect);
         const options = {
             createdAt: 'created_at',
@@ -67,11 +76,23 @@ class BaseRecord extends Model {
             options.timestamps = false;
         }
 
-        this.init(schema, options);
+        this.configureOverridenAccessors(schema);
 
-        this.initializeHooks();
+        return { schema, options };
+    }
 
-        this._initialized = true;
+
+    static configureOverridenAccessors(schema) {
+        for (const [colName, colOptions] of Object.entries(schema)) {
+            const getterName = `_get${camelize(colName)}`;
+            const setterName = `_set${camelize(colName)}`;
+            if (this.prototype[getterName]) {
+                colOptions.get = this.prototype[getterName]
+            }
+            if (this.prototype[setterName]) {
+                colOptions.set = this.prototype[setterName]
+            }
+        }
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vida-global/core",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "description": "Core libraries for supporting Vida development",
     "author": "",
     "license": "ISC",

package/test/active_record/baseRecord.test.js

@@ -6,6 +6,7 @@ const   importSchema              = require('../../lib/active_record/db/importSc
 const { Model, Sequelize }        = require('sequelize');
 const { redisClientFactory }      = require('../../lib/redis');
 const   TestHelpers               = require('@vida-global/test-helpers');
+const { camelize }                = require('inflection');
 
 
 const connectionConfig = {database: ' ', host: ' ', password: ' ', username: ' '};
@@ -53,6 +54,7 @@ const dataTypeKey1   = Object.keys(Sequelize.DataTypes)[0];
 const dataTypeKey2   = Object.keys(Sequelize.DataTypes)[1];
 const dataTypeValue1 = Sequelize.DataTypes[dataTypeKey1].types.postgres[0];
 const dataTypeValue2 = Sequelize.DataTypes[dataTypeKey2].types.postgres[0];
+const col1Name       = `${TestHelpers.Faker.Text.randomString()}_${TestHelpers.Faker.Text.randomString()}_${TestHelpers.Faker.Text.randomString()}`;
 
 
 jest.mock('../../lib/redis', () => {
@@ -67,7 +69,12 @@ jest.mock('../../lib/redis', () => {
 });
 
 jest.mock('../../lib/active_record/db/importSchema', () => jest.fn());
-importSchema.mockImplementation(() => ({created_at: {type: dataTypeValue1}, updated_at: {type: dataTypeValue2}}));
+const schema = {created_at: {type: dataTypeValue1},
+                updated_at: {type: dataTypeValue2},
+                [col1Name]: {type: dataTypeValue2}
+};
+importSchema.mockImplementation(() => structuredClone(schema));
+beforeEach(() => importSchema.mockImplementation(() => structuredClone(schema)));
 
 
 afterEach(() => {
@@ -88,7 +95,8 @@ describe('BaseRecord', () => {
             class User extends BaseRecord {}
             User.initialize();
             const tableDetails = {created_at: {type: Sequelize.DataTypes[dataTypeKey1]},
-                                  updated_at: {type: Sequelize.DataTypes[dataTypeKey2]}
+                                  updated_at: {type: Sequelize.DataTypes[dataTypeKey2]},
+                                  [col1Name]: {type: Sequelize.DataTypes[dataTypeKey2]}
             };
             expect(importSchema).toHaveBeenCalledTimes(1);
             expect(Model.init).toHaveBeenCalledTimes(1);
@@ -137,6 +145,34 @@ describe('BaseRecord', () => {
         it ('will throw an error when run on BaseRecord', () => {
             expect(() => BaseRecord.initialize()).toThrow();
         });
+
+        it ('allows for overriding getters and setters', () => {
+            class User extends BaseRecord {}
+            const getterMethodName = `_get${camelize(col1Name)}`;
+            const setterMethodName = `_set${camelize(col1Name)}`;
+            const getter = jest.fn();
+            const setter = jest.fn();
+            User.prototype[getterMethodName] = getter;
+            User.prototype[setterMethodName] = setter;
+            User.initialize();
+            const tableDetails = {created_at: {type: Sequelize.DataTypes[dataTypeKey1]},
+                                  updated_at: {type: Sequelize.DataTypes[dataTypeKey2]},
+                                  [col1Name]: {
+                                      type: Sequelize.DataTypes[dataTypeKey2],
+                                      get: getter,
+                                      set: setter,
+                                  }};
+            expect(Model.init).toHaveBeenCalledWith(tableDetails,
+                                                    {
+                                                      createdAt: 'created_at',
+                                                      deletedAt: 'deleted_at',
+                                                      modelName: 'User',
+                                                      sequelize: mockSequelize,
+                                                      tableName: 'users',
+                                                      updatedAt: 'updated_at'
+                                                    });
+
+        });
     });