chore: Organized models into subfolders structure that more clearly separates the fundamental data entities from the elements that structure or augment a feed, while still grouping related concerns.

fulleni · fulleni · commit 7e5d7fb21cfe · 2025-05-22T11:55:08.000+01:00
diff --git a/lib/ht_shared.dart b/lib/ht_shared.dart
@@ -2,5 +2,5 @@
 library;
 
 export 'src/exceptions/exceptions.dart';
+export 'src/models/auth/permission.dart';
 export 'src/models/models.dart';
-export 'src/models/permission.dart';
diff --git a/lib/src/models/auth/auth.dart b/lib/src/models/auth/auth.dart
@@ -0,0 +1,3 @@
+export 'permission.dart';
+export 'user.dart';
+export 'user_role.dart';
diff --git a/lib/src/models/auth/permission.dart b/lib/src/models/auth/permission.dart
diff --git a/lib/src/models/auth/permission.g.dart b/lib/src/models/auth/permission.g.dart
diff --git a/lib/src/models/auth/user.dart b/lib/src/models/auth/user.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:ht_shared/src/models/user_role.dart';
+import 'package:ht_shared/src/models/auth/user_role.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'user.g.dart';
diff --git a/lib/src/models/auth/user.g.dart b/lib/src/models/auth/user.g.dart
diff --git a/lib/src/models/auth/user_role.dart b/lib/src/models/auth/user_role.dart
diff --git a/lib/src/models/core/content_type.dart b/lib/src/models/core/content_type.dart
diff --git a/lib/src/models/core/core.dart b/lib/src/models/core/core.dart
@@ -0,0 +1,3 @@
+export 'content_type.dart';
+export 'feed_item.dart';
+export 'feed_item_action.dart';
diff --git a/lib/src/models/core/feed_item.dart b/lib/src/models/core/feed_item.dart
@@ -1,12 +1,12 @@
 import 'package:equatable/equatable.dart';
-import 'package:ht_shared/src/models/feed/ad.dart';
-import 'package:ht_shared/src/models/feed/engagement_content.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
-import 'package:ht_shared/src/models/feed/suggested_content.dart';
-import 'package:ht_shared/src/models/news/category.dart';
-import 'package:ht_shared/src/models/news/country.dart';
-import 'package:ht_shared/src/models/news/headline.dart';
-import 'package:ht_shared/src/models/news/source.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
+import 'package:ht_shared/src/models/entities/category.dart';
+import 'package:ht_shared/src/models/entities/country.dart';
+import 'package:ht_shared/src/models/entities/headline.dart';
+import 'package:ht_shared/src/models/entities/source.dart';
+import 'package:ht_shared/src/models/feed_decorator/ad.dart';
+import 'package:ht_shared/src/models/feed_decorator/engagement_content.dart';
+import 'package:ht_shared/src/models/feed_decorator/suggested_content.dart';
 
 /// {@template feed_item}
 /// An abstract base class for all items that can appear in a mixed content
diff --git a/lib/src/models/core/feed_item_action.dart b/lib/src/models/core/feed_item_action.dart
@@ -1,8 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:ht_shared/ht_shared.dart' show FeedItem;
-import 'package:ht_shared/src/models/content_type.dart';
-import 'package:ht_shared/src/models/feed/feed.dart' show FeedItem;
-import 'package:ht_shared/src/models/feed/feed_item.dart' show FeedItem;
+import 'package:ht_shared/src/models/core/content_type.dart';
+import 'package:ht_shared/src/models/core/feed_item.dart' show FeedItem;
 import 'package:ht_shared/src/models/models.dart' show FeedItem;
 // Removed redundant FeedItem imports
 import 'package:json_annotation/json_annotation.dart';
diff --git a/lib/src/models/core/feed_item_action.g.dart b/lib/src/models/core/feed_item_action.g.dart
diff --git a/lib/src/models/entities/category.dart b/lib/src/models/entities/category.dart
@@ -1,5 +1,5 @@
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
diff --git a/lib/src/models/entities/category.g.dart b/lib/src/models/entities/category.g.dart
diff --git a/lib/src/models/entities/country.dart b/lib/src/models/entities/country.dart
@@ -1,5 +1,5 @@
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uuid/uuid.dart';
diff --git a/lib/src/models/entities/country.g.dart b/lib/src/models/entities/country.g.dart
diff --git a/lib/src/models/entities/entities.dart b/lib/src/models/entities/entities.dart
@@ -2,3 +2,4 @@ export 'category.dart';
 export 'country.dart';
 export 'headline.dart';
 export 'source.dart';
