Fixes bug with the cache

NouanceLabs · May 25, 2023 · af4a21a · af4a21a
1 parent 30d4f9f
commit af4a21a
Show file tree

Hide file tree

Showing 9 changed files with 1,746 additions and 1,438 deletions.
diff --git a/demo/src/payload.config.ts b/demo/src/payload.config.ts
@@ -6,9 +6,9 @@ import Tags from "./collections/Tags";
 import Users from "./collections/Users";
 import Media from "./collections/Media";
 import Homepage from "./globals/Homepage";
-import dashboardAnalytics from "../../dist/index";
+import dashboardAnalytics from "../../src/index";
 
-import { PlausibleProvider, GoogleProvider } from "../../dist/types/providers";
+import { PlausibleProvider, GoogleProvider } from "../../src/types/providers";
 
 const PLAUSIBLE_API_KEY = process.env.PLAUSIBLE_API_KEY;
 const PLAUSIBLE_HOST = process.env.PLAUSIBLE_HOST;

diff --git a/demo/yarn.lock b/demo/yarn.lock
diff --git a/src/routes/getGlobalAggregate/handler.ts b/src/routes/getGlobalAggregate/handler.ts
@@ -78,8 +78,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data = await provider

diff --git a/src/routes/getGlobalChart/handler.ts b/src/routes/getGlobalChart/handler.ts
@@ -78,8 +78,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data = await provider

diff --git a/src/routes/getLive/handler.ts b/src/routes/getLive/handler.ts
@@ -62,8 +62,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data = await provider.getLiveData({});

diff --git a/src/routes/getPageAggregate/handler.ts b/src/routes/getPageAggregate/handler.ts
@@ -80,8 +80,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data: AggregateData = await provider

diff --git a/src/routes/getPageChart/handler.ts b/src/routes/getPageChart/handler.ts
@@ -86,8 +86,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data: ChartData = await provider

diff --git a/src/routes/getReport/handler.ts b/src/routes/getReport/handler.ts
@@ -84,8 +84,8 @@ const handler = (provider: ApiProvider, options: RouteOptions) => {
         if (cachedData) {
           if (
             differenceInMinutes(
-              Date.parse(cachedData.cacheTimestamp),
-              timeNow
+              timeNow,
+              Date.parse(cachedData.cacheTimestamp)
             ) > cacheLifetime
           ) {
             const data = await provider

diff --git a/yarn.lock b/yarn.lock