Revert "fix: related entity schema"

cellajs · Feb 21, 2025 · b4211f8 · b4211f8
1 parent 41c5dd6
commit b4211f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/backend/src/modules/organizations/routes.ts b/backend/src/modules/organizations/routes.ts
@@ -13,9 +13,9 @@ import {
   createOrganizationBodySchema,
   getOrganizationsQuerySchema,
   membershipsCountSchema,
-  organizationRelatedEntitiesCountSchema,
   organizationSchema,
   organizationWithMembershipSchema,
+  relatedEntitiesCountSchema,
   sendNewsletterBodySchema,
   updateOrganizationBodySchema,
 } from './schema';
@@ -120,9 +120,7 @@ class OrganizationRouteConfig {
         content: {
           'application/json': {
             schema: successWithDataSchema(
-              organizationSchema.extend({
-                counts: z.object({ ...membershipsCountSchema.shape, ...organizationRelatedEntitiesCountSchema().shape }),
-              }),
+              organizationSchema.extend({ counts: z.object({ ...membershipsCountSchema.shape, ...relatedEntitiesCountSchema.shape }) }),
             ),
           },
         },

diff --git a/backend/src/modules/organizations/schema.ts b/backend/src/modules/organizations/schema.ts
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { config } from 'config';
 import { createInsertSchema, createSelectSchema } from 'drizzle-zod';
 import { organizationsTable } from '#/db/schema/organizations';
-import { type ValidEntityTypes, hasField } from '#/utils/counts';
+import type { ValidEntityTypes } from '#/utils/counts';
 import {
   languageSchema,
   paginationQuerySchema,
@@ -23,22 +23,19 @@ export const membershipsCountSchema = z.object({
   }),
 });
 
-/**
- * Example schema demonstrating how to retrieve related entity counts.
- * It dynamically constructs a Zod schema for entities that reference an `organizationId` in their table.
+/** Type assertion to avoid "ReferenceError: Buffer is not defined" when using `hasField`.
+ * Redundant fields will be filtered out in `getRelatedEntityCounts`.
  */
-export const organizationRelatedEntitiesCountSchema = () => {
-  const filteredEntities = [...config.productEntityTypes, ...config.contextEntityTypes].filter((type) => hasField(type, 'organizationId'));
-  return z.object(
-    filteredEntities.reduce(
-      (acc, key) => {
-        acc[key] = z.number();
-        return acc;
-      },
-      {} as Record<ValidEntityTypes<'organizationId'>, z.ZodNumber>,
-    ),
-  );
-};
+//TODO: find way to fix ?
+export const relatedEntitiesCountSchema = z.object(
+  [...config.productEntityTypes, ...config.contextEntityTypes].reduce(
+    (acc, key) => {
+      acc[key as ValidEntityTypes<'organizationId'>] = z.number();
+      return acc;
+    },
+    {} as Record<ValidEntityTypes<'organizationId'>, z.ZodNumber>,
+  ),
+);
 
 export const organizationSchema = z.object({
   ...createSelectSchema(organizationsTable).shape,

diff --git a/backend/src/utils/counts.ts b/backend/src/utils/counts.ts
@@ -129,7 +129,7 @@ export type ValidEntityTypes<T extends string> = Extract<
 >;
 
 // Generic type guard function for filtering based on a dynamic field name 'T'
-export const hasField = <T extends string>(entityType: ProductEntity | ContextEntity, field: T): entityType is ValidEntityTypes<T> => {
+const hasField = <T extends string>(entityType: ProductEntity | ContextEntity, field: T): entityType is ValidEntityTypes<T> => {
   const table = entityTables[entityType];
   return field in table;
 };