test; maked all tests in sync with the new constrains

Author: fulleni

lib/src/models/entities/headline.dart

@@ -67,6 +67,7 @@ class Headline extends FeedItem {
   final String? imageUrl;
 
   /// Date and time when the headline was published.
+  @JsonKey(fromJson: _dateTimeFromJson)
   final DateTime? publishedAt;
 
   /// Source or origin of the headline.

lib/src/models/entities/headline.g.dart

@@ -100,11 +100,11 @@ class EngagementContent extends FeedItem {
     return EngagementContent(
       id: id ?? this.id,
       title: title ?? this.title,
-      description: description ?? this.description,
+      description: description,
       engagementContentType:
           engagementContentType ?? this.engagementContentType,
-      callToActionText: callToActionText ?? this.callToActionText,
-      callToActionUrl: callToActionUrl ?? this.callToActionUrl,
+      callToActionText: callToActionText,
+      callToActionUrl: callToActionUrl,
       action: action ?? this.action,
     );
   }

lib/src/models/feed_decorators/engagement_content.dart

@@ -1,3 +1,5 @@
+import 'package:json_annotation/json_annotation.dart';
+
 /// {@template app_accent_theme}
 /// Represents a selection of predefined accent color themes.
 ///
@@ -6,6 +8,7 @@
 /// The actual `ColorScheme` associated with each enum value would be defined
 /// within the application's theme configuration.
 /// {@endtemplate}
+@JsonEnum(fieldRename: FieldRename.snake)
 enum AppAccentTheme {
   /// The default blue accent theme.
   defaultBlue,

lib/src/models/user_settings/app_accent_theme.dart

@@ -49,16 +49,16 @@ void main() {
       test('toJson returns correct JSON map', () {
         final json = openInternalContent.toJson();
         expect(json, <String, dynamic>{
-          'contentId': contentId,
-          'contentType': contentType.name,
+          'content_id': contentId,
+          'content_type': contentType.name,
           'type': 'open_internal_content',
         });
       });
 
       test('fromJson returns correct OpenInternalContent object', () {
         final json = <String, dynamic>{
-          'contentId': contentId,
-          'contentType': contentType.name,
+          'content_id': contentId,
+          'content_type': contentType.name,
           'type': 'open_internal_content',
         };
         final fromJsonResult = OpenInternalContent.fromJson(json);
@@ -112,8 +112,8 @@ void main() {
       test('toJson returns correct JSON map', () {
         final json = showInterstitialThenOpenInternalContent.toJson();
         expect(json, <String, dynamic>{
-          'contentId': contentId,
-          'contentType': contentType.name,
+          'content_id': contentId,
+          'content_type': contentType.name,
           'type': 'show_interstitial_then_open_internal_content',
         });
       });
@@ -122,8 +122,8 @@ void main() {
           'fromJson returns correct ShowInterstitialThenOpenInternalContent '
           'object', () {
         final json = <String, dynamic>{
-          'contentId': contentId,
-          'contentType': contentType.name,
+          'content_id': contentId,
+          'content_type': contentType.name,
           'type': 'show_interstitial_then_open_internal_content',
         };
         final fromJsonResult =
@@ -168,8 +168,8 @@ void main() {
     group('feedItemActionFromJson', () {
       test('dispatches to OpenInternalContent', () {
         final json = <String, dynamic>{
-          'contentId': 'id1',
-          'contentType': 'headline',
+          'content_id': 'id1',
+          'content_type': 'headline',
           'type': 'open_internal_content',
         };
         final action = feedItemActionFromJson(json);
@@ -180,8 +180,8 @@ void main() {
 
       test('dispatches to ShowInterstitialThenOpenInternalContent', () {
         final json = <String, dynamic>{
-          'contentId': 'id2',
-          'contentType': 'category',
+          'content_id': 'id2',
+          'content_type': 'category',
           'type': 'show_interstitial_then_open_internal_content',
         };
         final action = feedItemActionFromJson(json);
@@ -204,7 +204,7 @@ void main() {
       });
 
       test('throws FormatException if type is missing', () {
-        final json = <String, dynamic>{'contentId': 'id1'};
+        final json = <String, dynamic>{'content_id': 'id1'};
         expect(
           () => feedItemActionFromJson(json),
           throwsA(
@@ -240,8 +240,8 @@ void main() {
         );
         final json = feedItemActionToJson(action);
         expect(json, <String, dynamic>{
-          'contentId': 'id1',
-          'contentType': 'headline',
+          'content_id': 'id1',
+          'content_type': 'headline',
           'type': 'open_internal_content',
         });
       });
@@ -253,8 +253,8 @@ void main() {
         );
         final json = feedItemActionToJson(action);
         expect(json, <String, dynamic>{
-          'contentId': 'id2',
-          'contentType': 'category',
+          'content_id': 'id2',
+          'content_type': 'category',
           'type': 'show_interstitial_then_open_internal_content',
         });
       });

lib/src/models/user_settings/display_settings.g.dart

@@ -62,8 +62,8 @@ void main() {
           'type': 'category',
           'action': {
             'type': 'open_internal_content',
-            'contentId': 'science-id',
-            'contentType': 'category',
+            'content_id': 'science-id',
+            'content_type': 'category',
           },
         };
         expect(
@@ -87,8 +87,8 @@ void main() {
           'type': 'category',
           'action': {
             'type': 'open_internal_content',
-            'contentId': 'art-id',
-            'contentType': 'category',
+            'content_id': 'art-id',
+            'content_type': 'category',
           },
         };
         final category = Category.fromJson(json);
@@ -115,8 +115,8 @@ void main() {
           'type': 'category',
           'action': {
             'type': 'open_internal_content',
-            'contentId': 'test-id',
-            'contentType': 'category',
+            'content_id': 'test-id',
+            'content_type': 'category',
           },
         });
       });
@@ -129,8 +129,8 @@ void main() {
           'type': 'category',
           'action': {
             'type': 'open_internal_content',
-            'contentId': 'test-id',
-            'contentType': 'category',
+            'content_id': 'test-id',
+            'content_type': 'category',
           },
         });
       });

test/src/models/core/feed_item_action_test.dart

@@ -1,5 +1,6 @@
 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:json_annotation/json_annotation.dart';
 import 'package:test/test.dart';
 import 'package:uuid/uuid.dart';
 
@@ -156,66 +157,60 @@ void main() {
       });
 
       // Updated to expect TypeError based on terminal output
-      test('throws TypeError for missing iso_code', () {
+      test('throws CheckedFromJsonException for missing iso_code', () {
         final json = createValidJsonMap()..remove('iso_code');
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for missing name', () {
+      test('throws CheckedFromJsonException for missing name', () {
         final json = createValidJsonMap()..remove('name');
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for missing flag_url', () {
+      test('throws CheckedFromJsonException for missing flag_url', () {
         final json = createValidJsonMap()..remove('flag_url');
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for wrong type (id)', () {
+      test('throws CheckedFromJsonException for wrong type (id)', () {
         final json = createValidJsonMap()..['id'] = 123; // Invalid type
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for wrong type (iso_code)', () {
+      test('throws CheckedFromJsonException for wrong type (iso_code)', () {
         final json = createValidJsonMap()..['iso_code'] = 123; // Invalid type
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for wrong type (name)', () {
+      test('throws CheckedFromJsonException for wrong type (name)', () {
         final json = createValidJsonMap()..['name'] = false; // Invalid type
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
 
-      // Updated to expect TypeError based on terminal output
-      test('throws TypeError for wrong type (flag_url)', () {
+      test('throws CheckedFromJsonException for wrong type (flag_url)', () {
         final json = createValidJsonMap()
           ..['flag_url'] = null; // Invalid type (non-nullable)
         expect(
           () => Country.fromJson(json),
-          throwsA(isA<TypeError>()), // Expect TypeError
+          throwsA(isA<CheckedFromJsonException>()),
         );
       });
     });

test/src/models/entities/category_test.dart

@@ -10,7 +10,7 @@ void main() {
     final sampleSourceJson = {
       'id': 'src-test',
       'name': 'Test Source',
-      'sourceType': 'news-agency', // Updated to match SourceType enum name
+      'source_type': 'news_agency', // Corrected to snake_case for enum value
       'type': 'source',
       'action': {
         'type': 'open_external_url',
@@ -49,8 +49,8 @@ void main() {
       'title': 'Full Headline Title',
       'description': 'Full description.',
       'url': 'http://example.com/full',
-      'imageUrl': 'http://example.com/full.jpg',
-      'publishedAt': testTimeString,
+      'image_url': 'http://example.com/full.jpg',
+      'published_at': testTimeString,
       'source': sampleSourceJson,
       'category': sampleCategoryJson,
       'action': defaultAction.toJson(),
@@ -107,14 +107,14 @@ void main() {
 
       test('should handle null DateTime correctly', () {
         final jsonWithNullDate = Map<String, dynamic>.from(fullHeadlineJson)
-          ..['publishedAt'] = null;
+          ..['published_at'] = null; // Use snake_case key
         final headline = Headline.fromJson(jsonWithNullDate);
         expect(headline.publishedAt, isNull);
       });
 
       test('should handle invalid DateTime string gracef@ully', () {
         final jsonWithInvalidDate = Map<String, dynamic>.from(fullHeadlineJson)
-          ..['publishedAt'] = 'invalid-date';
+          ..['published_at'] = 'invalid-date'; // Use snake_case key
         final headline = Headline.fromJson(jsonWithInvalidDate);
         // tryParse returns null for invalid format
         expect(headline.publishedAt, isNull);
@@ -148,8 +148,8 @@ void main() {
         expect(json['title'], minimalHeadline.title);
         expect(json.containsKey('description'), isFalse);
         expect(json.containsKey('url'), isFalse);
-        expect(json.containsKey('imageUrl'), isFalse);
-        expect(json.containsKey('publishedAt'), isFalse);
+        expect(json.containsKey('image_url'), isFalse);
+        expect(json.containsKey('published_at'), isFalse);
         expect(json.containsKey('source'), isFalse);
         expect(json.containsKey('category'), isFalse);
       });
@@ -216,8 +216,8 @@ void main() {
             fullHeadline.title,
             fullHeadline.description,
             fullHeadline.url,
-            fullHeadline.imageUrl,
-            fullHeadline.publishedAt,
+          fullHeadline.imageUrl,
+          fullHeadline.publishedAt,
             fullHeadline.source,
             fullHeadline.category,
             fullHeadline.type,