feat: updated resource integration - added product to the Resource model (#160)

* feat: updated resource integration - added product to the Resource model

* feat: update getServiceList and getAssetList methods

* feat: refactoring

Author: tomaszpacior

.changeset/tricky-trams-stick.md

@@ -0,0 +1,11 @@
+---
+'@o2s/integrations.medusajs': minor
+'@o2s/integrations.mocked': minor
+'@o2s/api-harmonization': minor
+'@o2s/framework': minor
+---
+
+feat: updated resource integration - added product to the Resource model
+
+- updated service-list and service-details blocks,
+- added sorting and filters to mocks,

apps/api-harmonization/src/blocks/featured-service-list/featured-service-list.mapper.ts

@@ -6,7 +6,10 @@ export const mapFeaturedServiceList = (
     featuredServices: Products.Model.Products,
     cms: CMS.Model.FeaturedServiceListBlock.FeaturedServiceListBlock,
 ): FeaturedServiceListBlock => {
-    const services = featuredServices.data.slice(0, cms.pagination?.limit || 3).map((product) => mapProduct(product));
+    const services = featuredServices.data
+        .slice(0, cms.pagination?.limit || 3)
+        .map((product) => mapProduct(product))
+        .filter((service) => service !== undefined);
 
     return {
         __typename: 'FeaturedServiceListBlock',
@@ -24,7 +27,11 @@ export const mapFeaturedServiceList = (
     };
 };
 
-const mapProduct = (product: Products.Model.Product): FeaturedService => {
+const mapProduct = (product: Products.Model.Product): FeaturedService | undefined => {
+    if (!product.id || !product.name) {
+        return undefined;
+    }
+
     return {
         id: product.id,
         name: product.name,

apps/api-harmonization/src/blocks/featured-service-list/featured-service-list.module.ts

@@ -1,3 +1,4 @@
+import { HttpModule } from '@nestjs/axios';
 import { DynamicModule, Module } from '@nestjs/common';
 
 import { ApiConfig } from '@o2s/framework/modules';
@@ -13,6 +14,7 @@ export class FeaturedServiceListBlockModule {
         return {
             module: FeaturedServiceListBlockModule,
             providers: [FeaturedServiceListService, CMS.Service, Resources.Service],
+            imports: [HttpModule],
             controllers: [FeaturedServiceListController],
             exports: [FeaturedServiceListService],
         };

apps/api-harmonization/src/blocks/service-details/service-details.mapper.ts

@@ -1,49 +1,47 @@
 import { formatDateRelative } from '@o2s/api-harmonization/utils/date';
 
-import { CMS, Products, Resources } from '../../models';
+import { CMS, Resources } from '../../models';
 
 import { Service, ServiceDetailsBlock } from './service-details.model';
 
 export const mapServiceDetails = (
     cms: CMS.Model.ServiceDetailsBlock.ServiceDetailsBlock,
     service: Resources.Model.Service,
-    product: Products.Model.Product,
     locale: string,
     timezone: string,
 ): ServiceDetailsBlock => {
     return {
         __typename: 'ServiceDetailsBlock',
         id: cms.id,
-        data: mapService(cms, service, product, locale, timezone),
+        data: mapService(cms, service, locale, timezone),
     };
 };
 
 export const mapService = (
     cms: CMS.Model.ServiceDetailsBlock.ServiceDetailsBlock,
     service: Resources.Model.Service,
-    product: Products.Model.Product,
     locale: string,
     timezone: string,
 ): Service => {
     return {
         price: {
             title: cms.properties?.price as string,
-            value: product.price,
+            value: service.product.price,
         },
         type: {
-            label: cms.fields.type?.[product.type] || product.type,
+            label: cms.fields.type?.[service.product.type] || service.product.type,
             title: cms.properties?.type as string,
-            value: product.type,
+            value: service.product.type,
         },
         status: {
             label: cms.fields.status?.[service.contract.status] || service.contract.status,
             title: cms.properties?.status as string,
             value: service.contract.status,
         },
         category: {
-            label: cms.fields.category?.[product.category] || product.category,
+            label: cms.fields.category?.[service.product.category] || service.product.category,
             title: cms.properties?.category as string,
-            value: product.category,
+            value: service.product.category,
         },
         startDate: {
             title: cms.properties?.startDate as string,
@@ -65,9 +63,9 @@ export const mapService = (
                 timezone,
             ),
         },
-        name: product.name,
+        name: service.product.name,
         details: cms.title,
-        description: product.description,
+        description: service.product.description,
         labels: {
             settings: cms.labels.settings,
             renew: cms.labels.renew,

apps/api-harmonization/src/blocks/service-details/service-details.model.ts

@@ -1,4 +1,4 @@
-import { Products, Resources } from '../../models';
+import { Resources } from '../../models';
 import { Block } from '../../utils';
 
 export class ServiceDetailsBlock extends Block.Block {
@@ -9,12 +9,12 @@ export class ServiceDetailsBlock extends Block.Block {
 export class Service {
     price!: {
         title: string;
-        value: Products.Model.Product['price'];
+        value: Resources.Model.Service['product']['price'];
     };
     type!: {
         label: string;
         title: string;
-        value: Products.Model.Product['type'];
+        value: Resources.Model.Service['product']['type'];
     };
     status!: {
         label: string;
@@ -24,7 +24,7 @@ export class Service {
     category!: {
         label: string;
         title: string;
-        value: Products.Model.Product['category'];
+        value: Resources.Model.Service['product']['category'];
     };
     startDate!: {
         title: string;

apps/api-harmonization/src/blocks/service-details/service-details.module.ts

@@ -3,7 +3,7 @@ import { DynamicModule, Module } from '@nestjs/common';
 
 import { ApiConfig } from '@o2s/framework/modules';
 
-import { CMS, Products, Resources } from '../../models';
+import { CMS, Resources } from '../../models';
 
 import { ServiceDetailsController } from './service-details.controller';
 import { ServiceDetailsService } from './service-details.service';
@@ -13,7 +13,7 @@ export class ServiceDetailsBlockModule {
     static register(_config: ApiConfig): DynamicModule {
         return {
             module: ServiceDetailsBlockModule,
-            providers: [ServiceDetailsService, CMS.Service, Resources.Service, Products.Service],
+            providers: [ServiceDetailsService, CMS.Service, Resources.Service],
             controllers: [ServiceDetailsController],
             exports: [ServiceDetailsService],
             imports: [HttpModule],

apps/api-harmonization/src/blocks/service-details/service-details.service.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
-import { Observable, concatMap, forkJoin, map } from 'rxjs';
+import { Observable, forkJoin, map } from 'rxjs';
 
 import { AppHeaders } from '@o2s/api-harmonization/utils/headers';
 
-import { CMS, Products, Resources } from '../../models';
+import { CMS, Resources } from '../../models';
 
 import { mapServiceDetails } from './service-details.mapper';
 import { ServiceDetailsBlock } from './service-details.model';
@@ -14,7 +14,6 @@ export class ServiceDetailsService {
     constructor(
         private readonly cmsService: CMS.Service,
         private readonly resourceService: Resources.Service,
-        private readonly productService: Products.Service,
     ) {}
 
     getServiceDetailsBlock(
@@ -26,21 +25,9 @@ export class ServiceDetailsService {
         const service = this.resourceService.getService({ ...params, locale: headers['x-locale'] });
 
         return forkJoin([cms, service]).pipe(
-            concatMap(([cms, service]) => {
-                return this.productService
-                    .getProduct({ id: service.productId, locale: headers['x-locale'] })
-                    .pipe(
-                        map((products) =>
-                            mapServiceDetails(
-                                cms,
-                                service,
-                                products,
-                                headers['x-locale'],
-                                headers['x-client-timezone'] || '',
-                            ),
-                        ),
-                    );
-            }),
+            map(([cms, service]) =>
+                mapServiceDetails(cms, service, headers['x-locale'], headers['x-client-timezone'] || ''),
+            ),
         );
     }
 }

apps/api-harmonization/src/blocks/service-list/service-list.mapper.ts

@@ -2,12 +2,12 @@ import format from 'string-template';
 
 import { formatDateRelative } from '@o2s/api-harmonization/utils/date';
 
-import { CMS } from '../../models';
+import { CMS, Resources } from '../../models';
 
-import { Service, ServiceListBlock, ServiceWithProduct, ServicesList } from './service-list.model';
+import { Service, ServiceListBlock } from './service-list.model';
 
 export const mapServiceList = (
-    services: ServicesList,
+    services: Resources.Model.Services,
     cms: CMS.Model.ServiceListBlock.ServiceListBlock,
     locale: string,
     timezone: string,
@@ -29,7 +29,7 @@ export const mapServiceList = (
 };
 
 const mapService = (
-    service: ServiceWithProduct,
+    service: Resources.Model.Service,
     cms: CMS.Model.ServiceListBlock.ServiceListBlock,
     locale: string,
     timezone: string,

apps/api-harmonization/src/blocks/service-list/service-list.model.ts

@@ -10,7 +10,10 @@ export class ServiceListBlock extends Block.Block {
     detailsLabel!: string;
     filters?: Models.Filters.Filters<Resources.Model.Contract & Products.Model.Product>;
     pagination?: Models.Pagination.Pagination;
-    services!: Services;
+    services!: {
+        data: Service[];
+        total: number;
+    };
     noResults!: {
         title: string;
         description?: string;
@@ -59,9 +62,3 @@ export class Service {
         tags: Products.Model.Product['tags'];
     };
 }
-
-export type ServiceWithProduct = Omit<Resources.Model.Service, 'productId'> & {
-    product: Products.Model.Product;
-};
-
-export type ServicesList = Models.Pagination.Paginated<ServiceWithProduct>;

apps/api-harmonization/src/blocks/service-list/service-list.module.ts

@@ -3,7 +3,7 @@ import { DynamicModule, Module } from '@nestjs/common';
 
 import { ApiConfig } from '@o2s/framework/modules';
 
-import { CMS, Products, Resources } from '../../models';
+import { CMS, Resources } from '../../models';
 
 import { ServiceListController } from './service-list.controller';
 import { ServiceListService } from './service-list.service';
@@ -13,10 +13,10 @@ export class ServiceListBlockModule {
     static register(_config: ApiConfig): DynamicModule {
         return {
             module: ServiceListBlockModule,
-            providers: [ServiceListService, CMS.Service, Resources.Service, Products.Service],
+            providers: [ServiceListService, CMS.Service, Resources.Service],
             controllers: [ServiceListController],
-            exports: [ServiceListService],
             imports: [HttpModule],
+            exports: [ServiceListService],
         };
     }
 }