Merge pull request Expensify#64784 from bernhardoj/fix/63291-unarchive-report-when-moving-ws

Unarchive expense report when moving to a different workspace

Author: srikarparsi

src/libs/actions/Report.ts

@@ -5671,6 +5671,22 @@ function buildOptimisticChangePolicyData(report: Report, policyID: string, repor
         },
     });
 
+    // 5. Make sure the expense report is not archived
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`,
+        value: {
+            private_isArchived: null,
+        },
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`,
+        value: {
+            private_isArchived: DateUtils.getDBTime(),
+        },
+    });
+
     return {optimisticData, successData, failureData, optimisticReportPreviewAction, optimisticMovedReportAction};
 }
 

tests/actions/ReportTest.ts

@@ -1760,6 +1760,77 @@ describe('actions/Report', () => {
         });
     });
 
+    describe('changeReportPolicy', () => {
+        it('should unarchive the expense report', async () => {
+            // Given an archived expense report
+            const expenseReport: OnyxTypes.Report = {
+                ...createRandomReport(1),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                policyID: '1',
+            };
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${expenseReport.reportID}`, {
+                private_isArchived: DateUtils.getDBTime(),
+            });
+
+            // When moving to another workspace
+            Report.changeReportPolicy(expenseReport, '2');
+            await waitForBatchedUpdates();
+
+            // Then the expense report should not be archived anymore
+            const isArchived = await new Promise<boolean>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${expenseReport.reportID}`,
+                    callback: (val) => {
+                        resolve(!!val?.private_isArchived);
+                        Onyx.disconnect(connection);
+                    },
+                });
+            });
+            expect(isArchived).toBe(false);
+        });
+    });
+
+    describe('changeReportPolicyAndInviteSubmitter', () => {
+        it('should unarchive the expense report', async () => {
+            // Given an archived expense report
+            const ownerAccountID = 1;
+            const ownerEmail = 'owner@gmail.com';
+            const adminEmail = 'admin@gmail.com';
+            const expenseReport: OnyxTypes.Report = {
+                ...createRandomReport(1),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                policyID: '1',
+                ownerAccountID,
+            };
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${expenseReport.reportID}`, {
+                private_isArchived: DateUtils.getDBTime(),
+            });
+            await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [ownerAccountID]: {
+                    login: ownerEmail,
+                },
+            });
+
+            // When moving to another workspace
+            Report.changeReportPolicyAndInviteSubmitter(expenseReport, '2', {
+                [adminEmail]: {role: CONST.POLICY.ROLE.ADMIN},
+            });
+            await waitForBatchedUpdates();
+
+            // Then the expense report should not be archived anymore
+            const isArchived = await new Promise<boolean>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${expenseReport.reportID}`,
+                    callback: (val) => {
+                        resolve(!!val?.private_isArchived);
+                        Onyx.disconnect(connection);
+                    },
+                });
+            });
+            expect(isArchived).toBe(false);
+        });
+    });
+
     describe('buildOptimisticChangePolicyData', () => {
         it('should build the optimistic data next step for the change policy data', () => {
             const report: OnyxTypes.Report = {