Skip to content

add support for string condition argument in DataStore.getObjectCount #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
illyaV merged 5 commits into from
Oct 12, 2017
Merged

add support for string condition argument in DataStore.getObjectCount #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc54c26
fix (persistence) remove method should return deletion time
vengrov Sep 25, 2017
d5e121d
Merge remote-tracking branch 'origin/master'
vengrov Sep 29, 2017
78191de
Merge remote-tracking branch 'origin/master'
vengrov Oct 11, 2017
487f1d0
add support for string condition argument in DataStore.getObjectCount
vengrov Oct 12, 2017
d2dd47b
fix (getObjectCount): change ts defenition
Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backendless.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,8 @@ declare module __Backendless {
loadRelations(parentObjectId:string, query:Backendless.LoadRelationsQueryBuilder):Promise<Array<Object>>;
loadRelationsSync(parentObjectId:string, query:Backendless.LoadRelationsQueryBuilder):Array<Object>;

getObjectCount(query?:Backendless.DataQueryBuilder):Promise<number>
getObjectCountSync(query?:Backendless.DataQueryBuilder):number
getObjectCount(query?:Backendless.DataQueryBuilder|string):Promise<number>
getObjectCountSync(query?:Backendless.DataQueryBuilder|string):number

setRelation(parentObject:Object, columnName:string, childObjectsArray:Array<Object>):Promise<string>;
setRelation(parentObject:Object, columnName:string, childObjectIdArray:Array<string>):Promise<string>;
Expand Down
26 changes: 16 additions & 10 deletions src/backendless.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,7 +1377,7 @@
/**
* Count of object
*
* @param {DataQueryBuilder} [queryBuilder]
* @param {String|DataQueryBuilder} [condition]
*
* @return {Promise}
*/
Expand All @@ -1386,27 +1386,33 @@
/**
* Count of object (sync)
*
* @param {DataQueryBuilder} [queryBuilder]
* @param {String|DataQueryBuilder} [condition]
*
* @return {number}
*/
getObjectCountSync: synchronized('_getObjectCount'),

_getObjectCount: function(queryBuilder, async) {
var args = this._parseFindArguments(arguments);
var dataQuery = args.queryBuilder ? args.queryBuilder.build() : {};
_getObjectCount: function(condition, async) {
if (condition instanceof Async) {
async = condition;
condition = null;
}

if (condition instanceof Backendless.DataQueryBuilder) {
condition = condition.build().condition;
}

var url = this.restUrl + '/count';
var isAsync = !!args.async;

if (dataQuery.condition) {
url += '?where=' + encodeURIComponent(dataQuery.condition);
if (condition) {
url += '?where=' + encodeURIComponent(condition);
}

return Backendless._ajax({
method : 'GET',
url : url,
isAsync : isAsync,
asyncHandler: args.async
isAsync : !!async,
asyncHandler: async
});
},

Expand Down