use resource service funktion

alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts

@@ -1234,33 +1234,22 @@ describe('BescheidService', () => {
   describe('get last bescheid', () => {
     const bescheid: BescheidResource = createBescheidResource();
     const bescheide: BescheidResource[] = [bescheid];
-    const bescheidListStateResource: StateResource<BescheidListResource> = createStateResource(
-      createBescheidListResource(bescheide),
-    );
+
     let sortByGermanDateStrSpy: jest.SpyInstance;
-    let getEmbeddedBescheidResourcesSpy: jest.SpyInstance;
+    let getItemsSpy: jest.SpyInstance;
 
     beforeEach(() => {
-      service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
       service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
       sortByGermanDateStrSpy = jest
         .spyOn(DateUtil, 'sortByGermanDateStr')
         .mockReturnValue(bescheide);
-      getEmbeddedBescheidResourcesSpy = jest
-        .spyOn(BescheidUtil, 'getEmbeddedBescheidResources')
-        .mockReturnValue(bescheide);
-    });
-
-    it('should get bescheid list', () => {
-      service.getLastBescheid().pipe(first()).subscribe();
-
-      expect(service.getBescheidList).toHaveBeenCalled();
+      getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
     });
 
-    it('should get embedded bescheid resource from list', () => {
+    it('should get items', () => {
       service.getLastBescheid().pipe(first()).subscribe();
 
-      expect(getEmbeddedBescheidResourcesSpy).toHaveBeenCalledWith(bescheidListStateResource);
+      expect(getItemsSpy).toHaveBeenCalled();
     });
 
     it('should filter by sent status', () => {
@@ -1288,25 +1277,18 @@ describe('BescheidService', () => {
     const bescheidListStateResource: StateResource<BescheidListResource> = createStateResource(
       createBescheidListResource(bescheide),
     );
-    let getEmbeddedBescheidResourcesSpy: jest.SpyInstance;
+    let getItemsSpy: jest.SpyInstance;
 
     beforeEach(() => {
       service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
       service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
-      getEmbeddedBescheidResourcesSpy = jest
-        .spyOn(BescheidUtil, 'getEmbeddedBescheidResources')
-        .mockReturnValue(bescheide);
-    });
-    it('should get bescheid list', () => {
-      service.existBescheid().pipe(first()).subscribe();
-
-      expect(service.getBescheidList).toHaveBeenCalled();
+      getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
     });
 
-    it('should get embedded bescheid resources from list', () => {
+    it('should get items', () => {
       service.existBescheid().pipe(first()).subscribe();
 
-      expect(getEmbeddedBescheidResourcesSpy).toHaveBeenCalledWith(bescheidListStateResource);
+      expect(getItemsSpy).toHaveBeenCalled();
     });
 
     it('should filter by sent status', () => {

alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts

@@ -65,7 +65,6 @@ import {
   buildDeleteBescheidCommandProps,
   buildSendBescheidCommandProps,
   buildUpdateBescheidCommandProps,
-  getEmbeddedBescheidResources,
 } from './bescheid.util';
 import { DocumentLinkRel } from './document.linkrel';
 import { DocumentResource } from './document.model';
@@ -484,11 +483,7 @@ export class BescheidService {
   }
 
   public getLastBescheid(): Observable<BescheidResource> {
-    return this.getBescheidList().pipe(
-      filter(isLoaded),
-      map((bescheidListStateResource: StateResource<BescheidListResource>) =>
-        getEmbeddedBescheidResources(bescheidListStateResource),
-      ),
+    return this.bescheidListService.getItems().pipe(
       map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
       map((bescheide: BescheidResource[]) => this.sortByBeschiedenAm(bescheide)),
       map((bescheide: BescheidResource[]) => bescheide[0]),
@@ -503,11 +498,7 @@ export class BescheidService {
   }
 
   public existBescheid(): Observable<boolean> {
-    return this.getBescheidList().pipe(
-      filter(isLoaded),
-      map((bescheidListStateResource: StateResource<BescheidListResource>) =>
-        getEmbeddedBescheidResources(bescheidListStateResource),
-      ),
+    return this.bescheidListService.getItems().pipe(
       map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
       map((bescheide: BescheidResource[]) => isNotEmpty(bescheide)),
     );