From 31eef33180b931950c849a242779e4ff630f9323 Mon Sep 17 00:00:00 2001 From: fulleni Date: Mon, 11 Aug 2025 12:39:05 +0100 Subject: [PATCH 1/4] fix(data_operation_registry): update user feed decorator status - Replace 'feedActionStatus' with 'feedDecoratorStatus' for User object - This change ensures the correct status field is updated when modifying a user --- lib/src/registry/data_operation_registry.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/registry/data_operation_registry.dart b/lib/src/registry/data_operation_registry.dart index afbb2d3..caf2371 100644 --- a/lib/src/registry/data_operation_registry.dart +++ b/lib/src/registry/data_operation_registry.dart @@ -199,7 +199,7 @@ class DataOperationRegistry { final repo = c.read>(); final existingUser = c.read>().data as User; final updatedUser = existingUser.copyWith( - feedActionStatus: (item as User).feedActionStatus, + feedDecoratorStatus: (item as User).feedDecoratorStatus, ); return repo.update(id: id, item: updatedUser, userId: uid); }, From 589a64e92135b500e687b003c2e646cf01a53349 Mon Sep 17 00:00:00 2001 From: fulleni Date: Mon, 11 Aug 2025 12:39:41 +0100 Subject: [PATCH 2/4] fix(auth_service): update user creation logic - Replace FeedActionType with FeedDecoratorType - Update UserFeedActionStatus to UserFeedDecoratorStatus - Replace language code 'en' with Language object --- lib/src/services/auth_service.dart | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/src/services/auth_service.dart b/lib/src/services/auth_service.dart index b8034fa..f29d18b 100644 --- a/lib/src/services/auth_service.dart +++ b/lib/src/services/auth_service.dart @@ -287,11 +287,11 @@ class AuthService { appRole: AppUserRole.standardUser, dashboardRole: DashboardUserRole.none, createdAt: DateTime.now(), - feedActionStatus: Map.fromEntries( - FeedActionType.values.map( + feedDecoratorStatus: Map.fromEntries( + FeedDecoratorType.values.map( (type) => MapEntry( type, - const UserFeedActionStatus(isCompleted: false), + const UserFeedDecoratorStatus(isCompleted: false), ), ), ), @@ -347,10 +347,10 @@ class AuthService { appRole: AppUserRole.guestUser, dashboardRole: DashboardUserRole.none, createdAt: DateTime.now(), - feedActionStatus: Map.fromEntries( - FeedActionType.values.map( + feedDecoratorStatus: Map.fromEntries( + FeedDecoratorType.values.map( (type) => - MapEntry(type, const UserFeedActionStatus(isCompleted: false)), + MapEntry(type, const UserFeedDecoratorStatus(isCompleted: false)), ), ), ); @@ -527,7 +527,15 @@ class AuthService { textScaleFactor: AppTextScaleFactor.medium, fontWeight: AppFontWeight.regular, ), - language: 'en', + language: Language( + id: '6633b7ac1892f06e6914d0b3', + code: 'en', + name: 'English', + nativeName: 'English', + createdAt: DateTime.now(), + updatedAt: DateTime.now(), + status: ContentStatus.active, + ), feedPreferences: const FeedDisplayPreferences( headlineDensity: HeadlineDensity.standard, headlineImageStyle: HeadlineImageStyle.smallThumbnail, From b016f119659e03775d9f4734340407a6eebc9f38 Mon Sep 17 00:00:00 2001 From: fulleni Date: Mon, 11 Aug 2025 12:39:47 +0100 Subject: [PATCH 3/4] fix(database): correct user status initialization and language structure - Change feedActionStatus to feedDecoratorStatus and update related types - Replace language code with Language object initialization --- lib/src/services/database_seeding_service.dart | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/src/services/database_seeding_service.dart b/lib/src/services/database_seeding_service.dart index d1bd025..1c03c66 100644 --- a/lib/src/services/database_seeding_service.dart +++ b/lib/src/services/database_seeding_service.dart @@ -216,10 +216,10 @@ class DatabaseSeedingService { appRole: AppUserRole.standardUser, dashboardRole: DashboardUserRole.admin, createdAt: DateTime.now(), - feedActionStatus: Map.fromEntries( - FeedActionType.values.map( + feedDecoratorStatus: Map.fromEntries( + FeedDecoratorType.values.map( (type) => - MapEntry(type, const UserFeedActionStatus(isCompleted: false)), + MapEntry(type, const UserFeedDecoratorStatus(isCompleted: false)), ), ), ); @@ -258,7 +258,15 @@ class DatabaseSeedingService { textScaleFactor: AppTextScaleFactor.medium, fontWeight: AppFontWeight.regular, ), - language: 'en', + language: Language( + id: '6633b7ac1892f06e6914d0b3', + code: 'en', + name: 'English', + nativeName: 'English', + createdAt: DateTime.now(), + updatedAt: DateTime.now(), + status: ContentStatus.active, + ),, feedPreferences: const FeedDisplayPreferences( headlineDensity: HeadlineDensity.standard, headlineImageStyle: HeadlineImageStyle.smallThumbnail, From e52231ad15802f4302d55be67cb82713075696e7 Mon Sep 17 00:00:00 2001 From: fulleni Date: Mon, 11 Aug 2025 12:40:19 +0100 Subject: [PATCH 4/4] fix(database): remove extra comma in database seeding service - Corrected a syntax error in the DatabaseSeedingService class - Removed the extraneous comma in the content creation process - This change ensures proper functionality when running the app and prevents potential errors during database seeding --- lib/src/services/database_seeding_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/services/database_seeding_service.dart b/lib/src/services/database_seeding_service.dart index 1c03c66..e8c0d1b 100644 --- a/lib/src/services/database_seeding_service.dart +++ b/lib/src/services/database_seeding_service.dart @@ -266,7 +266,7 @@ class DatabaseSeedingService { createdAt: DateTime.now(), updatedAt: DateTime.now(), status: ContentStatus.active, - ),, + ), feedPreferences: const FeedDisplayPreferences( headlineDensity: HeadlineDensity.standard, headlineImageStyle: HeadlineImageStyle.smallThumbnail,