electerious · Nesci28 · Oct 4, 2023
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,5 @@ dist/*
 
 # Vercel
 .vercel
+
+/docker
diff --git a/dist/index.css b/dist/index.css
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/database/actions.js b/src/database/actions.js
@@ -12,6 +12,7 @@ const intervals = require('../constants/intervals')
 const createArray = require('../utils/createArray')
 const matchesDate = require('../utils/matchesDate')
 const recursiveId = require('../utils/recursiveId')
+const convertTimezoneToOffset = require('../utils/convertTimezoneToOffset')
 
 const response = (entry) => ({
 	id: entry.id,
@@ -70,7 +71,7 @@ const getChart = async (ids, type, interval, limit, dateDetails) => {
 			// Database entries include the day, month and year in the
 			// timezone of the user. We therefore need to match it against a
 			// date in the timezone of the user.
-			const userZonedDate = utcToZonedTime(date, dateDetails.userTimeZone)
+			const userZonedDate = utcToZonedTime(date, convertTimezoneToOffset(dateDetails.userTimeZone))
 
 			// Find a entry that matches the date
 			const entry = entries.find((entry) => {

diff --git a/src/database/durations.js b/src/database/durations.js
@@ -8,6 +8,7 @@ const intervals = require('../constants/intervals')
 const createArray = require('../utils/createArray')
 const matchesDate = require('../utils/matchesDate')
 const recursiveId = require('../utils/recursiveId')
+const convertTimezoneToOffset = require('../utils/convertTimezoneToOffset')
 
 const get = async (ids, interval, limit, dateDetails) => {
 	const aggregation = (() => {
@@ -25,7 +26,7 @@ const get = async (ids, interval, limit, dateDetails) => {
 			// Database entries include the day, month and year in the
 			// timezone of the user. We therefore need to match it against a
 			// date in the timezone of the user.
-			const userZonedDate = utcToZonedTime(date, dateDetails.userTimeZone)
+			const userZonedDate = utcToZonedTime(date, convertTimezoneToOffset(dateDetails.userTimeZone))
 
 			// Find a entry that matches the date
 			const entry = entries.find((entry) => {

diff --git a/src/database/views.js b/src/database/views.js
@@ -9,6 +9,7 @@ const intervals = require('../constants/intervals')
 const createArray = require('../utils/createArray')
 const matchesDate = require('../utils/matchesDate')
 const recursiveId = require('../utils/recursiveId')
+const convertTimezoneToOffset = require('../utils/convertTimezoneToOffset')
 
 const get = async (ids, type, interval, limit, dateDetails) => {
 	const aggregation = (() => {
@@ -27,7 +28,7 @@ const get = async (ids, type, interval, limit, dateDetails) => {
 			// Database entries include the day, month and year in the
 			// timezone of the user. We therefore need to match it against a
 			// date in the timezone of the user.
-			const userZonedDate = utcToZonedTime(date, dateDetails.userTimeZone)
+			const userZonedDate = utcToZonedTime(date, convertTimezoneToOffset(dateDetails.userTimeZone))
 
 			// Find a entry that matches the date
 			const entry = entries.find((entry) => {

diff --git a/src/utils/convertTimezoneToOffset.js b/src/utils/convertTimezoneToOffset.js
@@ -0,0 +1,14 @@
+'use strict'
+
+const { getTimezoneOffset, format } = require('date-fns-tz')
+
+const formatMsToOffset = (ms) => {
+	const isPositive = ms >= 0
+	const formatted = format(ms, 'hh:mm')
+	return `${ isPositive ? '+' : '-' }${ formatted }`
+}
+
+module.exports = (timezone) => {
+	const offset = getTimezoneOffset(timezone)
+	return offset ? formatMsToOffset(offset) : '+00:00'
+}
diff --git a/yarn.lock b/yarn.lock