added support of sortBy and properties for LoadRelationsQueryBuilder / http://bugs.backendless.com/browse/BKNDLSS-18028

Author: Olha Danylova

CHANGELOG.md

@@ -1,5 +1,8 @@
 # RELEASE HISTORY
 
+## -
+* added support of sortBy and properties for LoadRelationsQueryBuilder
+
 ## 5.2.12 March, 26 2019
 * podspec updated to support Socket.IO v14.0.0
 

SDK/backendlessAPI/Classes/Persistence/LoadRelationsQueryBuilder.h

@@ -35,4 +35,14 @@
 -(instancetype) preparePreviousPage;
 -(NSMutableArray<NSString*> *)getRelationType;
 
+-(NSMutableArray<NSString*> *)getProperties;
+-(instancetype)setProperties:(NSArray<NSString*> *)properties;
+-(instancetype)addProperty:(NSString *)property;
+-(instancetype)addProperties:(NSArray<NSString *> *)properties;
+
+-(NSMutableArray<NSString *> *)getSortBy;
+-(instancetype)setSortBy:(NSArray<NSString *> *)sortBy;
+-(instancetype)addSortBy:(NSString *)sortBy;
+-(instancetype)addListSortBy:(NSArray<NSString *> *)sortBy;
+
 @end

SDK/backendlessAPI/Classes/Persistence/LoadRelationsQueryBuilder.m

@@ -24,11 +24,14 @@
 #import "QueryOptions.h"
 #import "BackendlessDataQuery.h"
 #import "PagedQueryBuilder.h"
+#import "QueryOptionsBuilder.h"
 
 @interface LoadRelationsQueryBuilder () {
     NSString *_relationName;
     Class _relationType;
     PagedQueryBuilder *_pagedQueryBuilder;
+    NSMutableArray<NSString *> *_properties;
+    QueryOptionsBuilder *_queryOptionsBuilder;
 }
 @end
 
