Merge pull request #128 from flutter-news-app-full-source-code/refactor/filter-active-content-status

Refactor/filter active content status

Author: fulleni

lib/account/bloc/available_sources_bloc.dart

@@ -33,7 +33,9 @@ class AvailableSourcesBloc
     emit(state.copyWith(status: AvailableSourcesStatus.loading));
     try {
       // TODO(fulleni): Add pagination if necessary for very large datasets.
+      // Filter to fetch only active sources.
       final response = await _sourcesRepository.readAll(
+        filter: {'status': ContentStatus.active.name},
         sort: [const SortOption('name', SortOrder.asc)],
       );
       emit(

lib/account/bloc/available_topics_bloc.dart

@@ -29,7 +29,9 @@ class AvailableTopicsBloc
     emit(state.copyWith(status: AvailableTopicsStatus.loading));
     try {
       // TODO(fulleni): Add pagination if necessary for very large datasets.
+      // Filter to fetch only active topics.
       final response = await _topicsRepository.readAll(
+        filter: {'status': ContentStatus.active.name},
         sort: [const SortOption('name', SortOrder.asc)],
       );
       emit(

lib/ads/inline_ad_cache_service.dart

@@ -109,6 +109,7 @@ class InlineAdCacheService {
     final ad = _cache[id];
     if (ad != null) {
       _logger.info('Removing and disposing inline ad with ID "$id".');
+      // Delegate disposal to AdService
       _adService.disposeAd(ad);
       _cache.remove(id);
     } else {
@@ -126,8 +127,12 @@ class InlineAdCacheService {
       'Clearing all cached inline ads and disposing their resources.',
     );
     for (final ad in _cache.values.whereType<InlineAd>()) {
+
+      // Delegate disposal to AdService
       _adService.disposeAd(ad);
     }
+    
+    // Ensure cache is empty after disposal attempts.
     _cache.clear();
     _logger.info('All cached inline ads cleared.');
   }

lib/ads/interstitial_ad_manager.dart

@@ -176,6 +176,7 @@ class InterstitialAdManager {
     if (requiredTransitions > 0 && _transitionCount >= requiredTransitions) {
       _logger.info('Transition count meets threshold. Attempting to show ad.');
       await _showAd();
+      // Reset counter after showing (or attempting to show)
       _transitionCount = 0;
     } else {
       _logger.info(
@@ -201,6 +202,7 @@ class InterstitialAdManager {
     }
 
     final adToShow = _preloadedAd!;
+    // Clear the pre-loaded ad before showing
     _preloadedAd = null;
 
     try {
@@ -234,6 +236,8 @@ class InterstitialAdManager {
     } finally {
       // After the ad is shown or fails to show, dispose of it and
       // start pre-loading the next one for the next opportunity.
+
+      // Ensure the ad object is disposed
       _disposePreloadedAd();
       unawaited(_maybePreloadAd(_appBloc.state));
     }
@@ -272,6 +276,7 @@ class InterstitialAdManager {
     // Await the result of showDialog, which completes when the dialog is popped.
     await showDialog<void>(
       context: context,
+      // Prevent dismissing by tapping outside
       barrierDismissible: false,
       builder: (_) => LocalInterstitialAdDialog(
         localInterstitialAd: ad.adObject as LocalInterstitialAd,
@@ -283,6 +288,7 @@ class InterstitialAdManager {
     // Await the result of showDialog, which completes when the dialog is popped.
     await showDialog<void>(
       context: context,
+      // Prevent dismissing by tapping outside
       barrierDismissible: false,
       builder: (_) => const DemoInterstitialAdDialog(),
     );

lib/ads/widgets/feed_ad_loader_widget.dart

@@ -98,6 +98,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
       // completed. This prevents a race condition if a new load is triggered
       // while an old one is still in progress.
       if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
+        // Complete normally to prevent crashes
         _loadAdCompleter!.complete();
       }
       _loadAdCompleter = null;
@@ -125,6 +126,7 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
     // This prevents `setState()` calls on a disposed widget.
     // Ensure the completer is not already completed before attempting to complete it.
     if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
+      // Complete normally to prevent crashes
       _loadAdCompleter!.complete();
     }
     _loadAdCompleter = null;
@@ -214,7 +216,6 @@ class _FeedAdLoaderWidgetState extends State<FeedAdLoaderWidget> {
         adType: widget.adPlaceholder.adType,
         adThemeStyle: widget.adThemeStyle,
         headlineImageStyle: headlineImageStyle,
-        userRole: userRole,
       );
 
       if (loadedAd != null) {

lib/ads/widgets/in_article_ad_loader_widget.dart

@@ -99,6 +99,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
       _adCacheService.removeAndDisposeAd(oldCacheKey);
 
       if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
+        // Complete normally to prevent crashes
         _loadAdCompleter!.complete();
       }
       _loadAdCompleter = null;
@@ -121,6 +122,7 @@ class _InArticleAdLoaderWidgetState extends State<InArticleAdLoaderWidget> {
     _adCacheService.removeAndDisposeAd(cacheKey);
 
     if (_loadAdCompleter != null && !_loadAdCompleter!.isCompleted) {
+      // Complete normally to prevent crashes
       _loadAdCompleter!.complete();
     }
     _loadAdCompleter = null;

lib/app/bloc/app_bloc.dart

@@ -355,6 +355,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
               ),
             ),
           );
+          // Stop further processing if initialization failed critically.
           return;
         }
       }
@@ -392,6 +393,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
                 ),
               ),
             );
+            // Stop further processing if migration failed critically.
             return;
           }
         }

lib/app/config/app_config.dart

@@ -14,12 +14,16 @@ class AppConfig {
     baseUrl: 'http://api.yourproductiondomain.com',
   );
 
-  factory AppConfig.demo() =>
-      const AppConfig(environment: AppEnvironment.demo, baseUrl: '');
+  factory AppConfig.demo() => const AppConfig(
+    environment: AppEnvironment.demo,
+    // No API access needed for in-memory demo
+    baseUrl: '',
+  );
 
   factory AppConfig.development() => const AppConfig(
     // For local Dart Frog API
     environment: AppEnvironment.development,
+    // Default Dart Frog local URL
     baseUrl: 'http://localhost:8080',
   );
 

lib/app/view/app.dart

@@ -149,6 +149,7 @@ class App extends StatelessWidget {
               appBloc: context.read<AppBloc>(),
               adService: context.read<AdService>(),
             ),
+            // Ensure it's created immediately
             lazy: false,
           ),
         ],

lib/entity_details/bloc/entity_details_bloc.dart

@@ -102,6 +102,9 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
         filter['eventCountry.id'] = (entityToLoad as Country).id;
       }
 
+      // Always filter for active headlines.
+      filter['status'] = ContentStatus.active.name;
+
       final headlineResponse = await _headlinesRepository.readAll(
         filter: filter,
         pagination: const PaginationOptions(limit: _headlinesLimit),
@@ -270,6 +273,9 @@ class EntityDetailsBloc extends Bloc<EntityDetailsEvent, EntityDetailsState> {
         filter['eventCountry.id'] = (state.entity! as Country).id;
       }
 
+      // Always filter for active headlines.
+      filter['status'] = ContentStatus.active.name;
+
       final headlineResponse = await _headlinesRepository.readAll(
         filter: filter,
         pagination: PaginationOptions(