Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ As well, don't miss [the Wiki](../../wiki), which includes even more info for co

## Deployment & Setup

<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000CmfBAAS">
<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EOwvAAG">
<img alt="Deploy to Salesforce" src="./media/deploy-package-to-prod.png">
</a>

<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000CmfBAAS">
<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EOwvAAG">
<img alt="Deploy to Salesforce Sandbox" src="./media/deploy-package-to-sandbox.png">
</a>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apex-rollup",
"version": "1.7.41",
"version": "1.7.42",
"description": "Fast, configurable, elastically scaling custom rollup solution. Apex Invocable action, one-liner Apex trigger/CMDT-driven logic, and scheduled Apex-ready.",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions plugins/ExtraCodeCoverage/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Extra Code Coverage

<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg70000006DqbAAE">
<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EOqTAAW">
<img alt="Deploy to Salesforce"
src="../../media/deploy-package-to-prod.png">
</a>

<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg70000006DqbAAE">
<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EOqTAAW">
<img alt="Deploy to Salesforce Sandbox"
src="../../media/deploy-package-to-sandbox.png">
</a>
Expand Down
4 changes: 2 additions & 2 deletions rollup-namespaced/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ For more info, see the base `README`.

## Deployment & Setup

<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000CmldAAC">
<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EP09AAG">
<img alt="Deploy to Salesforce"
src="./media/deploy-package-to-prod.png">
</a>

