Skip to content

Commit 45b315a

Browse files
zapcannon87zapcannon87
committed
fix: can not delete friendship request
1 parent ec9841d commit 45b315a

File tree

8 files changed

+133
-209
lines changed

8 files changed

+133
-209
lines changed

‎AVOS/LeanCloudObjcTests/LCLeaderboardTestCase.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ class LCLeaderboardTestCase: BaseTestCase {
6666
}
6767

6868
func testGetUserStatistics() {
69-
defer {
70-
LCUser.logOut()
71-
}
7269
let user = LCUser()
7370
expecting { exp in
7471
user.login(withAuthData: ["openid" : uuid], platformId: "test", options: nil) { _, error in
@@ -328,9 +325,6 @@ class LCLeaderboardTestCase: BaseTestCase {
328325
}
329326

330327
func testGetUserRankings() {
331-
defer {
332-
LCUser.logOut()
333-
}
334328
let object = LCObject()
335329
XCTAssertTrue(object.save())
336330
let user = LCUser()

‎AVOS/LeanCloudObjcTests/LCUserTestCase.swift‎

Lines changed: 50 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class LCUserTestCase: BaseTestCase {
5858
exp.fulfill()
5959
}
6060
}
61-
LCUser.logOut()
6261
*/
6362
}
6463

@@ -106,17 +105,13 @@ class LCUserTestCase: BaseTestCase {
106105
exp.fulfill()
107106
}
108107
}
109-
LCUser.logOut()
110108
*/
111109
}
112110

