fix: fix bug with timezones and group generation

back/src/main.ts

@@ -1,10 +1,11 @@
+process.env.TZ = 'UTC'
+
 import { NestFactory } from '@nestjs/core'
 
 import { setupCors } from '@back/addons/setupCors'
 import { setupLogger } from '@back/addons/setupLogger'
 import { setupSwagger } from '@back/addons/setupSwagger'
 import { AppModule } from '@back/app.module'
-import { TelegramBot } from 'nest-telegram'
 import { setupTelegram } from './addons/setupTelegram'
 
 async function bootstrap() {

back/src/utils/infrastructure/dateGroups/createMonthGroups.ts

@@ -1,4 +1,4 @@
-import { addMonths, startOfMonth } from 'date-fns'
+import { addMonths, startOfMonth, subMonths } from 'date-fns'
 
 import { DateRange } from '../dto/DateRange'
 import { DateGroup } from './DateGroup'
@@ -8,7 +8,7 @@ export const createMonthGroups = ({ from, to }: DateRange): DateGroup[] => {
   const groups = []
 
   let now = startOfMonth(from)
-  while (now < to) {
+  while (now < subMonths(to, 1)) {
     const next = addMonths(now, 1)
     const nowYear = now.getFullYear()
     groups.push({

back/src/utils/infrastructure/dateGroups/createWeekGroups.ts

@@ -1,4 +1,4 @@
-import { addWeeks, getISOWeek, startOfWeek } from 'date-fns'
+import { addWeeks, getISOWeek, startOfWeek, subWeeks } from 'date-fns'
 
 import { DateRange } from '../dto/DateRange'
 import { DateGroup } from './DateGroup'
@@ -8,7 +8,7 @@ export const createWeekGroups = ({ from, to }: DateRange): DateGroup[] => {
   const groups = []
 
   let now = startOfWeek(from)
-  while (now < to) {
+  while (now < subWeeks(to, 1)) {
     const next = addWeeks(now, 1)
     const nowYear = now.getFullYear()
     groups.push({

back/src/utils/infrastructure/dateGroups/createYearGroups.ts

@@ -7,7 +7,7 @@ export const createYearGroups = ({ from, to }: DateRange): DateGroup[] => {
   const firstYear = from.getFullYear()
   const lastYear = to.getFullYear()
 
-  const years = range(firstYear, lastYear + 1)
+  const years = range(firstYear, lastYear)
 
   return years.map(year => ({
     title: year.toString(),

front/src/features/app/features/history/History.tsx

@@ -10,11 +10,12 @@ import { Period } from '@front/ui/components/form/period'
 import { Loader } from '@front/ui/components/layout/loader'
 import { GroupBy } from '@shared/enum/GroupBy'
 import { ControlHeader } from '@front/ui/components/controls/control-header'
+import { useActualDateRange } from '@front/ui/hooks/useActualDateRange'
+import { wantUTC } from '@front/helpers/wantUTC'
 
 import { Incomes } from './components/Incomes'
 import { Outcomes } from './components/Outcomes'
 import * as styles from './History.css'
-import { useActualDateRange } from '@front/ui/hooks/useActualDateRange'
 
 interface Props {
   className?: string
@@ -29,8 +30,8 @@ export const History = ({ className }: Props) => {
   const { from, setFrom, to, setTo, actualFrom, actualTo } = useActualDateRange(
     new Date(),
     new Date(),
-    startOfMonth,
-    endOfMonth,
+    wantUTC(startOfMonth),
+    wantUTC(endOfMonth),
   )
 
   const history = useMemoState(

front/src/features/app/features/stats/Stats.tsx

@@ -16,6 +16,7 @@ import { GroupBy } from '@shared/enum/GroupBy'
 import { ControlHeader } from '@front/ui/components/controls/control-header'
 import { CurrencySwitch } from '@front/ui/components/controls/currency-switch'
 import { useActualDateRange } from '@front/ui/hooks/useActualDateRange'
+import { wantUTC } from '@front/helpers/wantUTC'
 
 const groupBy = GroupBy.Year
 
@@ -31,8 +32,8 @@ export const Stats = ({ className }: Props) => {
   const { from, setFrom, to, setTo, actualFrom, actualTo } = useActualDateRange(
     firstTransactionDate,
     new Date(),
-    startOfYear,
-    endOfYear,
+    wantUTC(startOfYear),
+    wantUTC(endOfYear),
   )
 
   const [currency, setCurrency] = useState(Currency.USD)

front/src/features/statistics/features/monthly/Monthly.tsx

@@ -15,6 +15,7 @@ import { GroupBy } from '@shared/enum/GroupBy'
 import { ControlHeader } from '@front/ui/components/controls/control-header'
 import { YearPicker } from '@front/ui/components/form/year-picker'
 import { getFirstTransactionDate } from '@front/domain/money/selectors/getFirstTransactionDate'
+import { wantUTC } from '@front/helpers/wantUTC'
 
 const groupBy = GroupBy.Month
 
@@ -34,7 +35,7 @@ export const Monthly = ({ className, currency }: Props) => {
   const [from, to] = useMemo(() => {
     const date = parse(`${year}-01-01`)
 
-    return [startOfYear(date), endOfYear(date)]
+    return [wantUTC(startOfYear)(date), wantUTC(endOfYear)(date)]
   }, [year])
 
   const stats = useMemoState(() => getStats(from, to, groupBy, currency), [

front/src/features/statistics/features/yearly/Yearly.tsx

@@ -15,6 +15,7 @@ import { Currency } from '@shared/enum/Currency'
 import { GroupBy } from '@shared/enum/GroupBy'
 import { ControlHeader } from '@front/ui/components/controls/control-header'
 import { useMemoState } from '@front/domain/store'
+import { wantUTC } from '@front/helpers/wantUTC'
 
 const groupBy = GroupBy.Year
 
@@ -29,10 +30,10 @@ export const Yearly = ({ className, currency }: Props) => {
   const dispatch = useThunk()
   const isSmall = useMedia({ maxWidth: 768 })
 
-  const from = useMemo(() => startOfYear(firstTransactionDate), [
+  const from = useMemo(() => wantUTC(startOfYear)(firstTransactionDate), [
     firstTransactionDate,
   ])
-  const to = useMemo(() => endOfYear(new Date()), [])
+  const to = useMemo(() => wantUTC(endOfYear)(new Date()), [])
 
   const stats = useMemoState(() => getStats(from, to, groupBy, currency), [
     from,

front/src/helpers/wantUTC.ts

@@ -0,0 +1,10 @@
+import { addHours } from 'date-fns'
+
+export const wantUTC = <T extends []>(f: (d: Date, ...args: T) => Date) => (
+  date: Date,
+  ...args: T
+) => {
+  const newDate = f(date, ...args)
+
+  return addHours(newDate, -newDate.getTimezoneOffset() / 60)
+}

front/src/ui/hooks/useActualDateRange.ts

@@ -1,5 +1,4 @@
-import { useState } from 'react'
-import { useMemo } from 'react'
+import { useState, useMemo } from 'react'
 
 export const useActualDateRange = (
   initialFrom: Date,