Merge branch 'main' into feature/#736-add-contract-detailed-view

CHANGELOG.md

@@ -14,17 +14,24 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #596 Added Policy management documentation
 - Added overview of the scheduler tasks in documentation
 - #736 Added Contract Detailed View
+- #706 Created notification classes to support both alert and investigations
+- #706 Notification controller having the same endpoints as alerts and investigations controllers
 
 ### Changed
 - #709 Bumped spring-core from 6.0.17 to 6.1.5
 - #606 cucumber tests retry on error
 - #606 refactored response model to only be used by common model package tx-models
 - #709 Fixed CVE-2024-22257 overriding spring-security-core from 6.1.7 to 6.2.3
 - #596 Policy management has been moved to different module
+- #616 Merged quality investigations / alerts into a single view
 - #762 updated documentation for release 24.5
+- #706 StartNotificationRequest now requires additional parameter type ("ALERT", "INVESTIGATION") which
+- #706 Search criteria allows to filter by new type parameter
+- #706 Notification response have new title parameter
 
 ### Removed
 - Shedlock, resilence4j, templateResolver as not used anymore
+- #706 Removed alert and investigation specific classes and services to replace them with merged notification classes
 
 ### Added
 - #630 Added Parts extended detailed view

docs/concept/#568-policy-management/send-notification-policy-verification.puml

@@ -1,7 +1,7 @@
 @startuml
 
 title
-    ==Send Quality Investigation
+    ==Send Quality Notification
 end title
 
 autonumber "<B>[00]"

docs/src/docs/arc42/runtime-view/notifications/quality-investigation-receive.adoc

@@ -1,14 +1,14 @@
-= Receive Quality Investigation
+= Receive Quality Notification
 
-This sequence diagram describes the process of receiving a quality investigation from another Traceability partner.
+This sequence diagram describes the process of receiving a quality notification from another Traceability partner.
 
 [plantuml, target=business-context_quality-investigation, format=svg]
 ....
 include::../../../../uml-diagrams/arc42/runtime-view/quality-investigation-receive.puml[]
 ....
 
 == Overview
-As for the sending of a quality investigation also for receiving of a notification EDC is used to push data from a sender to a receiver.
+As for the sending of a quality notification also for receiving of a notification EDC is used to push data from a sender to a receiver.
 To enable receiving a notification by a partner you need to
 
 * Create notification endpoint for qualitynotifications/receive

docs/src/docs/arc42/runtime-view/notifications/quality-investigation-send.adoc

@@ -1,6 +1,6 @@
-= Send Quality Investigation
+= Send Quality Notification
 
-This sequence diagram describes the process of sending a quality investigation between Traceability applications.
+This sequence diagram describes the process of sending a quality notification between Traceability applications.
 
 [plantuml, target=business-context_quality-investigation_send, format=svg]
 ....

docs/src/uml-diagrams/arc42/runtime-view/quality-investigation-receive.puml

@@ -1,7 +1,7 @@
 @startuml
 
 title
-    ==Receive Quality Investigation
+    ==Receive Quality Notification
 end title
 
 autonumber "<B>[00]"

docs/src/uml-diagrams/arc42/runtime-view/quality-investigation-send.puml

@@ -1,7 +1,7 @@
 @startuml
 
 title
-    ==Send Quality Investigation
+    ==Send Quality Notification
 end title
 
 autonumber "<B>[00]"

frontend/cypress/support/step_definitions/menu.ts

