fix week count calculation

src/server/api/routers/habit.ts

@@ -25,6 +25,21 @@ export async function getUserTimezoneOffsetFromHid(
   return getTimezoneOffset(timezone);
 }
 
+export async function getUserTime(hid: string) {
+  const ctx = createInnerTRPCContext({ session: null });
+
+  const res = await ctx.prisma.habit.findFirst({
+    where: { id: hid },
+    select: { user: true },
+  });
+
+  const timezone = !res ? "America/New_York" : res.user.timezone;
+
+  return (date: Date) => {
+    return utcToZonedTime(date, timezone);
+  };
+}
+
 type LoggedOnDateInput = {
   hid: string;
   date?: Date;
@@ -53,7 +68,6 @@ async function loggedOnDate({
   const ctx = createInnerTRPCContext({ session: null });
 
   if (startTime && endTime) {
-    console.log("checking start and time: ", { startTime, endTime });
     const log = await ctx.prisma.habitLog.findFirst({
       where: {
         habitId: hid,

src/server/api/routers/stats.ts

@@ -9,6 +9,7 @@ import {
 import { createTRPCRouter, publicProcedure } from "../trpc";
 import { addMilliseconds, subDays, subMilliseconds } from "date-fns";
 import { getTimezoneOffset, utcToZonedTime, zonedTimeToUtc } from "date-fns-tz";
+import { getUserTime } from "./habit";
 
 export const statsRouter = createTRPCRouter({
   /**
@@ -134,6 +135,7 @@ export const statsRouter = createTRPCRouter({
     .input(z.object({ hid: z.string().array() }))
     .query(async ({ ctx, input }) => {
       const { hid } = input;
+      const getLocalTime = await getUserTime(hid[0] ?? "");
 
       const res: { [key: string]: number[] } = {};
 
@@ -150,7 +152,7 @@ export const statsRouter = createTRPCRouter({
 
         for (const log of logs) {
           // Get the day of the week (0-6) where 0 is monday and 6 is sunday.
-          const day = (log.date.getDay() + 6) % 7;
+          const day = (getLocalTime(log.date).getDay() + 6) % 7;
 
           data[day]++;
         }