[FEATURE] NEXT_N_QUARTERS

.github/workflows/deploy.yaml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'dont deploy') && github.event.pull_request.merged == true }}
     steps:
-      - uses: 8BitJonny/[email protected]
-        id: PR
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Create Auth File
-        run: |
-          echo '{"sfdxAuthUrl": "${{ secrets.SF_AUTH_URL }}"}' > authFile.json
+        run: scripts/bash/create-sfdx-auth-file.sh
+      - name: Get Deployment
+        id: get_deployment
+        run: scripts/bash/get-deployment.sh
       - uses: ZackFra/sf-delta-deploy@master
         with:
           branch: origin/main
-          quick-deploy-id: ${{ steps.PR.outputs.pr_body }}
+          quick-deploy-id: ${{ steps.get_deployment.outputs.quick-deploy-id }}

.github/workflows/validate.yaml

@@ -30,6 +30,16 @@ on:
     paths:
       - "**/main/default/**"
 
+env:
+  AWS_SECRET: ${{ secrets.AWS_SECRET }}
+  AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
+  AWS_REGION: ${{ secrets.AWS_REGION }}
+  AWS_SAVE_DEPLOYMENT_FUNC: ${{ secrets.AWS_SAVE_DEPLOYMENT_FUNC }}
+  AWS_GET_DEPLOYMENT_FUNC: ${{ secrets.AWS_GET_DEPLOYMENT_FUNC }}
+  SF_AUTH_URL: ${{ secrets.SF_AUTH_URL }}
+  REPOSITORY: ${{ github.repository }}
+  PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+
 jobs:
   validate-pull-request:
     permissions: write-all
@@ -41,19 +51,11 @@ jobs:
         with:
           fetch-depth: 0
       - name: Create Auth File
-        run: |
-          echo '{"sfdxAuthUrl": "${{ secrets.SF_AUTH_URL }}"}' > authFile.json
+        run: scripts/bash/create-sfdx-auth-file.sh
       - uses: ZackFra/sf-delta-validate@master
         with:
           branch: origin/main
-      - name: Get Job Id
-        run: |
-          node scripts/js/get-job-id.js
-      - name: Update PR Description
-        uses: nefrob/[email protected]
-        with:
-          content: job-id.txt
-          contentIsFilePath: true
-          regex: ".*"
-          token: ${{ secrets.GITHUB_TOKEN }}
+          auth-file: authFile.json
+      - name: Save To Database
+        run: scripts/bash/save-deployment.sh
 

authFile.json

@@ -0,0 +1 @@
+{"sfdxAuthUrl": "$SF_AUTH_URL"}

moxygen/main/default/classes/mock-soql-database/core/database/MockDatabaseTest.cls

