Skip to content

Commit a0c28cd

Browse files
authored
Merge pull request AOSSIE-Org#652 from pranjal29092005/fix/appwrite-v1.8-relationship-loading
fix: add explicit relationship field selection for Appwrite v1.8.0 compatibility
2 parents d934d2f + 6b94057 commit a0c28cd

9 files changed

+24
-2
lines changed

lib/controllers/auth_state_controller.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ class AuthStateController extends GetxController {
207207
databaseId: userDatabaseID,
208208
tableId: usersTableID,
209209
rowId: appwriteUser.$id,
210+
queries: [Query.select(["*", "followers.*", "userReports.*"])],
210211
);
211212
profileImageUrl = userDataDoc.data["profileImageUrl"];
212213
profileImageID = userDataDoc.data["profileImageID"];

lib/controllers/change_email_controller.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ class ChangeEmailController extends GetxController {
3838
final docs = await tables.listRows(
3939
databaseId: userDatabaseID,
4040
tableId: usernameTableID,
41-
queries: [Query.equal('email', changedEmail)],
41+
queries: [
42+
Query.equal('email', changedEmail),
43+
],
4244
);
4345

4446
if (docs.total > 0) {

lib/controllers/explore_story_controller.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,7 @@ class ExploreStoryController extends GetxController {
690690
databaseId: userDatabaseID,
691691
tableId: liveChapterAttendeesTableId,
692692
rowId: liveStoryDocuments.first.$id,
693+
queries: [Query.select(["*", "users.*"])],
693694
);
694695

695696
final attendeesModel = LiveChapterAttendeesModel.fromJson(

lib/controllers/friends_controller.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ class FriendsController extends GetxController {
9999
databaseId: userDatabaseID,
100100
tableId: usersTableID,
101101
rowId: authStateController.uid!,
102+
queries: [Query.select(["*", "friends.*"])],
102103
);
103104
for (var friend in (userDoc.data["friends"] ?? []) as List<dynamic>) {
104105
final friendModel = FriendsModel.fromJson(friend);

lib/controllers/user_profile_controller.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ class UserProfileController extends GetxController {
123123
databaseId: userDatabaseID,
124124
tableId: usersTableID,
125125
rowId: userId,
126+
queries: [Query.select(["*", "followers.*"])],
126127
);
127128

128129
searchedUserFollowers.value =

test/controllers/auth_state_controller_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ void main() {
165165
databaseId: userDatabaseID,
166166
tableId: usersTableID,
167167
rowId: '123',
168+
queries: [Query.select(["*", "followers.*", "userReports.*"])],
168169
),
169170
).thenAnswer((_) => Future.value(mockUserDocument));
170171
when(

test/controllers/change_email_controller_test.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ void main() {
8080
mockTablesDB.listRows(
8181
databaseId: userDatabaseID,
8282
tableId: usernameTableID,
83-
queries: [Query.equal('email', 'test2@test.com')],
83+
queries: [
84+
Query.equal('email', 'test2@test.com'),
85+
],
8486
),
8587
).thenAnswer((_) => Future.value(RowList(total: 0, rows: [])));
8688
when(mockAccount.get()).thenAnswer((_) => Future.value(mockUser));
@@ -90,6 +92,7 @@ void main() {
9092
databaseId: userDatabaseID,
9193
tableId: usersTableID,
9294
rowId: '123',
95+
queries: [Query.select(["*", "followers.*", "userReports.*"])],
9396
),
9497
).thenAnswer((_) => Future.value(mockUserDocument.rows.first));
9598
when(

test/controllers/friends_controller_test.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,18 @@ void main() {
216216
);
217217

218218
friendsController.authStateController.uid = 'id2';
219+
friendsController.authStateController.userName = 'testu2';
220+
friendsController.authStateController.profileImageUrl = 'https://example.com/profile2.jpg';
221+
friendsController.authStateController.displayName = 'Test User 2';
222+
friendsController.authStateController.ratingTotal = 25.0;
223+
friendsController.authStateController.ratingCount = 5;
219224

220225
when(
221226
tables.getRow(
222227
databaseId: userDatabaseID,
223228
tableId: usersTableID,
224229
rowId: 'id2',
230+
queries: [Query.select(["*", "friends.*"])],
225231
),
226232
).thenAnswer(
227233
(_) => Future.delayed(Duration(seconds: 2), () => mockUserRow),

test/controllers/user_profile_controller_test.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ void main() {
219219
);
220220

221221
userProfileController.authStateController.uid = 'id2';
222+
userProfileController.authStateController.userName = 'testu2';
223+
userProfileController.authStateController.profileImageUrl = 'https://example.com/profile2.jpg';
224+
userProfileController.authStateController.displayName = 'Test User 2';
225+
userProfileController.authStateController.ratingTotal = 25.0;
226+
userProfileController.authStateController.ratingCount = 5;
222227

223228
when(
224229
tablesDB.listRows(
@@ -254,6 +259,7 @@ void main() {
254259
databaseId: userDatabaseID,
255260
tableId: usersTableID,
256261
rowId: 'id1',
262+
queries: [Query.select(["*", "followers.*"])],
257263
),
258264
).thenAnswer(
259265
(_) =>

0 commit comments

Comments
 (0)