Skip to content

Commit f16ccf4

Browse files
martmullmartmull
committed
Create a dedicated module for core rest api
1 parent 5927847 commit f16ccf4

File tree

3 files changed

+57
-46
lines changed

3 files changed

+57
-46
lines changed

‎packages/twenty-server/src/engine/api/rest/core/rest-api-core-v2.service.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
33
import { Request } from 'express';
44
import { isDefined } from 'twenty-shared/utils';
55

6-
import { ApiEventEmitterService } from 'src/engine/api/graphql/graphql-query-runner/services/api-event-emitter.service';
76
import { parseCorePath } from 'src/engine/api/rest/core/query-builder/utils/path-parsers/parse-core-path.utils';
87
import { RestApiDeleteOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-delete-one-resolver.service';
98
import { RestApiCreateOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-create-one-resolver.service';
@@ -14,7 +13,6 @@ import { RestApiGetManyResolverService } from 'src/engine/api/rest/core/resolver
1413
@Injectable()
1514
export class RestApiCoreServiceV2 {
1615
constructor(
17-
protected readonly apiEventEmitterService: ApiEventEmitterService,
1816
private readonly restApiDeleteOneResolverService: RestApiDeleteOneResolverService,
1917
private readonly restApiCreateOneResolverService: RestApiCreateOneResolverService,
2018
private readonly restApiUpdateOneResolverService: RestApiUpdateOneResolverService,

‎packages/twenty-server/src/engine/api/rest/core/rest-api-core.module.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import { Module } from '@nestjs/common';
2+
import { HttpModule } from '@nestjs/axios';
3+
4+
import { RestApiDeleteOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-delete-one-resolver.service';
5+
import { RestApiCreateOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-create-one-resolver.service';
6+
import { RestApiUpdateOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-update-one-resolver.service';
7+
import { RestApiGetOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-get-one-resolver.service';
8+
import { RestApiGetManyResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-get-many-resolver.service';
9+
import { CoreQueryBuilderModule } from 'src/engine/api/rest/core/query-builder/core-query-builder.module';
10+
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
11+
import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
12+
import { RecordTransformerModule } from 'src/engine/core-modules/record-transformer/record-transformer.module';
13+
import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module';
14+
import { RestApiCoreController } from 'src/engine/api/rest/core/controllers/rest-api-core.controller';
15+
import { coreQueryBuilderFactories } from 'src/engine/api/rest/core/query-builder/factories/factories';
16+
import { RestApiCoreBatchController } from 'src/engine/api/rest/core/controllers/rest-api-core-batch.controller';
17+
import { RestApiCoreServiceV2 } from 'src/engine/api/rest/core/rest-api-core-v2.service';
18+
import { RestApiCoreService } from 'src/engine/api/rest/core/rest-api-core.service';
19+
import { RestApiService } from 'src/engine/api/rest/rest-api.service';
20+
import { ApiEventEmitterService } from 'src/engine/api/graphql/graphql-query-runner/services/api-event-emitter.service';
21+
import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
22+
23+
const restApiCoreResolvers = [
24+
RestApiDeleteOneResolverService,
25+
RestApiCreateOneResolverService,
26+
RestApiUpdateOneResolverService,
27+
RestApiGetOneResolverService,
28+
RestApiGetManyResolverService,
29+
];
30+
31+
@Module({
32+
imports: [
33+
CoreQueryBuilderModule,
34+
WorkspaceCacheStorageModule,
35+
AuthModule,
36+
HttpModule,
37+
TwentyORMModule,
38+
RecordTransformerModule,
39+
WorkspacePermissionsCacheModule,
40+
],
41+
controllers: [RestApiCoreController, RestApiCoreBatchController],
42+
providers: [
43+
RestApiService,
44+
RestApiCoreService,
45+
RestApiCoreServiceV2,
46+
ApiEventEmitterService,
47+
...coreQueryBuilderFactories,
48+
...restApiCoreResolvers,
49+
],
50+
})
51+
export class RestApiCoreModule {}

‎packages/twenty-server/src/engine/api/rest/rest-api.module.ts

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,23 @@
11
import { HttpModule } from '@nestjs/axios';
22
import { Module } from '@nestjs/common';
33

4-
import { RestApiCoreBatchController } from 'src/engine/api/rest/core/controllers/rest-api-core-batch.controller';
5-
import { RestApiCoreController } from 'src/engine/api/rest/core/controllers/rest-api-core.controller';
6-
import { RestApiCoreServiceV2 } from 'src/engine/api/rest/core/rest-api-core-v2.service';
7-
import { RestApiCoreService } from 'src/engine/api/rest/core/rest-api-core.service';
84
import { MetadataQueryBuilderModule } from 'src/engine/api/rest/metadata/query-builder/metadata-query-builder.module';
9-
import { RestApiMetadataController } from 'src/engine/api/rest/metadata/rest-api-metadata.controller';
105
import { RestApiMetadataService } from 'src/engine/api/rest/metadata/rest-api-metadata.service';
11-
import { RestApiService } from 'src/engine/api/rest/rest-api.service';
126
import { AuthModule } from 'src/engine/core-modules/auth/auth.module';
13-
import { RecordTransformerModule } from 'src/engine/core-modules/record-transformer/record-transformer.module';
14-
import { WorkspacePermissionsCacheModule } from 'src/engine/metadata-modules/workspace-permissions-cache/workspace-permissions-cache.module';
15-
import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
167
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
17-
import { ApiEventEmitterService } from 'src/engine/api/graphql/graphql-query-runner/services/api-event-emitter.service';
18-
import { coreQueryBuilderFactories } from 'src/engine/api/rest/core/query-builder/factories/factories';
19-
import { RestApiDeleteOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-delete-one-resolver.service';
20-
import { CoreQueryBuilderModule } from 'src/engine/api/rest/core/query-builder/core-query-builder.module';
21-
import { RestApiCreateOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-create-one-resolver.service';
22-
import { RestApiUpdateOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-update-one-resolver.service';
23-
import { RestApiGetOneResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-get-one-resolver.service';
24-
import { RestApiGetManyResolverService } from 'src/engine/api/rest/core/resolvers/rest-api-get-many-resolver.service';
25-
26-
const restApiCoreResolvers = [
27-
RestApiDeleteOneResolverService,
28-
RestApiCreateOneResolverService,
29-
RestApiUpdateOneResolverService,
30-
RestApiGetOneResolverService,
31-
RestApiGetManyResolverService,
32-
];
8+
import { RestApiCoreModule } from 'src/engine/api/rest/core/rest-api-core.module';
9+
import { RestApiService } from 'src/engine/api/rest/rest-api.service';
10+
import { RestApiMetadataController } from 'src/engine/api/rest/metadata/rest-api-metadata.controller';
3311

3412
@Module({
3513
imports: [
36-
CoreQueryBuilderModule,
3714
MetadataQueryBuilderModule,
3815
WorkspaceCacheStorageModule,
3916
AuthModule,
4017
HttpModule,
41-
TwentyORMModule,
42-
RecordTransformerModule,
43-
WorkspacePermissionsCacheModule,
44-
],
45-
controllers: [
46-
RestApiMetadataController,
47-
RestApiCoreBatchController,
48-
RestApiCoreController,
49-
],
50-
providers: [
51-
RestApiMetadataService,
52-
RestApiCoreService,
53-
RestApiCoreServiceV2,
54-
RestApiService,
55-
ApiEventEmitterService,
56-
...coreQueryBuilderFactories,
57-
...restApiCoreResolvers,
18+
RestApiCoreModule,
5819
],
59-
exports: [RestApiMetadataService],
20+
controllers: [RestApiMetadataController],
21+
providers: [RestApiService, RestApiMetadataService],
6022
})
6123
export class RestApiModule {}

0 commit comments

Comments
 (0)