+export 'source_type.dart';
diff --git a/lib/src/models/entities/headline.dart b/lib/src/models/entities/headline.dart
@@ -1,8 +1,8 @@
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
-import 'package:ht_shared/src/models/news/category.dart';
-import 'package:ht_shared/src/models/news/source.dart';
+import 'package:ht_shared/src/models/entities/category.dart';
+import 'package:ht_shared/src/models/entities/source.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
 import 'package:uuid/uuid.dart';
diff --git a/lib/src/models/entities/headline.g.dart b/lib/src/models/entities/headline.g.dart
diff --git a/lib/src/models/entities/source.dart b/lib/src/models/entities/source.dart
@@ -1,8 +1,8 @@
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
-import 'package:ht_shared/src/models/feed/source_type.dart';
-import 'package:ht_shared/src/models/news/country.dart';
+import 'package:ht_shared/src/models/entities/country.dart';
+import 'package:ht_shared/src/models/entities/source_type.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/lib/src/models/entities/source.g.dart b/lib/src/models/entities/source.g.dart
diff --git a/lib/src/models/entities/source_type.dart b/lib/src/models/entities/source_type.dart
diff --git a/lib/src/models/feed_decorator/ad.dart b/lib/src/models/feed_decorator/ad.dart
@@ -1,7 +1,7 @@
-import 'package:ht_shared/src/models/feed/ad_placement.dart';
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
+import 'package:ht_shared/src/models/feed_decorator/ad_placement.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/lib/src/models/feed_decorator/ad.g.dart b/lib/src/models/feed_decorator/ad.g.dart
diff --git a/lib/src/models/feed_decorator/ad_placement.dart b/lib/src/models/feed_decorator/ad_placement.dart
diff --git a/lib/src/models/feed_decorator/engagement_content.dart b/lib/src/models/feed_decorator/engagement_content.dart
@@ -1,7 +1,7 @@
-import 'package:ht_shared/src/models/feed/engagement_content_type.dart';
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
+import 'package:ht_shared/src/models/feed_decorator/engagement_content_type.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/lib/src/models/feed_decorator/engagement_content.g.dart b/lib/src/models/feed_decorator/engagement_content.g.dart
diff --git a/lib/src/models/feed_decorator/engagement_content_type.dart b/lib/src/models/feed_decorator/engagement_content_type.dart
@@ -1,7 +1,7 @@
 import 'package:ht_shared/ht_shared.dart' show EngagementContent;
-import 'package:ht_shared/src/models/feed/engagement_content.dart'
+import 'package:ht_shared/src/models/feed_decorator/engagement_content.dart'
     show EngagementContent;
-import 'package:ht_shared/src/models/feed/feed.dart' show EngagementContent;
+import 'package:ht_shared/src/models/feed_decorator/feed_decorator.dart' show EngagementContent;
 import 'package:ht_shared/src/models/models.dart' show EngagementContent;
 import 'package:json_annotation/json_annotation.dart';
 
diff --git a/lib/src/models/feed_decorator/feed_decorator.dart b/lib/src/models/feed_decorator/feed_decorator.dart
@@ -2,7 +2,5 @@ export 'ad.dart';
 export 'ad_placement.dart';
 export 'engagement_content.dart';
 export 'engagement_content_type.dart';
-export 'feed_item.dart';
-export 'source_type.dart';
 export 'suggested_content.dart';
 export 'suggested_content_display_type.dart';
diff --git a/lib/src/models/feed_decorator/suggested_content.dart b/lib/src/models/feed_decorator/suggested_content.dart
@@ -1,12 +1,12 @@
 import 'package:ht_shared/ht_shared.dart'
     show Category, Country, Headline, Source;
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart'
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart'
     show FeedItemAction, feedItemActionFromJson, feedItemActionToJson;
-import 'package:ht_shared/src/models/feed/suggested_content_display_type.dart';
-import 'package:ht_shared/src/models/models.dart'
+import 'package:ht_shared/src/models/entities/entities.dart'
     show Category, Country, Headline, Source;
-import 'package:ht_shared/src/models/news/news.dart'
+import 'package:ht_shared/src/models/feed_decorator/suggested_content_display_type.dart';
+import 'package:ht_shared/src/models/models.dart'
     show Category, Country, Headline, Source;
 // Removed redundant imports for Category, Country, Headline, Source
 // as FeedItem itself will handle these.
