update rethink integration

This commit is contained in:
2018-01-07 17:58:30 +01:00
parent 8101e49026
commit 1af51dd989
3 changed files with 34 additions and 34 deletions

View File

@ -16,8 +16,9 @@ export class Db {
connectionOptions: plugins.rethinkDb.ConnectionOptions
dbConnection: plugins.rethinkDb.Connection
status: TConnectionStatus
dbTablesMap = new Objectmap<DbTable<any>>()
constructor (connectionOptionsArg: ConnectionOptions) {
constructor(connectionOptionsArg: ConnectionOptions) {
this.dbName = connectionOptionsArg.db
this.connectionOptions = connectionOptionsArg
}
@ -43,4 +44,21 @@ export class Db {
return done.promise
}
// handle table to class distribution
/**
* Gets a table's name and returns smartdata's DbTable class
* @param nameArg
* @returns DbTable
*/
async getDbTableByName<T>(nameArg: string): Promise<DbTable<T>> {
let resultCollection = this.dbTablesMap.find((dbCollectionArg) => {
return dbCollectionArg.name === nameArg
})
return resultCollection
}
addTable (dbCollectionArg: DbTable<any>) {
this.dbTablesMap.add(dbCollectionArg)
}
}

View File

@ -35,7 +35,7 @@ export class DbTable<T> {
this.table = plugins.rethinkDb.db(this.db.dbName).table(this.name)
// tell the db class about it (important since Db uses different systems under the hood)
this.db.addCollection(this)
this.db.addTable(this)
}
/**
@ -48,36 +48,15 @@ export class DbTable<T> {
/**
* finds an object in the DbCollection
*/
find (docMatchArg: T | any, optionsArg?: IFindOptions): Promise<T[]> {
let done = plugins.smartq.defer<T[]>()
let findCursor = this.table.find(docMatchArg)
if (optionsArg) {
if (optionsArg.limit) { findCursor = findCursor.limit(1) }
}
findCursor.toArray((err, docs) => {
if (err) {
done.reject(err)
throw err
}
done.resolve(docs)
})
return done.promise
async find (docMatchArg: T | any, optionsArg?: IFindOptions): Promise<T[]> {
}
/**
* inserts object into the DbCollection
*/
insertOne (docArg: T): Promise<void> {
let done = plugins.smartq.defer<void>()
this.checkDoc(docArg).then(
() => {
this.table.insertOne(docArg)
.then(() => { done.resolve() })
},
() => {
done.reject(new Error('one the docs did not pass validation'))
})
return done.promise
async insertOne (docArg: T): Promise<void> {
await this.checkDoc(docArg)
}
/**