Merge pull request Expensify#70627 from mohammadjafarinejad/fix/68966

Fix/68966 - [ORTF] report:enddate

Author: neil-marcellini

src/libs/Formula.ts

@@ -248,6 +248,8 @@ function computeReportPart(part: FormulaPart, context: FormulaContext): string {
             return formatType(report.type);
         case 'startdate':
             return formatDate(getOldestTransactionDate(report.reportID, context), format);
+        case 'enddate':
+            return formatDate(getNewestTransactionDate(report.reportID, context), format);
         case 'total':
             return formatAmount(report.total, getCurrencySymbol(report.currency ?? '') ?? report.currency);
         case 'currency':
@@ -468,6 +470,26 @@ function formatType(type: string | undefined): string {
     return typeMapping[type.toLowerCase()] || type;
 }
 
+/**
+ * Get all transactions for a report, including any context transaction.
+ * Updates an existing transaction if it matches the context or adds it if new.
+ */
+function getAllReportTransactionsWithContext(reportID: string, context?: FormulaContext): Transaction[] {
+    const transactions = [...getReportTransactions(reportID)];
+    const contextTransaction = context?.transaction;
+
+    if (contextTransaction?.transactionID && contextTransaction.reportID === reportID) {
+        const transactionIndex = transactions.findIndex((transaction) => transaction?.transactionID === contextTransaction.transactionID);
+        if (transactionIndex >= 0) {
+            transactions[transactionIndex] = contextTransaction;
+        } else {
+            transactions.push(contextTransaction);
+        }
+    }
+
+    return transactions;
+}
+
 /**
  * Get the date of the oldest transaction for a given report
  */
@@ -476,25 +498,26 @@ function getOldestTransactionDate(reportID: string, context?: FormulaContext): s
         return undefined;
     }
 