@@ -3900,11 +3900,11 @@ private class MockDatabaseTest {
     @isTest
     static void ensureNextQuarterInWhereClause() {
         List<Opportunity> oppList = new List<Opportunity>();
-        Date startOfYear = Date.newInstance(Gmt.today().year(), 1, 1);
+        Date today = Gmt.today();
         for(Integer i = 0; i < 12; i++) {
             oppList.add(new Opportunity(
                 Name = 'Opp' + i,
-                CloseDate = startOfYear.addMonths(i)
+                CloseDate = today.addMonths(i)
             ));
         }
 
@@ -3917,4 +3917,25 @@ private class MockDatabaseTest {
 
         Assert.areEqual(3, opportunities.size(), 'Incorrect number of opportunities');
     }
+
+    @isTest
+    static void ensureNextNQuartersWorksInWhereClause() {
+
+        List<Opportunity> oppList = new List<Opportunity>();
+        Date today = Gmt.today();
+        for(Integer i = 0; i < 12; i++) {
+            oppList.add(new Opportunity(
+                Name = 'Opp' + i,
+                CloseDate = today.addMonths(i)
+            ));
+        }
+
+        MockDatabase.doInsert(oppList, true);
+
+        Test.startTest();
+        List<Opportunity> opportunities = MockDatabase.query('SELECT Id FROM Opportunity WHERE CloseDate = NEXT_N_QUARTERS:2');
+        Test.stopTest();
+
+        Assert.areEqual(6, opportunities.size(), 'Incorrect number of opportunities');
+    }
 }

moxygen/main/default/classes/mock-soql-database/core/operator-handler/date-literal-comparable/DateLiteralComparableFactory.cls

@@ -24,7 +24,8 @@ public with sharing class DateLiteralComparableFactory {
         Token.N_MONTHS_AGO_LITERAL => NMonthsAgoComparable.class,
         Token.THIS_QUARTER_LITERAL => ThisQuarterComparable.class,
         Token.LAST_QUARTER_LITERAL => LastQuarterComparable.class,
-        Token.NEXT_QUARTER_LITERAL => NextQuarterComparable.class
+        Token.NEXT_QUARTER_LITERAL => NextQuarterComparable.class,
+        Token.NEXT_N_QUARTERS_LITERAL => NextNQuartersComparable.class
     };
 
     @TestVisible

moxygen/main/default/classes/mock-soql-database/core/operator-handler/date-literal-comparable/NextNQuartersComparable.cls

@@ -0,0 +1,43 @@
+/**
+ * @description Comparable for the NEXT_N_QUARTERS token
+ * @author Zackary Frazier
+ * @since 1/4/2025
+ */
+public with sharing class NextNQuartersComparable extends DateLiteralComparable {
+    /**
+     * @description Returns whether fieldValue is in the NEXT_N_QUARTERS
+     * @param fieldValue `Datetime`
+     * @return  `Boolean`
+     */
+    public override Boolean isEqual(Datetime fieldValue) {
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+        String nQuarters = this.token.split(':')[1];
+        Integer nQuartersInt = Integer.valueOf(nQuarters);
+        Datetime nextNQuarters = startOfNextQuarter.addMonths(nQuartersInt * 3);
+
+        return startOfNextQuarter <= fieldValue && fieldValue < nextNQuarters;
+    }
+
+    /**
+     * @description Returns whether fieldValue is less than NEXT_N_QUARTERS
+     * @param fieldValue `Datetime`
+     * @return  `Boolean`
+     */
+    public override Boolean isLessThan(Datetime fieldValue) {
+        return fieldValue < Gmt.startOfThisCalendarQuarter().addMonths(3);
+    }
+
+    /**
+     * @description Return whether fieldValue is greater than NEXT_N_QUARTERS
+     * @param fieldValue `Datetime`
+     * @return  `Boolean`
+     */
+    public override Boolean isGreaterThan(Datetime fieldValue) {
+        String nQuarters = this.token.split(':')[1];
+        Integer nQuartersInt = Integer.valueOf(nQuarters);
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+        Datetime nextNQuarters = startOfNextQuarter.addMonths(nQuartersInt * 3);
+
+        return fieldValue >= nextNQuarters;
+    }
+}

moxygen/main/default/classes/mock-soql-database/core/operator-handler/date-literal-comparable/NextNQuartersComparable.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>62.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

moxygen/main/default/classes/mock-soql-database/core/operator-handler/date-literal-comparable/NextNQuartersComparableTest.cls

@@ -0,0 +1,117 @@
+@isTest
+private class NextNQuartersComparableTest {
+
+    @isTest
+    static void ensureIsEqualWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+        Assert.isFalse(
+            nextNQuarters.isEqual(Gmt.today()),
+            'Today should not be equal to NEXT_N_QUARTERS:5'
+        );
+
+        Assert.isTrue(
+            nextNQuarters.isEqual(startOfNextQuarter.addMonths(3 * 5).addDays(-1)),
+            'isEqual should return true when fieldValue is in the next 5 quarters'
+        );
+
+        Assert.isFalse(
+            nextNQuarters.isEqual(startOfNextQuarter.addMonths(3 * 6)),
+            'isEqual should return false when fieldValue is not in the next 5 quarters'
+        );
+    }
+
+    @isTest
+    static void ensuresIsLessThanWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+
+        Assert.isTrue(
+            nextNQuarters.isLessThan(Gmt.startOfThisCalendarQuarter().addMonths(3).addDays(-1)),
+            'isLessThan should return true when fieldValue is not in the next quarter'
+        );
+
+        Assert.isFalse(
+            nextNQuarters.isLessThan(Gmt.startOfThisCalendarQuarter().addMonths(3 * 5)),
+            'isLessThan should return false when fieldValue is in the next 5 quarters'
+        );
+    }
+
+    @isTest
+    static void ensuresIsGreaterThanWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+        Assert.isTrue(
+            nextNQuarters.isGreaterThan(startOfNextQuarter.addMonths(3 * 5)),
+            'isGreaterThan should return true when fieldValue is not in the next 5 quarters'
+        );
+
+        Assert.isFalse(
+            nextNQuarters.isGreaterThan(startOfNextQuarter.addMonths(3 * 5).addDays(-1)),
+            'isGreaterThan should return false when fieldValue is in the next 5 quarters'
+        );
+    }
+
+    @isTest
+    static void ensureIsLessThanOrEqualWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+
+        Assert.isTrue(
+            nextNQuarters.isLessThanOrEqual(startOfNextQuarter.addDays(-1)),
+            'isLessThanOrEqual should return true when fieldValue is not in the next quarter'
+        );
+
+        Assert.isTrue(
+            nextNQuarters.isLessThanOrEqual(startOfNextQuarter.addMonths(3 * 5).addDays(-1)),
+            'isLessThanOrEqual should return true when fieldValue is in the next 5 quarters'
+        );
+
+        Assert.isFalse(
+            nextNQuarters.isLessThanOrEqual(startOfNextQuarter.addMonths(3 * 5)),
+            'isLessThanOrEqual should return false when fieldValue is not in the next 5 quarters'
+        );
+    }
+
+    @isTest
+    static void ensuresIsGreaterThanOrEqualWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+        Datetime nextCalendarQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+
+        Assert.isTrue(
+            nextNQuarters.isGreaterThanOrEqual(nextCalendarQuarter.addMonths(3 * 6)),
+            'isGreaterThanOrEqual should return true when fieldValue is in the next 5 quarters'
+        );
+
+        Assert.isTrue(
+            nextNQuarters.isGreaterThanOrEqual(nextCalendarQuarter.addMonths(3 * 5).addMonths(1)),
+            'isGreaterThanOrEqual should return true when fieldValue is in the next 5 quarters'
+        );
+
+        Assert.isFalse(
+            nextNQuarters.isGreaterThanOrEqual(Gmt.startOfThisCalendarQuarter()),
+            'isGreaterThanOrEqual should return false when fieldValue is not in the next 5 quarters'
+        );
+    }
+
+    @isTest
+    static void ensureIsNotEqualWorks() {
+        DateLiteralComparable nextNQuarters = new NextNQuartersComparable().withToken('NEXT_N_QUARTERS:5');
+
+        Assert.isTrue(
+            nextNQuarters.isNotEqual(Gmt.today()),
+            'Today should not be equal to NEXT_N_QUARTERS:5'
+        );
+
+        Datetime startOfNextQuarter = Gmt.startOfThisCalendarQuarter().addMonths(3);
+
+        Assert.isFalse(
+            nextNQuarters.isNotEqual(startOfNextQuarter.addMonths(3 * 5).addDays(-1)),
+            'isNotEqual should return false when fieldValue is in the next 5 quarters'
+        );
+
+        Assert.isTrue(
+            nextNQuarters.isNotEqual(startOfNextQuarter.addMonths(3 * 5)),
+            'isNotEqual should return true when fieldValue is not in the next 5 quarters'
+        );
+    }
+}

