Fix dates for monthly totals (#272)

maffin-io · Oct 11, 2023 · 5041ffe · 5041ffe
1 parent 2bca0b9
commit 5041ffe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 250 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "react-tailwindcss-datepicker": "^1.6.6",
     "react-tooltip": "^5.21.5",
     "reflect-metadata": "^0.1.13",
-    "sharp": "^0.32.6",
     "simplebar-react": "^3.2.4",
     "sql.js": "^1.8.0",
     "swr": "^2.2.4",

diff --git a/src/__tests__/components/pages/accounts/MonthlyTotalHistogram.test.tsx b/src/__tests__/components/pages/accounts/MonthlyTotalHistogram.test.tsx
@@ -46,6 +46,7 @@ describe('MonthlyTotalHistogram', () => {
         data: {
           datasets: [],
           labels: [
+            DateTime.fromISO('2022-05-01').startOf('day'),
             DateTime.fromISO('2022-06-01').startOf('day'),
             DateTime.fromISO('2022-07-01').startOf('day'),
             DateTime.fromISO('2022-08-01').startOf('day'),
@@ -128,7 +129,7 @@ describe('MonthlyTotalHistogram', () => {
   it.each([
     undefined,
     now.minus({ months: 3 }),
-  ])('selects default date now - 8 months', (date) => {
+  ])('selects default date now - 9 months', (date) => {
     jest.spyOn(apiHook, 'useAccountsMonthlyTotals').mockReturnValue(
       {
         data: {
@@ -159,7 +160,8 @@ describe('MonthlyTotalHistogram', () => {
         data: {
           datasets: expect.any(Array),
           labels: [
-            now.minus({ months: 7 }).startOf('month'),
+            now.minus({ months: 8 }).startOf('month'),
+            expect.any(DateTime),
             expect.any(DateTime),
             expect.any(DateTime),
             expect.any(DateTime),
@@ -174,7 +176,7 @@ describe('MonthlyTotalHistogram', () => {
     );
   });
 
-  it('selects date range of 8 months in the past', () => {
+  it('selects date range of 9 months in the past', () => {
     jest.spyOn(apiHook, 'useAccountsMonthlyTotals').mockReturnValue(
       {
         data: {
@@ -206,7 +208,8 @@ describe('MonthlyTotalHistogram', () => {
         data: {
           datasets: expect.any(Array),
           labels: [
-            selectedDate.minus({ months: 3 }).startOf('month'),
+            selectedDate.minus({ months: 4 }).startOf('month'),
+            expect.any(DateTime),
             expect.any(DateTime),
             expect.any(DateTime),
             expect.any(DateTime),
@@ -260,11 +263,11 @@ describe('MonthlyTotalHistogram', () => {
         data: {
           datasets: [
             {
-              data: [-0, -0, -0, -0, -0, 1000, 1000, -0],
+              data: [-0, -0, -0, -0, -0, -0, 1000, 1000, -0],
               label: 'Salary',
             },
             {
-              data: [-0, -0, -0, -0, -0, 150, 50, -0],
+              data: [-0, -0, -0, -0, -0, -0, 150, 50, -0],
               label: 'Dividends',
             },
           ],

diff --git a/src/components/pages/accounts/MonthlyTotalHistogram.tsx b/src/components/pages/accounts/MonthlyTotalHistogram.tsx
@@ -28,7 +28,7 @@ export default function MonthlyTotalHistogram({
     selectedDate = now.minus({ months: 4 });
   }
   const interval = Interval.fromDateTimes(
-    selectedDate.minus({ months: 4 }),
+    selectedDate.minus({ months: 5 }),
     selectedDate.plus({ months: 4 }),
   );