Fix handling margin for whole months

Swydo · Jan 12, 2017 · 4f3aa1a · 4f3aa1a
1 parent 01edfc6
commit 4f3aa1a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/previous-date-range.js b/src/previous-date-range.js
@@ -28,12 +28,14 @@ class PreviousDateRange {
 
     const end = moment(this.date);
 
-    if (!this.whole) {
-      end.subtract(this.margin, 'day');
-    } else {
-      end.startOf(this.cleanMeasure)
-        .subtract(this.margin, 'day')
+    if (this.whole) {
+      end
+        .subtract(this.margin - 1, 'day')
+        .startOf(this.cleanMeasure)
+        .subtract(1, 'day')
         .endOf(this.cleanMeasure);
+    } else {
+      end.subtract(this.margin, 'day');
     }
 
     end.endOf('day');
@@ -47,7 +49,10 @@ class PreviousDateRange {
 
   get isToDate() { return /ToDate$/.test(this.measure); }
 
-  get whole() { return this.WHOLE != null ? this.WHOLE : !this.isToDate; }
+  // Days are always whole days.
+  // If something is `<measure>ToDate`, then it isn't whole by default.
+  // Can be manually overruled for things that aren't a day.
+  get whole() { return this.cleanMeasure === 'day' || this.WHOLE != null ? this.WHOLE : !this.isToDate; }
 
   get date() { return this.DATE; }
 
@@ -57,7 +62,7 @@ class PreviousDateRange {
 
   get measure() { return this.MEASURE || 'month'; }
 
-  get cleanMeasure() { return this.measure.replace(/[s]?[ToDate]+$/, ''); }
+  get cleanMeasure() { return this.measure.replace(/[ToDate]+$/, '').replace(/s$/, ''); }
 
   get countableMeasure() {
     switch (this.cleanMeasure) {

diff --git a/test/previous-date-range.spec.js b/test/previous-date-range.spec.js
@@ -149,6 +149,18 @@ describe('PreviousDateRange', function () {
       expect(this.range.start.format(DAY_FORMAT)).to.equal('09-02-3000');
       expect(this.range.end.format(DAY_FORMAT)).to.equal('10-02-3000');
     });
+
+    it('should handle whole month', function () {
+      this.range.date = new Date(3000, 0, 1);
+
+      expect(this.range.start.format(DAY_FORMAT)).to.equal('01-12-2999');
+      expect(this.range.end.format(DAY_FORMAT)).to.equal('31-12-2999');
+
+      this.range.margin = 2;
+
+      expect(this.range.start.format(DAY_FORMAT)).to.equal('01-11-2999');
+      expect(this.range.end.format(DAY_FORMAT)).to.equal('30-11-2999');
+    });
   });
 
   describe('whole', function () {