feat: updated to the latest version

Author: marcinkrasowski

apps/api-harmonization/package.json

@@ -25,8 +25,8 @@
         "@nestjs/config": "^3.3.0",
         "@nestjs/core": "^10.0.0",
         "@nestjs/platform-express": "^10.0.0",
-        "@o2s/framework": "^0.12.0",
-        "@o2s/integrations.mocked": "^0.11.2",
+        "@o2s/framework": "^0.13.0",
+        "@o2s/integrations.mocked": "^0.12.0",
         "@o2s/utils.logger": "^0.9.1",
         "compression": "^1.7.5",
         "cookie": "^1.0.2",

apps/api-harmonization/src/app.module.ts

@@ -38,6 +38,7 @@ import { AppConfig } from './app.config';
 import { AppService } from './app.service';
 import { ContextHeadersMiddleware } from './middleware/context-headers.middleware';
 import { LoginPageModule } from './modules/login-page/login-page.module';
+import { NotFoundPageModule } from './modules/not-found-page/not-found-page.module';
 import { PageModule } from './modules/page/page.module';
 import { RoutesModule } from './modules/routes/routes.module';
 
@@ -62,6 +63,7 @@ import { RoutesModule } from './modules/routes/routes.module';
         PageModule.register(AppConfig),
         RoutesModule.register(AppConfig),
         LoginPageModule.register(AppConfig),
+        NotFoundPageModule.register(AppConfig),
 
         TicketListComponentModule.register(AppConfig),
         TicketDetailsComponentModule.register(AppConfig),

apps/api-harmonization/src/modules/index.ts

@@ -1,3 +1,4 @@
 export * as Page from './page';
 export * as Sitemap from './routes/';
 export * as LoginPage from './login-page';
+export * as NotFoundPage from './not-found-page';

apps/api-harmonization/src/modules/login-page/login-page.mapper.ts

@@ -2,10 +2,10 @@ import { CMS } from '../../models';
 
 import { LoginPage } from './login-page.model';
 
-export const mapLoginPage = (header: CMS.Model.Header.Header, loginPage: CMS.Model.LoginPage.LoginPage): LoginPage => {
+export const mapLoginPage = (loginPage: CMS.Model.LoginPage.LoginPage): LoginPage => {
     const { seo, ...data } = loginPage;
+
     return {
-        header,
         data,
         seo: {
             title: seo.title,

apps/api-harmonization/src/modules/login-page/login-page.model.ts

@@ -1,7 +1,6 @@
 import { CMS, Models } from '@o2s/framework/modules';
 
 export class LoginPage {
-    header!: CMS.Model.Header.Header;
-    data!: Omit<CMS.Model.LoginPage.LoginPage, 'seo'>;
     seo!: Models.SEO.Page;
+    data!: Omit<CMS.Model.LoginPage.LoginPage, 'seo'>;
 }

apps/api-harmonization/src/modules/login-page/login-page.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
-import { Observable, forkJoin, map, switchMap } from 'rxjs';
+import { Observable, forkJoin, map } from 'rxjs';
 
 import { AppHeaders } from '@o2s/api-harmonization/utils/headers';
 
@@ -13,23 +13,15 @@ export class LoginPageService {
     constructor(private readonly cmsService: CMS.Service) {}
 
     getLoginPage(headers: AppHeaders): Observable<LoginPage> {
-        return this.cmsService.getAppConfig({ locale: headers['x-locale'] }).pipe(
-            switchMap((appConfig) => {
-                const header = this.cmsService.getHeader({
-                    id: appConfig.signedOut.header || '',
-                    locale: headers['x-locale'],
-                });
-                const loginPage = this.cmsService.getLoginPage({ locale: headers['x-locale'] });
+        const loginPage = this.cmsService.getLoginPage({ locale: headers['x-locale'] });
 
-                return forkJoin([header, loginPage]).pipe(
-                    map(([header, loginPage]) => {
-                        if (!loginPage) {
-                            throw new NotFoundException();
-                        }
+        return forkJoin([loginPage]).pipe(
+            map(([loginPage]) => {
+                if (!loginPage) {
+                    throw new NotFoundException();
+                }
 
-                        return mapLoginPage(header, loginPage);
-                    }),
-                );
+                return mapLoginPage(loginPage);
             }),
         );
     }

apps/api-harmonization/src/modules/not-found-page/index.ts

@@ -0,0 +1,4 @@
+export const URL = '/not-found-page';
+
+export * as Model from './not-found-page.model';
+export * as Request from './not-found-page.request';

apps/api-harmonization/src/modules/not-found-page/not-found-page.controller.ts

@@ -0,0 +1,16 @@
+import { URL } from '.';
+import { Controller, Get, Headers } from '@nestjs/common';
+
+import { AppHeaders } from '@o2s/api-harmonization/utils/headers';
+
+import { NotFoundPageService } from './not-found-page.service';
+
+@Controller(URL)
+export class NotFoundPageController {
+    constructor(protected readonly service: NotFoundPageService) {}
+
+    @Get()
+    getNotFoundPage(@Headers() headers: AppHeaders) {
+        return this.service.getNotFoundPage(headers);
+    }
+}

apps/api-harmonization/src/modules/not-found-page/not-found-page.mapper.ts

@@ -0,0 +1,12 @@
+import { CMS } from '../../models';
+
+import { NotFoundPage } from './not-found-page.model';
+
+export const mapNotFoundPage = (notFoundPage: CMS.Model.NotFoundPage.NotFoundPage): NotFoundPage => {
+    return {
+        title: notFoundPage.title,
+        description: notFoundPage.description,
+        urlLabel: notFoundPage.urlLabel,
+        url: notFoundPage.url,
+    };
+};

apps/api-harmonization/src/modules/not-found-page/not-found-page.model.ts

@@ -0,0 +1,8 @@
+import { CMS } from '@o2s/framework/modules';
+
+export class NotFoundPage {
+    title!: CMS.Model.NotFoundPage.NotFoundPage['title'];
+    description!: CMS.Model.NotFoundPage.NotFoundPage['description'];
+    urlLabel!: CMS.Model.NotFoundPage.NotFoundPage['urlLabel'];
+    url?: CMS.Model.NotFoundPage.NotFoundPage['url'];
+}