diff --git a/lib/src/models/feed_decorator/suggested_content.g.dart b/lib/src/models/feed_decorator/suggested_content.g.dart
diff --git a/lib/src/models/feed_decorator/suggested_content_display_type.dart b/lib/src/models/feed_decorator/suggested_content_display_type.dart
@@ -1,6 +1,6 @@
 import 'package:ht_shared/ht_shared.dart' show SuggestedContent;
-import 'package:ht_shared/src/models/feed/feed.dart' show SuggestedContent;
-import 'package:ht_shared/src/models/feed/suggested_content.dart'
+import 'package:ht_shared/src/models/feed_decorator/feed_decorator.dart' show SuggestedContent;
+import 'package:ht_shared/src/models/feed_decorator/suggested_content.dart'
     show SuggestedContent;
 import 'package:ht_shared/src/models/models.dart' show SuggestedContent;
 import 'package:json_annotation/json_annotation.dart';
diff --git a/lib/src/models/models.dart b/lib/src/models/models.dart
@@ -1,9 +1,8 @@
-export 'feed/feed.dart';
-export 'news/news.dart';
-export 'permission.dart';
-export 'remote-config/remote_config.dart';
+export 'auth/auth.dart';
+export 'core/core.dart';
+export 'entities/entities.dart';
+export 'feed_decorator/feed_decorator.dart';
+export 'remote-config/remote-config.dart';
 export 'responses/responses.dart';
-export 'user-preferences/user_preferences.dart';
-export 'user-settings/user_settings.dart';
-export 'user.dart';
-export 'user_role.dart';
+export 'user-preferences/user-preferences.dart';
+export 'user-settings/user-settings.dart';
diff --git a/lib/src/models/remote-config/remote-config.dart b/lib/src/models/remote-config/remote-config.dart
@@ -0,0 +1,4 @@
+export 'ad_config.dart';
+export 'app_config.dart';
+export 'remote_config.dart';
+export 'user_preference_limits.dart';
diff --git a/lib/src/models/user-preferences/user-preferences.dart b/lib/src/models/user-preferences/user-preferences.dart
@@ -0,0 +1,2 @@
+export 'user_content_preferences.dart';
+export 'user_preferences.dart';
diff --git a/lib/src/models/user-preferences/user_content_preferences.dart b/lib/src/models/user-preferences/user_content_preferences.dart
@@ -1,8 +1,8 @@
 import 'package:equatable/equatable.dart';
-import 'package:ht_shared/src/models/news/category.dart';
-import 'package:ht_shared/src/models/news/country.dart';
-import 'package:ht_shared/src/models/news/headline.dart';
-import 'package:ht_shared/src/models/news/source.dart';
+import 'package:ht_shared/src/models/entities/category.dart';
+import 'package:ht_shared/src/models/entities/country.dart';
+import 'package:ht_shared/src/models/entities/headline.dart';
+import 'package:ht_shared/src/models/entities/source.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart'; // Import meta for @immutable
 
diff --git a/lib/src/models/user-settings/user-settings.dart b/lib/src/models/user-settings/user-settings.dart
@@ -0,0 +1,8 @@
+export 'app_accent_theme.dart';
+export 'app_base_theme.dart';
+export 'app_font_weight.dart';
+export 'app_language.dart';
+export 'app_text_scale_factor.dart';
+export 'display_settings.dart';
+export 'user_app_settings.dart';
+export 'user_settings.dart';
diff --git a/test/src/models/content_type_test.dart b/test/src/models/content_type_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/content_type.dart';
+import 'package:ht_shared/src/models/core/content_type.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/ad_placement_test.dart b/test/src/models/feed/ad_placement_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/feed/ad_placement.dart';
+import 'package:ht_shared/src/models/feed_decorator/ad_placement.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/ad_test.dart b/test/src/models/feed/ad_test.dart
@@ -1,7 +1,7 @@
-import 'package:ht_shared/src/models/content_type.dart';
-import 'package:ht_shared/src/models/feed/ad.dart';
-import 'package:ht_shared/src/models/feed/ad_placement.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
+import 'package:ht_shared/src/models/core/content_type.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
+import 'package:ht_shared/src/models/feed_decorator/ad.dart';
+import 'package:ht_shared/src/models/feed_decorator/ad_placement.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/feed/engagement_content_test.dart b/test/src/models/feed/engagement_content_test.dart
@@ -1,7 +1,7 @@
-import 'package:ht_shared/src/models/content_type.dart';
-import 'package:ht_shared/src/models/feed/engagement_content.dart';
-import 'package:ht_shared/src/models/feed/engagement_content_type.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
+import 'package:ht_shared/src/models/core/content_type.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
+import 'package:ht_shared/src/models/feed_decorator/engagement_content.dart';
+import 'package:ht_shared/src/models/feed_decorator/engagement_content_type.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/feed/engagement_content_type_test.dart b/test/src/models/feed/engagement_content_type_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/feed/engagement_content_type.dart';
+import 'package:ht_shared/src/models/feed_decorator/engagement_content_type.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/feed_item_action_test.dart b/test/src/models/feed/feed_item_action_test.dart
@@ -1,5 +1,5 @@
-import 'package:ht_shared/src/models/content_type.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
+import 'package:ht_shared/src/models/core/content_type.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/feed_item_test.dart b/test/src/models/feed/feed_item_test.dart
@@ -1,5 +1,4 @@
 import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/source_type_test.dart b/test/src/models/feed/source_type_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/feed/source_type.dart';
