📈 perf(cache): rEAD ALL CONFIG THROUGH CACHE!!!

dashpresshq · Dec 11, 2023 · 9e48cc0 · 9e48cc0
1 parent 9e43fe8
commit 9e48cc0
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 33 deletions.
diff --git a/src/backend/lib/cache/AbstractCacheService.ts b/src/backend/lib/cache/AbstractCacheService.ts
@@ -1,4 +1,3 @@
-import { isNotEmpty } from "class-validator";
 import { ConfigApiService } from "../config/config.service";
 
 export abstract class AbstractCacheService {
@@ -10,8 +9,8 @@ export abstract class AbstractCacheService {
 
   public abstract setup(): Promise<void>;
 
-  protected prefixKey(key: string) {
-    return `__dashpress__:${key}`;
+  private prefixKey(key: string) {
+    return `__dp__:${key}`;
   }
 
   abstract pullItem<T>(key: string): Promise<T | undefined>;
@@ -27,13 +26,13 @@ export abstract class AbstractCacheService {
 
     const data = await this.pullItem<T>(key);
 
-    if (isNotEmpty(data)) {
+    if (data !== undefined) {
       return data;
     }
 
     const fetchedData = await fetcher();
 
-    await this.persistData(key, fetchedData);
+    await this.persistData(key, fetchedData || null);
 
     return fetchedData;
   }

diff --git a/src/backend/lib/cache/MemoryCacheAdaptor.ts b/src/backend/lib/cache/MemoryCacheAdaptor.ts
@@ -27,7 +27,7 @@ export class MemoryCacheAdaptor extends AbstractCacheService {
   }
 
   async clearItem(key: string) {
-    delete this.getData()[this.prefixKey(key)];
+    delete this.getData()[key];
   }
 
   async purge() {

diff --git a/src/backend/lib/cache/RedisCacheAdaptor.ts b/src/backend/lib/cache/RedisCacheAdaptor.ts
@@ -39,7 +39,7 @@ export class RedisCacheAdaptor extends AbstractCacheService {
   }
 
   async clearItem(key: string) {
-    await (await this.getRedisInstance()).del(this.prefixKey(key));
+    await (await this.getRedisInstance()).del(key);
   }
 
   async purge() {

diff --git a/src/backend/lib/config-persistence/AbstractConfigDataPersistenceService.ts b/src/backend/lib/config-persistence/AbstractConfigDataPersistenceService.ts
@@ -1,7 +1,10 @@
+import { createCacheService } from "../cache";
 import { ConfigApiService } from "../config/config.service";
 import { NotFoundError } from "../errors";
 import { ConfigDomain } from "./types";
 
+const cacheService = createCacheService();
+
 export abstract class AbstractConfigDataPersistenceService<T> {
   protected readonly _configDomain!: ConfigDomain;
 
@@ -21,7 +24,27 @@ export abstract class AbstractConfigDataPersistenceService<T> {
     return `${key}__${secondaryKey}`;
   }
 
-  public abstract getItem(key: string): Promise<T | undefined>;
+  public abstract _getItem(key: string): Promise<T | undefined>; //
+
+  public abstract _persistItem(key: string, data: T): Promise<void>; //
+
+  public abstract _removeItem(key: string): Promise<void>; //
+
+  public async getItem(key: string) {
+    return await cacheService.getItem(key, async () => {
+      return this._getItem(key);
+    });
+  }
+
+  public async persistItem(key: string, data: T) {
+    await cacheService.clearItem(key);
+    await this._persistItem(key, data);
+  }
+
+  public async removeItem(key: string) {
+    await cacheService.clearItem(key);
+    await this._removeItem(key);
+  }
 
   public abstract getItemLastUpdated(key: string): Promise<Date>;
 
@@ -39,8 +62,6 @@ export abstract class AbstractConfigDataPersistenceService<T> {
 
   public abstract getAllItems(): Promise<T[]>;
 
-  public abstract persistItem(key: string, data: T): Promise<void>;
-
   public async upsertItem(key: string, data: T): Promise<void> {
     await this.persistItem(key, data);
   }
@@ -49,8 +70,6 @@ export abstract class AbstractConfigDataPersistenceService<T> {
     await this.persistItem(key, data);
   }
 
-  public abstract removeItem(key: string): Promise<void>; //
-
   public async resetState(keyField: keyof T, data: T[]) {
     await this.resetToEmpty();
     await this.saveAllItems(keyField, data);

diff --git a/src/backend/lib/config-persistence/DatabaseConfigDataPersistenceAdaptor.ts b/src/backend/lib/config-persistence/DatabaseConfigDataPersistenceAdaptor.ts
@@ -94,7 +94,7 @@ export class DatabaseConfigDataPersistenceAdaptor<
     );
   }
 
-  async getItem(key: string) {
+  async _getItem(key: string) {
     const connection = await this.getDbInstance();
     const queryResponse = await connection
       .table(CONFIG_TABLE_NAME)
@@ -129,7 +129,7 @@ export class DatabaseConfigDataPersistenceAdaptor<
     }
   }
 
-  async persistItem(key: string, value: T) {
+  async _persistItem(key: string, value: T) {
     const affectedRowsCount = await (
       await this.getDbInstance()
     )(CONFIG_TABLE_NAME)
@@ -152,7 +152,7 @@ export class DatabaseConfigDataPersistenceAdaptor<
     }
   }
 
-  async removeItem(key: string): Promise<void> {
+  async _removeItem(key: string): Promise<void> {
     await (
       await this.getDbInstance()
     )(CONFIG_TABLE_NAME)

diff --git a/src/backend/lib/config-persistence/JsonFileConfigDataPersistenceAdaptor.ts b/src/backend/lib/config-persistence/JsonFileConfigDataPersistenceAdaptor.ts
@@ -71,7 +71,7 @@ export class JsonFileConfigDataPersistenceAdaptor<
     );
   }
 
-  async getItem(key: string) {
+  async _getItem(key: string) {
     const allIndexedItems = await this.getDomainData();
     const currentItem = allIndexedItems[key];
     if (currentItem) {
@@ -80,13 +80,13 @@ export class JsonFileConfigDataPersistenceAdaptor<
     return undefined;
   }
 
-  async persistItem(key: string, data: T) {
+  async _persistItem(key: string, data: T) {
     const allIndexedItems = await this.getDomainData();
     allIndexedItems[key] = data;
     await this.persist(allIndexedItems);
   }
 
-  async removeItem(key: string): Promise<void> {
+  async _removeItem(key: string): Promise<void> {
     const allIndexedItems = await this.getDomainData();
     delete allIndexedItems[key];
     await this.persist(allIndexedItems);

diff --git a/src/backend/lib/config-persistence/MemoryConfigDataPersistenceAdaptor.ts b/src/backend/lib/config-persistence/MemoryConfigDataPersistenceAdaptor.ts
@@ -56,7 +56,7 @@ export class MemoryConfigDataPersistenceAdaptor<
     );
   }
 
-  async getItem(key: string) {
+  async _getItem(key: string) {
     const currentItem = MemoryConfigDataPersistenceAdaptor.getDomainData(
       this._configDomain
     )[key];
@@ -66,15 +66,15 @@ export class MemoryConfigDataPersistenceAdaptor<
     return undefined;
   }
 
-  async persistItem(key: string, data: T) {
+  async _persistItem(key: string, data: T) {
     const domainData = MemoryConfigDataPersistenceAdaptor.getDomainData(
       this._configDomain
     );
     domainData[key] = data;
     this.persistDomainData(domainData);
   }
 
-  public async removeItem(key: string): Promise<void> {
+  async _removeItem(key: string): Promise<void> {
     const domainData = MemoryConfigDataPersistenceAdaptor.getDomainData(
       this._configDomain
     );

diff --git a/src/backend/lib/config-persistence/RedisConfigDataPersistenceAdaptor.ts b/src/backend/lib/config-persistence/RedisConfigDataPersistenceAdaptor.ts
@@ -72,21 +72,21 @@ export class RedisConfigDataPersistenceAdaptor<
     );
   }
 
-  async getItem(key: string) {
+  async _getItem(key: string) {
     return JSON.parse(
       await (
         await this.getRedisInstance()
       ).hGet(this.wrapWithConfigDomain(), key)
     );
   }
 
-  async persistItem(key: string, data: T) {
+  async _persistItem(key: string, data: T) {
     await (
       await this.getRedisInstance()
     ).hSet(this.wrapWithConfigDomain(), { [key]: JSON.stringify(data) });
   }
 
-  public async removeItem(key: string): Promise<void> {
+  async _removeItem(key: string): Promise<void> {
     await (
       await this.getRedisInstance()
     ).hDel(this.wrapWithConfigDomain(), key);

diff --git a/src/frontend/lib/storage/app.ts b/src/frontend/lib/storage/app.ts
@@ -1,7 +1,7 @@
 import { sluggify } from "shared/lib/strings";
 import { StorageService } from ".";
 
-const PREFIX = "_app_config__";
+const PREFIX = "__dp__";
 
 const makeKey = (key: string): string => {
   return sluggify(`${PREFIX}${key}`, "_");

diff --git a/src/frontend/views/data/Details/RelationsDetails.tsx b/src/frontend/views/data/Details/RelationsDetails.tsx
@@ -124,7 +124,9 @@ export function EntityRelationDetails() {
         <SectionBox
           title={title}
           isLoading={
-            entityDataReference.isLoading || entityDataReference.isIdle
+            entityDataReference.isLoading ||
+            entityDataReference.isIdle ||
+            dataDetails.isLoading
           }
           backLink={backLink}
           actionButtons={actionButtons}

diff --git a/src/frontend/views/data/Details/index.tsx b/src/frontend/views/data/Details/index.tsx
@@ -38,7 +38,7 @@ export function EntityDetails() {
     entity,
     id,
     redirectAfterDelete: NAVIGATION_LINKS.ENTITY.TABLE(entity),
-    exclude: ["table"],
+    exclude: ["details"],
   });
 
   const portalActionButtons = usePortalActionButtons({

diff --git a/src/frontend/views/data/Table/useTableColumns.tsx b/src/frontend/views/data/Table/useTableColumns.tsx
@@ -67,14 +67,9 @@ const buildFilterConfigFromType = (prop: {
   entityFieldSelections: IColorableSelection[];
   isIdField: boolean;
   referenceField?: string;
-  lean?: true; // TODO is it in use?
 }): TableFilterType | undefined => {
-  const { entityType, entityFieldSelections, isIdField, referenceField, lean } =
-    prop;
+  const { entityType, entityFieldSelections, isIdField, referenceField } = prop;
 
-  if (lean) {
-    return undefined;
-  }
   if (isIdField) {
     return {
       _type: "idField",