113111
func testFriendshipRequestAccept() {
114-
let openid_1 = uuid
115-
let openid_2 = uuid
116-
117112
let user_1 = LCUser()
118113
expecting { exp in
119-
user_1.login(withAuthData: ["openid": openid_1], platformId: "test", options: nil) { succeeded, error in
114+
user_1.login(withAuthData: ["openid": uuid], platformId: "test", options: nil) { succeeded, error in
120115
XCTAssertTrue(succeeded)
121116
XCTAssertNil(error)
122117
exp.fulfill()
@@ -132,7 +127,7 @@ class LCUserTestCase: BaseTestCase {
132127

133128
let user_2 = LCUser()
134129
expecting { exp in
135-
user_2.login(withAuthData: ["openid": openid_2], platformId: "test", options: nil) { succeeded, error in
130+
user_2.login(withAuthData: ["openid": uuid], platformId: "test", options: nil) { succeeded, error in
136131
XCTAssertTrue(succeeded)
137132
XCTAssertNil(error)
138133
exp.fulfill()
@@ -153,31 +148,25 @@ class LCUserTestCase: BaseTestCase {
153148
}
154149
}
155150

156-
LCUser.logOut()
151+
LCUser.changeCurrentUser(user_1, save: false)
157152

158153
var query: LCQuery!
159-
expecting(description: "Accept Friendship Request", count: 3) { exp in
160-
user_1.login(withAuthData: ["openid": openid_1], platformId: "test", options: nil) { succeeded, error in
154+
expecting(description: "Accept Friendship Request", count: 2) { exp in
155+
query = LCFriendshipRequest.query()
156+
query.findObjectsInBackground { requests, error in
157+
let request = requests?.first as? LCFriendshipRequest
158+
let friend = request?["friend"] as? LCUser
159+
let user = request?["user"] as? LCUser
160+
XCTAssertNotNil(request)
161+
XCTAssertNotNil(friend)
162+
XCTAssertNotNil(user)
161163
XCTAssertNil(error)
162164
exp.fulfill()
163-
if succeeded {
164-
query = LCFriendshipRequest.query()
165-
query.findObjectsInBackground { requests, error in
166-
let request = requests?.first as? LCFriendshipRequest
167-
let friend = request?["friend"] as? LCUser
168-
let user = request?["user"] as? LCUser
169-
XCTAssertNotNil(request)
170-
XCTAssertNotNil(friend)
171-
XCTAssertNotNil(user)
165+
if let request = request {
166+
LCFriendship.accept(request, attributes: ["group": "music"]) { succeeded, error in
167+
XCTAssertTrue(succeeded)
172168
XCTAssertNil(error)
173169
exp.fulfill()
174-
if let request = request {
175-
LCFriendship.accept(request, attributes: ["group": "music"]) { succeeded, error in
176-
XCTAssertTrue(succeeded)
177-
XCTAssertNil(error)
178-
exp.fulfill()
179-
}
180-
}
181170
}
182171
}
183172
}
@@ -195,50 +184,39 @@ class LCUserTestCase: BaseTestCase {
195184
}
196185
}
197186

198-
LCUser.logOut()
187+
LCUser.changeCurrentUser(user_2, save: false)
199188

200-
expecting(count: 4) { exp in
201-
user_2.login(withAuthData: ["openid": openid_2], platformId: "test", options: nil) { succeeded, error in
189+
expecting(count: 3) { exp in
190+
query = user_2.followeeObjectsQuery()
191+
query.whereKey("friendStatus", equalTo: true)
192+
query.findObjectsInBackground { followees, error in
193+
let followee = followees?.first as? LCObject
194+
XCTAssertNotNil(followee)
195+
XCTAssertEqual(followee?["group"] as? String, "sport")
202196
XCTAssertNil(error)
203197
exp.fulfill()
204-
if succeeded {
205-
query = user_2.followeeObjectsQuery()
206-
query.whereKey("friendStatus", equalTo: true)
207-
query.findObjectsInBackground { followees, error in
208-
let followee = followees?.first as? LCObject
209-
XCTAssertNotNil(followee)
210-
XCTAssertEqual(followee?["group"] as? String, "sport")
198+
if let followee = followee {
199+
followee["group"] = "music"
200+
followee.saveInBackground { succeeded, error in
211201
XCTAssertNil(error)
212202
exp.fulfill()
213-
if let followee = followee {
214-
followee["group"] = "music"
215-
followee.saveInBackground { succeeded, error in
203+
if succeeded {
204+
user_2.unfollow(user_1.objectId!) { succeeded, error in
205+
XCTAssertTrue(succeeded)
216206
XCTAssertNil(error)
217207
exp.fulfill()
218-
if succeeded {
219-
user_2.unfollow(user_1.objectId!) { succeeded, error in
220-
XCTAssertTrue(succeeded)
221-
XCTAssertNil(error)
222-
exp.fulfill()
223-
}
224-
}
225208
}
226209
}
227210
}
228211
}
229212
}
230213
}
231-
232-
LCUser.logOut()
233214
}
234215

235216
func testFriendshipRequestDecline() {
236-
let openid_1 = uuid
237-
let openid_2 = uuid
238-
239217
let user_1 = LCUser()
240218
expecting { exp in
241-
user_1.login(withAuthData: ["openid": openid_1], platformId: "test", options: nil) { succeeded, error in
219+
user_1.login(withAuthData: ["openid": uuid], platformId: "test", options: nil) { succeeded, error in
242220
XCTAssertTrue(succeeded)
243221
XCTAssertNil(error)
244222
exp.fulfill()
@@ -254,7 +232,7 @@ class LCUserTestCase: BaseTestCase {
254232

255233
let user_2 = LCUser()
256234
expecting { exp in
257-
user_2.login(withAuthData: ["openid": openid_2], platformId: "test", options: nil) { succeeded, error in
235+
user_2.login(withAuthData: ["openid": uuid], platformId: "test", options: nil) { succeeded, error in
258236
XCTAssertTrue(succeeded)
259237
XCTAssertNil(error)
260238
exp.fulfill()
@@ -275,37 +253,31 @@ class LCUserTestCase: BaseTestCase {
275253
}
276254
}
277255

278-
LCUser.logOut()
256+
LCUser.changeCurrentUser(user_1, save: false)
279257

280258
var query: LCQuery!
281-
expecting(description: "Decline Friendship Request", count: 3) { exp in
282-
user_1.login(withAuthData: ["openid": openid_1], platformId: "test", options: nil) { succeeded, error in
259+
expecting(description: "Decline Friendship Request", count: 2) { exp in
260+
query = LCFriendshipRequest.query()
261+
query.findObjectsInBackground { requests, error in
262+
let request = requests?.first as? LCFriendshipRequest
263+
let friend = request?["friend"] as? LCUser
264+
let user = request?["user"] as? LCUser
265+
XCTAssertNotNil(request)
266+
XCTAssertNotNil(friend)
267+
XCTAssertNotNil(user)
283268
XCTAssertNil(error)
284269
exp.fulfill()
285-
if succeeded {
286-
query = LCFriendshipRequest.query()
287-
query.findObjectsInBackground { requests, error in
288-
let request = requests?.first as? LCFriendshipRequest
289-
let friend = request?["friend"] as? LCUser
290-
let user = request?["user"] as? LCUser
291-
XCTAssertNotNil(request)
292-
XCTAssertNotNil(friend)
293-
XCTAssertNotNil(user)
270+
if let request = request {
271+
LCFriendship.declineRequest(request) { succeeded, error in
272+
XCTAssertTrue(succeeded)
294273
XCTAssertNil(error)
295274
exp.fulfill()
296-
if let request = request {
297-
LCFriendship.declineRequest(request) { succeeded, error in
298-
XCTAssertTrue(succeeded)
299-
XCTAssertNil(error)
300-
exp.fulfill()
301-
}
302-
}
303275
}
304276
}
305277
}
306278
}
307279

308-
expecting { exp in
280+
expecting(description: "Delete Friendship Request", count: 2) { exp in
309281
query = LCFriendshipRequest.query()
310282
query.whereKey("status", equalTo: "declined")
311283
query.findObjectsInBackground { requests, error in
@@ -317,9 +289,12 @@ class LCUserTestCase: BaseTestCase {
317289
XCTAssertNotNil(user)
318290
XCTAssertNil(error)
319291
exp.fulfill()
292+
request?.deleteInBackground({ succeeded, error in
293+
XCTAssertTrue(succeeded)
294+
XCTAssertNil(error)
295+
exp.fulfill()
296+
})
320297
}
321298
}
322-
323-
LCUser.logOut()
324299
}
325300
}

‎AVOS/Sources/Foundation/Object/LCObjectUtils.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@
6060
+ (NSMutableDictionary *)objectSnapshot:(LCObject *)object;
6161
+ (NSMutableDictionary *)objectSnapshot:(LCObject *)object recursive:(BOOL)recursive;
6262

63-
+(LCObject *)lcObjectFromDictionary:(NSDictionary *)dict;
64-
+(LCObject *)lcObjectForClass:(NSString *)className;
65-
+(LCObject *)targetObjectFromRelationDictionary:(NSDictionary *)dict;
63+
+ (LCObject *)lcObjectForClass:(NSString *)className;
64+
+ (LCObject *)lcObjectFromDictionary:(NSDictionary *)dictionary;
65+
+ (LCObject *)targetObjectFromRelationDictionary:(NSDictionary *)dictionary;
6666

6767
+(NSSet *)allObjectProperties:(Class)objectClass;
6868

6969
#pragma mark - Rebuild Relation
7070
+(void)setupRelation:(LCObject *)parent
7171
withDictionary:(NSDictionary *)relationMap;
7272

73+
// MARK: Batch Request from operation list
7374

74-
#pragma mark - batch request from operation list
7575
+ (BOOL)isUserClass:(NSString *)className;
7676
+ (BOOL)isRoleClass:(NSString *)className;
7777
+ (BOOL)isFileClass:(NSString *)className;

0 commit comments

Comments
 (0)