Skip to content

Fix previous sync errors #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fulleni merged 5 commits into from
Aug 11, 2025
Merged

Fix previous sync errors #43

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31eef33
fix(data_operation_registry): update user feed decorator status
fulleni Aug 11, 2025
589a64e
fix(auth_service): update user creation logic
fulleni Aug 11, 2025
b016f11
fix(database): correct user status initialization and language structure
fulleni Aug 11, 2025
e52231a
fix(database): remove extra comma in database seeding service
fulleni Aug 11, 2025
e405996
Merge branch 'main' into fix-previous-sync-errors
fulleni Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/registry/data_operation_registry.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class DataOperationRegistry {
final repo = c.read<DataRepository<User>>();
final existingUser = c.read<FetchedItem<dynamic>>().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);
},
Expand Down
22 changes: 15 additions & 7 deletions lib/src/services/auth_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
),
),
Expand Down Expand Up @@ -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)),
),
),
);
Expand Down Expand Up @@ -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,
Expand Down
16 changes: 12 additions & 4 deletions lib/src/services/database_seeding_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
),
),
);
Expand Down Expand Up @@ -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,
Expand Down