Remove duplicated types from the scheme

Adrinalin4ik · Feb 21, 2023 · 3c6345c · 3c6345c
1 parent bd85900
commit 3c6345c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/dist-lib/filters/input-type-generator.js b/dist-lib/filters/input-type-generator.js
diff --git a/dist-lib/filters/input-type-generator.js.map b/dist-lib/filters/input-type-generator.js.map
diff --git a/lib/filters/input-type-generator.ts b/lib/filters/input-type-generator.ts
@@ -47,8 +47,9 @@ const filterFullTypes = new Map();
 const filterTypes = new Map();
 const propertyTypes = new Map()
 
-const generateFilterPropertyType = (field, parentName: string) => {
-  const key = `${standardize(field.name)}_${parentName}_${InputMapPrefixes.PropertyFilterInputType}`;
+const generateFilterPropertyType = (field) => {
+  const typeName = field.typeFn && field.typeFn()?.name;
+  const key = `${standardize(typeName)}_${InputMapPrefixes.PropertyFilterInputType}`;
 
   const propType = propertyTypes.get(key);
   if (propType) return propType;
@@ -138,7 +139,7 @@ function generateFilterInputType<T extends BaseEntity>(classes: T[], name: strin
       if (typeof field.typeFn === 'function') {
         field.typeFn();
       }
-      const fieldType = generateFilterPropertyType(field, name);
+      const fieldType = generateFilterPropertyType(field);
       Field(() => fieldType, {nullable: true})(PartialObjectType.prototype, field.name)
     } else {
       // Relations are not supported yet