Fix automatic status on resolving an appeal.

Author: isoos

app/lib/admin/actions/moderation_case_resolve.dart

@@ -72,14 +72,20 @@ Closes the moderation case and updates the status based on the actions logged on
           final appealedCase = await tx.lookupValue<ModerationCase>(dbService
               .emptyKey
               .append(ModerationCase, id: mc.appealedCaseId!));
-          final appealHadModeratedAction =
+          final appealedCaseHadModeratedAction =
               appealedCase.getActionLog().hasModeratedAction();
-          if (appealHadModeratedAction) {
-            status = hasModeratedAction
-                ? ModerationStatus.moderationReverted
-                : ModerationStatus.moderationUpheld;
+          final compositeActionLog = ModerationActionLog(entries: [
+            ...appealedCase.getActionLog().entries,
+            ...mc.getActionLog().entries,
+          ]);
+          final compositeHasModeratedAction =
+              compositeActionLog.hasModeratedAction();
+          if (appealedCaseHadModeratedAction) {
+            status = compositeHasModeratedAction
+                ? ModerationStatus.moderationUpheld
+                : ModerationStatus.moderationReverted;
           } else {
-            status = hasModeratedAction
+            status = compositeHasModeratedAction
                 ? ModerationStatus.noActionReverted
                 : ModerationStatus.noActionUpheld;
           }

app/test/admin/moderation_case_resolve_test.dart

@@ -115,7 +115,7 @@ void main() {
         reason: 'The package violated our policy.',
       );
 
-      final mc = await _prepare(apply: true, appealCaseId: mc1.caseId);
+      final mc = await _prepare(apply: false, appealCaseId: mc1.caseId);
       expect(await _close(mc.caseId), 'moderation-reverted');
     });