use local date in resetDate and getState #6

Author: a-p-z

src/__tests__/datetime/datetime.spec.ts

@@ -7,8 +7,10 @@ jest.mock("../../hass");
 const setDatetimeServiceFactoryMock = setDatetimeServiceFactory as jest.MockedFunction<typeof setDatetimeServiceFactory>
 
 describe("datetime", () => {
-    const yesterday = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString().split("T")[0];
-    const tenDaysAgo = new Date(Date.now() - 10 * 24 * 60 * 60 * 1000).toISOString().split("T")[0];
+    const tzOffset = new Date().getTimezoneOffset() * 60000;
+    const localDateTime = Date.now() - tzOffset;
+    const yesterday = new Date(localDateTime - 24 * 60 * 60 * 1000).toISOString().split("T")[0];
+    const tenDaysAgo = new Date(localDateTime - 10 * 24 * 60 * 60 * 1000).toISOString().split("T")[0];
 
     [
         { hass: undefined, entity: undefined, expected: 0 },

src/datetime/datetime.ts

@@ -4,20 +4,24 @@ import { setDatetimeServiceFactory } from "../hass";
 const MS_IN_A_DAY = 1000 * 60 * 60 * 24;
 
 function getState(hass: IHass, entity: IEntity): number {
-    const date = Date.parse(hass?.states?.[entity?.id]?.state) || Date.now();
-    return Math.floor((Date.now() - date) / MS_IN_A_DAY);
+    const tzOffset = new Date().getTimezoneOffset() * 60000;
+    const localDateTime = Date.now() - tzOffset;
+    const date = Date.parse(hass?.states?.[entity?.id]?.state) || localDateTime;
+    return Math.floor((localDateTime - date) / MS_IN_A_DAY);
 }
 
 function resetDate($event: Event, hass: IHass, entity: IEntity): void {
     const friendly_name = hass.states[entity.id].attributes.friendly_name;
     const entity_id = entity.id;
-    const date = new Date().toISOString().split("T")[0];
+    const tzOffset = new Date().getTimezoneOffset() * 60000;
+    const localDateTime = new Date(Date.now() - tzOffset);
+    const localDate = localDateTime.toISOString().split("T")[0];
     const confirmation = `Do you want to reset ${friendly_name}?`;
     const element = setDatetimeServiceFactory(
         hass,
         confirmation,
         entity_id,
-        date
+        localDate
     );
     (<any>$event.target).appendChild(element);
     (<any>element).buttonTapped();