<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000CmldAAC">
<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04tg7000000EP09AAG">
<img alt="Deploy to Salesforce Sandbox"
src="./media/deploy-package-to-sandbox.png">
</a>
7 changes: 4 additions & 3 deletions rollup-namespaced/sfdx-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"default": true,
"package": "apex-rollup-namespaced",
"path": "rollup-namespaced/source/rollup",
"versionName": "Summer 26 updates",
"versionNumber": "1.2.37.0",
"versionName": "Date literal updates",
"versionNumber": "1.2.38.0",
"versionDescription": "Fast, configurable, elastically scaling custom rollup solution. Apex Invocable action, one-liner Apex trigger/CMDT-driven logic, and scheduled Apex-ready.",
"releaseNotesUrl": "https://github.com/jamessimone/apex-rollup/releases/latest",
"unpackagedMetadata": {
Expand Down Expand Up @@ -54,6 +54,7 @@
"apex-rollup-namespaced@1.2.34": "04tg70000005BndAAE",
"apex-rollup-namespaced@1.2.35": "04tg70000007ht3AAA",
"apex-rollup-namespaced@1.2.36": "04tg7000000CG7RAAW",
"apex-rollup-namespaced@1.2.37": "04tg7000000CmldAAC"
"apex-rollup-namespaced@1.2.37": "04tg7000000CmldAAC",
"apex-rollup-namespaced@1.2.38": "04tg7000000EP09AAG"
}
}
20 changes: 12 additions & 8 deletions rollup/core/classes/RollupDateLiteral.cls
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,9 @@ public without sharing abstract class RollupDateLiteral {
*/
private virtual class LastQuarterLiteral extends RollupDateLiteral {
public LastQuarterLiteral() {
this.ref = getRelativeDatetime(this.getLastQuarterStart(), START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(this.ref.addMonths(3).addDays(-1).date(), END_TIME));
Date lastQuarterStart = this.getLastQuarterStart();
this.ref = getRelativeDatetime(lastQuarterStart, START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(lastQuarterStart.addMonths(3).addDays(-1), END_TIME));
}

protected virtual Date getLastQuarterStart() {
Expand All @@ -705,8 +706,9 @@ public without sharing abstract class RollupDateLiteral {
*/
private virtual class ThisQuarterLiteral extends RollupDateLiteral {
public ThisQuarterLiteral() {
this.ref = getRelativeDatetime(this.getThisQuarterStart(), START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(this.ref.addMonths(3).addDays(-1).date(), END_TIME));
Date thisQuarterStart = this.getThisQuarterStart();
this.ref = getRelativeDatetime(thisQuarterStart, START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(thisQuarterStart.addMonths(3).addDays(-1), END_TIME));
}

protected virtual Date getThisQuarterStart() {
Expand All @@ -719,8 +721,9 @@ public without sharing abstract class RollupDateLiteral {
*/
private virtual class NextQuarterLiteral extends RollupDateLiteral {
public NextQuarterLiteral() {
this.ref = getRelativeDatetime(this.getNextQuarterDate(), START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(this.ref.addMonths(3).addDays(-1).date(), END_TIME));
Date nextQuarterStart = this.getNextQuarterDate();
this.ref = getRelativeDatetime(nextQuarterStart, START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(nextQuarterStart.addMonths(3).addDays(-1), END_TIME));
}

protected virtual Date getNextQuarterDate() {
Expand Down Expand Up @@ -750,8 +753,9 @@ public without sharing abstract class RollupDateLiteral {
private class NQuartersAgoLiteral extends RollupDateLiteral {
protected override void setDynamicValue(String num) {
Integer quarterRange = Integer.valueOf(num);
this.ref = getRelativeDatetime(Date.newInstance(System.today().year(), getCurrentQuarterStartMonth(), 1).addMonths(-quarterRange * 3), START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(this.ref.addMonths(3).addDays(-1).date(), END_TIME));
Date relativeQuarterStart = Date.newInstance(System.today().year(), getCurrentQuarterStartMonth(), 1).addMonths(-quarterRange * 3);
this.ref = getRelativeDatetime(relativeQuarterStart, START_TIME);
this.bound = offsetToFirstDay(getRelativeDatetime(relativeQuarterStart.addMonths(3).addDays(-1), END_TIME));
}
}

Expand Down
2 changes: 1 addition & 1 deletion rollup/core/classes/RollupLogger.cls
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
global without sharing virtual class RollupLogger implements ILogger {
@TestVisible
// this gets updated via the pipeline as the version number gets incremented
private static final String CURRENT_VERSION_NUMBER = 'v1.7.41';
private static final String CURRENT_VERSION_NUMBER = 'v1.7.42';
private static final System.LoggingLevel FALLBACK_LOGGING_LEVEL = System.LoggingLevel.DEBUG;
private static final RollupPlugin PLUGIN = new RollupPlugin();

Expand Down
16 changes: 7 additions & 9 deletions sfdx-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"package": "apex-rollup",
"path": "rollup",
"scopeProfiles": true,
"versionName": "Summer 26 updates",
"versionNumber": "1.7.41.0",
"versionName": "Date literal updates",
"versionNumber": "1.7.42.0",
"versionDescription": "Fast, configurable, elastically scaling custom rollup solution. Apex Invocable action, one-liner Apex trigger/CMDT-driven logic, and scheduled Apex-ready.",
"releaseNotesUrl": "https://github.com/jamessimone/apex-rollup/releases/latest",
"unpackagedMetadata": {
Expand Down Expand Up @@ -69,12 +69,12 @@
"package": "Apex Rollup - Extra Code Coverage",
"versionDescription": "This plugin adds code coverage for Apex Rollup if you need additional code coverage for the base package",
"versionName": "Updating code coverage",
"versionNumber": "0.0.29.0",
"versionNumber": "0.0.30.0",
"default": false,
"scopeProfiles": true,
"dependencies": [
{
"package": "apex-rollup@1.7.38"
"package": "apex-rollup@1.7.42"
}
]
},
Expand All @@ -91,8 +91,8 @@
"Apex Rollup - Custom Logger@0.0.13": "04tKf000000syF7IAI",
"Apex Rollup - Custom Logger@0.0.14": "04tg7000000ClG5AAK",
"Apex Rollup - Extra Code Coverage": "0Ho6g000000GnCWCA0",
"Apex Rollup - Extra Code Coverage@0.0.28": "04tg70000002W8fAAE",
"Apex Rollup - Extra Code Coverage@0.0.29": "04tg70000006DqbAAE",
"Apex Rollup - Extra Code Coverage@0.0.30": "04tg7000000EOqTAAW",
"Apex Rollup - Nebula Logger": "0Ho6g000000Gn8PCAS",
"Apex Rollup - Nebula Logger@0.0.7-0": "04t6g000008b0O7AAI",
"Apex Rollup - Nebula Logger@0.0.8-0": "04t6g000007zM6tAAE",
Expand All @@ -102,10 +102,8 @@
"Apex Rollup - Rollup Callback@0.0.3-0": "04t6g000008Sis0AAC",
"Nebula Logger - Core@4.14.4-optionally-auto-call-lightning-logger-lwc": "04t5Y0000015oRNQAY",
"apex-rollup": "0Ho6g000000TNcOCAW",
"apex-rollup@1.7.37": "04tg700000037wDAAQ",
"apex-rollup@1.7.38": "04tg70000005Bm1AAE",
"apex-rollup@1.7.39": "04tg70000007hmbAAA",
"apex-rollup@1.7.40": "04tg7000000CG0zAAG",
"apex-rollup@1.7.41": "04tg7000000CmfBAAS"
"apex-rollup@1.7.41": "04tg7000000CmfBAAS",
"apex-rollup@1.7.42": "04tg7000000EOwvAAG"
}
}