OZG-7473 fix unit tests

Sub task: OZG-7887

alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping-resource.service.spec.ts

@@ -18,7 +18,7 @@ import { Observable, of } from 'rxjs';
 import { createRouteData, createUrlSegment } from '../../../../navigation-shared/test/navigation-test-factory';
 import { singleColdCompleted } from '../../../../tech-shared/test/marbles';
 import { createAggregationMappingResource } from '../../test/aggregation-mapping';
-import * as module from './aggregation-mapping-resource.service';
+import * as mod from './aggregation-mapping-resource.service';
 
 jest.mock('@alfa-client/tech-shared', () => ({
   ...jest.requireActual('@alfa-client/tech-shared'),
@@ -37,16 +37,14 @@ describe('AggregationMappingResourceService', () => {
   });
 
   describe('build config', () => {
-    const _getResourceByNavigationRoute: jest.SpyInstance = jest
-      .spyOn(module, '_getResourceByNavigationRoute')
-      .mockImplementation();
+    const _getResourceByNavigationRoute: jest.SpyInstance = jest.spyOn(mod, '_getResourceByNavigationRoute').mockImplementation();
 
     afterAll(() => {
       _getResourceByNavigationRoute.mockRestore();
     });
 
     it('should get resource by navigation route', () => {
-      module._buildResourceServiceConfig(useFromMock(repository), useFromMock(navigationService));
+      mod._buildResourceServiceConfig(useFromMock(repository), useFromMock(navigationService));
 
       expect(_getResourceByNavigationRoute).toHaveBeenCalled();
     });
@@ -55,7 +53,7 @@ describe('AggregationMappingResourceService', () => {
       const staticResource: StateResource<AggregationMappingResource> = createStateResource(createAggregationMappingResource());
       _getResourceByNavigationRoute.mockReturnValue(of(staticResource));
 
-      const config: ResourceServiceConfig<AggregationMappingResource> = module._buildResourceServiceConfig(
+      const config: ResourceServiceConfig<AggregationMappingResource> = mod._buildResourceServiceConfig(
         useFromMock(repository),
         useFromMock(navigationService),
       );
@@ -66,11 +64,9 @@ describe('AggregationMappingResourceService', () => {
 
   describe('get resource by navigation route', () => {
     const routeData: RouteData = createRouteData();
-    const _isAggregationMappingEditUrl: jest.SpyInstance = jest
-      .spyOn(module, '_isAggregationMappingEditUrl')
-      .mockImplementation();
+    const _isAggregationMappingEditUrl: jest.SpyInstance = jest.spyOn(mod, '_isAggregationMappingEditUrl').mockImplementation();
     const _getAggregationMappingResourceByRoute: jest.SpyInstance = jest
-      .spyOn(module, '_getAggregationMappingResourceByRoute')
+      .spyOn(mod, '_getAggregationMappingResourceByRoute')
       .mockImplementation();
 
     beforeEach(() => {
@@ -83,19 +79,19 @@ describe('AggregationMappingResourceService', () => {
     });
 
     it('should get current route data', () => {
-      module._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
+      mod._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
 
       expect(navigationService.getCurrentRouteData).toHaveBeenCalled();
     });
 
     it('should check if url contains resource uri', () => {
-      module._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
+      mod._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
 
       expect(_isAggregationMappingEditUrl).toHaveBeenCalled();
     });
 
     it('should get aggregation mapping resource by route', () => {
-      module._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
+      mod._getResourceByNavigationRoute(useFromMock(repository), useFromMock(navigationService)).subscribe();
 
       expect(_getAggregationMappingResourceByRoute).toHaveBeenCalled();
     });
@@ -105,7 +101,7 @@ describe('AggregationMappingResourceService', () => {
       _getAggregationMappingResourceByRoute.mockReturnValue(of(stateResource));
       _isAggregationMappingEditUrl.mockReturnValue(true);
 
-      const resourceByRoute$: Observable<StateResource<AggregationMappingResource>> = module._getResourceByNavigationRoute(
+      const resourceByRoute$: Observable<StateResource<AggregationMappingResource>> = mod._getResourceByNavigationRoute(
         useFromMock(repository),
         useFromMock(navigationService),
       );
@@ -117,7 +113,7 @@ describe('AggregationMappingResourceService', () => {
       const stateResource: StateResource<AggregationMappingResource> = createEmptyStateResource();
       _isAggregationMappingEditUrl.mockReturnValue(false);
 
-      const resourceByRoute$: Observable<StateResource<AggregationMappingResource>> = module._getResourceByNavigationRoute(
+      const resourceByRoute$: Observable<StateResource<AggregationMappingResource>> = mod._getResourceByNavigationRoute(
         useFromMock(repository),
         useFromMock(navigationService),
       );
@@ -133,7 +129,7 @@ describe('AggregationMappingResourceService', () => {
         urlSegments: Array(numberOfSegments).fill(createUrlSegment()),
       };
 
-      expect(module._isAggregationMappingEditUrl(routeData)).toBe(false);
+      expect(mod._isAggregationMappingEditUrl(routeData)).toBe(false);
     });
 
     it('should return false if first path is wrong', () => {
@@ -142,7 +138,7 @@ describe('AggregationMappingResourceService', () => {
         urlSegments: Array(2).fill(createUrlSegment()),
       };
 
-      expect(module._isAggregationMappingEditUrl(routeData)).toBe(false);
+      expect(mod._isAggregationMappingEditUrl(routeData)).toBe(false);
     });
 
     it('should return false if second path is wrong', () => {
@@ -155,7 +151,7 @@ describe('AggregationMappingResourceService', () => {
         urlSegments: [firstUrlSegment, secondUrlSegment],
       };
 
-      expect(module._isAggregationMappingEditUrl(routeData)).toBe(false);
+      expect(mod._isAggregationMappingEditUrl(routeData)).toBe(false);
     });
 
     it('should return true', () => {
@@ -168,7 +164,7 @@ describe('AggregationMappingResourceService', () => {
         urlSegments: [firstUrlSegment, secondUrlSegment],
       };
 
-      expect(module._isAggregationMappingEditUrl(routeData)).toBe(true);
+      expect(mod._isAggregationMappingEditUrl(routeData)).toBe(true);
     });
   });
 
@@ -190,19 +186,19 @@ describe('AggregationMappingResourceService', () => {
     });
 
     it('should decode url', () => {
-      module._getAggregationMappingResourceByRoute(useFromMock(repository), routeData);
+      mod._getAggregationMappingResourceByRoute(useFromMock(repository), routeData);
 
       expect(decodeUrlFromEmbeddingMock).toHaveBeenCalledWith(secondUrlSegment.path);
     });
 
     it('should get resource', () => {
-      module._getAggregationMappingResourceByRoute(useFromMock(repository), routeData);
+      mod._getAggregationMappingResourceByRoute(useFromMock(repository), routeData);
 
       expect(repository.getResource).toHaveBeenCalledWith(uri);
     });
 
     it('should return state resource', () => {
-      const stateResource$: Observable<StateResource<AggregationMappingResource>> = module._getAggregationMappingResourceByRoute(
+      const stateResource$: Observable<StateResource<AggregationMappingResource>> = mod._getAggregationMappingResourceByRoute(
         useFromMock(repository),
         routeData,
       );

alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping-resource.service.ts

@@ -11,7 +11,7 @@ import {
 } from '@alfa-client/tech-shared';
 import { UrlSegment } from '@angular/router';
 import { iif, map, Observable, of, switchMap } from 'rxjs';
-import * as module from './aggregation-mapping-resource.service';
+import * as mod from './aggregation-mapping-resource.service';
 import { AggregationMappingLinkRel } from './aggregation-mapping.linkrel';
 import { AggregationMappingResource } from './aggregation-mapping.model';
 
@@ -31,9 +31,8 @@ export function _buildResourceServiceConfig(
   repository: ResourceRepository,
   navigationService: NavigationService,
 ): ResourceServiceConfig<AggregationMappingResource> {
-  module._getResourceByNavigationRoute(repository, navigationService);
   return {
-    resource: module._getResourceByNavigationRoute(repository, navigationService),
+    resource: mod._getResourceByNavigationRoute(repository, navigationService),
     getLinkRel: AggregationMappingLinkRel.SELF,
     edit: { linkRel: AggregationMappingLinkRel.SELF },
     delete: { linkRel: AggregationMappingLinkRel.SELF },
@@ -49,8 +48,8 @@ export function _getResourceByNavigationRoute(
     .pipe(
       switchMap((route: RouteData) =>
         iif(
-          () => module._isAggregationMappingEditUrl(route),
-          module._getAggregationMappingResourceByRoute(repository, route),
+          () => mod._isAggregationMappingEditUrl(route),
+          mod._getAggregationMappingResourceByRoute(repository, route),
           of(createEmptyStateResource<AggregationMappingResource>()),
         ),
       ),