Merge pull request #3 from UNICEFECAR/feature/US-387-cache-client-data

FEATURE: Cache User + Client data
UNICEFECAR · Jan 19, 2023 · 33ea125 · 33ea125
2 parents 33c62c1 + b017a97
commit 33ea125
Show file tree

Hide file tree

Showing 8 changed files with 276 additions and 28 deletions.
diff --git a/service/.env.sample b/service/.env.sample
@@ -7,4 +7,6 @@ PORT=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
-AWS_BUCKET_NAME=
+AWS_BUCKET_NAME=
+
+REDIS_CACHE=
diff --git a/service/controllers/clients.js b/service/controllers/clients.js
@@ -13,6 +13,7 @@ import {
 } from "#queries/clients";
 
 import { clientNotFound, incorrectPassword, emailUsed } from "#utils/errors";
+import { deleteCacheItem } from "#utils/cache";
 
 const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
 const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
@@ -40,6 +41,7 @@ export const updateClientData = async ({
   country,
   language,
   client_id,
+  user_id,
   name,
   surname,
   nickname,
@@ -77,10 +79,13 @@ export const updateClientData = async ({
     yearOfBirth,
     urbanRural,
   })
-    .then((res) => {
+    .then(async (res) => {
       if (res.rowCount === 0) {
         throw clientNotFound(language);
       } else {
+        const cacheKey = `client_${country}_${user_id}`;
+        await deleteCacheItem(cacheKey);
+
         return res.rows[0];
       }
     })
@@ -145,6 +150,9 @@ export const deleteClientData = async ({
           }
         }
 
+        const cacheKey = `client_${country}_${user_id}`;
+        await deleteCacheItem(cacheKey);
+
         return res.rows[0];
       }
     })
@@ -157,17 +165,21 @@ export const updateClientImage = async ({
   country,
   language,
   client_id,
+  user_id,
   image,
 }) => {
   return await updateClientImageQuery({
     poolCountry: country,
     client_id,
     image,
   })
-    .then((res) => {
+    .then(async (res) => {
       if (res.rowCount === 0) {
         throw clientNotFound(language);
       } else {
+        const cacheKey = `client_${country}_${user_id}`;
+        await deleteCacheItem(cacheKey);
+
         return res.rows[0];
       }
     })
@@ -176,15 +188,23 @@ export const updateClientImage = async ({
     });
 };
 
-export const deleteClientImage = async ({ country, language, client_id }) => {
+export const deleteClientImage = async ({
+  country,
+  language,
+  client_id,
+  user_id,
+}) => {
   return await deleteClientImageQuery({
     poolCountry: country,
     client_id,
   })
-    .then((res) => {
+    .then(async (res) => {
       if (res.rowCount === 0) {
         throw clientNotFound(language);
       } else {
+        const cacheKey = `client_${country}_${user_id}`;
+        await deleteCacheItem(cacheKey);
+
         return res.rows[0];
       }
     })
@@ -197,17 +217,21 @@ export const updateClientDataProcessing = async ({
   country,
   language,
   client_id,
+  user_id,
   dataProcessing,
 }) => {
   return await updateClientDataProcessingQuery({
     poolCountry: country,
     client_id,
     dataProcessing,
   })
-    .then((res) => {
+    .then(async (res) => {
       if (res.rowCount === 0) {
         throw clientNotFound(language);
       } else {
+        const cacheKey = `client_${country}_${user_id}`;
+        await deleteCacheItem(cacheKey);
+
         return res.rows[0];
       }
     })

diff --git a/service/middlewares/populateMiddleware.js b/service/middlewares/populateMiddleware.js
@@ -2,22 +2,30 @@ import { getClientByUserID } from "#queries/clients";
 import { getUserByID } from "#queries/users";
 
 import { clientNotFound } from "#utils/errors";
+import { getCacheItem, setCacheItem } from "#utils/cache";
 
 export const populateClient = async (req, res, next) => {
   const country = req.header("x-country-alpha-2");
   const user_id = req.header("x-user-id");
 
-  const client = await getClientByUserID(country, user_id)
-    .then((res) => res.rows[0])
-    .catch((err) => {
-      throw err;
-    });
+  const cacheKey = `client_${country}_${user_id}`;
+  const cachedClientData = await getCacheItem(cacheKey);
 
-  if (!client) {
-    return next(clientNotFound(country));
-  }
+  if (cachedClientData) req.client = cachedClientData;
+  else {
+    const client = await getClientByUserID(country, user_id)
+      .then((res) => res.rows[0])
+      .catch((err) => {
+        throw err;
+      });
+
+    if (!client) {
+      return next(clientNotFound(country));
+    }
 
-  req.client = client;
+    await setCacheItem(cacheKey, client, 60 * 60 * 2); // cache data for 2 hours
+    req.client = client;
+  }
 
   return next();
 };
@@ -26,13 +34,20 @@ export const populateUser = async (req, res, next) => {
   const country = req.header("x-country-alpha-2");
   const user_id = req.header("x-user-id");
 
-  const user = await getUserByID(country, user_id)
-    .then((res) => res.rows[0])
-    .catch((err) => {
-      throw err;
-    });
+  const cacheKey = `user_${country}_${user_id}`;
+  const cachedUserData = await getCacheItem(cacheKey);
 
-  req.user = user;
+  if (cachedUserData) req.user = cachedUserData;
+  else {
+    const user = await getUserByID(country, user_id)
+      .then((res) => res.rows[0])
+      .catch((err) => {
+        throw err;
+      });
+
+    await setCacheItem(cacheKey, user, 60 * 60 * 2); // cache data for 2 hours
+    req.user = user;
+  }
 
   return next();
 };