fix(database): custom endpoint handler was not assigned properly

ConduitPlatform · Mar 29, 2022 · 4622540 · 4622540
1 parent d4232ef
commit 4622540
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/modules/database/src/controllers/customEndpoints/customEndpoint.controller.ts b/modules/database/src/controllers/customEndpoints/customEndpoint.controller.ts
@@ -8,12 +8,13 @@ import { MongooseSchema } from '../../adapters/mongoose-adapter/MongooseSchema';
 import { SequelizeSchema } from '../../adapters/sequelize-adapter/SequelizeSchema';
 
 export class CustomEndpointController {
-
+  private handler: CustomEndpointHandler
   constructor(
     private readonly grpcSdk: ConduitGrpcSdk,
     private readonly database: DatabaseAdapter<MongooseSchema | SequelizeSchema>,
     private router: DatabaseRoutes,
   ) {
+    this.handler = new CustomEndpointHandler(this.grpcSdk);
     this.refreshRoutes()
       .catch((err: any) => {
         console.log(err);
@@ -36,7 +37,8 @@ export class CustomEndpointController {
         }
         let routes: any[] = [];
         r.forEach((schema: ICustomEndpoint) => {
-          routes.push(createCustomEndpointRoute(schema));
+
+          routes.push(createCustomEndpointRoute(schema,this.handler.entryPoint.bind(this.handler)));
           CustomEndpointHandler.addNewCustomOperationControl(schema);
         });
 

diff --git a/modules/database/src/controllers/customEndpoints/utils.ts b/modules/database/src/controllers/customEndpoints/utils.ts
@@ -70,10 +70,11 @@ function extractParams(
   return resultingObject;
 }
 
-export function createCustomEndpointRoute(endpoint: ICustomEndpoint) {
+export function createCustomEndpointRoute(endpoint: ICustomEndpoint,handler:any ) {
   let route = new RouteBuilder()
     .path(`/function/${endpoint.name}`)
-    .method(getOperation(endpoint.operation));
+    .method(getOperation(endpoint.operation))
+    .handler(handler);
   if (endpoint.authentication) {
     route.middleware('authMiddleware');
   }

diff --git a/modules/database/src/routes/routes.ts b/modules/database/src/routes/routes.ts
@@ -28,7 +28,6 @@ export class DatabaseRoutes {
 
   constructor(readonly server: GrpcServer, private readonly database: DatabaseAdapter<MongooseSchema | SequelizeSchema>, private readonly grpcSdk: ConduitGrpcSdk) {
     this.handlers = new CmsHandlers(grpcSdk, database);
-    this.customEndpointHandler = new CustomEndpointHandler(grpcSdk);
     this._routingManager = new RoutingManager(this.grpcSdk.router, server);
   }