Refactor/consolidate moderation status

lib/src/enums/enums.dart

@@ -8,7 +8,6 @@ export 'app_text_scale_factor.dart';
 export 'app_user_role.dart';
 export 'banner_ad_shape.dart';
 export 'comment_report_reason.dart';
-export 'comment_status.dart';
 export 'content_status.dart';
 export 'content_type.dart';
 export 'dashboard_user_role.dart';
@@ -21,10 +20,10 @@ export 'feed_item_click_behavior.dart';
 export 'feed_item_density.dart';
 export 'feed_item_image_style.dart';
 export 'headline_report_reason.dart';
+export 'moderation_status.dart';
 export 'push_notification_provider.dart';
 export 'push_notification_subscription_delivery_type.dart';
 export 'reaction_type.dart';
-export 'report_status.dart';
 export 'reportable_entity.dart';
 export 'sort_order.dart';
 export 'source_report_reason.dart';

lib/src/enums/moderation_status.dart

@@ -0,0 +1,16 @@
+import 'package:json_annotation/json_annotation.dart';
+
+/// {@template moderation_status}
+/// Defines the moderation status of a user-submitted content, such as a
+/// comment or a report.
+/// {@endtemplate}
+@JsonEnum()
+enum ModerationStatus {
+  /// The item has been submitted and is awaiting moderation.
+  @JsonValue('pendingReview')
+  pendingReview,
+
+  /// The item has been reviewed and a decision has been made.
+  @JsonValue('resolved')
+  resolved,
+}

lib/src/fixtures/headline_comments.dart

@@ -54,12 +54,10 @@ List<Comment> getHeadlineCommentsFixturesData({
     for (var j = 0; j < 10; j++) {
       final commentIndex = i * 10 + j;
 
-      // Vary the status for realism
-      var status = CommentStatus.approved;
+      // Vary the status for realism. Default to resolved.
+      var status = ModerationStatus.resolved;
       if (commentIndex % 15 == 0) {
-        status = CommentStatus.pendingReview;
-      } else if (commentIndex % 25 == 0) {
-        status = CommentStatus.rejected;
+        status = ModerationStatus.pendingReview;
       }
 
       comments.add(

lib/src/fixtures/reports.dart

@@ -35,12 +35,10 @@ List<Report> getReportsFixturesData({DateTime? now}) {
 
   for (var i = 0; i < users.length; i++) {
     final user = users[i];
-    final headline = headlines[i];
-    var status = ReportStatus.submitted;
-    if (i % 3 == 0) {
-      status = ReportStatus.inReview;
-    } else if (i % 5 == 0) {
-      status = ReportStatus.resolved;
+    var status = ModerationStatus.pendingReview;
+    // Every 4th report is resolved
+    if (i > 0 && i % 4 == 0) {
+      status = ModerationStatus.resolved;
     }
 
     // Create a mix of report types
@@ -51,7 +49,7 @@ List<Report> getReportsFixturesData({DateTime? now}) {
           id: reportIds[i],
           reporterUserId: user.id,
           entityType: ReportableEntity.headline,
-          entityId: headline.id,
+          entityId: headlines[i].id,
           reason: headlineReasons[i % headlineReasons.length].name,
           additionalComments: 'This headline seems misleading.',
           status: status,

lib/src/models/user_generated_content/comment.dart

@@ -15,7 +15,7 @@ class Comment extends Equatable {
   const Comment({
     required this.language,
     required this.content,
-    this.status = CommentStatus.pendingReview,
+    this.status = ModerationStatus.pendingReview,
   });
 
   /// Creates a [Comment] from JSON data.
@@ -29,7 +29,7 @@ class Comment extends Equatable {
   final String content;
 
   /// The current moderation status of the comment.
-  final CommentStatus status;
+  final ModerationStatus status;
 
   /// Converts this [Comment] instance to JSON data.
   Map<String, dynamic> toJson() => _$CommentToJson(this);
@@ -41,7 +41,7 @@ class Comment extends Equatable {
   Comment copyWith({
     String? content,
     Language? language,
-    CommentStatus? status,
+    ModerationStatus? status,
   }) {
     return Comment(
       language: language ?? this.language,

lib/src/models/user_generated_content/report.dart

@@ -1,6 +1,6 @@
 import 'package:core/src/enums/comment_report_reason.dart';
 import 'package:core/src/enums/headline_report_reason.dart';
-import 'package:core/src/enums/report_status.dart';
+import 'package:core/src/enums/moderation_status.dart';
 import 'package:core/src/enums/reportable_entity.dart';
 import 'package:core/src/enums/source_report_reason.dart';
 import 'package:core/src/utils/json_helpers.dart';
@@ -64,7 +64,7 @@ class Report extends Equatable {
   final String reason;
 
   /// The current moderation status of the report.
-  final ReportStatus status;
+  final ModerationStatus status;
 
   /// Optional additional comments from the user providing more context.
   final String? additionalComments;
@@ -96,7 +96,7 @@ class Report extends Equatable {
     ReportableEntity? entityType,
     String? entityId,
     String? reason,
-    ReportStatus? status,
+    ModerationStatus? status,
     ValueWrapper<String?>? additionalComments,
     DateTime? createdAt,
   }) {

test/src/enums/moderation_status_test.dart

@@ -0,0 +1,32 @@
+import 'package:core/src/enums/moderation_status.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group('ModerationStatus', () {
+    test('has correct values', () {
+      expect(
+        ModerationStatus.values,
+        containsAll([
+          ModerationStatus.pendingReview,
+          ModerationStatus.resolved,
+        ]),
+      );
+    });
+
+    test('has correct string values', () {
+      expect(ModerationStatus.pendingReview.name, 'pendingReview');
+      expect(ModerationStatus.resolved.name, 'resolved');
+    });
+
+    test('can be created from string values', () {
+      expect(
+        ModerationStatus.values.byName('pendingReview'),
+        ModerationStatus.pendingReview,
+      );
+      expect(
+        ModerationStatus.values.byName('resolved'),
+        ModerationStatus.resolved,
+      );
+    });
+  });
+}

test/src/models/user_generated_content/comment_test.dart

@@ -27,7 +27,7 @@ void main() {
     group('copyWith', () {
       test('returns a new instance with updated fields', () {
         const newContent = 'This is updated content.';
-        const newStatus = CommentStatus.rejected;
+        const newStatus = ModerationStatus.resolved;
 
         final updatedComment = commentFixture.copyWith(
           content: newContent,

test/src/models/user_generated_content/report_test.dart

@@ -24,9 +24,9 @@ void main() {
     group('copyWith', () {
       test('returns a new instance with updated values', () {
         final updatedReport = reportFixture.copyWith(
-          status: ReportStatus.resolved,
+          status: ModerationStatus.resolved,
         );
-        expect(updatedReport.status, ReportStatus.resolved);
+        expect(updatedReport.status, ModerationStatus.resolved);
         expect(updatedReport, isNot(equals(reportFixture)));
       });