From b526a1829e1e147f479cc169ca3aaa0f2f195078 Mon Sep 17 00:00:00 2001 From: Martin <git@mail.de> Date: Wed, 12 Feb 2025 22:02:36 +0100 Subject: [PATCH] OZG-5977 implement get uploaded files --- .../src/lib/binary-file.service.spec.ts | 29 +++++++++++++++---- .../src/lib/binary-file.service.ts | 7 +---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.spec.ts b/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.spec.ts index 16991df5bd..3e21ff0e6d 100644 --- a/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.spec.ts +++ b/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.spec.ts @@ -58,13 +58,16 @@ describe('BinaryFileService', () => { }); describe('is upload in progress', () => { - it('should return true if uploadedFiles contains loading stateResource by key', () => { - const uploadFile: UploadFile = { - fileToUpload: createFile(), - uploadedFile: of(createEmptyStateResource<BinaryFileResource>(true)), - }; + const uploadFile: UploadFile = { + fileToUpload: createFile(), + uploadedFile: of(createEmptyStateResource<BinaryFileResource>(true)), + }; + + beforeEach(() => { service.uploadFiles.next({ [BinaryFileUploadType.BESCHEID]: [uploadFile] }); + }); + it('should return true if uploadedFiles contains loading stateResource by key', () => { const uploadInProgress: Observable<boolean> = service.isUploadInProgress(BinaryFileUploadType.BESCHEID); expect(uploadInProgress).toBeObservable(singleCold(true)); @@ -72,7 +75,21 @@ describe('BinaryFileService', () => { }); describe('get uploaded files', () => { - //Implement me + const uploadFile: UploadFile = { + fileToUpload: createFile(), + uploadedFile: of(createStateResource(createBinaryFileResource())), + }; + + beforeEach(() => { + service.uploadFiles.next({ [BinaryFileUploadType.BESCHEID]: [uploadFile] }); + }); + + it('should return uploaded files by key', (done) => { + service.getUploadedFiles(BinaryFileUploadType.BESCHEID).subscribe((uploadedFiles: UploadFile[]) => { + expect(uploadedFiles).toEqual([uploadFile]); + done(); + }); + }); }); describe('upload file new', () => { diff --git a/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.ts b/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.ts index e45a0278cc..490f0b8571 100644 --- a/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.ts +++ b/alfa-client/libs/binary-file-shared/src/lib/binary-file.service.ts @@ -77,12 +77,7 @@ export class BinaryFileService { } public getUploadedFiles(type: BinaryFileUploadType): Observable<UploadFile[]> { - //Implement me - return of([this.createDummyUploadFile()]); - } - - private createDummyUploadFile(): UploadFile { - return { fileToUpload: <any>{ name: 'DummyFileName' }, uploadedFile: of(createEmptyStateResource<BinaryFileResource>()) }; + return this.uploadFiles.asObservable().pipe(map((files: UploadFilesByType) => files[type])); } //TODO Rename -- GitLab