push.rocks/smartdata
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2020-09-25 21:05:21 +00:00
parent e550a8dbd6
commit f29ae67580
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/test.ts
View File

@ -27,7 +27,7 @@ tap.skip.test('should create a testinstance as database', async () => {
smartdataOptions = { smartdataOptions = {
mongoDbName: await mongod.getDbName(), mongoDbName: await mongod.getDbName(),
mongoDbPass: '', mongoDbPass: '',
mongoDbUrl: await mongod.getConnectionString(), mongoDbUrl: await mongod.getUri(),
}; };
console.log(smartdataOptions); console.log(smartdataOptions);
testDb = new smartdata.SmartdataDb(smartdataOptions); testDb = new smartdata.SmartdataDb(smartdataOptions);
@ -88,11 +88,15 @@ tap.test('should save the car to the db', async () => {
let counter = 0; let counter = 0;
const totalCars = 2000;
do { do {
const myCar3 = new Car('red', 'Renault'); const myCar3 = new Car('red', 'Renault');
await myCar3.save(); await myCar3.save();
counter++; counter++;
} while (counter < 2000); if (counter%100 === 0) {
console.log(`Filled database with ${counter} of ${totalCars} Cars`);
}
} while (counter < totalCars);
}); });
tap.test('expect to get instance of Car with shallow match', async () => { tap.test('expect to get instance of Car with shallow match', async () => {
@ -102,7 +106,7 @@ tap.test('expect to get instance of Car with shallow match', async () => {
const myCars = await Car.getInstances<Car>({ const myCars = await Car.getInstances<Car>({
brand: 'Renault', brand: 'Renault',
}); });
console.log(`took ${Date.now() - timeStart}`); console.log(`took ${Date.now() - timeStart}ms to query a set of 2000`);
expect(myCars[0].deepData.sodeep).to.equal('yes'); expect(myCars[0].deepData.sodeep).to.equal('yes');
expect(myCars[0].brand).to.equal('Renault'); expect(myCars[0].brand).to.equal('Renault');
counter++; counter++;
@ -116,7 +120,7 @@ tap.test('expect to get instance of Car with deep match', async () => {
const myCars2 = await Car.getInstances<Car>({ const myCars2 = await Car.getInstances<Car>({
'deepData.sodeep': 'yes', 'deepData.sodeep': 'yes',
} as any); } as any);
console.log(`took ${Date.now() - timeStart}`); console.log(`took ${Date.now() - timeStart}ms to query a set of 2000`);
expect(myCars2[0].deepData.sodeep).to.equal('yes'); expect(myCars2[0].deepData.sodeep).to.equal('yes');
expect(myCars2[0].brand).to.equal('Volvo'); expect(myCars2[0].brand).to.equal('Volvo');
counter++; counter++;
@ -133,11 +137,15 @@ tap.test('expect to get instance of Car and update it', async () => {
}); });
tap.test('should be able to delete an instance of car', async () => { tap.test('should be able to delete an instance of car', async () => {
const myCar = await Car.getInstance<Car>({ const myCars = await Car.getInstances<Car>({
brand: 'Volvo', brand: 'Volvo',
color: 'blue'
}); });
expect(myCar.color).to.equal('blue'); console.log(myCars);
expect(myCars[0].color).to.equal('blue');
for (const myCar of myCars) {
await myCar.delete(); await myCar.delete();
}
const myCar2 = await Car.getInstance<Car>({ const myCar2 = await Car.getInstance<Car>({
brand: 'Volvo', brand: 'Volvo',

3
ts/smartdata.classes.collection.ts
View File

@ -131,11 +131,12 @@ export class SmartdataCollection<T> {
} }
updateableObject[key] = saveableObject[key]; updateableObject[key] = saveableObject[key];
} }
this.mongoDbCollection.updateOne( const result = await this.mongoDbCollection.updateOne(
identifiableObject, identifiableObject,
{ $set: updateableObject }, { $set: updateableObject },
{ upsert: true } { upsert: true }
); );
return result;
} }
public async delete(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> { public async delete(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> {

6
ts/smartdata.classes.doc.ts
View File

@ -110,17 +110,19 @@ export class SmartDataDbDoc<T, TImplements> {
public async save() { public async save() {
// tslint:disable-next-line: no-this-assignment // tslint:disable-next-line: no-this-assignment
const self: any = this; const self: any = this;
let dbResult: any;
switch (this.creationStatus) { switch (this.creationStatus) {
case 'db': case 'db':
await this.collection.update(self); dbResult = await this.collection.update(self);
break; break;
case 'new': case 'new':
const writeResult = await this.collection.insert(self); dbResult = await this.collection.insert(self);
this.creationStatus = 'db'; this.creationStatus = 'db';
break; break;
default: default:
console.error('neither new nor in db?'); console.error('neither new nor in db?');
} }
return dbResult;
} }
/** /**