Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Refactor redis calls.
Mike Caod05fd2bd3d24
diff --git a/pages/api/websites/index.js b/pages/api/websites/index.jsindex 36d386606..daecac882 100644--- a/pages/api/websites/index.js+++ b/pages/api/websites/index.js@@ -25,7 +25,7 @@ export default async (req, res) => {const websites =isAdmin && include_all? await getAllWebsites()- : await getUserWebsites({ userId: account.id });+ : await getUserWebsites({ userId: account?.id });return ok(res, websites);}diff --git a/queries/admin/account/deleteAccount.js b/queries/admin/account/deleteAccount.jsindex caef8709d..9f6dd6365 100644--- a/queries/admin/account/deleteAccount.js+++ b/queries/admin/account/deleteAccount.js@@ -39,7 +39,7 @@ export async function deleteAccount(userId) {}),]).then(async res => {- if (redis.client) {+ if (redis.enabled) {for (let i = 0; i < websiteUuids.length; i++) {await redis.set(`website:${websiteUuids[i]}`, DELETED);}diff --git a/queries/admin/website/createWebsite.js b/queries/admin/website/createWebsite.jsindex 7a45f1cfd..22ac50c61 100644--- a/queries/admin/website/createWebsite.js+++ b/queries/admin/website/createWebsite.js@@ -14,8 +14,8 @@ export async function createWebsite(userId, data) {},}).then(async res => {- if (redis.client && res) {- await redis.client.set(`website:${res.websiteUuid}`, res.id);+ if (redis.enabled && res) {+ await redis.set(`website:${res.websiteUuid}`, res.id);}return res;diff --git a/queries/admin/website/deleteWebsite.js b/queries/admin/website/deleteWebsite.jsindex f08dc63e9..4eb4d97b2 100644--- a/queries/admin/website/deleteWebsite.js+++ b/queries/admin/website/deleteWebsite.js@@ -21,8 +21,8 @@ export async function deleteWebsite(websiteUuid) {where: { websiteUuid },}),]).then(async res => {- if (redis.client) {- await redis.client.set(`website:${websiteUuid}`, DELETED);+ if (redis.enabled) {+ await redis.set(`website:${websiteUuid}`, DELETED);}return res;diff --git a/queries/admin/website/getWebsite.js b/queries/admin/website/getWebsite.jsindex d33c9eadd..6c109ff7d 100644--- a/queries/admin/website/getWebsite.js+++ b/queries/admin/website/getWebsite.js@@ -8,7 +8,7 @@ export async function getWebsite(where) {}).then(async data => {if (redis.enabled && data) {- await redis.client.set(`website:${data.websiteUuid}`, data.id);+ await redis.set(`website:${data.websiteUuid}`, data.id);}return data;diff --git a/queries/analytics/session/createSession.js b/queries/analytics/session/createSession.jsindex c851eb0a6..824ed2528 100644--- a/queries/analytics/session/createSession.js+++ b/queries/analytics/session/createSession.js@@ -30,8 +30,8 @@ async function relationalQuery(websiteId, data) {},}).then(async res => {- if (redis.client && res) {- await redis.client.set(`session:${res.sessionUuid}`, 1);+ if (redis.enabled && res) {+ await redis.set(`session:${res.sessionUuid}`, 1);}return res;@@ -59,7 +59,7 @@ async function clickhouseQuery(await sendMessage(params, 'event');- if (redis.client) {- await redis.client.set(`session:${sessionUuid}`, 1);+ if (redis.enabled) {+ await redis.set(`session:${sessionUuid}`, 1);}}diff --git a/queries/analytics/session/getSessionByUuid.js b/queries/analytics/session/getSessionByUuid.jsindex 638891cbb..2bb29c018 100644--- a/queries/analytics/session/getSessionByUuid.js+++ b/queries/analytics/session/getSessionByUuid.js@@ -18,8 +18,8 @@ async function relationalQuery(sessionUuid) {},}).then(async res => {- if (redis.client && res) {- await redis.client.set(`session:${res.sessionUuid}`, 1);+ if (redis.enabled && res) {+ await redis.set(`session:${res.sessionUuid}`, 1);}return res;@@ -48,8 +48,8 @@ async function clickhouseQuery(sessionUuid) {).then(result => findFirst(result)).then(async res => {- if (redis.client && res) {- await redis.client.set(`session:${res.session_uuid}`, 1);+ if (redis.enabled && res) {+ await redis.set(`session:${res.session_uuid}`, 1);}return res;