Merge pull request #56 from flutter-news-app-full-source-code/54-feat-filter-bookmarked-entry-model

feat filter bookmarked entry model

Author: fulleni

CHANGELOG.md

@@ -0,0 +1,11 @@
+# 1.2.0 - 2024-05-21
+
+- feat: add SavedFilter model for storing user-defined filter combinations.
+- **BREAKING** feat!: link SavedFilter to UserContentPreferences, making `savedFilters` a required field.
+- **BREAKING** feat!: add limits for saved filters to UserPreferenceConfig.
+- **BREAKING** refactor!: organize saved models into a new `user_presets` directory.
+- test: add unit tests for SavedFilter model.
+- test: update tests for UserContentPreferences to include saved filters.
+- docs: update README to reflect new User Presets section and model.
+- chore: add fixture data for SavedFilter.
+- chore: synchronize all related fixtures with recent model updates.

README.md

@@ -27,6 +27,9 @@ This package provides the critical building blocks for a professional news appli
 - **`User`, `AppUserRole`, `DashboardUserRole`, `Permission`:** Robust models for user profiles, roles, and permissions, enabling secure and personalized experiences.
 - **`UserContentPreferences`, `UserAppSettings`:** Detailed models for storing user-specific content preferences (e.g., followed topics, saved headlines) and application settings (e.g., theme, language).
 
+### 💾 User Presets
+- **`SavedFilter`:** A model for storing user-defined filter combinations.
+
 ### ⚙️ Application Configuration
 - **`RemoteConfig`:** A central container for all dynamic application settings, fetched from a remote source. This includes:
     - **`AdConfig`:** Master configuration for all advertising, now featuring **highly flexible, role-based control** over ad visibility and frequency for feed, article, and interstitial ads. This allows for granular control over monetization strategies per user segment.

lib/src/fixtures/fixture_ids.dart

@@ -530,3 +530,7 @@ const kLocalAd3Id = '3563c000a4a4e6e1a8e7f0f3';
 const kLocalAd4Id = '4563c000a4a4e6e1a8e7f0f4';
 const kLocalAd5Id = '5563c000a4a4e6e1a8e7f0f5';
 const kLocalAd6Id = '6563c000a4a4e6e1a8e7f0f6';
+
+/// Saved filters Fixture IDs.
+const String kSavedFilterId1 = 'saved_search_1';
+const String kSavedFilterId2 = 'saved_search_2';

lib/src/fixtures/fixtures.dart

@@ -5,8 +5,9 @@ export 'headlines.dart';
 export 'languages.dart';
 export 'local_ads.dart';
 export 'remote_configs.dart';
+export 'saved_filter.dart';
 export 'sources.dart';
 export 'topics.dart';
-export 'user_app_settings_fixtures.dart';
-export 'user_content_preferences_fixtures.dart';
+export 'user_app_settings.dart';
+export 'user_content_preferences.dart';
 export 'users.dart';

lib/src/fixtures/remote_configs.dart

@@ -35,6 +35,9 @@ final List<RemoteConfig> remoteConfigsFixturesData = [
       authenticatedSavedHeadlinesLimit: 30,
       premiumFollowedItemsLimit: 30,
       premiumSavedHeadlinesLimit: 100,
+      guestSavedFiltersLimit: 3,
+      authenticatedSavedFiltersLimit: 10,
+      premiumSavedFiltersLimit: 25,
     ),
     adConfig: const AdConfig(
       enabled: true,

lib/src/fixtures/saved_filter.dart

@@ -0,0 +1,30 @@
+import 'package:core/src/fixtures/countries.dart';
+import 'package:core/src/fixtures/fixture_ids.dart';
+import 'package:core/src/fixtures/sources.dart';
+import 'package:core/src/fixtures/topics.dart';
+import 'package:core/src/models/user_presets/saved_filter.dart';
+
+/// A list of predefined saved searches for fixture data.
+final savedFiltersFixturesData = <SavedFilter>[
+  SavedFilter(
+    id: kSavedFilterId1,
+    name: 'UK Tech & Politics',
+    topics: [
+      topicsFixturesData.firstWhere((t) => t.name == 'Technology'),
+      topicsFixturesData.firstWhere((t) => t.name == 'Politics'),
+    ],
+    sources: [sourcesFixturesData.firstWhere((s) => s.name == 'BBC News')],
+    countries: [
+      countriesFixturesData.firstWhere((c) => c.name == 'United Kingdom'),
+    ],
+  ),
+  SavedFilter(
+    id: kSavedFilterId2,
+    name: 'US Business News',
+    topics: [topicsFixturesData.firstWhere((t) => t.name == 'Business')],
+    sources: const [],
+    countries: [
+      countriesFixturesData.firstWhere((c) => c.name == 'United States'),
+    ],
+  ),
+];

lib/src/fixtures/user_app_settings_fixtures.dart renamed to lib/src/fixtures/user_app_settings.dart

@@ -9,5 +9,6 @@ final List<UserContentPreferences> userContentPreferencesFixturesData = [
     followedSources: [],
     followedTopics: [],
     savedHeadlines: [],
+    savedFilters: [],
   ),
 ];

