diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts index 72ad99b1ccbd64af919d0d67a83fa3c78551e988..8aae7f66f74abf27206092e6df5e05413295bc9d 100644 --- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts +++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.spec.ts @@ -128,14 +128,14 @@ describe('AggregationMappingFormService', () => { const stateResource: StateResource<AggregationMappingResource> = createStateResource(createAggregationMappingResource()); beforeEach(() => { - service.getByCurrentUrl.mockReturnValue(of(stateResource)); + service.get.mockReturnValue(of(stateResource)); formService._patchForm = jest.fn(); }); it('should get by current url', () => { formService.get(); - expect(service.getByCurrentUrl).toHaveBeenCalled(); + expect(service.get).toHaveBeenCalled(); }); it('should patch form', () => { diff --git a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts index 3096bf7854aeb7afb1efb242f3473f9e11e9bcf4..09c620e51c53f37b5db731b7488d9538c1bdee06 100644 --- a/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts +++ b/alfa-client/libs/admin/aggregation-mapping/src/lib/aggregation-mapping-form-container/aggregation-mapping-form/aggregation-mapping.formservice.ts @@ -58,7 +58,7 @@ export class AggregationMappingFormservice extends AbstractFormService<Aggregati } public get(): Observable<StateResource<AggregationMappingResource>> { - return this.aggregationMappingService.getByCurrentUrl().pipe( + return this.aggregationMappingService.get().pipe( filter(isLoaded), tap((stateResource: StateResource<AggregationMappingResource>) => this._patchForm(stateResource.resource)), ); diff --git a/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.spec.ts b/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.spec.ts index 0846feed2dc535c4cfa67dc22287013d45b967a0..a3fa52a58ed9f0a0fe0b692f6a6ee67985250981 100644 --- a/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.spec.ts +++ b/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.spec.ts @@ -95,20 +95,20 @@ describe('AggregationMappingService', () => { }); }); - describe('get by current url', () => { + describe('get', () => { const stateResource = createStateResource(createAggregationMappingResource()); beforeEach(() => { resourceService.get = jest.fn().mockReturnValue(of(stateResource)); }); it('should call resource service', () => { - service.getByCurrentUrl(); + service.get(); expect(resourceService.get).toHaveBeenCalled(); }); it('should emit resource', () => { - expect(service.getByCurrentUrl()).toBeObservable(singleColdCompleted(stateResource)); + expect(service.get()).toBeObservable(singleColdCompleted(stateResource)); }); }); diff --git a/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.ts b/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.ts index 333d530998d7fba90a96239816b84f2be4534351..96c72825e5794c7affdb1019d5febd4624b885a7 100644 --- a/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.ts +++ b/alfa-client/libs/admin/reporting-shared/src/lib/aggregation-mapping.service.ts @@ -22,7 +22,7 @@ export class AggregationMappingService { this.listService.refresh(); } - public getByCurrentUrl(): Observable<StateResource<AggregationMappingResource>> { + public get(): Observable<StateResource<AggregationMappingResource>> { return this.resourceService.get(); }