Merge pull request #10 from catenax-ng/TRACEFOSS-986-notification-reason

TRACEFOSS-986: added reason visualisation for notification

Author: fbedarf

src/app/mocks/services/index.ts

@@ -22,6 +22,6 @@
 export { dashboardHandler } from './dashboard-mock/dashboard.handler';
 export { partsHandlers, partsHandlersTest } from './parts-mock/parts.handler';
 export { otherPartsHandlers, otherPartsHandlersTest } from './otherParts-mock/otherParts.handler';
-export { investigationsHandlers } from './investigations-mock/investigations.handler';
+export { investigationsHandlers, investigationsTestHandlers } from './investigations-mock/investigations.handler';
 export { adminHandler } from './admin-mock/admin.handler';
 export { errorHandler } from './error-mock/error.handler';

src/app/mocks/services/investigations-mock/investigations.handler.ts

@@ -24,6 +24,29 @@ import { NotificationStatus } from '@shared/model/notification.model';
 import { rest } from 'msw';
 import { applyPagination, extractPagination } from '../pagination.helper';
 import { buildMockInvestigations, getInvestigationById, InvestigationIdPrefix } from './investigations.model';
+import {
+  buildMockInvestigations as testBuildMockInvestigations,
+  getInvestigationById as testGetInvestigationById,
+  InvestigationIdPrefix as testInvestigationIdPrefix,
+} from './investigations.test.model';
+
+const commonHandler = [
+  rest.post(`*${environment.apiUrl}/investigations/:investigationId/close`, (req, res, ctx) => {
+    return res(ctx.status(204));
+  }),
+
+  rest.post(`*${environment.apiUrl}/investigations/:investigationId/approve`, (req, res, ctx) => {
+    return res(ctx.status(204));
+  }),
+
+  rest.post(`*${environment.apiUrl}/investigations/:investigationId/cancel`, (req, res, ctx) => {
+    return res(ctx.status(204));
+  }),
+
+  rest.post(`${environment.apiUrl}/investigations/:investigationId/update`, (req, res, ctx) => {
+    return res(ctx.status(204));
+  }),
+];
 
 export const investigationsHandlers = [
   rest.get(`*${environment.apiUrl}/investigations/created`, (req, res, ctx) => {
@@ -35,6 +58,8 @@ export const investigationsHandlers = [
       NotificationStatus.ACKNOWLEDGED,
       NotificationStatus.ACCEPTED,
       NotificationStatus.DECLINED,
+      NotificationStatus.CLOSED,
+      NotificationStatus.CANCELED,
     ];
 
     return res(
@@ -46,7 +71,14 @@ export const investigationsHandlers = [
   rest.get(`*${environment.apiUrl}/investigations/received`, (req, res, ctx) => {
     const pagination = extractPagination(req);
 
-    const currentStatus = [NotificationStatus.RECEIVED, NotificationStatus.ACKNOWLEDGED];
+    const currentStatus = [
+      NotificationStatus.RECEIVED,
+      NotificationStatus.ACKNOWLEDGED,
+      NotificationStatus.ACCEPTED,
+      NotificationStatus.DECLINED,
+      NotificationStatus.CLOSED,
+      NotificationStatus.CANCELED,
+    ];
     return res(
       ctx.status(200),
       ctx.json(applyPagination(buildMockInvestigations(currentStatus, 'RECEIVER'), pagination)),
@@ -67,14 +99,18 @@ export const investigationsHandlers = [
       NotificationStatus.ACKNOWLEDGED,
       NotificationStatus.ACCEPTED,
       NotificationStatus.DECLINED,
+
       NotificationStatus.ACKNOWLEDGED,
+      NotificationStatus.ACCEPTED,
+      NotificationStatus.DECLINED,
+      NotificationStatus.CLOSED,
+      NotificationStatus.CANCELED,
     ];
-    const channel = indexFromId === 2 || indexFromId === 8 ? 'RECEIVER' : 'SENDER';
+    const channel = [2, 8, 9, 10, 11, 12].includes(indexFromId) ? 'RECEIVER' : 'SENDER';
     const randomNotification = buildMockInvestigations([statusCollection[indexFromId]], channel)[0];
 
     return res(ctx.status(200), ctx.json({ ...randomNotification, id: investigationId }));
   }),
-
   rest.post(`*${environment.apiUrl}/investigations`, (_, res, ctx) => {
     return res(ctx.status(200), ctx.json({ id: InvestigationIdPrefix + 1 }));
   }),
@@ -86,20 +122,68 @@ export const investigationsHandlers = [
     const investigation = getInvestigationById(investigationId as string);
     return res(ctx.status(200), ctx.json({ ...investigation, status }));
   }),
+  ...commonHandler,
+];
 
-  rest.post(`*${environment.apiUrl}/investigations/:investigationId/close`, (req, res, ctx) => {
-    return res(ctx.status(204));
+export const investigationsTestHandlers = [
+  rest.get(`*${environment.apiUrl}/investigations/created`, (req, res, ctx) => {
+    const pagination = extractPagination(req);
+
+    const currentStatus = [
+      NotificationStatus.CREATED,
+      NotificationStatus.APPROVED,
+      NotificationStatus.ACKNOWLEDGED,
+      NotificationStatus.ACCEPTED,
+      NotificationStatus.DECLINED,
+    ];
+
+    return res(
+      ctx.status(200),
+      ctx.json(applyPagination(testBuildMockInvestigations(currentStatus, 'SENDER'), pagination)),
+    );
   }),
 
-  rest.post(`*${environment.apiUrl}/investigations/:investigationId/approve`, (req, res, ctx) => {
-    return res(ctx.status(204));
+  rest.get(`*${environment.apiUrl}/investigations/received`, (req, res, ctx) => {
+    const pagination = extractPagination(req);
+
+    const currentStatus = [NotificationStatus.RECEIVED, NotificationStatus.ACKNOWLEDGED];
+    return res(
+      ctx.status(200),
+      ctx.json(applyPagination(testBuildMockInvestigations(currentStatus, 'RECEIVER'), pagination)),
+    );
   }),
 
-  rest.post(`*${environment.apiUrl}/investigations/:investigationId/cancel`, (req, res, ctx) => {
-    return res(ctx.status(204));
+  rest.get(`*${environment.apiUrl}/investigations/:investigationId`, (req, res, ctx) => {
+    const { investigationId } = req.params;
+
+    const indexFromId = parseInt((investigationId as string).replace('id-', ''), 10);
+
+    const statusCollection = [
+      NotificationStatus.CREATED,
+      NotificationStatus.APPROVED,
+      NotificationStatus.RECEIVED,
+      NotificationStatus.CLOSED,
+      NotificationStatus.CANCELED,
+      NotificationStatus.ACKNOWLEDGED,
+      NotificationStatus.ACCEPTED,
+      NotificationStatus.DECLINED,
+      NotificationStatus.ACKNOWLEDGED,
+    ];
+    const channel = indexFromId === 2 || indexFromId === 8 ? 'RECEIVER' : 'SENDER';
+    const randomNotification = testBuildMockInvestigations([statusCollection[indexFromId]], channel)[0];
+
+    return res(ctx.status(200), ctx.json({ ...randomNotification, id: investigationId }));
+  }),
+  rest.post(`*${environment.apiUrl}/investigations`, (_, res, ctx) => {
+    return res(ctx.status(200), ctx.json({ id: testInvestigationIdPrefix + 1 }));
   }),
 
-  rest.post(`${environment.apiUrl}/investigations/:investigationId/update`, (req, res, ctx) => {
-    return res(ctx.status(204));
+  rest.put(`*${environment.apiUrl}/investigations/:investigationId/status`, (req, res, ctx) => {
+    const { investigationId } = req.params;
+    const { status } = req.body as Record<string, unknown>;
+
+    const investigation = testGetInvestigationById(investigationId as string);
+    return res(ctx.status(200), ctx.json({ ...investigation, status }));
   }),
+  ...commonHandler,
 ];

src/app/mocks/services/investigations-mock/investigations.model.ts

@@ -23,6 +23,7 @@ import type { NotificationResponse } from '@shared/model/notification.model';
 import { NotificationStatus } from '@shared/model/notification.model';
 import { getRandomAsset } from '../parts-mock/parts.model';
 import { MOCK_part_1 } from '../parts-mock/parts.test.model';
+import { getRandomIntFromInterval, getRandomText } from '../text-generator.helper';
 
 export const InvestigationIdPrefix = 'id-';
 export const buildMockInvestigations = (
@@ -31,12 +32,28 @@ export const buildMockInvestigations = (
 ): NotificationResponse[] =>
   new Array(25).fill(null).map((_, index) => {
     const status = statuses[index % statuses.length];
+
+    const close = status === NotificationStatus.CLOSED ? getRandomText(getRandomIntFromInterval(15, 500)) : '';
+    const isDeclined = Math.random() >= 0.5;
+
+    const decline =
+      status === NotificationStatus.DECLINED || (!!close && isDeclined)
+        ? getRandomText(getRandomIntFromInterval(15, 500))
+        : '';
+
+    const accept =
+      status === NotificationStatus.ACCEPTED || (!!close && !isDeclined)
+        ? getRandomText(getRandomIntFromInterval(15, 500))
+        : '';
+
     return {
       id: `${InvestigationIdPrefix}${index + 1}`,
-      description: `Investigation No ${index + 1}`,
+      description: `Investigation No ${index + 1} ${getRandomText(getRandomIntFromInterval(15, 500))}`,
       status,
       channel,
-      createdBy: 'BPNL00000003AYRE',
+      createdBy: 'OEM A',
+      sendTo: 'OEM B',
+      reason: { close, decline, accept },
       createdDate: `2022-05-${(index + 1).toString().padStart(2, '0')}T12:34:12`,
       assetIds: [MOCK_part_1.id, getRandomAsset().id, getRandomAsset().id, getRandomAsset().id],
     };
@@ -47,6 +64,8 @@ const MockEmptyInvestigation: NotificationResponse = {
   description: `Investigation No 000`,
   status: NotificationStatus.CREATED,
   createdBy: 'OEM A',
+  sendTo: 'OEM B',
+  reason: { close: '', decline: '', accept: '' },
   createdDate: `2022-05-01T12:34:12`,
   assetIds: [getRandomAsset().id],
   channel: 'SENDER',

src/app/mocks/services/investigations-mock/investigations.test.model.ts

@@ -0,0 +1,61 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2022, 2023 ZF Friedrichshafen AG
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+import type { NotificationResponse } from '@shared/model/notification.model';
+import { NotificationStatus } from '@shared/model/notification.model';
+import { getRandomAsset } from '../parts-mock/parts.model';
+import { MOCK_part_1 } from '../parts-mock/parts.test.model';
+
+export const InvestigationIdPrefix = 'id-';
+export const buildMockInvestigations = (
+  statuses: NotificationStatus[],
+  channel: 'SENDER' | 'RECEIVER',
+): NotificationResponse[] =>
+  new Array(25).fill(null).map((_, index) => {
+    const status = statuses[index % statuses.length];
+    return {
+      id: `${InvestigationIdPrefix}${index + 1}`,
+      description: `Investigation No ${index + 1}`,
+      status,
+      channel,
+      createdBy: 'OEAM A',
+      sendTo: 'OEM B',
+      reason: { close: '', accept: '', decline: '' },
+      createdDate: `2022-05-${(index + 1).toString().padStart(2, '0')}T12:34:12`,
+      assetIds: [MOCK_part_1.id, getRandomAsset().id, getRandomAsset().id, getRandomAsset().id],
+    };
+  });
+
+const MockEmptyInvestigation: NotificationResponse = {
+  id: `${InvestigationIdPrefix}000`,
+  description: `Investigation No 000`,
+  status: NotificationStatus.CREATED,
+  createdBy: 'OEM A',
+  sendTo: 'OEAM B',
+  reason: { close: '', accept: '', decline: '' },
+  createdDate: `2022-05-01T12:34:12`,
+  assetIds: [getRandomAsset().id],
+  channel: 'SENDER',
+};
+
+export const getInvestigationById = (id: string) => {
+  return [].find(investigation => investigation.id === id) || { ...MockEmptyInvestigation, id };
+};