Merge branch 'main' into j-s/civil-claimant-assigned-notifications

apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts

@@ -241,7 +241,11 @@ export class SubpoenaService {
       defenderNationalId,
     )
 
-    if (update.serviceStatus && subpoena.case) {
+    if (
+      update.serviceStatus &&
+      update.serviceStatus !== subpoena.serviceStatus &&
+      subpoena.case
+    ) {
       this.eventService.postEvent(
         'SUBPOENA_SERVICE_STATUS',
         subpoena.case,

apps/services/auth/delegation-api/src/app/delegations/test/me-delegations.access-incoming.spec.ts

@@ -9,7 +9,9 @@ import {
   DelegationScope,
   DelegationsIndexService,
 } from '@island.is/auth-api-lib'
+import { RskRelationshipsClient } from '@island.is/clients-rsk-relationships'
 import { NationalRegistryClientService } from '@island.is/clients/national-registry-v2'
+import { CompanyRegistryClientService } from '@island.is/clients/rsk/company-registry'
 import {
   expectMatchingDelegations,
   FixtureFactory,
@@ -41,9 +43,16 @@ describe('MeDelegationsController', () => {
         })
         server = request(app.getHttpServer())
         delegationIndexService = app.get(DelegationsIndexService)
+        const rskRelationshipsClientService = app.get(RskRelationshipsClient)
         const nationalRegistryClientService = app.get(
           NationalRegistryClientService,
         )
+        const companyRegistryClientService = app.get(
+          CompanyRegistryClientService,
+        )
+        jest
+          .spyOn(nationalRegistryClientService, 'getCustodyChildren')
+          .mockImplementation(async () => [])
         jest
           .spyOn(nationalRegistryClientService, 'getIndividual')
           .mockImplementation(async (nationalId: string) =>
@@ -52,6 +61,12 @@ describe('MeDelegationsController', () => {
               name: fromName,
             }),
           )
+        jest
+          .spyOn(rskRelationshipsClientService, 'getIndividualRelationships')
+          .mockImplementation(async () => null)
+        jest
+          .spyOn(companyRegistryClientService, 'getCompany')
+          .mockImplementation(async () => null)
         jest
           .spyOn(delegationIndexService, 'indexDelegations')
           .mockImplementation()

apps/services/auth/public-api/test/mocks/companyRegistryClientService.mock.ts

@@ -0,0 +1,8 @@
+import { CompanyRegistryClientService } from '@island.is/clients/rsk/company-registry'
+
+export const CompanyRegistryClientServiceMock: Partial<CompanyRegistryClientService> =
+  {
+    getCompany() {
+      return Promise.resolve(null)
+    },
+  }

apps/services/auth/public-api/test/mocks/index.ts

@@ -1,3 +1,4 @@
 export * from './einstaklingurApi.mock'
 export * from './rskProcuringClient.mock'
 export * from './featureFlagService.mock'
+export * from './companyRegistryClientService.mock'

apps/services/auth/public-api/test/setup.ts

@@ -16,6 +16,7 @@ import {
   IndividualDto,
   NationalRegistryClientService,
 } from '@island.is/clients/national-registry-v2'
+import { CompanyRegistryClientService } from '@island.is/clients/rsk/company-registry'
 import { ConfigType } from '@island.is/nest/config'
 import { FeatureFlagService } from '@island.is/nest/feature-flags'
 import {
@@ -35,6 +36,7 @@ import {
 
 import { AppModule } from '../src/app/app.module'
 import {
+  CompanyRegistryClientServiceMock,
   createMockEinstaklingurApi,
   FeatureFlagServiceMock,
   RskProcuringClientMock,
@@ -156,6 +158,8 @@ export const setupWithAuth = async ({
         .useValue(createMockEinstaklingurApi(nationalRegistryUser))
         .overrideProvider(RskRelationshipsClient)
         .useValue(RskProcuringClientMock)
+        .overrideProvider(CompanyRegistryClientService)
+        .useValue(CompanyRegistryClientServiceMock)
         .overrideProvider(DelegationConfig.KEY)
         .useValue(delegationConfig)
         .overrideProvider(FeatureFlagService)