From a376eb9b51db656f5fa2c6642bbda0fb22a9a6d8 Mon Sep 17 00:00:00 2001
From: Matti Nannt <mail@matthiasnannt.com>
Date: Fri, 17 Nov 2023 20:15:17 +0100
Subject: [PATCH] fix: caching issue by simplifying person service (#1636)

---
 packages/lib/person/service.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/lib/person/service.ts b/packages/lib/person/service.ts
index 03bf5857e3..178f8031d7 100644
--- a/packages/lib/person/service.ts
+++ b/packages/lib/person/service.ts
@@ -181,7 +181,8 @@ export const createPerson = async (environmentId: string, userId: string): Promi
 
     personCache.revalidate({
       id: transformedPerson.id,
-      environmentId: transformedPerson.environmentId,
+      environmentId,
+      userId,
     });
 
     return transformedPerson;
@@ -347,7 +348,7 @@ export const getPersonByUserId = async (userId: string, environmentId: string):
 
       personCache.revalidate({
         id: personWithUserIdAttribute.id,
-        environmentId: personWithUserIdAttribute.environmentId,
+        environmentId,
         userId,
       });
 
@@ -355,7 +356,11 @@ export const getPersonByUserId = async (userId: string, environmentId: string):
     },
     [`getPersonByUserId-${userId}-${environmentId}`],
     {
-      tags: [personCache.tag.byEnvironmentIdAndUserId(environmentId, userId)],
+      tags: [
+        personCache.tag.byEnvironmentIdAndUserId(environmentId, userId),
+        personCache.tag.byUserId(userId), // fix for caching issue on vercel
+        personCache.tag.byEnvironmentId(environmentId), // fix for caching issue on vercel
+      ],
       revalidate: SERVICES_REVALIDATION_INTERVAL,
     }
   )();
@@ -391,7 +396,7 @@ export const getOrCreatePersonByUserId = async (userId: string, environmentId: s
 
       personCache.revalidate({
         id: personPrisma.id,
-        environmentId: personPrisma.environmentId,
+        environmentId,
         userId,
       });