mirrors/steedos-platform
1
0
Fork 0
mirror of https://github.com/steedos/steedos-platform synced 2024-11-22 17:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化代码，拆分getMongoOptions函数

Browse Source
This commit is contained in:
yinlainghui 2019-03-29 14:24:50 +08:00
parent 87e95ca0d6
commit 44099dcbd0
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/objectql/src/driver/mongo.ts
View File

@ -34,10 +34,6 @@ export class SteedosMongoDriver implements SteedosDriver {
}
}
formatFiltersToDev(filters: SteedosQueryFilters) {
return filters;
}
formatFiltersToMongoQuery(filters: any): JsonMap {
let odataQuery: string = formatFiltersToODataQuery(filters)
let query: JsonMap = createFilter(odataQuery)
@ -55,14 +51,8 @@ export class SteedosMongoDriver implements SteedosDriver {
return mongoFilters
}
/* TODO： */
getMongoOptions(options: SteedosQueryOptions): JsonMap {
if (_.isUndefined(options)) {
return {};
}
let result: JsonMap = {};
let fields: string[] | string = options.fields;
if (typeof fields == "string"){
getMongoFieldsOptions(fields: string[] | string): JsonMap {
if (typeof fields == "string") {
fields = (<string>fields).split(",").map((n) => { return n.trim(); });
}
if (!(fields && fields.length)) {
@ -70,13 +60,17 @@ export class SteedosMongoDriver implements SteedosDriver {
}
let projection: JsonMap = {};
(<string[]>fields).forEach((field) => {
if (field){
if (field) {
projection[field] = 1;
}
});
let sort: JsonMap = undefined;
if (options.sort && typeof options.sort === "string") {
let arraySort: string[] = options.sort.split(",").map((n) => { return n.trim(); });
return projection;
}
getMongoSortOptions(sort: string): JsonMap {
let result: JsonMap = undefined;
if (sort && typeof sort === "string") {
let arraySort: string[] = sort.split(",").map((n) => { return n.trim(); });
let stringSort: string = "";
arraySort.forEach((n) => {
if (n) {
@ -84,12 +78,23 @@ export class SteedosMongoDriver implements SteedosDriver {
}
});
stringSort = stringSort.replace(/,$/g, "");
sort = createQuery(`$orderby=${stringSort}`).sort;
result = createQuery(`$orderby=${stringSort}`).sort;
}
return result;
}
/* TODO： */
getMongoOptions(options: SteedosQueryOptions): JsonMap {
if (_.isUndefined(options)) {
return {};
}
let result: JsonMap = {};
let projection: JsonMap = this.getMongoFieldsOptions(options.fields);
let sort: JsonMap = this.getMongoSortOptions(options.sort);
result.projection = projection;
result.sort = sort;
result.limit = options.top;
result.skip = options.skip;
result.sort = sort;
return result;
}

2
packages/objectql/test/unit/driver/mongo/sort.ts
View File

@ -87,7 +87,7 @@ describe('fetch records with sort arguments as a string that comply with odata-v
expect(result[3]._id).to.be.eq("cnpc1");
});
it.only('multi sort error correction', async () => {
it('multi sort error correction', async () => {
let mongo = new SteedosMongoDriver({ url: "mongodb://127.0.0.1/steedos" });
await mongo.connect();