Merge branch 'fix/serviceproperty-inline' into dev

Author: kodjunkie

packages/core/src/crud/crud-routes.factory.ts

@@ -88,17 +88,6 @@ export class CrudRoutesFactory {
     };
   }
 
-  protected resolveService(controller: any): any {
-    const prop = this.options.serviceProperty ?? 'service';
-    const svc = controller[prop];
-    if (!svc) {
-      throw new Error(
-        `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
-      );
-    }
-    return svc;
-  }
-
   protected create() {
     const routesSchema = this.getRoutesSchema();
     this.mergeOptions();
@@ -256,58 +245,106 @@ export class CrudRoutesFactory {
   }
 
   protected getManyBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function getManyBase(req: CrudRequest) {
-      return resolve(this).getMany(req);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.getMany(req);
     };
   }
 
   protected getOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function getOneBase(req: CrudRequest) {
-      return resolve(this).getOne(req);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.getOne(req);
     };
   }
 
   protected createOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function createOneBase(req: CrudRequest, dto: any) {
-      return resolve(this).createOne(req, dto);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.createOne(req, dto);
     };
   }
 
   protected createManyBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function createManyBase(req: CrudRequest, dto: any) {
-      return resolve(this).createMany(req, dto);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.createMany(req, dto);
     };
   }
 
   protected updateOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function updateOneBase(req: CrudRequest, dto: any) {
-      return resolve(this).updateOne(req, dto);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.updateOne(req, dto);
     };
   }
 
   protected replaceOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function replaceOneBase(req: CrudRequest, dto: any) {
-      return resolve(this).replaceOne(req, dto);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.replaceOne(req, dto);
     };
   }
 
   protected deleteOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function deleteOneBase(req: CrudRequest) {
-      return resolve(this).deleteOne(req);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.deleteOne(req);
     };
   }
 
   protected recoverOneBase(name: BaseRouteName) {
-    const resolve = this.resolveService.bind(this);
+    const prop = this.options.serviceProperty ?? 'service';
     this.targetProto[name] = function recoverOneBase(req: CrudRequest) {
-      return resolve(this).recoverOne(req);
+      const svc = this[prop];
+      if (!svc) {
+        throw new Error(
+          `@Crud: controller property "${prop}" is undefined — did you forget to inject the CrudService field?`,
+        );
+      }
+      return svc.recoverOne(req);
     };
   }