chore: rename SignalService to SignalsService

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>

plugins/notifications-backend/src/plugin.ts

@@ -19,7 +19,7 @@ import {
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
 import { createRouter } from './service/router';
-import { signalService } from '@backstage/plugin-signals-node';
+import { signalsServiceRef } from '@backstage/plugin-signals-node';
 import {
   NotificationProcessor,
   notificationsProcessingExtensionPoint,
@@ -66,7 +66,7 @@ export const notificationsPlugin = createBackendPlugin({
         logger: coreServices.logger,
         database: coreServices.database,
         discovery: coreServices.discovery,
-        signals: signalService,
+        signals: signalsServiceRef,
       },
       async init({
         auth,
@@ -86,7 +86,7 @@ export const notificationsPlugin = createBackendPlugin({
             logger,
             database,
             discovery,
-            signalService: signals,
+            signals,
             processors: processingExtensions.processors,
           }),
         );

plugins/notifications-backend/src/service/router.test.ts

@@ -23,7 +23,7 @@ import request from 'supertest';
 
 import { createRouter } from './router';
 import { ConfigReader } from '@backstage/config';
-import { SignalService } from '@backstage/plugin-signals-node';
+import { SignalsService } from '@backstage/plugin-signals-node';
 import { mockServices } from '@backstage/backend-test-utils';
 
 function createDatabase(): PluginDatabaseManager {
@@ -42,7 +42,7 @@ function createDatabase(): PluginDatabaseManager {
 describe('createRouter', () => {
   let app: express.Express;
 
-  const signalService: jest.Mocked<SignalService> = {
+  const signalService: jest.Mocked<SignalsService> = {
     publish: jest.fn(),
   };
 
@@ -56,7 +56,7 @@ describe('createRouter', () => {
       logger: getVoidLogger(),
       database: createDatabase(),
       discovery,
-      signalService,
+      signals: signalService,
       userInfo,
       httpAuth,
       auth,

plugins/notifications-backend/src/service/router.ts

@@ -38,7 +38,7 @@ import {
   LoggerService,
   UserInfoService,
 } from '@backstage/backend-plugin-api';
-import { SignalService } from '@backstage/plugin-signals-node';
+import { SignalsService } from '@backstage/plugin-signals-node';
 import {
   NewNotificationSignal,
   Notification,
@@ -53,7 +53,7 @@ export interface RouterOptions {
   auth: AuthService;
   httpAuth: HttpAuthService;
   userInfo: UserInfoService;
-  signalService?: SignalService;
+  signals?: SignalsService;
   catalog?: CatalogApi;
   processors?: NotificationProcessor[];
 }
@@ -71,7 +71,7 @@ export async function createRouter(
     discovery,
     catalog,
     processors,
-    signalService,
+    signals,
   } = options;
 
   const catalogClient =
@@ -245,8 +245,8 @@ export async function createRouter(
     if (read === true) {
       await store.markRead({ user, ids });
 
-      if (signalService) {
-        await signalService.publish<NotificationReadSignal>({
+      if (signals) {
+        await signals.publish<NotificationReadSignal>({
           recipients: [user],
           message: { action: 'notification_read', notification_ids: ids },
           channel: 'notifications',
@@ -255,8 +255,8 @@ export async function createRouter(
     } else if (read === false) {
       await store.markUnread({ user: user, ids });
 
-      if (signalService) {
-        await signalService.publish<NotificationReadSignal>({
+      if (signals) {
+        await signals.publish<NotificationReadSignal>({
           recipients: [user],
           message: { action: 'notification_unread', notification_ids: ids },
           channel: 'notifications',
@@ -343,8 +343,8 @@ export async function createRouter(
       processorSendNotification(ret);
       notifications.push(ret);
 
-      if (signalService) {
-        await signalService.publish<NewNotificationSignal>({
+      if (signals) {
+        await signals.publish<NewNotificationSignal>({
           recipients: user,
           message: {
             action: 'new_notification',

plugins/notifications-backend/src/service/standaloneServer.ts

@@ -32,7 +32,7 @@ import {
   CatalogRequestOptions,
   GetEntitiesByRefsRequest,
 } from '@backstage/catalog-client';
-import { DefaultSignalService } from '@backstage/plugin-signals-node';
+import { DefaultSignalsService } from '@backstage/plugin-signals-node';
 import {
   EventParams,
   EventsService,
@@ -112,7 +112,7 @@ export async function startStandaloneServer(
     },
   };
 
-  const signalService = DefaultSignalService.create({ events });
+  const signalService = DefaultSignalsService.create({ events });
   // TODO: Move to use services instead this hack
   const { auth, httpAuth, userInfo } = createLegacyAuthAdapters<
     any,
@@ -128,7 +128,7 @@ export async function startStandaloneServer(
     database: dbMock,
     catalog: catalogApi,
     discovery,
-    signalService,
+    signals: signalService,
     auth,
     httpAuth,
     userInfo,