@@ -37,6 +40,8 @@ @implementation LoadRelationsQueryBuilder
 -(instancetype)init {
     if (self = [super init]) {
         _pagedQueryBuilder = [[PagedQueryBuilder alloc] init:self];
+        _properties = [NSMutableArray<NSString *> new];
+        _queryOptionsBuilder = [[QueryOptionsBuilder alloc] init:self];
         _relationName = nil;
         _relationType = nil;
     }
@@ -46,6 +51,8 @@ -(instancetype)init {
 -(instancetype)initWithClass:(Class)relationType {
     if ( (self=[super init]) ) {
         _pagedQueryBuilder = [[PagedQueryBuilder alloc] init:self];
+        _properties = [NSMutableArray<NSString *> new];
+        _queryOptionsBuilder = [[QueryOptionsBuilder alloc] init:self];
         _relationName = nil;
         _relationType = relationType;
     }
@@ -71,6 +78,7 @@ +(instancetype)of:(Class)relationType {
 
 -(BackendlessDataQuery *)build {
     BackendlessDataQuery *dataQuery = [_pagedQueryBuilder build];
+    dataQuery.properties = _properties ? [[NSMutableArray alloc] initWithArray:_properties] : nil;
     QueryOptions *queryOptions = [QueryOptions new];
     [queryOptions addRelated:_relationName];
     dataQuery.queryOptions = queryOptions;
@@ -106,4 +114,54 @@ -(Class)getRelationType {
     return _relationType;
 }
 
+-(NSMutableArray<NSString*> *)getProperties {
+    return _properties;
+}
+
+-(instancetype)setProperties:(NSArray<NSString*> *)properties {
+    if (properties) {
+        _properties = [[NSMutableArray alloc] initWithArray:properties];
+    }
+    return self;
+}
+
+-(instancetype)addProperty:(NSString *)property {
+    if (property) {
+        [_properties addObject:property];
+    }
+    return self;
+}
+
+-(instancetype)addProperties:(NSArray<NSString *> *)properties {
+    if (properties) {
+        [_properties addObjectsFromArray:properties];
+    }
+    return self;
+}
+
+-(NSMutableArray<NSString *> *)getSortBy {
+    return [_queryOptionsBuilder getSortBy];
+}
+
+-(instancetype)setSortBy:(NSArray<NSString *> *)sortBy {
+    if (sortBy) {
+        [_queryOptionsBuilder setSortBy:sortBy];
+    }
+    return self;
+}
+
+-(instancetype)addSortBy:(NSString *)sortBy {
+    if (sortBy) {
+        [_queryOptionsBuilder addSortBy:sortBy];
+    }
+    return self;
+}
+
+-(instancetype)addListSortBy:(NSArray<NSString *> *)sortBy {
+    if (sortBy) {
+        [_queryOptionsBuilder addListSortBy:sortBy];
+    }
+    return self;
+}
+
 @end

SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj

@@ -5856,8 +5856,6 @@
 				F91B48291603649C00012DFC /* IDataStore.h */,
 				F99D92231607240B00AFF3F6 /* DataStoreFactory.h */,
 				F99D92241607240C00AFF3F6 /* DataStoreFactory.m */,
-				84B027E41DF6FABA00F084C2 /* LoadRelationsQueryBuilder.h */,
-				84B027E51DF6FABA00F084C2 /* LoadRelationsQueryBuilder.m */,
 				F99A74951D4A0CAB001AF91F /* MapDrivenDataStore.h */,
 				F99A74961D4A0CAB001AF91F /* MapDrivenDataStore.m */,
 				F96B1C5E1DD3A23C00A4B362 /* PagedQueryBuilder.h */,
@@ -5866,6 +5864,8 @@
 				F96B1C6B1DD3B6CA00A4B362 /* QueryOptionsBuilder.m */,
 				F96B1C781DD4BF5F00A4B362 /* DataQueryBuilder.h */,
 				F96B1C791DD4BF5F00A4B362 /* DataQueryBuilder.m */,
+				84B027E41DF6FABA00F084C2 /* LoadRelationsQueryBuilder.h */,
+				84B027E51DF6FABA00F084C2 /* LoadRelationsQueryBuilder.m */,
 			);
 			path = Persistence;
 			sourceTree = "<group>";

SDK/ios/backendless/backendless.a

@@ -35,4 +35,14 @@
 -(instancetype) preparePreviousPage;
 -(NSMutableArray<NSString*> *)getRelationType;
 
+-(NSMutableArray<NSString*> *)getProperties;
+-(instancetype)setProperties:(NSArray<NSString*> *)properties;
+-(instancetype)addProperty:(NSString *)property;
+-(instancetype)addProperties:(NSArray<NSString *> *)properties;
+
+-(NSMutableArray<NSString *> *)getSortBy;
+-(instancetype)setSortBy:(NSArray<NSString *> *)sortBy;
+-(instancetype)addSortBy:(NSString *)sortBy;
+-(instancetype)addListSortBy:(NSArray<NSString *> *)sortBy;
+
 @end

SDK/ios/backendless/include/LoadRelationsQueryBuilder.h

@@ -35,4 +35,14 @@
 -(instancetype) preparePreviousPage;
 -(NSMutableArray<NSString*> *)getRelationType;
 
+-(NSMutableArray<NSString*> *)getProperties;
+-(instancetype)setProperties:(NSArray<NSString*> *)properties;
+-(instancetype)addProperty:(NSString *)property;
+-(instancetype)addProperties:(NSArray<NSString *> *)properties;
+
+-(NSMutableArray<NSString *> *)getSortBy;
+-(instancetype)setSortBy:(NSArray<NSString *> *)sortBy;
+-(instancetype)addSortBy:(NSString *)sortBy;
+-(instancetype)addListSortBy:(NSArray<NSString *> *)sortBy;
+
 @end