remove unnecessary parameter

goofy-client/libs/ozg-file/src/lib/anhang-list-container/anhang-list-container.component.spec.ts

@@ -94,10 +94,9 @@ describe('AnhangListContainerComponent', () => {
 	describe('ng on changes', () => {
 
 		it('should call vorgang service getAttachments', () => {
-			component.vorgangWithEingang = vorgang;
 			component.ngOnChanges();
 
-			expect(vorgangService.getAttachments).toHaveBeenCalledWith(vorgang);
+			expect(vorgangService.getAttachments).toHaveBeenCalled();
 		})
 	})
 });
\ No newline at end of file

goofy-client/libs/ozg-file/src/lib/anhang-list-container/anhang-list-container.component.ts

@@ -21,6 +21,6 @@ export class AnhangListContainerComponent implements OnChanges {
 	constructor(private vorgangService: VorgangService) { }
 
 	ngOnChanges(): void {
-		this.attachmentStateResource$ = this.vorgangService.getAttachments(this.vorgangWithEingang);
+		this.attachmentStateResource$ = this.vorgangService.getAttachments();
 	}
 }

goofy-client/libs/vorgang-shared/src/lib/vorgang.service.spec.ts

@@ -83,12 +83,6 @@ describe('VorgangService', () => {
 
 			expect(service.loadPendingCommandsByVorgang).toHaveBeenCalled();
 		})
-
-		it('should load attachments', () => {
-			service.updateVorgang(createVorgangWithEingangResource());
-
-			expect(service.loadAttachments).toHaveBeenCalled();
-		})
 	})
 
 	describe('loadPendingCommandsByVorgang', () => {
@@ -202,23 +196,20 @@ describe('VorgangService', () => {
 	describe('loadAttachments', () => {
 
 		beforeEach(() => {
+			service.setStateResourceOnLoading = jest.fn();
 			repository.getAttachments.mockReturnValue(of(createOzgFileListResource()));
 		})
 
-		it('should call repository', () => {
-			const vorgang: VorgangWithEingangResource = createVorgangWithEingangResource([VorgangWithEingangLinkRel.ATTACHMENTS]);
-
-			service.loadAttachments(vorgang);
+		it('should set loading flag', () => {
+			service.loadAttachments();
 
-			expect(repository.getAttachments).toHaveBeenCalledWith(vorgang);
+			expect(service.setStateResourceOnLoading).toHaveBeenCalled();
 		})
 
-		it('should NOT call repository', () => {
-			const vorgang: VorgangWithEingangResource = createVorgangWithEingangResource();
-
-			service.loadAttachments(vorgang);
+		it('should call repository', () => {
+			service.loadAttachments();
 
-			expect(repository.getAttachments).not.toHaveBeenCalled();
+			expect(repository.getAttachments).toHaveBeenCalled();
 		})
 	})
 

goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts

@@ -10,7 +10,7 @@ import { isNil, isUndefined } from 'lodash-es';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { first, startWith, tap } from 'rxjs/operators';
 import { VorgangWithEingangLinkRel } from './vorgang.linkrel';
-import { CreateAssignUserCommand, VorgangOrder, VorgangResource, VorgangWithEingangResource } from './vorgang.model';
+import { CreateAssignUserCommand, VorgangOrder, VorgangWithEingangResource } from './vorgang.model';
 import { VorgangRepository } from './vorgang.repository';
 
 @Injectable({ providedIn: 'root' })
@@ -61,7 +61,6 @@ export class VorgangService {
 		this.setVorgangWithEingang(createStateResource(vorgang));
 		//TODO nur laden, wenn es notwendig ist -> im HTML anstoßen
 		this.loadPendingCommandsByVorgang(vorgang);
-		//this.loadAttachments(vorgang);
 	}
 
 	setVorgangWithEingang(stateResource: StateResource<VorgangWithEingangResource>) {
@@ -124,13 +123,15 @@ export class VorgangService {
 		stateResource$.next({ ...stateResource$.value, loading: true });
 	}
 
-	getAttachments(vorgang: VorgangWithEingangResource): Observable<StateResource<OzgFileListResource>> {
-		doIfLoadingRequired(this.attachments$.value, () => {
+	getAttachments(): Observable<StateResource<OzgFileListResource>> {
+		doIfLoadingRequired(this.attachments$.value, () => this.loadAttachments());
+		return this.attachments$.asObservable();
+	}
+
+	loadAttachments(): void {
 		this.setStateResourceOnLoading(this.attachments$);
-			this.vorgangRepository.getAttachments(vorgang).pipe(first())
+		this.vorgangRepository.getAttachments(this.getVorgang()).pipe(first())
 			.subscribe(result => this.attachments$.next(createStateResource(result)))
-		})
-		return this.attachments$.asObservable();
 	}
 
 	private listenForLeavingVorgang(): void {
@@ -163,21 +164,23 @@ export class VorgangService {
 		this.attachments$.next(createEmptyStateResource());
 	}
 
-	getVorgang(): VorgangResource {
-		return this.vorgangWithEingang$.value.resource;
-	}
+
 
 	reloadVorgang(commandResource: CommandResource): void {
 		this.loadVorgangWithEingang(getUrl(commandResource, CommandLinkRel.EFFECTED_RESOURCE));
 	}
 
 	public assignUser(userUri: ResourceUri): Observable<StateResource<CommandResource>> {
-		return this.commandService.createCommand(this.vorgangWithEingang$.value.resource, VorgangWithEingangLinkRel.ASSIGN, this.createAssignUserOrder(userUri)).pipe(
+		return this.commandService.createCommand(this.getVorgang(), VorgangWithEingangLinkRel.ASSIGN, this.createAssignUserOrder(userUri)).pipe(
 			tap(commandStateResource => this.reloadVorgangOnDone(commandStateResource)),
 			startWith(createEmptyStateResource<CommandResource>(true))
 		)
 	}
 
+	public getVorgang(): VorgangWithEingangResource {
+		return this.vorgangWithEingang$.value.resource;
+	}
+
 	reloadVorgangOnDone(commandResource: StateResource<CommandResource>): void {
 		if (isDone(commandResource.resource)) {
 			this.reloadVorgang(commandResource.resource);