-    const transactions = getReportTransactions(reportID);
+    const transactions = getAllReportTransactionsWithContext(reportID, context);
     if (!transactions || transactions.length === 0) {
         return new Date().toISOString();
     }
 
     let oldestDate: string | undefined;
 
     transactions.forEach((transaction) => {
-        // Use updated transaction data if available and matches this transaction
-        const currentTransaction = context?.transaction && transaction.transactionID === context.transaction.transactionID ? context.transaction : transaction;
-
-        const created = getCreated(currentTransaction);
+        const created = getCreated(transaction);
         if (!created) {
             return;
         }
+        // Skip transactions with pending deletion (offline deletes) to calculate dates properly.
+        if (transaction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            return;
+        }
         if (oldestDate && created >= oldestDate) {
             return;
         }
-        if (isPartialTransaction(currentTransaction)) {
+        if (isPartialTransaction(transaction)) {
             return;
         }
         oldestDate = created;
@@ -503,6 +526,42 @@ function getOldestTransactionDate(reportID: string, context?: FormulaContext): s
     return oldestDate;
 }
 
+/**
+ * Get the date of the newest transaction for a given report
+ */
+function getNewestTransactionDate(reportID: string, context?: FormulaContext): string | undefined {
+    if (!reportID) {
+        return undefined;
+    }
+
+    const transactions = getAllReportTransactionsWithContext(reportID, context);
+    if (!transactions || transactions.length === 0) {
+        return new Date().toISOString();
+    }
+
+    let newestDate: string | undefined;
+
+    transactions.forEach((transaction) => {
+        const created = getCreated(transaction);
+        if (!created) {
+            return;
+        }
+        // Skip transactions with pending deletion (offline deletes) to calculate dates properly.
+        if (transaction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            return;
+        }
+        if (newestDate && created <= newestDate) {
+            return;
+        }
+        if (isPartialTransaction(transaction)) {
+            return;
+        }
+        newestDate = created;
+    });
+
+    return newestDate;
+}
+
 export {FORMULA_PART_TYPES, compute, extract, parse};
 
 export type {FormulaContext, FormulaPart};

src/libs/ReportUtils.ts

@@ -6254,6 +6254,7 @@ function populateOptimisticReportFormula(formula: string, report: OptimisticExpe
         // We don't translate because the server response is always in English
         .replaceAll(/\{report:type\}/gi, 'Expense Report')
         .replaceAll(/\{report:startdate\}/gi, createdDate ? format(createdDate, CONST.DATE.FNS_FORMAT_STRING) : '')
+        .replaceAll(/\{report:enddate\}/gi, createdDate ? format(createdDate, CONST.DATE.FNS_FORMAT_STRING) : '')
         .replaceAll(/\{report:id\}/gi, getBase62ReportID(Number(report.reportID)))
         .replaceAll(/\{report:total\}/gi, report.total !== undefined && !Number.isNaN(report.total) ? convertToDisplayString(Math.abs(report.total), report.currency).toString() : '')
         .replaceAll(/\{report:currency\}/gi, report.currency ?? '')

tests/unit/FormulaTest.ts

@@ -180,6 +180,11 @@ describe('CustomFormula', () => {
             expect(result).toBe('2025-01-08'); // Should use oldest transaction date (2025-01-08)
         });
 
+        test('should compute enddate formula using transactions', () => {
+            const result = compute('{report:enddate}', mockContext);
+            expect(result).toBe('2025-01-14'); // Should use newest transaction date (2025-01-14)
+        });
+
         test('should compute created formula using report actions', () => {
             const result = compute('{report:created}', mockContext);
             expect(result).toBe('2025-01-10'); // Should use oldest report action date (2025-01-10)
@@ -190,6 +195,11 @@ describe('CustomFormula', () => {
             expect(result).toBe('01/08/2025'); // Should use oldest transaction date with yyyy-MM-dd format
         });
 
+        test('should compute enddate with custom format', () => {
+            const result = compute('{report:enddate:MM/dd/yyyy}', mockContext);
+            expect(result).toBe('01/14/2025'); // Should use newest transaction date with MM/dd/yyyy format
+        });
+
         test('should compute created with custom format', () => {
             const result = compute('{report:created:MMMM dd, yyyy}', mockContext);
             expect(result).toBe('January 10, 2025'); // Should use oldest report action date with MMMM dd, yyyy format
@@ -200,6 +210,11 @@ describe('CustomFormula', () => {
             expect(result).toBe('08 Jan 2025'); // Should use oldest transaction date with dd MMM yyyy format
         });
 
+        test('should compute enddate with short month format', () => {
+            const result = compute('{report:enddate:dd MMM yyyy}', mockContext);
+            expect(result).toBe('14 Jan 2025'); // Should use newest transaction date with dd MMM yyyy format
+        });
+
         test('should compute policy name', () => {
             const result = compute('{report:policyname}', mockContext);
             expect(result).toBe('Test Policy');
@@ -366,6 +381,18 @@ describe('CustomFormula', () => {
             expect(result).toBe(expected);
         });
 
+        test('should handle missing transactions for enddate', () => {
+            mockReportUtils.getReportTransactions.mockReturnValue([]);
+            const context: FormulaContext = {
+                report: {reportID: '123'} as Report,
+                policy: null as unknown as Policy,
+            };
+            const today = new Date();
+            const expected = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
+            const result = compute('{report:enddate}', context);
+            expect(result).toBe(expected);
+        });
+
         test('should call getReportTransactions with correct reportID for startdate', () => {
             const context: FormulaContext = {
                 report: {reportID: 'test-report-123'} as Report,
@@ -416,6 +443,9 @@ describe('CustomFormula', () => {
 
             const result = compute('{report:startdate}', context);
             expect(result).toBe('2025-01-12');
+
+            const endResult = compute('{report:enddate}', context);
+            expect(endResult).toBe('2025-01-15');
         });
 
         test('should skip partial transactions (zero amount)', () => {
@@ -449,6 +479,9 @@ describe('CustomFormula', () => {
 
             const result = compute('{report:startdate}', context);
             expect(result).toBe('2025-01-12');
+
+            const endResult = compute('{report:enddate}', context);
+            expect(endResult).toBe('2025-01-15');
         });
     });
 });