diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
index 9cae99e2f96b7c85a7a8f9931cc7b8d008cb8e5c..881bf8106312b35a9110b5d660e97a8617452689 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
@@ -114,15 +114,15 @@ describe('BescheidService', () => {
createStateResource(bescheidDraft);
it('should call resource service', () => {
- service.bescheidDraftService.get = jest.fn();
+ service.bescheidResourceService.get = jest.fn();
service.getBescheidDraft();
- expect(service.bescheidDraftService.get).toHaveBeenCalled();
+ expect(service.bescheidResourceService.get).toHaveBeenCalled();
});
it('should return value', () => {
- service.bescheidDraftService.get = jest
+ service.bescheidResourceService.get = jest
.fn()
.mockReturnValue(singleCold(bescheidDraftStateResource));
@@ -148,7 +148,7 @@ describe('BescheidService', () => {
beforeEach(() => {
facade.getBescheidCommand.mockReturnValue(of(commandStateResource));
- service.bescheidDraftService.loadByResourceUri = jest.fn();
+ service.bescheidResourceService.loadByResourceUri = jest.fn();
});
it('should call facade', () => {
@@ -163,7 +163,7 @@ describe('BescheidService', () => {
it('should set resource by uri', () => {
service.createBescheid(vorgangWithEingang).pipe(first()).subscribe();
- expect(service.bescheidDraftService.loadByResourceUri).toHaveBeenCalledWith(
+ expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
getUrl(command, CommandLinkRel.EFFECTED_RESOURCE),
);
});
@@ -420,9 +420,8 @@ describe('BescheidService', () => {
buildUpdateBescheidCommandPropsSpy = jest
.spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
.mockReturnValue(createCommandProps);
- service.bescheidDraftService.stateResource.next(createStateResource(bescheidResource));
commandService.createCommandByProps.mockReturnValue(of(commandStateResource));
- service.bescheidDraftService.loadByResourceUri = jest.fn();
+ service.bescheidResourceService.loadByResourceUri = jest.fn();
service.getResource = jest.fn().mockReturnValue(createBescheidResource());
});
@@ -453,7 +452,7 @@ describe('BescheidService', () => {
.updateBescheid(bescheid)
.pipe(first())
.subscribe((commandStateResource: StateResource<CommandResource>) => {
- expect(service.bescheidDraftService.loadByResourceUri).toHaveBeenCalledWith(
+ expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
getUrl(commandStateResource.resource, CommandLinkRel.EFFECTED_RESOURCE),
);
done();
@@ -488,7 +487,7 @@ describe('BescheidService', () => {
let buildSendBescheidCommandPropsSpy: jest.SpyInstance;
beforeEach(() => {
- service.bescheidDraftService.get = jest
+ service.bescheidResourceService.get = jest
.fn()
.mockReturnValue(of(createStateResource(bescheidResource)));
buildSendBescheidCommandPropsSpy = jest
@@ -500,7 +499,7 @@ describe('BescheidService', () => {
it('should get resource', () => {
service.sendBescheid(bescheidResource, linkRel);
- expect(service.bescheidDraftService.get).toHaveBeenCalled();
+ expect(service.bescheidResourceService.get).toHaveBeenCalled();
});
it('should call command service', (done) => {
@@ -1090,17 +1089,17 @@ describe('BescheidService', () => {
describe('exists bescheid draft', () => {
beforeEach(() => {
- service.bescheidDraftService.existResource = jest.fn().mockReturnValue(of(true));
+ service.bescheidResourceService.existResource = jest.fn().mockReturnValue(of(true));
});
- it('should call bescheid draft service', () => {
+ it('should call bescheid resource service', () => {
service.existsBescheidDraft();
- expect(service.bescheidDraftService.existResource).toHaveBeenCalled();
+ expect(service.bescheidResourceService.existResource).toHaveBeenCalled();
});
it('should return false on missing resource', () => {
- service.bescheidDraftService.existResource = jest.fn().mockReturnValue(of(false));
+ service.bescheidResourceService.existResource = jest.fn().mockReturnValue(of(false));
const exists: boolean = service.existsBescheidDraft();
@@ -1200,19 +1199,19 @@ describe('BescheidService', () => {
});
describe('get bescheid list', () => {
- it('should call bescheid list service', () => {
- service.bescheidListService.getList = jest.fn();
+ it('should call bescheid list resource service', () => {
+ service.bescheidListResourceService.getList = jest.fn();
service.getBescheidList();
- expect(service.bescheidListService.getList).toHaveBeenCalled();
+ expect(service.bescheidListResourceService.getList).toHaveBeenCalled();
});
it('should return value', () => {
const bescheidList: BescheidListResource = createBescheidListResource();
const bescheidListStateResource: StateResource<BescheidListResource> =
createStateResource(bescheidList);
- service.bescheidListService.getList = jest
+ service.bescheidListResourceService.getList = jest
.fn()
.mockReturnValue(singleCold(bescheidListStateResource));
@@ -1251,18 +1250,18 @@ describe('BescheidService', () => {
const bescheidStateResource: StateResource<BescheidResource> =
createStateResource(bescheidResource);
- it('should call bescheid draft service', () => {
- service.bescheidDraftService.selectResource = jest
+ it('should call bescheid resource service select resource', () => {
+ service.bescheidResourceService.selectResource = jest
.fn()
.mockReturnValue(of(bescheidStateResource));
service.getResource();
- expect(service.bescheidDraftService.selectResource).toHaveBeenCalled();
+ expect(service.bescheidResourceService.selectResource).toHaveBeenCalled();
});
it('should return value', () => {
- service.bescheidDraftService.selectResource = jest
+ service.bescheidResourceService.selectResource = jest
.fn()
.mockReturnValue(of(bescheidStateResource));
@@ -1302,7 +1301,9 @@ describe('BescheidService', () => {
sortByGermanDateStrSpy = jest
.spyOn(DateUtil, 'sortByGermanDateStr')
.mockReturnValue(bescheide);
- getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
+ getItemsSpy = service.bescheidListResourceService.getItems = jest
+ .fn()
+ .mockReturnValue(of(bescheide));
});
it('should get items', () => {
@@ -1341,7 +1342,9 @@ describe('BescheidService', () => {
beforeEach(() => {
service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide);
- getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide));
+ getItemsSpy = service.bescheidListResourceService.getItems = jest
+ .fn()
+ .mockReturnValue(of(bescheide));
});
it('should get items', () => {
@@ -1400,12 +1403,12 @@ describe('BescheidService', () => {
});
describe('refresh list', () => {
- it('should call refresh on list service', () => {
- service.bescheidListService.refresh = jest.fn();
+ it('should call refresh on list resource service', () => {
+ service.bescheidListResourceService.refresh = jest.fn();
service.refreshList();
- expect(service.bescheidListService.refresh).toHaveBeenCalled();
+ expect(service.bescheidListResourceService.refresh).toHaveBeenCalled();
});
});
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
index bffb7c69a61829da611ac18a2b4891af78886c2e..d3b333c029ee6d6a2e21a34cee47f373c445c0b7 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
@@ -74,8 +74,8 @@ import { DocumentResource } from './document.model';
@Injectable({ providedIn: 'root' })
export class BescheidService {
- bescheidDraftService: ResourceService<VorgangWithEingangResource, BescheidResource>;
- bescheidListService: ResourceListService<
+ bescheidResourceService: ResourceService<VorgangWithEingangResource, BescheidResource>;
+ bescheidListResourceService: ResourceListService<
VorgangWithEingangResource,
BescheidListResource,
BescheidResource
@@ -117,12 +117,12 @@ export class BescheidService {
private readonly binaryFileService: BinaryFileService,
private readonly repository: ResourceRepository,
) {
- this.bescheidDraftService = new CommandResourceService(
+ this.bescheidResourceService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(),
repository,
this.commandService,
);
- this.bescheidListService = new ResourceListService(
+ this.bescheidListResourceService = new ResourceListService(
this.buildBescheidListServiceConfig(),
repository,
);
@@ -146,7 +146,7 @@ export class BescheidService {
}
public init(): void {
- this.bescheidDraftService = new CommandResourceService(
+ this.bescheidResourceService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(),
this.repository,
this.commandService,
@@ -159,7 +159,7 @@ export class BescheidService {
}
public getBescheidDraft(): Observable<StateResource<BescheidResource>> {
- return this.bescheidDraftService.get();
+ return this.bescheidResourceService.get();
}
public getBescheidCommand(): Observable<StateResource<CommandResource>> {
@@ -249,7 +249,7 @@ export class BescheidService {
bescheidResource: BescheidResource,
linkRel: string,
): Observable<StateResource<CommandResource>> {
- return this.bescheidDraftService.get().pipe(
+ return this.bescheidResourceService.get().pipe(
filterIsLoadedOrHasError(),
switchMap((stateResource: StateResource<BescheidResource>) =>
this.commandService.createCommandByProps(
@@ -269,7 +269,7 @@ export class BescheidService {
}
private updateBescheidDraft(command: CommandResource): void {
- this.bescheidDraftService.loadByResourceUri(getEffectedResourceUrl(command));
+ this.bescheidResourceService.loadByResourceUri(getEffectedResourceUrl(command));
}
public getAttachments(): Observable<BinaryFileResource[]> {
@@ -454,7 +454,7 @@ export class BescheidService {
public existsBescheidDraft(): boolean {
let exists: boolean;
- this.bescheidDraftService
+ this.bescheidResourceService
.existResource()
.pipe(take(1))
.subscribe((existsDraft: boolean) => (exists = existsDraft));
@@ -475,11 +475,11 @@ export class BescheidService {
}
/**
- * @returns @deprecated Don't use this function, instead passing data to function if necessarry.
+ * @returns @deprecated Don't use this function, instead pass data to function if necessarry.
*/
getResource(): BescheidResource {
let resource: StateResource<BescheidResource> = undefined;
- this.bescheidDraftService
+ this.bescheidResourceService
.selectResource()
.pipe(take(1))
.subscribe((stateResource: StateResource<BescheidResource>) => (resource = stateResource));
@@ -509,7 +509,7 @@ export class BescheidService {
}
public getLastBescheid(): Observable<BescheidResource> {
- return this.bescheidListService.getItems().pipe(
+ return this.bescheidListResourceService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => this.sortByBeschiedenAm(bescheide)),
map((bescheide: BescheidResource[]) => bescheide[0]),
@@ -524,14 +524,14 @@ export class BescheidService {
}
public existBescheid(): Observable<boolean> {
- return this.bescheidListService.getItems().pipe(
+ return this.bescheidListResourceService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => isNotEmpty(bescheide)),
);
}
public getBescheidList(): Observable<StateResource<BescheidListResource>> {
- return this.bescheidListService.getList();
+ return this.bescheidListResourceService.getList();
}
filterBySentStatus(bescheide: BescheidResource[]): BescheidResource[] {
@@ -543,7 +543,7 @@ export class BescheidService {
}
public refreshList(): void {
- this.bescheidListService.refresh();
+ this.bescheidListResourceService.refresh();
}
public uploadAttachment(