Skip to content

Commit 8a4b5e5

Browse files
committed
fix(database): rename user_app_settings collection to app_settings
- Update collection name in AppDependencies - Update related permissions in Permissions class - Update DataOperationRegistry to use new collection name - Update ModelRegistry to reflect new collection name - Update DatabaseSeedingService to use new collection name These changes ensure consistency across the codebase and database, using the more appropriate "app_settings" collection name instead of "user_app_settings".
1 parent 9c0a23d commit 8a4b5e5

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

lib/src/config/app_dependencies.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class AppDependencies {
6767
late final DataRepository<User> userRepository;
6868
late final DataRepository<AppSettings> userAppSettingsRepository;
6969
late final DataRepository<UserContentPreferences>
70-
userContentPreferencesRepository;
70+
userContentPreferencesRepository;
7171
late final DataRepository<PushNotificationDevice>
72-
pushNotificationDeviceRepository;
72+
pushNotificationDeviceRepository;
7373
late final DataRepository<RemoteConfig> remoteConfigRepository;
7474
late final DataRepository<InAppNotification> inAppNotificationRepository;
7575

@@ -192,7 +192,7 @@ class AppDependencies {
192192
);
193193
final userAppSettingsClient = DataMongodb<AppSettings>(
194194
connectionManager: _mongoDbConnectionManager,
195-
modelName: 'user_app_settings',
195+
modelName: 'app_settings',
196196
fromJson: AppSettings.fromJson,
197197
toJson: (item) => item.toJson(),
198198
logger: Logger('DataMongodb<AppSettings>'),

lib/src/rbac/permissions.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ abstract class Permissions {
5050
static const String userUpdate = 'user.update';
5151

5252
// User App Settings Permissions (User-owned)
53-
static const String userAppSettingsReadOwned = 'user_app_settings.read_owned';
54-
static const String userAppSettingsUpdateOwned =
55-
'user_app_settings.update_owned';
53+
static const String userAppSettingsReadOwned = 'app_settings.read_owned';
54+
static const String userAppSettingsUpdateOwned = 'app_settings.update_owned';
5655

5756
// User Content Preferences Permissions (User-owned)
5857
static const String userContentPreferencesReadOwned =

lib/src/registry/data_operation_registry.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class DataOperationRegistry {
113113
c.read<DataRepository<Language>>().read(id: id, userId: null),
114114
'user': (c, id) =>
115115
c.read<DataRepository<User>>().read(id: id, userId: null),
116-
'user_app_settings': (c, id) =>
116+
'app_settings': (c, id) =>
117117
c.read<DataRepository<AppSettings>>().read(id: id, userId: null),
118118
'user_content_preferences': (c, id) => c
119119
.read<DataRepository<UserContentPreferences>>()
@@ -389,7 +389,7 @@ class DataOperationRegistry {
389389
userId: uid,
390390
);
391391
},
392-
'user_app_settings': (c, id, item, uid) => c
392+
'app_settings': (c, id, item, uid) => c
393393
.read<DataRepository<AppSettings>>()
394394
.update(id: id, item: item as AppSettings, userId: uid),
395395
'user_content_preferences': (context, id, item, uid) async {
@@ -454,7 +454,7 @@ class DataOperationRegistry {
454454
c.read<DataRepository<Country>>().delete(id: id, userId: uid),
455455
'language': (c, id, uid) =>
456456
c.read<DataRepository<Language>>().delete(id: id, userId: uid),
457-
'user_app_settings': (c, id, uid) =>
457+
'app_settings': (c, id, uid) =>
458458
c.read<DataRepository<AppSettings>>().delete(id: id, userId: uid),
459459
'user_content_preferences': (c, id, uid) => c
460460
.read<DataRepository<UserContentPreferences>>()

lib/src/registry/model_registry.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ final modelRegistry = <String, ModelConfig<dynamic>>{
305305
type: RequiredPermissionType.unsupported,
306306
),
307307
),
308-
'user_app_settings': ModelConfig<AppSettings>(
308+
'app_settings': ModelConfig<AppSettings>(
309309
fromJson: AppSettings.fromJson,
310310
getId: (s) => s.id,
311311
getOwnerId: (dynamic item) => (item as AppSettings).id,

lib/src/services/database_seeding_service.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ class DatabaseSeedingService {
358358
Future<void> _deleteUserAndData(ObjectId userId) async {
359359
await _db.collection('users').deleteOne(where.eq('_id', userId));
360360
await _db
361-
.collection('user_app_settings')
361+
.collection('app_settings')
362362
.deleteOne(where.eq('_id', userId));
363363
await _db
364364
.collection('user_content_preferences')
@@ -390,7 +390,7 @@ class DatabaseSeedingService {
390390
showPublishDateInHeadlineFeed: true,
391391
),
392392
);
393-
await _db.collection('user_app_settings').insertOne({
393+
await _db.collection('app_settings').insertOne({
394394
'_id': userId,
395395
...defaultAppSettings.toJson()..remove('id'),
396396
});

0 commit comments

Comments
 (0)