Skip to content

Commit

Permalink
Client injection changed to session injection
Browse files Browse the repository at this point in the history
  • Loading branch information
@jormaechea
jormaechea committed Oct 1, 2019
1 parent 9dfb12e commit 86d16c0
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 48 deletions.
44 changes: 24 additions & 20 deletions lib/model.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,19 @@ const DEFAULT_PAGE_LIMIT = 500;

class Model {

set client(client) {
this._client = client;
}

get client() {
return this._client;
}

static get defaultPageLimit() {
return DEFAULT_PAGE_LIMIT;
}

get db() {
async getDb() {

if(this.databaseKey)
return DatabaseDispatcher.getDatabaseByKey(this.databaseKey);

if(this.client)
return DatabaseDispatcher.getDatabaseByClient(this.client, this.useReadDB);
if(this.session) {
const sessionClient = await this.session.client;
return DatabaseDispatcher.getDatabaseByClient(sessionClient, this.useReadDB);
}

throw new ModelError(`Invalid Model ${this.constructor.name} - No database config`, ModelError.codes.DATABASE_CONFIG_NOT_FOUND);
}
Expand All @@ -35,7 +29,9 @@ class Model {

this.useReadDB = !!params.readonly;

const items = await this.db
const db = await this.getDb();

const items = await db
.get(this, params);

if(typeof items === 'undefined')
Expand Down Expand Up @@ -115,42 +111,50 @@ class Model {
}

async getTotals() {
return this.db.getTotals(this);
const db = await this.getDb();
return db.getTotals(this);
}

async insert(item) {
this.useReadDB = false;
return this.db.insert(this, item);
const db = await this.getDb();
return db.insert(this, item);
}

async save(item) {
this.useReadDB = false;
return this.db.save(this, item);
const db = await this.getDb();
return db.save(this, item);
}

async update(values, filter) {
this.useReadDB = false;
return this.db.update(this, values, filter);
const db = await this.getDb();
return db.update(this, values, filter);
}

async remove(item) {
this.useReadDB = false;
return this.db.remove(this, item);
const db = await this.getDb();
return db.remove(this, item);
}

async multiInsert(items) {
this.useReadDB = false;
return this.db.multiInsert(this, items);
const db = await this.getDb();
return db.multiInsert(this, items);
}

async multiSave(items) {
this.useReadDB = false;
return this.db.multiSave(this, items);
const db = await this.getDb();
return db.multiSave(this, items);
}

async multiRemove(filter) {
this.useReadDB = false;
return this.db.multiRemove(this, filter);
const db = await this.getDb();
return db.multiRemove(this, filter);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 34 additions & 27 deletions tests/model-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ describe('Model', () => {
myconfig: 'my-config'
};

const clientModel = class ClientModel extends Model {};
class ClientModel extends Model {
}

class CoreModel extends Model {
get databaseKey() { return 'core'; }
Expand Down Expand Up @@ -76,9 +77,9 @@ describe('Model', () => {

describe('Database getters', function() {

it('should reject when model haven\'t a client injected or databaseKey getter', async function() {
it('Should reject when model haven\'t a client injected or databaseKey getter', async function() {

const myClientModel = new clientModel(); // eslint-disable-line
const myClientModel = new ClientModel();

await assert.rejects(() => myClientModel.get(), {
name: 'ModelError',
Expand All @@ -87,7 +88,7 @@ describe('Model', () => {
});


it('should call DBDriver get using databaseKey when it exists', async function() {
it('Should call DBDriver get using databaseKey when it exists', async function() {

await myCoreModel.get();

Expand All @@ -98,11 +99,13 @@ describe('Model', () => {
sandbox.assert.calledWithExactly(DBDriver.get, myCoreModel, {});
});

it('should call DBDriver get using client config when it exists', async function() {
it('Should call DBDriver get using client config when it exists', async function() {

const myClientModel = new clientModel(); // eslint-disable-line
const myClientModel = new ClientModel();

myClientModel.client = client;
myClientModel.session = {
client: Promise.resolve(client)
};

await myClientModel.get();

Expand All @@ -115,11 +118,13 @@ describe('Model', () => {
sandbox.assert.calledWithExactly(DBDriver.get, myClientModel, {});
});

it('should call DBDriver get using read DB when readonly param is true', async function() {
it('Should call DBDriver get using read DB when readonly param is true', async function() {

const myClientModel = new clientModel(); // eslint-disable-line
const myClientModel = new ClientModel();

myClientModel.client = client;
myClientModel.session = {
client: Promise.resolve(client)
};

await myClientModel.get({ readonly: true });

Expand All @@ -145,9 +150,11 @@ describe('Model', () => {

it(`should call DBDriver using write DB when ${method} is executed after a readonly get`, async () => {

const myClientModel = new clientModel(); // eslint-disable-line
const myClientModel = new ClientModel();

myClientModel.client = client;
myClientModel.session = {
client: Promise.resolve(client)
};

await myClientModel.get({ readonly: true });

Expand All @@ -164,7 +171,7 @@ describe('Model', () => {
});
});

it('should admit object result from model', async function() {
it('Should admit object result from model', async function() {

DBDriver.get.returns({ foo: 456 });

Expand All @@ -184,7 +191,7 @@ describe('Model', () => {
assert.deepEqual(result, { foo: 456 });
});

it('should return an empty array when driver returns an empty array', async function() {
it('Should return an empty array when driver returns an empty array', async function() {

DBDriver.get
.returns([]);
Expand All @@ -197,7 +204,7 @@ describe('Model', () => {
assert.deepEqual(result, []);
});

it('should get normaly if no \'formatGet\' method exists', async function() {
it('Should get normaly if no \'formatGet\' method exists', async function() {

delete myCoreModel.formatGet;

Expand All @@ -214,7 +221,7 @@ describe('Model', () => {
assert.deepEqual(result, [{ fooItem: 88 }]);
});

it('should get normaly if no \'afterGet\' method exists', async function() {
it('Should get normaly if no \'afterGet\' method exists', async function() {

delete myCoreModel.afterGet;

Expand All @@ -231,7 +238,7 @@ describe('Model', () => {
assert.deepEqual(result, [{ fooItem: 7787 }]);
});

it('should call DBDriver getTotals method passing the model', async function() {
it('Should call DBDriver getTotals method passing the model', async function() {

await myCoreModel.getTotals();

Expand All @@ -258,7 +265,7 @@ describe('Model', () => {
});
});

it('should call DBDriver update method passing the model and the values and filter received', async function() {
it('Should call DBDriver update method passing the model and the values and filter received', async function() {

await myCoreModel.update({ status: -1 }, { foo: 'bar' });

Expand All @@ -285,7 +292,7 @@ describe('Model', () => {
});
});

it('should call DBDriver multiRemove method passing the model and the filter received', async function() {
it('Should call DBDriver multiRemove method passing the model and the filter received', async function() {

await myCoreModel.multiRemove({ foo: 'bar' });

Expand All @@ -299,7 +306,7 @@ describe('Model', () => {

context('when param \'changeKeys\' received', function() {

it('should change keys if key found in items', async function() {
it('Should change keys if key found in items', async function() {

DBDriver.get
.returns([{ id: 1, foo: 'bar' }, { id: 2, bar: 'foo' }]);
Expand All @@ -320,7 +327,7 @@ describe('Model', () => {
});
});

it('should ignore items that hasn\'t the key', async function() {
it('Should ignore items that hasn\'t the key', async function() {

DBDriver.get
.returns([{ foo: 'bar' }, { bar: 'foo' }]);
Expand All @@ -339,7 +346,7 @@ describe('Model', () => {
});
});

it('should call controller \'formatGet\' with each item', async function() {
it('Should call controller \'formatGet\' with each item', async function() {

myCoreModel.formatGet
.callsFake(({ ...item }) => {
Expand All @@ -365,7 +372,7 @@ describe('Model', () => {
]);
});

it('should call controller \'afterGet\' with all items', async function() {
it('Should call controller \'afterGet\' with all items', async function() {

DBDriver.get
.returns([{ foo: 1 }, { bar: 2 }]);
Expand All @@ -381,7 +388,7 @@ describe('Model', () => {
assert.deepEqual(result, [{ foo: 1 }, { bar: 2 }]);
});

it('should call controller \'afterGet\' with all items, params, indexes and ids', async function() {
it('Should call controller \'afterGet\' with all items, params, indexes and ids', async function() {

DBDriver.get
.returns([{ id: 33, foo: 45 }, { id: 78, bar: 987 }]);
Expand All @@ -399,7 +406,7 @@ describe('Model', () => {

context('when call \'getPaged\' method', function() {

it('should reject if received an invalid callback', async function() {
it('Should reject if received an invalid callback', async function() {

const wrongCallbackError = {
name: 'ModelError',
Expand All @@ -419,7 +426,7 @@ describe('Model', () => {
await Promise.all(promises);
});

it('shouldn\'t call the callback if get response empty results', async function() {
it('Shouldn\'t call the callback if get response empty results', async function() {

sandbox.stub(myCoreModel, 'get')
.returns([]);
Expand All @@ -435,7 +442,7 @@ describe('Model', () => {
sandbox.assert.notCalled(getPagedCallback);
});

it('should call the callback one time if get response an array of items, passing custom limit', async function() {
it('Should call the callback one time if get response an array of items, passing custom limit', async function() {

sandbox.stub(myCoreModel, 'get')
.onCall(0)
Expand Down

0 comments on commit 86d16c0

Please sign in to comment.