style: misc

Author: fulleni

analysis_options.yaml

@@ -9,6 +9,7 @@ analyzer:
     avoid_dynamic_calls: ignore
     avoid_catching_errors: ignore
     document_ignores: ignore
+    one_member_abstracts: ignore
   exclude:
     - build/**
 linter:

lib/src/feed_enhancement/decorators/ad_decorator.dart

@@ -12,7 +12,8 @@ import 'package:uuid/uuid.dart';
 /// {@endtemplate}
 class AdDecorator implements FeedDecorator {
   /// {@macro ad_decorator}
-  const AdDecorator({Uuid? uuidGenerator}) : _uuid = uuidGenerator ?? const Uuid();
+  const AdDecorator({Uuid? uuidGenerator})
+      : _uuid = uuidGenerator ?? const Uuid();
 
   final Uuid _uuid;
 
@@ -49,8 +50,7 @@ class AdDecorator implements FeedDecorator {
     }
 
     final decoratedFeed = <FeedItem>[];
-    int primaryItemCount = 0;
-    int adsInjected = 0;
+    var primaryItemCount = 0;
 
     for (var i = 0; i < currentFeedItems.length; i++) {
       decoratedFeed.add(currentFeedItems[i]);
@@ -66,10 +66,10 @@ class AdDecorator implements FeedDecorator {
           targetUrl: 'https://example.com/ad_click_target',
           adType: AdType.banner, // Example ad type
           placement: AdPlacement.feedInlineStandardBanner, // Example placement
-          action: const OpenExternalUrl(url: 'https://example.com/ad_click_target'),
+          action:
+              const OpenExternalUrl(url: 'https://example.com/ad_click_target'),
         );
         decoratedFeed.add(adItem);
-        adsInjected++;
         // Reset primaryItemCount to ensure interval is respected after injection
         primaryItemCount = 0;
       }

lib/src/feed_enhancement/decorators/engagement_decorator.dart

@@ -1,6 +1,5 @@
 import 'package:ht_api/src/feed_enhancement/feed_decorator.dart';
 import 'package:ht_api/src/feed_enhancement/feed_enhancement_context.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
 import 'package:uuid/uuid.dart';
 
@@ -55,7 +54,7 @@ class EngagementDecorator implements FeedDecorator {
     // Variables to hold the selected rule and template
     EngagementRule? ruleToInject;
     EngagementContentTemplate? templateToInject;
-    int selectedRuleShownCount = 0; // Initialize to 0
+    var selectedRuleShownCount = 0; // Initialize to 0
 
     for (final rule in rules) {
       // 1. Check user role
@@ -80,8 +79,8 @@ class EngagementDecorator implements FeedDecorator {
       }
 
       // 4. Check minDaysSinceLastShown
-      final lastShownTimestamp =
-          updatedAppSettings.engagementLastShownTimestamps[rule.templateType.name];
+      final lastShownTimestamp = updatedAppSettings
+          .engagementLastShownTimestamps[rule.templateType.name];
       if (rule.minDaysSinceLastShown != null && lastShownTimestamp != null) {
         final daysSinceLastShown = now.difference(lastShownTimestamp).inDays;
         if (daysSinceLastShown < rule.minDaysSinceLastShown!) {
@@ -109,7 +108,8 @@ class EngagementDecorator implements FeedDecorator {
       // If we reach here, this rule is a candidate.
       // For simplicity, we'll inject the first valid one found.
       ruleToInject = rule;
-      selectedRuleShownCount = currentShownCount; // Capture for the selected rule
+      selectedRuleShownCount =
+          currentShownCount; // Capture for the selected rule
       break; // Exit loop after finding the first suitable rule
     }
 
@@ -123,7 +123,8 @@ class EngagementDecorator implements FeedDecorator {
             EngagementContentType.values.byName(ruleToInject.templateType.name),
         // Action for the client to perform when this is tapped.
         // This could be more dynamic based on templateType or rule.
-        action: const OpenExternalUrl(url: 'https://example.com/engagement_action'),
+        action:
+            const OpenExternalUrl(url: 'https://example.com/engagement_action'),
       );
 
       // Determine placement (simple for now, can be enhanced)
@@ -136,7 +137,10 @@ class EngagementDecorator implements FeedDecorator {
           // Not enough primary items for this placement, do not insert
         } else if (placement.afterPrimaryItemIndex != null &&
             placement.afterPrimaryItemIndex! < decoratedFeed.length) {
-          decoratedFeed.insert(placement.afterPrimaryItemIndex! + 1, engagementItem);
+          decoratedFeed.insert(
+            placement.afterPrimaryItemIndex! + 1,
+            engagementItem,
+          );
           inserted = true;
         } else if (placement.relativePosition == 'middle' &&
             decoratedFeed.isNotEmpty) {

lib/src/feed_enhancement/decorators/suggested_content_decorator.dart

@@ -1,6 +1,5 @@
 import 'package:ht_api/src/feed_enhancement/feed_decorator.dart';
 import 'package:ht_api/src/feed_enhancement/feed_enhancement_context.dart';
-import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
 import 'package:uuid/uuid.dart';
 
@@ -38,7 +37,7 @@ class SuggestedContentDecorator implements FeedDecorator {
     // Find a suitable suggestion to inject
     SuggestionRule? ruleToInject;
     SuggestedContentTemplate? templateToInject;
-    List<FeedItem> dynamicItems = [];
+    var dynamicItems = <FeedItem>[];
 
     for (final rule in rules) {
       // 1. Check user role
@@ -139,7 +138,10 @@ class SuggestedContentDecorator implements FeedDecorator {
           // Not enough primary items for this placement, do not insert
         } else if (placement.afterPrimaryItemIndex != null &&
             placement.afterPrimaryItemIndex! < decoratedFeed.length) {
-          decoratedFeed.insert(placement.afterPrimaryItemIndex! + 1, suggestedItem);
+          decoratedFeed.insert(
+            placement.afterPrimaryItemIndex! + 1,
+            suggestedItem,
+          );
           inserted = true;
         } else if (placement.relativePosition == 'middle' &&
             decoratedFeed.isNotEmpty) {

lib/src/feed_enhancement/feed_enhancement_context.dart

@@ -1,3 +1,5 @@
+import 'package:ht_api/src/feed_enhancement/feed_decorator.dart'
+    show FeedDecorator;
 import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
 

routes/_middleware.dart

@@ -2,21 +2,20 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:dart_frog/dart_frog.dart';
+import 'package:ht_api/src/feed_enhancement/decorators/ad_decorator.dart'; // New
+import 'package:ht_api/src/feed_enhancement/decorators/engagement_decorator.dart'; // New
+import 'package:ht_api/src/feed_enhancement/decorators/suggested_content_decorator.dart'; // New
 import 'package:ht_api/src/middlewares/error_handler.dart';
 import 'package:ht_api/src/rbac/permission_service.dart'; // Import PermissionService
 import 'package:ht_api/src/registry/model_registry.dart';
 import 'package:ht_api/src/services/auth_service.dart';
 import 'package:ht_api/src/services/auth_token_service.dart';
 import 'package:ht_api/src/services/default_user_preference_limit_service.dart'; // Import DefaultUserPreferenceLimitService
+import 'package:ht_api/src/services/feed_enhancement_service.dart'; // New
 import 'package:ht_api/src/services/jwt_auth_token_service.dart';
 import 'package:ht_api/src/services/token_blacklist_service.dart';
 import 'package:ht_api/src/services/user_preference_limit_service.dart'; // Import UserPreferenceLimitService interface
 import 'package:ht_api/src/services/verification_code_storage_service.dart';
-import 'package:ht_api/src/services/feed_enhancement_service.dart'; // New
-import 'package:ht_api/src/feed_enhancement/feed_decorator.dart'; // New
-import 'package:ht_api/src/feed_enhancement/decorators/ad_decorator.dart'; // New
-import 'package:ht_api/src/feed_enhancement/decorators/engagement_decorator.dart'; // New
-import 'package:ht_api/src/feed_enhancement/decorators/suggested_content_decorator.dart'; // New
 import 'package:ht_data_inmemory/ht_data_inmemory.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_email_inmemory/ht_email_inmemory.dart';
@@ -308,11 +307,12 @@ Handler middleware(Handler handler) {
   print('[MiddlewareSetup] DefaultUserPreferenceLimitService instantiated.');
 
   // --- Feed Enhancement Dependencies ---
-  final adDecorator = AdDecorator(uuidGenerator: uuid);
-  final engagementDecorator = EngagementDecorator(uuidGenerator: uuid);
-  final suggestedContentDecorator = SuggestedContentDecorator(uuidGenerator: uuid);
+  const adDecorator = AdDecorator(uuidGenerator: uuid);
+  const engagementDecorator = EngagementDecorator(uuidGenerator: uuid);
+  const suggestedContentDecorator =
+      SuggestedContentDecorator(uuidGenerator: uuid);
 
-  final feedEnhancementService = FeedEnhancementService(
+  const feedEnhancementService = FeedEnhancementService(
     decorators: [
       adDecorator,
       engagementDecorator,

routes/api/v1/data/index.dart

@@ -21,8 +21,7 @@ Future<Response> onRequest(RequestContext context) async {
   final authenticatedUser = context.read<User>();
   final permissionService =
       context.read<PermissionService>(); // Read PermissionService
-  final feedEnhancementService =
-      context.read<FeedEnhancementService>(); // New
+  final feedEnhancementService = context.read<FeedEnhancementService>(); // New
 
   // The main try/catch block here is removed to let the errorHandler middleware
   // handle all exceptions thrown by the handlers below.
@@ -62,7 +61,8 @@ Future<Response> _handleGet(
   ModelConfig<dynamic> modelConfig,
   User authenticatedUser,
   PermissionService permissionService, // Receive PermissionService
-  FeedEnhancementService feedEnhancementService, // Receive FeedEnhancementService
+  FeedEnhancementService
+      feedEnhancementService, // Receive FeedEnhancementService
   String requestId,
 ) async {
   // Authorization check is handled by authorizationMiddleware before this.
@@ -251,9 +251,12 @@ Future<Response> _handleGet(
       authenticatedUser: authenticatedUser,
       appConfig: context.read<AppConfig>(),
       primaryModelName: modelName,
-      userAppSettingsRepository: context.read<HtDataRepository<UserAppSettings>>(),
-      engagementContentTemplateRepository: context.read<HtDataRepository<EngagementContentTemplate>>(),
-      suggestedContentTemplateRepository: context.read<HtDataRepository<SuggestedContentTemplate>>(),
+      userAppSettingsRepository:
+          context.read<HtDataRepository<UserAppSettings>>(),
+      engagementContentTemplateRepository:
+          context.read<HtDataRepository<EngagementContentTemplate>>(),
+      suggestedContentTemplateRepository:
+          context.read<HtDataRepository<SuggestedContentTemplate>>(),
       categoryRepository: context.read<HtDataRepository<Category>>(),
       sourceRepository: context.read<HtDataRepository<Source>>(),
       countryRepository: context.read<HtDataRepository<Country>>(),