moxygen/main/default/classes/mock-soql-database/core/operator-handler/date-literal-comparable/NextNQuartersComparableTest.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>62.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

moxygen/main/default/classes/mock-soql-database/parser/ParserTest.cls

@@ -418,4 +418,17 @@ private class ParserTest {
         }
         Test.stopTest();
     }
+
+    @isTest
+    static void ensureParserCanParseNextNQuarters() {
+        Parser p = new Parser();
+        String soqlQuery = 'SELECT Id FROM Opportunity WHERE CreatedDate = NEXT_N_QUARTERS:5';
+        Test.startTest();
+        try {
+            p.parse(soqlQuery);
+        } catch(Exception e) {
+            Assert.fail('Expected no exception but got ' + e.getMessage() + ' for ' + soqlQuery);
+        }
+        Test.stopTest();
+    }
 }

moxygen/main/default/classes/mock-soql-database/parser/sub-parser/primitive-parsers/PrimitiveParserFactory.cls

@@ -27,6 +27,7 @@ public with sharing class PrimitiveParserFactory {
         Token.THIS_QUARTER_LITERAL => ThisQuarterParser.class,
         Token.LAST_QUARTER_LITERAL => LastQuarterParser.class,
         Token.NEXT_QUARTER_LITERAL => NextQuarterParser.class,
+        Token.NEXT_N_QUARTERS_LITERAL => NextNQuartersParser.class,
         Token.XTRUE => BooleanParser.class,
         Token.XFALSE => BooleanParser.class,
         Token.XNULL => NullParser.class,

moxygen/main/default/classes/mock-soql-database/parser/sub-parser/primitive-parsers/date-literal-parsers/NextNQuartersParser.cls

@@ -0,0 +1,15 @@
+/**
+ * @description Parser for the NEXT_N_QUARTERS_LITERAL 
+ * @author Zackary Frazier
+ * @since 1/4/2025
+ */
+public with sharing class NextNQuartersParser extends DateLiteralParser {
+    /**
+     * @description Parses the NEXT_N_QUARTERS_LITERAL
+     * @param query `String`
+     * @return  `Intermediary`
+     */
+    public override Intermediary parse(String query) {
+        return parseNDays(query, Token.NEXT_N_QUARTERS_LITERAL);
+    }
+}

moxygen/main/default/classes/mock-soql-database/parser/sub-parser/primitive-parsers/date-literal-parsers/NextNQuartersParser.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>62.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

moxygen/main/default/classes/mock-soql-database/parser/sub-parser/primitive-parsers/date-literal-parsers/NextNQuartersParserTest.cls

@@ -0,0 +1,11 @@
+@isTest
+private class NextNQuartersParserTest {
+
+    @IsTest
+    static void ensureNextNQuartersCanBeParsed() {
+        Assert.isTrue(
+            DateLiteralParserTestUtil.ensureVariableTokenCanBeParsed('NEXT_N_QUARTERS:5', new NextNQuartersParser()),
+            'NEXT_N_QUARTERS should be parsed'
+        );
+    }
+}

moxygen/main/default/classes/mock-soql-database/parser/sub-parser/primitive-parsers/date-literal-parsers/NextNQuartersParserTest.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>62.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

moxygen/main/default/classes/mock-soql-database/parser/types/Token.cls

@@ -144,4 +144,5 @@ public inherited sharing class Token {
     public final static String THIS_QUARTER_LITERAL = 'this_quarter';
     public final static String LAST_QUARTER_LITERAL = 'last_quarter';
     public final static String NEXT_QUARTER_LITERAL = 'next_quarter';
+    public final static String NEXT_N_QUARTERS_LITERAL = 'next_n_quarters';
 }

scripts/bash/config-aws.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+npm i -g aws-cdk
+aws configure set aws_access_key_id $AWS_ACCESS_KEY
+aws configure set aws_secret_access_key $AWS_SECRET
+aws configure set default.region $AWS_REGION
+aws configure set default.output json

scripts/bash/create-sfdx-auth-file.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+echo "{\"sfdxAuthUrl\": \"$SF_AUTH_URL\"}" > authFile.json

scripts/bash/get-deployment.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+scripts/bash/config-aws.sh
+scripts/bash/invoke-lambda-func.sh "{\"pullRequestUrl\":\"/$REPOSITORY/pull/$PULL_REQUEST_NUMBER\"}" $AWS_GET_DEPLOYMENT_FUNC
+cat outfile.json
+node scripts/js/get-job-id.js "outfile.json"
+echo "quick-deploy-id=$(cat job-id.txt)" >> "$GITHUB_OUTPUT"

scripts/bash/invoke-lambda-func.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+aws lambda invoke --payload $1 --function-name $2 --cli-binary-format raw-in-base64-out outfile.json 

scripts/bash/save-deployment.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+scripts/bash/config-aws.sh
+node scripts/js/format-deployment-data.js "validate.json"
+scripts/bash/invoke-lambda-func.sh "file://deployment-request.json" $AWS_SAVE_DEPLOYMENT_FUNC