5582 get httpsapitwentycomrestmetadata objects filters dont work

packages/twenty-server/src/engine/api/rest/controllers/rest-api-core-batch.controller.ts → packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core-batch.controller.ts

@@ -2,7 +2,7 @@ import { Controller, Post, Req, Res } from '@nestjs/common';
 
 import { Request, Response } from 'express';
 
-import { RestApiCoreService } from 'src/engine/api/rest/services/rest-api-core.service';
+import { RestApiCoreService } from 'src/engine/api/rest/core/rest-api-core.service';
 import { cleanGraphQLResponse } from 'src/engine/api/rest/utils/clean-graphql-response.utils';
 
 @Controller('rest/batch/*')

packages/twenty-server/src/engine/api/rest/controllers/rest-api-core.controller.ts → packages/twenty-server/src/engine/api/rest/core/controllers/rest-api-core.controller.ts

@@ -11,7 +11,7 @@ import {
 
 import { Request, Response } from 'express';
 
-import { RestApiCoreService } from 'src/engine/api/rest/services/rest-api-core.service';
+import { RestApiCoreService } from 'src/engine/api/rest/core/rest-api-core.service';
 import { cleanGraphQLResponse } from 'src/engine/api/rest/utils/clean-graphql-response.utils';
 
 @Controller('rest/*')

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/core-query-builder.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/core-query-builder.factory.ts

@@ -2,24 +2,24 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 
 import { Request } from 'express';
 
-import { DeleteQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/delete-query.factory';
+import { DeleteQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/delete-query.factory';
 import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
 import { TokenService } from 'src/engine/core-modules/auth/services/token.service';
-import { CreateOneQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/create-one-query.factory';
-import { UpdateQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/update-query.factory';
-import { FindOneQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/find-one-query.factory';
-import { FindManyQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/find-many-query.factory';
-import { DeleteVariablesFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/delete-variables.factory';
-import { CreateVariablesFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/create-variables.factory';
-import { UpdateVariablesFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/update-variables.factory';
-import { GetVariablesFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/get-variables.factory';
-import { parseCorePath } from 'src/engine/api/rest/rest-api-core-query-builder/utils/path-parsers/parse-core-path.utils';
-import { computeDepth } from 'src/engine/api/rest/rest-api-core-query-builder/utils/compute-depth.utils';
+import { CreateOneQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/create-one-query.factory';
+import { UpdateQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/update-query.factory';
+import { FindOneQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/find-one-query.factory';
+import { FindManyQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/find-many-query.factory';
+import { DeleteVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/delete-variables.factory';
+import { CreateVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/create-variables.factory';
+import { UpdateVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/update-variables.factory';
+import { GetVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/get-variables.factory';
+import { parseCorePath } from 'src/engine/api/rest/core/query-builder/utils/path-parsers/parse-core-path.utils';
+import { computeDepth } from 'src/engine/api/rest/core/query-builder/utils/compute-depth.utils';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { Query } from 'src/engine/api/rest/types/query.type';
+import { Query } from 'src/engine/api/rest/core/types/query.type';
 import { EnvironmentService } from 'src/engine/integrations/environment/environment.service';
-import { CreateManyQueryFactory } from 'src/engine/api/rest/rest-api-core-query-builder/factories/create-many-query.factory';
-import { parseCoreBatchPath } from 'src/engine/api/rest/rest-api-core-query-builder/utils/path-parsers/parse-core-batch-path.utils';
+import { CreateManyQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/create-many-query.factory';
+import { parseCoreBatchPath } from 'src/engine/api/rest/core/query-builder/utils/path-parsers/parse-core-batch-path.utils';
 
 @Injectable()
 export class CoreQueryBuilderFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/core-query-builder.module.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/core-query-builder.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { CoreQueryBuilderFactory } from 'src/engine/api/rest/rest-api-core-query-builder/core-query-builder.factory';
-import { coreQueryBuilderFactories } from 'src/engine/api/rest/rest-api-core-query-builder/factories/factories';
+import { CoreQueryBuilderFactory } from 'src/engine/api/rest/core/query-builder/core-query-builder.factory';
+import { coreQueryBuilderFactories } from 'src/engine/api/rest/core/query-builder/factories/factories';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
 import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
 

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/create-many-query.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/create-many-query.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class CreateManyQueryFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/create-one-query.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/create-one-query.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class CreateOneQueryFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/create-variables.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/create-variables.factory.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { Request } from 'express';
 
-import { QueryVariables } from 'src/engine/api/rest/types/query-variables.type';
+import { QueryVariables } from 'src/engine/api/rest/core/types/query-variables.type';
 
 @Injectable()
 export class CreateVariablesFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/delete-variables.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/delete-variables.factory.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { QueryVariables } from 'src/engine/api/rest/types/query-variables.type';
+import { QueryVariables } from 'src/engine/api/rest/core/types/query-variables.type';
 
 @Injectable()
 export class DeleteVariablesFactory {

packages/twenty-server/src/engine/api/rest/core/query-builder/factories/factories.ts

@@ -0,0 +1,25 @@
+import { DeleteQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/delete-query.factory';
+import { CreateOneQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/create-one-query.factory';
+import { UpdateQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/update-query.factory';
+import { FindOneQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/find-one-query.factory';
+import { FindManyQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/find-many-query.factory';
+import { DeleteVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/delete-variables.factory';
+import { CreateVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/create-variables.factory';
+import { UpdateVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/update-variables.factory';
+import { GetVariablesFactory } from 'src/engine/api/rest/core/query-builder/factories/get-variables.factory';
+import { CreateManyQueryFactory } from 'src/engine/api/rest/core/query-builder/factories/create-many-query.factory';
+import { inputFactories } from 'src/engine/api/rest/input-factories/factories';
+
+export const coreQueryBuilderFactories = [
+  DeleteQueryFactory,
+  CreateOneQueryFactory,
+  CreateManyQueryFactory,
+  UpdateQueryFactory,
+  FindOneQueryFactory,
+  FindManyQueryFactory,
+  DeleteVariablesFactory,
+  CreateVariablesFactory,
+  UpdateVariablesFactory,
+  GetVariablesFactory,
+  ...inputFactories,
+];

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/find-many-query.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/find-many-query.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class FindManyQueryFactory {
@@ -17,10 +17,16 @@ export class FindManyQueryFactory {
         $orderBy: [${objectNameSingular}OrderByInput],
         $startingAfter: String,
         $endingBefore: String,
-        $limit: Int = 60
+        $first: Int,
+        $last: Int
         ) {
         ${objectNamePlural}(
-        filter: $filter, orderBy: $orderBy, first: $limit, after: $startingAfter, before: $endingBefore
+          filter: $filter,
+          orderBy: $orderBy,
+          first: $first,
+          last: $last,
+          after: $startingAfter,
+          before: $endingBefore
         ) {
           edges {
             node {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/find-one-query.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/find-one-query.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class FindOneQueryFactory {

packages/twenty-server/src/engine/api/rest/core/query-builder/factories/get-variables.factory.ts

@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+
+import { Request } from 'express';
+
+import { LimitInputFactory } from 'src/engine/api/rest/input-factories/limit-input.factory';
+import { OrderByInputFactory } from 'src/engine/api/rest/input-factories/order-by-input.factory';
+import { FilterInputFactory } from 'src/engine/api/rest/input-factories/filter-input.factory';
+import { QueryVariables } from 'src/engine/api/rest/core/types/query-variables.type';
+import { EndingBeforeInputFactory } from 'src/engine/api/rest/input-factories/ending-before-input.factory';
+import { StartingAfterInputFactory } from 'src/engine/api/rest/input-factories/starting-after-input.factory';
+
+@Injectable()
+export class GetVariablesFactory {
+  constructor(
+    private readonly startingAfterInputFactory: StartingAfterInputFactory,
+    private readonly endingBeforeInputFactory: EndingBeforeInputFactory,
+    private readonly limitInputFactory: LimitInputFactory,
+    private readonly orderByInputFactory: OrderByInputFactory,
+    private readonly filterInputFactory: FilterInputFactory,
+  ) {}
+
+  create(
+    id: string | undefined,
+    request: Request,
+    objectMetadata,
+  ): QueryVariables {
+    if (id) {
+      return { filter: { id: { eq: id } } };
+    }
+
+    const limit = this.limitInputFactory.create(request);
+    const endingBefore = this.endingBeforeInputFactory.create(request);
+    const startingAfter = this.startingAfterInputFactory.create(request);
+
+    return {
+      filter: this.filterInputFactory.create(request, objectMetadata),
+      orderBy: this.orderByInputFactory.create(request, objectMetadata),
+      first: !endingBefore ? limit : undefined,
+      last: endingBefore ? limit : undefined,
+      startingAfter,
+      endingBefore,
+    };
+  }
+}

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/update-query.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/update-query.factory.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { capitalize } from 'src/utils/capitalize';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 @Injectable()
 export class UpdateQueryFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/update-variables.factory.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/factories/update-variables.factory.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { Request } from 'express';
 
-import { QueryVariables } from 'src/engine/api/rest/types/query-variables.type';
+import { QueryVariables } from 'src/engine/api/rest/core/types/query-variables.type';
 
 @Injectable()
 export class UpdateVariablesFactory {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/utils/__tests__/check-fields.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/check-fields.utils.spec.ts

@@ -1,6 +1,6 @@
 import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
-import { checkFields } from 'src/engine/api/rest/rest-api-core-query-builder/utils/check-fields.utils';
-import { checkArrayFields } from 'src/engine/api/rest/rest-api-core-query-builder/utils/check-order-by.utils';
+import { checkFields } from 'src/engine/api/rest/core/query-builder/utils/check-fields.utils';
+import { checkArrayFields } from 'src/engine/api/rest/core/query-builder/utils/check-order-by.utils';
 
 describe('checkFields', () => {
   it('should check field types', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/utils/__tests__/compute-depth.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/compute-depth.utils.spec.ts

@@ -1,4 +1,4 @@
-import { computeDepth } from 'src/engine/api/rest/rest-api-core-query-builder/utils/compute-depth.utils';
+import { computeDepth } from 'src/engine/api/rest/core/query-builder/utils/compute-depth.utils';
 
 describe('computeDepth', () => {
   it('should compute depth from query', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/utils/__tests__/get-field-type.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/get-field-type.utils.spec.ts

@@ -1,6 +1,6 @@
 import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { getFieldType } from 'src/engine/api/rest/rest-api-core-query-builder/utils/get-field-type.utils';
+import { getFieldType } from 'src/engine/api/rest/core/query-builder/utils/get-field-type.utils';
 
 describe('getFieldType', () => {
   it('should get field type', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts

@@ -5,7 +5,7 @@ import {
   fieldTextMock,
   objectMetadataItemMock,
 } from 'src/engine/api/__mocks__/object-metadata-item.mock';
-import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/rest-api-core-query-builder/utils/map-field-metadata-to-graphql-query.utils';
+import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
 
 describe('mapFieldMetadataToGraphqlQuery', () => {
   it('should map properly', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/add-default-conjunction.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/add-default-conjunction.utils.spec.ts

@@ -1,4 +1,4 @@
-import { addDefaultConjunctionIfMissing } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils';
+import { addDefaultConjunctionIfMissing } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/add-default-conjunction.utils';
 
 describe('addDefaultConjunctionIfMissing', () => {
   it('should add default conjunction if missing', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-enum-values.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-enum-values.spec.ts

@@ -1,4 +1,4 @@
-import { checkFilterEnumValues } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/check-filter-enum-values';
+import { checkFilterEnumValues } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   fieldSelectMock,

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/check-filter-query.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-query.utils.spec.ts

@@ -1,4 +1,4 @@
-import { checkFilterQuery } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/check-filter-query.utils';
+import { checkFilterQuery } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-query.utils';
 
 describe('checkFilterQuery', () => {
   it('should check filter query', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/format-field-values.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/format-field-values.utils.spec.ts

@@ -1,5 +1,5 @@
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { formatFieldValue } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
+import { formatFieldValue } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils';
 
 describe('formatFieldValue', () => {
   it('should format fieldNumber value', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/parse-base-filter.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/parse-base-filter.utils.spec.ts

@@ -1,4 +1,4 @@
-import { parseBaseFilter } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
+import { parseBaseFilter } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils';
 
 describe('parseBaseFilter', () => {
   it('should parse simple filter string test 1', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter-content.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/parse-filter-content.utils.spec.ts

@@ -1,4 +1,4 @@
-import { parseFilterContent } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
+import { parseFilterContent } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-filter-content.utils';
 
 describe('parseFilterContent', () => {
   it('should parse query filter test 1', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/__tests__/parse-filter.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/parse-filter.utils.spec.ts

@@ -1,5 +1,5 @@
 import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
-import { parseFilter } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { parseFilter } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-filter.utils';
 
 describe('parseFilter', () => {
   it('should parse string filter test 1', () => {

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/add-default-conjunction.utils.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/add-default-conjunction.utils.ts

@@ -1,4 +1,4 @@
-import { Conjunctions } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-filter.utils';
+import { Conjunctions } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-filter.utils';
 
 export const DEFAULT_CONJUNCTION = Conjunctions.and;
 

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/format-field-values.utils.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils.ts

@@ -1,7 +1,7 @@
 import { BadRequestException } from '@nestjs/common';
 
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { FieldValue } from 'src/engine/api/rest/types/field-value.type';
+import { FieldValue } from 'src/engine/api/rest/core/types/field-value.type';
 
 export const formatFieldValue = (
   value: string,

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-filter.utils.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/parse-filter.utils.ts

@@ -2,13 +2,13 @@ import { BadRequestException } from '@nestjs/common';
 
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { parseFilterContent } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-filter-content.utils';
-import { parseBaseFilter } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/parse-base-filter.utils';
-import { checkFields } from 'src/engine/api/rest/rest-api-core-query-builder/utils/check-fields.utils';
-import { formatFieldValue } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/format-field-values.utils';
-import { FieldValue } from 'src/engine/api/rest/types/field-value.type';
-import { checkFilterEnumValues } from 'src/engine/api/rest/rest-api-core-query-builder/factories/input-factories/filter-utils/check-filter-enum-values';
-import { getFieldType } from 'src/engine/api/rest/rest-api-core-query-builder/utils/get-field-type.utils';
+import { parseFilterContent } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-filter-content.utils';
+import { parseBaseFilter } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils';
+import { checkFields } from 'src/engine/api/rest/core/query-builder/utils/check-fields.utils';
+import { formatFieldValue } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils';
+import { FieldValue } from 'src/engine/api/rest/core/types/field-value.type';
+import { checkFilterEnumValues } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values';
+import { getFieldType } from 'src/engine/api/rest/core/query-builder/utils/get-field-type.utils';
 
 export enum Conjunctions {
   or = 'or',

packages/twenty-server/src/engine/api/rest/rest-api-core-query-builder/utils/path-parsers/__tests__/parse-core-batch-path.utils.spec.ts → packages/twenty-server/src/engine/api/rest/core/query-builder/utils/path-parsers/__tests__/parse-core-batch-path.utils.spec.ts

@@ -1,4 +1,4 @@
-import { parseCoreBatchPath } from 'src/engine/api/rest/rest-api-core-query-builder/utils/path-parsers/parse-core-batch-path.utils';
+import { parseCoreBatchPath } from 'src/engine/api/rest/core/query-builder/utils/path-parsers/parse-core-batch-path.utils';
 
 describe('parseCoreBatchPath', () => {
   it('should parse object from request path', () => {