Add model and collection type parameters to generated service methods

Author: diegomvh

projects/angular-odata/schematics/apigen/angular/package.ts

@@ -82,6 +82,14 @@ export class Package {
         this.services.push(service);
         for (let entitySet of entityContainer.EntitySet ?? []) {
           const service = new Service(this, options, entitySet);
+          const model = this.models.find(m => m.entityType() === service.entityType());
+          if (model !== undefined) {
+            service.setModel(model);
+          }
+          const collection = this.collections.find(c => c.entityType() === service.entityType());
+          if (collection !== undefined) {
+            service.setCollection(collection);
+          }
           this.module.addService(service);
           this.index.addDependency(service);
           this.services.push(service);

projects/angular-odata/schematics/apigen/angular/service.ts

@@ -7,8 +7,12 @@ import { url, Source } from '@angular-devkit/schematics';
 import { Schema as ApiGenSchema } from '../schema';
 import { Package } from './package';
 import { Import } from './import';
+import { Collection } from './collection';
+import { Model } from './model';
 
 export class Service extends Base {
+  model?: Model;
+  collection?: Collection;
   constructor(
     pkg: Package,
     options: ApiGenSchema,
@@ -32,6 +36,8 @@ export class Service extends Base {
           : this.edmElement instanceof CsdlSingleton
             ? this.edmElement.Type
             : this.options.name,
+      model: this.model,
+      collection: this.collection,
       callables: this.callables ?? [],
     };
   }
@@ -43,6 +49,14 @@ export class Service extends Base {
         : '';
   }
 
+  setModel(model: Model) {
+    this.model = model;
+    this.addDependency(model);
+  }
+  setCollection(collection: Collection) {
+    this.collection = collection;
+    this.addDependency(collection);
+  }
   public override name() {
     return strings.classify(this.edmElement.name()) + 'Service';
   }

projects/angular-odata/schematics/apigen/files/entityset-service/__fileName__.ts

@@ -17,10 +17,10 @@ export class <%= classify(name) %> extends ODataEntitySetService<<%= toTypescrip
     super(client, '<%= path %>', '<%= type %>');
   }
   <%= camelize(toTypescriptType(type)) %>Model(entity?: Partial<<%= toTypescriptType(type) %>>) {
-    return this.model(entity);
+    return this.model<<%= model.importedName(imports) %><<%= toTypescriptType(type) %>>>(entity);
   }
   <%= camelize(toTypescriptType(type)) %>Collection(entities?: Partial<<%= toTypescriptType(type) %>>[]) {
-    return this.collection(entities);
+    return this.collection<<%= model.importedName(imports) %><<%= toTypescriptType(type) %>>, <%= collection.importedName(imports) %><<%= toTypescriptType(type) %>, <%= model.importedName(imports) %><<%= toTypescriptType(type) %>>>>(entities);
   }<% for (let cal of callables) { %>
   // <%= cal.name() %>
   <%= cal.resourceFunction() %>