lib/src/fixtures/user_content_preferences_fixtures.dart renamed to lib/src/fixtures/user_content_preferences.dart

@@ -1,5 +1,6 @@
 import 'package:core/src/models/config/remote_config.dart';
 import 'package:core/src/models/user_preferences/user_content_preferences.dart';
+import 'package:core/src/models/user_presets/saved_filter.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
@@ -22,17 +23,8 @@ part 'user_preference_config.g.dart';
 ///   Countries, up to 5 Sources, and up to 5 Categories).
 /// - Saved Headlines: The limit applies to the total number of headlines
 ///   a user can save.
-///
-/// **Tiered Limits defaults:**
-/// - **Guest User:**
-///   - Followed Items (Countries, Sources, Categories): 5 each
-///   - Saved Headlines: 10
-/// - **Authenticated User:**
-///   - Followed Items (Countries, Sources, Categories): 15 each
-///   - Saved Headlines: 30
-/// - **Premium User:**
-///   - Followed Items (Countries, Sources, Categories): 30 each
-///   - Saved Headlines: 100
+/// - Saved Filters: The limit applies to the total number of [SavedFilter]
+///   a user can save.
 ///
 /// These limits are configurable to balance performance (allowing fetching
 /// full objects within these limits) and feature differentiation across tiers.
@@ -49,6 +41,9 @@ class UserPreferenceConfig extends Equatable {
     required this.authenticatedSavedHeadlinesLimit,
     required this.premiumFollowedItemsLimit,
     required this.premiumSavedHeadlinesLimit,
+    required this.guestSavedFiltersLimit,
+    required this.authenticatedSavedFiltersLimit,
+    required this.premiumSavedFiltersLimit,
   });
 
   /// Factory method to create a [UserPreferenceConfig] instance from a JSON map.
@@ -76,6 +71,15 @@ class UserPreferenceConfig extends Equatable {
   /// Maximum number of headlines a Premium user can save.
   final int premiumSavedHeadlinesLimit;
 
+  /// Maximum number of filters a Guest user can save.
+  final int guestSavedFiltersLimit;
+
+  /// Maximum number of filters an Authenticated user can save.
+  final int authenticatedSavedFiltersLimit;
+
+  /// Maximum number of filters a Premium user can save.
+  final int premiumSavedFiltersLimit;
+
   /// Converts this [UserPreferenceConfig] instance to a JSON map.
   Map<String, dynamic> toJson() => _$UserPreferenceConfigToJson(this);
 
@@ -88,6 +92,9 @@ class UserPreferenceConfig extends Equatable {
     int? authenticatedSavedHeadlinesLimit,
     int? premiumFollowedItemsLimit,
     int? premiumSavedHeadlinesLimit,
+    int? guestSavedFiltersLimit,
+    int? authenticatedSavedFiltersLimit,
+    int? premiumSavedFiltersLimit,
   }) {
     return UserPreferenceConfig(
       guestFollowedItemsLimit:
@@ -104,6 +111,12 @@ class UserPreferenceConfig extends Equatable {
           premiumFollowedItemsLimit ?? this.premiumFollowedItemsLimit,
       premiumSavedHeadlinesLimit:
           premiumSavedHeadlinesLimit ?? this.premiumSavedHeadlinesLimit,
+      guestSavedFiltersLimit:
+          guestSavedFiltersLimit ?? this.guestSavedFiltersLimit,
+      authenticatedSavedFiltersLimit:
+          authenticatedSavedFiltersLimit ?? this.authenticatedSavedFiltersLimit,
+      premiumSavedFiltersLimit:
+          premiumSavedFiltersLimit ?? this.premiumSavedFiltersLimit,
     );
   }
 
@@ -115,6 +128,9 @@ class UserPreferenceConfig extends Equatable {
     authenticatedSavedHeadlinesLimit,
     premiumFollowedItemsLimit,
     premiumSavedHeadlinesLimit,
+    guestSavedFiltersLimit,
+    authenticatedSavedFiltersLimit,
+    premiumSavedFiltersLimit,
   ];
 
   @override