@@ -37,10 +37,6 @@ When("user navigate to {string}", function(desiredMenu) {
         cy.get('[href="/dashboard"]').click();
         break;
       }
-      case 'Quality investigations': {
-        cy.get('[href="/investigations"]').click();
-        break;
-      }
       case 'Quality alerts': {
         cy.get('[href="/alerts"]').click();
         break;

frontend/src/app/mocks/services/alerts-mock/alerts.handler.ts

@@ -31,25 +31,25 @@ import {
 } from './alerts.test.model';
 
 const commonHandler = [
-  rest.post(`*${ environment.apiUrl }/alerts/:alertId/close`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/:alertId/close`, (req, res, ctx) => {
     return res(ctx.status(204));
   }),
 
-  rest.post(`*${ environment.apiUrl }/alerts/:alertId/approve`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/:alertId/approve`, (req, res, ctx) => {
     return res(ctx.status(400), ctx.json({message: "Failed to send alert to EDC"}));
   }),
 
-  rest.post(`*${ environment.apiUrl }/alerts/:alertId/cancel`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/:alertId/cancel`, (req, res, ctx) => {
     return res(ctx.status(204));
   }),
 
-  rest.post(`${ environment.apiUrl }/alerts/:alertId/update`, (req, res, ctx) => {
+  rest.post(`${ environment.apiUrl }/notifications/:alertId/update`, (req, res, ctx) => {
     return res(ctx.status(204));
   }),
 ];
 
 export const alertsHandlers = [
-  rest.post(`*${ environment.apiUrl }/alerts/filter`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/filter`, (req, res, ctx) => {
     const pagination = extractPaginationOfNotifications(req);
 
     const currentStatus = [
@@ -65,7 +65,7 @@ export const alertsHandlers = [
     return res(ctx.status(200), ctx.json(applyPagination(buildMockAlerts(currentStatus, 'SENDER'), pagination)));
   }),
 
-  rest.post(`*${ environment.apiUrl }/alerts/filter`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/filter`, (req, res, ctx) => {
     const pagination = extractPaginationOfNotifications(req);
 
     const currentStatus = [
@@ -79,7 +79,7 @@ export const alertsHandlers = [
     return res(ctx.status(200), ctx.json(applyPagination(buildMockAlerts(currentStatus, 'RECEIVER'), pagination)));
   }),
 
-  rest.get(`*${ environment.apiUrl }/alerts/:alertId`, (req, res, ctx) => {
+  rest.get(`*${ environment.apiUrl }/notifications/:alertId`, (req, res, ctx) => {
     const { alertId } = req.params;
 
     const indexFromId = parseInt((alertId as string).replace('id-', ''), 10);
@@ -105,12 +105,12 @@ export const alertsHandlers = [
 
     return res(ctx.status(200), ctx.json({ ...randomNotification, id: alertId }));
   }),
-  rest.post(`*${ environment.apiUrl }/alerts`, (_, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications`, (_, res, ctx) => {
     return res(ctx.status(400), ctx.json({message: "Error while sending Alert to EDC"} ));
     //return res(ctx.status(200), ctx.json({ id: AlertIdPrefix + 1 }));
   }),
 
-  rest.put(`*${ environment.apiUrl }/alerts/:alertId/status`, async (req, res, ctx) => {
+  rest.put(`*${ environment.apiUrl }/notifications/:alertId/status`, async (req, res, ctx) => {
     const { alertId } = req.params;
     const { status } = await req.json();
 
@@ -121,7 +121,7 @@ export const alertsHandlers = [
 ];
 
 export const alertsTestHandlers = [
-  rest.post(`*${ environment.apiUrl }/alerts/filter`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/filter`, (req, res, ctx) => {
     const pagination = extractPaginationOfNotifications(req);
 
     const currentStatus = [
@@ -135,14 +135,14 @@ export const alertsTestHandlers = [
     return res(ctx.status(200), ctx.json(applyPagination(testBuildMockAlerts(currentStatus, 'SENDER'), pagination)));
   }),
 
-  rest.post(`*${ environment.apiUrl }/alerts/filter`, (req, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications/filter`, (req, res, ctx) => {
     const pagination = extractPaginationOfNotifications(req);
 
     const currentStatus = [ NotificationStatus.RECEIVED, NotificationStatus.ACKNOWLEDGED ];
     return res(ctx.status(200), ctx.json(applyPagination(testBuildMockAlerts(currentStatus, 'RECEIVER'), pagination)));
   }),
 
-  rest.get(`*${ environment.apiUrl }/alerts/:alertId`, (req, res, ctx) => {
+  rest.get(`*${ environment.apiUrl }/notifications/:alertId`, (req, res, ctx) => {
     const { alertId } = req.params;
 
     const indexFromId = parseInt((alertId as string).replace('id-', ''), 10);
@@ -163,11 +163,11 @@ export const alertsTestHandlers = [
 
     return res(ctx.status(200), ctx.json({ ...randomNotification, id: alertId }));
   }),
-  rest.post(`*${ environment.apiUrl }/alerts`, (_, res, ctx) => {
+  rest.post(`*${ environment.apiUrl }/notifications`, (_, res, ctx) => {
     return res(ctx.status(200), ctx.json({ id: testAlertIdPrefix + 1 }));
   }),
 
-  rest.put(`*${ environment.apiUrl }/alerts/:alertId/status`, async (req, res, ctx) => {
+  rest.put(`*${ environment.apiUrl }/notifications/:alertId/status`, async (req, res, ctx) => {
     const { alertId } = req.params;
     const { status } = await req.json();
 

frontend/src/app/mocks/services/alerts-mock/alerts.model.ts

@@ -20,7 +20,7 @@
  ********************************************************************************/
 
 import type { NotificationResponse } from '@shared/model/notification.model';
-import { NotificationStatus } from '@shared/model/notification.model';
+import { NotificationStatus, NotificationTypeResponse } from '@shared/model/notification.model';
 import { Severity } from '@shared/model/severity.model';
 import { getRandomAsset } from '../parts-mock/partsAsPlanned/partsAsPlanned.model';
 import { MOCK_part_1 } from '../parts-mock/partsAsPlanned/partsAsPlanned.test.model';
@@ -61,6 +61,7 @@ export const buildMockAlerts = (
     return {
       id: `${ AlertIdPrefix }${ index + 1 }`,
       description: `Alert No ${ index + 1 } ${ getRandomText(getRandomIntFromInterval(15, 500)) }`,
+      title: 'title',
       status,
       severity,
       channel,
@@ -73,13 +74,15 @@ export const buildMockAlerts = (
       targetDate: `2022-${ numberToString(month) }-${ numberToString(day + 1) }T12:34:12`,
       assetIds: [ MOCK_part_1.id, getRandomAsset().id, getRandomAsset().id, getRandomAsset().id ],
       errorMessage: errorAlert,
+      type: NotificationTypeResponse.ALERT,
     };
   });
 
 const MockEmptyAlert: NotificationResponse = {
   id: `${ AlertIdPrefix }000`,
   description: `Alert No 000`,
   status: NotificationStatus.CREATED,
+  title: 'Title',
   severity: Severity.MINOR,
   createdBy: 'BPN10000000OEM0A',
   createdByName: 'OEM xxxxxxxxxxxxxxx A',
@@ -90,6 +93,7 @@ const MockEmptyAlert: NotificationResponse = {
   targetDate: `2022-02-01T12:34:12`,
   assetIds: [ getRandomAsset().id ],
   channel: 'SENDER',
+  type: NotificationTypeResponse.ALERT,
 };
 
 export const getAlertById = (id: string) => {

frontend/src/app/mocks/services/alerts-mock/alerts.test.model.ts

@@ -20,7 +20,7 @@
  ********************************************************************************/
 
 import type { NotificationResponse } from '@shared/model/notification.model';
-import { NotificationStatus } from '@shared/model/notification.model';
+import { NotificationStatus, NotificationTypeResponse } from '@shared/model/notification.model';
 import { Severity } from '@shared/model/severity.model';
 import { getRandomAsset } from '../parts-mock/partsAsPlanned/partsAsPlanned.model';
 import { MOCK_part_1 } from '../parts-mock/partsAsPlanned/partsAsPlanned.test.model';
@@ -50,11 +50,13 @@ export const buildMockAlerts = (
       createdBy: 'BPN10000000OEM0A',
       createdByName: 'OEM xxxxxxxxxxxxxxx A',
       sendTo: 'BPN20000000OEM0B',
+      title: 'Title',
       sendToName: 'OEM xxxxxxxxxxxxxxx B',
       reason: { close: '', accept: '', decline: '' },
       createdDate: `2022-${ numberToString(month) }-${ numberToString(day) }T12:34:12`,
       assetIds: [ MOCK_part_1.id, getRandomAsset().id, getRandomAsset().id, getRandomAsset().id ],
       errorMessage: errorAlert,
+      type: NotificationTypeResponse.ALERT,
     };
   });
 
@@ -71,6 +73,8 @@ export const MockEmptyAlert: NotificationResponse = {
   createdDate: `2022-05-01T12:34:12`,
   assetIds: [ getRandomAsset().id ],
   channel: 'SENDER',
+  title: 'Title',
+  type: NotificationTypeResponse.ALERT,
 };
 
 export const getAlertById = (id: string) => {