+import 'package:ht_shared/src/models/entities/source_type.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/suggested_content_display_type_test.dart b/test/src/models/feed/suggested_content_display_type_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/feed/suggested_content_display_type.dart';
+import 'package:ht_shared/src/models/feed_decorator/suggested_content_display_type.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/feed/suggested_content_test.dart b/test/src/models/feed/suggested_content_test.dart
@@ -1,12 +1,12 @@
-import 'package:ht_shared/src/models/content_type.dart';
-import 'package:ht_shared/src/models/feed/feed_item.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
-import 'package:ht_shared/src/models/feed/suggested_content.dart';
-import 'package:ht_shared/src/models/feed/suggested_content_display_type.dart';
-import 'package:ht_shared/src/models/news/category.dart';
-import 'package:ht_shared/src/models/news/country.dart';
-import 'package:ht_shared/src/models/news/headline.dart';
-import 'package:ht_shared/src/models/news/source.dart';
+import 'package:ht_shared/src/models/core/content_type.dart';
+import 'package:ht_shared/src/models/core/feed_item.dart';
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
+import 'package:ht_shared/src/models/entities/category.dart';
+import 'package:ht_shared/src/models/entities/country.dart';
+import 'package:ht_shared/src/models/entities/headline.dart';
+import 'package:ht_shared/src/models/entities/source.dart';
+import 'package:ht_shared/src/models/feed_decorator/suggested_content.dart';
+import 'package:ht_shared/src/models/feed_decorator/suggested_content_display_type.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/news/country_test.dart b/test/src/models/news/country_test.dart
@@ -1,5 +1,5 @@
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
-import 'package:ht_shared/src/models/news/country.dart'; // Use direct import
+import 'package:ht_shared/src/models/core/feed_item_action.dart';
+import 'package:ht_shared/src/models/entities/country.dart'; // Use direct import
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/news/headline_test.dart b/test/src/models/news/headline_test.dart
@@ -1,5 +1,4 @@
 import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/news/source_test.dart b/test/src/models/news/source_test.dart
@@ -1,5 +1,4 @@
 import 'package:ht_shared/ht_shared.dart';
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
diff --git a/test/src/models/permission_test.dart b/test/src/models/permission_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/permission.dart';
+import 'package:ht_shared/src/models/auth/permission.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/user-preferences/user_content_preferences_test.dart b/test/src/models/user-preferences/user_content_preferences_test.dart
@@ -1,7 +1,6 @@
 // ignore_for_file: inference_failure_on_collection_literal, strict_raw_type, avoid_dynamic_calls
 
 import 'package:ht_shared/ht_shared.dart'; // Import the barrel file
-import 'package:ht_shared/src/models/feed/feed_item_action.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/user_role_test.dart b/test/src/models/user_role_test.dart
@@ -1,4 +1,4 @@
-import 'package:ht_shared/src/models/user_role.dart';
+import 'package:ht_shared/src/models/auth/user_role.dart';
 import 'package:test/test.dart';
 
 void main() {
diff --git a/test/src/models/user_test.dart b/test/src/models/user_test.dart
@@ -1,5 +1,5 @@
-import 'package:ht_shared/src/models/user.dart';
-import 'package:ht_shared/src/models/user_role.dart';
+import 'package:ht_shared/src/models/auth/user.dart';
+import 'package:ht_shared/src/models/auth/user_role.dart';
 import 'package:test/test.dart';
 
 void main() {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export 'permission.dart';`
	`2`	`+export 'user.dart';`
	`3`	`+export 'user_role.dart';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export 'content_type.dart';`
	`2`	`+export 'feed_item.dart';`
	`3`	`+export 'feed_item_action.dart';`