fix: fixed api-harmonization generator (#200)

Author: tomaszpacior

.changeset/pink-candies-rule.md

@@ -0,0 +1,5 @@
+---
+'@o2s/api-harmonization': patch
+---
+
+fix: fixed api-harmonization generator

apps/api-harmonization/turbo/generators/templates/block/module.hbs

@@ -1,6 +1,6 @@
 import { DynamicModule, Module } from '@nestjs/common';
 
-import { ApiConfig } from '@o2s/framework/modules';
+import * as Framework from '@o2s/framework/modules';
 
 import { CMS } from '../../models';
 
@@ -9,15 +9,19 @@ import { {{ pascalCase name }}Service } from './{{ kebabCase name }}.service';
 
 @Module({})
 export class {{ pascalCase name }}BlockModule {
-    static register(_config: ApiConfig): DynamicModule {
+    static register(_config: Framework.ApiConfig): DynamicModule {
         return {
             module: {{ pascalCase name }}BlockModule,
             providers: [
                 {{ pascalCase name }}Service,
-                CMS.Service,
+                {
+                    provide: CMS.Service,
+                    useExisting: Framework.CMS.Service,
+                },
             ],
             controllers: [{{ pascalCase name }}Controller],
             exports: [{{ pascalCase name }}Service],
         };
     }
 }
+

apps/api-harmonization/turbo/generators/templates/block/service.hbs

@@ -1,27 +1,26 @@
-import { DynamicModule, Module } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import { Observable, forkJoin, map } from 'rxjs';
 
-import * as Framework from '@o2s/framework/modules';
+import { AppHeaders } from '@o2s/api-harmonization/utils/headers';
 
-import { Articles, CMS } from '../../models';
+import { CMS } from '../../models';
 
-import { {{ pascalCase name }}Controller } from './{{ kebabCase name }}.controller';
-import { {{ pascalCase name }}Service } from './{{ kebabCase name }}.service';
+import { map{{ pascalCase name }} } from './{{ kebabCase name }}.mapper';
+import { {{ pascalCase name }}Block } from './{{ kebabCase name }}.model';
+import { Get{{ pascalCase name }}BlockQuery } from './{{ kebabCase name }}.request';
 
-@Module({})
-export class {{ pascalCase name }}BlockModule {
-    static register(_config: Framework.ApiConfig): DynamicModule {
-        return {
-            module: {{ pascalCase name }}BlockModule,
-            providers: [
-                {{ pascalCase name }}Service,
-                {
-                    provide: CMS.Service,
-                    useExisting: Framework.CMS.Service,
-                },
-            ],
-            controllers: [{{ pascalCase name }}Controller],
-            exports: [{{ pascalCase name }}Service],
-        };
+@Injectable()
+export class {{ pascalCase name }}Service {
+    constructor(
+        private readonly cmsService: CMS.Service,
+    ) {}
+
+    get{{ pascalCase name }}Block(
+        query: Get{{ pascalCase name }}BlockQuery,
+        headers: AppHeaders,
+    ): Observable<{{ pascalCase name }}Block> {
+        const cms = this.cmsService.get{{ pascalCase name }}Block({ ...query, locale: headers['x-locale'] });
+
+        return forkJoin([cms]).pipe(map(([cms]) => map{{ pascalCase name }}(cms, headers['x-locale'])));
     }
 }
-