OZG-3563 after merge

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

@@ -35,6 +35,7 @@ import { BescheidService } from './bescheid.service';
 @NgModule({
   imports: [CommonModule, VorgangSharedModule, StoreModule.forFeature(BESCHEID_FEATURE_KEY, bescheidReducer)],
   providers: [
+    BescheidService,
     {
       provide: BescheidListResourceService,
       useFactory: createBescheidListResourceService,
@@ -45,7 +46,6 @@ import { BescheidService } from './bescheid.service';
       useFactory: createBescheidResourceService,
       deps: [StateService, CommandService, VorgangService],
     },
-    BescheidService,
   ],
 })
 export class BescheidSharedModule {}

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

@@ -91,8 +91,6 @@ import {
   BescheidResourceService,
   buildCreateBescheidDocumentFromFileProps,
   buildUpdateBescheidCommandProps,
-  createBescheidListResourceService,
-  createBescheidResourceService,
 } from '@alfa-client/bescheid-shared';
 import { expect } from '@jest/globals';
 import { cold } from 'jest-marbles';
@@ -104,8 +102,6 @@ jest.mock('@alfa-client/bescheid-shared', () => {
   return {
     __esModule: true,
     ...originalModule,
-    createBescheidResourceService: jest.fn(),
-    createBescheidListResourceService: jest.fn(),
     buildUpdateBescheidCommandProps: jest.fn(),
     buildCreateBescheidDocumentFromFileProps: jest.fn(),
   };
@@ -142,8 +138,6 @@ describe('BescheidService', () => {
     bescheidResourceService = mock(CommandResourceService);
     bescheidListResourceService = mock(CommandListResourceService);
     stateService = mock(StateService);
-    (createBescheidResourceService as jest.Mock).mockReturnValue(bescheidResourceService);
-    (createBescheidListResourceService as jest.Mock).mockReturnValue(bescheidListResourceService);
 
     TestBed.configureTestingModule({
       providers: [
@@ -154,10 +148,9 @@ describe('BescheidService', () => {
         { provide: StateService, useValue: stateService },
         { provide: VorgangCommandService, useValue: vorgangCommandService },
         { provide: BinaryFileService, useValue: binaryFileService },
-        {
-          provide: PostfachService,
-          useValue: postfachService,
-        },
+        { provide: PostfachService, useValue: postfachService },
+        { provide: BescheidResourceService, useValue: bescheidResourceService },
+        { provide: BescheidListResourceService, useValue: bescheidListResourceService },
         BescheidService,
       ],
     });

alfa-client/libs/bescheid/src/lib/bescheid-wizard-container/bescheid-wizard-container.component.ts

@@ -72,7 +72,6 @@ export class BescheidWizardContainerComponent implements OnInit, OnDestroy {
     this.bescheidService.setNachrichtEmpfaenger(getEmpfaenger(this.vorgangWithEingangResource));
     this.formService.setVorgangWithEingangResource(this.vorgangWithEingangResource);
     this.activeStep$ = this.bescheidService.getActiveStep();
-    this.bescheidDraftStateResource$.subscribe((x) => console.log(x));
     this.subscribeToBescheidResourceIfExists();
     this.handleEscapeKey();
   }