fix: add the catalog user repository to the catalog service

Author: Freek van de Ven

packages/flutter_catalog/lib/src/flutter_catalog_userstory.dart

@@ -119,10 +119,16 @@ abstract class _BaseCatalogNavigatorUserstory extends HookWidget {
     var catalogService = useMemoized(
       () => CatalogService(
         repository: options.catalogRepository,
+        userRepository: options.catalogUserRepository,
         userId: userId,
         userLocation: userLocation,
       ),
-      [options.catalogRepository],
+      [
+        options.catalogRepository,
+        options.catalogUserRepository,
+        userId,
+        userLocation,
+      ],
     );
 
     var filterService = useMemoized(

packages/flutter_catalog/lib/src/services/catalog_service.dart

@@ -6,14 +6,18 @@ import "package:flutter_catalog_interface/flutter_catalog_interface.dart";
 /// manipulate catalog data of type T.
 class CatalogService<T extends CatalogItem> {
   /// Creates a [CatalogService] with the given repository.
-  CatalogService({
+  const CatalogService({
     required CatalogRepository<T> repository,
+    required CatalogUserRepository<CatalogUser> userRepository,
     required this.userId,
     required this.userLocation,
-  }) : _repository = repository;
+  })  : _repository = repository,
+        _userRepository = userRepository;
 
   final CatalogRepository<T> _repository;
 
+  final CatalogUserRepository<CatalogUser> _userRepository;
+
   /// The ID of the user for whom catalog operations are performed.
   final String userId;
 
@@ -34,6 +38,21 @@ class CatalogService<T extends CatalogItem> {
         offset: offset,
       );
 
+  /// Fetches users for a list of catalog items.
+  Future<List<CatalogUser>> fetchUsersForItems(
+    List<T> items,
+  ) async {
+    var userIds =
+        items.map((item) => item.authorId).whereType<String>().toSet().toList();
+    return _userRepository.getUsers(userIds);
+  }
+
+  /// Retrieves a user for a specific catalog item.
+  Future<CatalogUser?> getUserForCatalogItem(T item) async {
+    if (item.authorId == null) return null;
+    return _userRepository.getUser(item.authorId!);
+  }
+
   /// Toggles the favorite status of an item for the current user.
   Future<void> toggleFavorite(String itemId) async =>
       _repository.toggleFavorite(itemId, userId);

packages/flutter_catalog/lib/src/views/catalog_detail_view.dart

@@ -37,9 +37,7 @@ class CatalogDetailView extends HookWidget {
 
     // ignore: discarded_futures
     var authorFuture = useMemoized(
-      () async => item.authorId != null
-          ? options.catalogUserRepository.getUser(item.authorId!)
-          : Future.value(null),
+      () async => service.getUserForCatalogItem(item),
       [item.authorId],
     );
 

packages/flutter_catalog/lib/src/views/catalog_overview_view.dart

@@ -231,6 +231,7 @@ class _Body extends HookWidget {
     var localizations = FlutterCatalogLocalizations.of(context)!;
 
     var scope = CatalogScope.of(context);
+    var catalogService = scope.catalogService;
     var filterService = scope.filterService;
     var filtersStream =
         useMemoized(() => filterService.getFiltersWithValues(), []);
@@ -242,28 +243,31 @@ class _Body extends HookWidget {
     var itemsFuture = useMemoized(
       () async {
         if (!filtersSnapshot.hasData) {
-          return scope.catalogService.fetchCatalogItems();
+          return catalogService.fetchCatalogItems();
         }
-        return scope.catalogService.fetchCatalogItems(
+        return catalogService.fetchCatalogItems(
           filters: filtersSnapshot.data!.toSerializedFilterMap(),
         );
       },
       [filtersSnapshot.data],
     );
     var snapshot = useFuture(itemsFuture);
+    var items = snapshot.data;
+    useEffect(
+      () {
+        if (items == null || items.isEmpty) {
+          options.onNoItems?.call();
+        }
+        return;
+      },
+      [],
+    );
 
     // ignore: discarded_futures
     var usersFuture = useMemoized(
       () async {
         if (snapshot.hasData && snapshot.data!.isNotEmpty) {
-          var authorIds = snapshot.data!
-              .map((item) => item.authorId)
-              .whereType<String>()
-              .toSet()
-              .toList();
-          if (authorIds.isNotEmpty) {
-            return scope.options.catalogUserRepository.getUsers(authorIds);
-          }
+          return catalogService.fetchUsersForItems(snapshot.data!);
         }
         return Future.value(<CatalogUser>[]);
       },
@@ -284,16 +288,6 @@ class _Body extends HookWidget {
           Center(child: Text(localizations.itemLoadingError));
     }
 
-    var items = snapshot.data;
-    useEffect(
-      () {
-        if (items == null || items.isEmpty) {
-          options.onNoItems?.call();
-        }
-        return;
-      },
-      [],
-    );
     if (items == null || items.isEmpty) {
       return builders.noItemsPlaceholderBuilder?.call(context) ??
           Center(child: Text(localizations.noItemsFound));

packages/flutter_catalog/lib/src/widgets/catalog_grid_item.dart

@@ -85,7 +85,7 @@ class CatalogGridItem extends StatelessWidget {
                       const SizedBox(width: 4),
                       Expanded(
                         child: Text(
-                          author?.name ?? item.authorId ?? "Unknown",
+                          author?.name ?? "Unknown",
                           style: textTheme.bodySmall,
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,