Skip to content
Snippets Groups Projects
Commit 1f2fdca4 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5012 rename attributes and test description

parent 2a9710ba
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+ 30
− 27
View file @ 1f2fdca4
...@@ -114,15 +114,15 @@ describe('BescheidService', () => { ...@@ -114,15 +114,15 @@ describe('BescheidService', () => {
createStateResource(bescheidDraft); createStateResource(bescheidDraft);
it('should call resource service', () => { it('should call resource service', () => {
service.bescheidDraftService.get = jest.fn(); service.bescheidResourceService.get = jest.fn();
service.getBescheidDraft(); service.getBescheidDraft();
expect(service.bescheidDraftService.get).toHaveBeenCalled(); expect(service.bescheidResourceService.get).toHaveBeenCalled();
}); });
it('should return value', () => { it('should return value', () => {
service.bescheidDraftService.get = jest service.bescheidResourceService.get = jest
.fn() .fn()
.mockReturnValue(singleCold(bescheidDraftStateResource)); .mockReturnValue(singleCold(bescheidDraftStateResource));
...@@ -148,7 +148,7 @@ describe('BescheidService', () => { ...@@ -148,7 +148,7 @@ describe('BescheidService', () => {
beforeEach(() => { beforeEach(() => {
facade.getBescheidCommand.mockReturnValue(of(commandStateResource)); facade.getBescheidCommand.mockReturnValue(of(commandStateResource));
service.bescheidDraftService.loadByResourceUri = jest.fn(); service.bescheidResourceService.loadByResourceUri = jest.fn();
}); });
it('should call facade', () => { it('should call facade', () => {
...@@ -163,7 +163,7 @@ describe('BescheidService', () => { ...@@ -163,7 +163,7 @@ describe('BescheidService', () => {
it('should set resource by uri', () => { it('should set resource by uri', () => {
service.createBescheid(vorgangWithEingang).pipe(first()).subscribe(); service.createBescheid(vorgangWithEingang).pipe(first()).subscribe();
expect(service.bescheidDraftService.loadByResourceUri).toHaveBeenCalledWith( expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
getUrl(command, CommandLinkRel.EFFECTED_RESOURCE), getUrl(command, CommandLinkRel.EFFECTED_RESOURCE),
); );
}); });
...@@ -420,9 +420,8 @@ describe('BescheidService', () => { ...@@ -420,9 +420,8 @@ describe('BescheidService', () => {
buildUpdateBescheidCommandPropsSpy = jest buildUpdateBescheidCommandPropsSpy = jest
.spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps') .spyOn(BescheidUtil, 'buildUpdateBescheidCommandProps')
.mockReturnValue(createCommandProps); .mockReturnValue(createCommandProps);
service.bescheidDraftService.stateResource.next(createStateResource(bescheidResource));
commandService.createCommandByProps.mockReturnValue(of(commandStateResource)); commandService.createCommandByProps.mockReturnValue(of(commandStateResource));
service.bescheidDraftService.loadByResourceUri = jest.fn(); service.bescheidResourceService.loadByResourceUri = jest.fn();
service.getResource = jest.fn().mockReturnValue(createBescheidResource()); service.getResource = jest.fn().mockReturnValue(createBescheidResource());
}); });
...@@ -453,7 +452,7 @@ describe('BescheidService', () => { ...@@ -453,7 +452,7 @@ describe('BescheidService', () => {
.updateBescheid(bescheid) .updateBescheid(bescheid)
.pipe(first()) .pipe(first())
.subscribe((commandStateResource: StateResource<CommandResource>) => { .subscribe((commandStateResource: StateResource<CommandResource>) => {
expect(service.bescheidDraftService.loadByResourceUri).toHaveBeenCalledWith( expect(service.bescheidResourceService.loadByResourceUri).toHaveBeenCalledWith(
getUrl(commandStateResource.resource, CommandLinkRel.EFFECTED_RESOURCE), getUrl(commandStateResource.resource, CommandLinkRel.EFFECTED_RESOURCE),
); );
done(); done();
...@@ -488,7 +487,7 @@ describe('BescheidService', () => { ...@@ -488,7 +487,7 @@ describe('BescheidService', () => {
let buildSendBescheidCommandPropsSpy: jest.SpyInstance; let buildSendBescheidCommandPropsSpy: jest.SpyInstance;
beforeEach(() => { beforeEach(() => {
service.bescheidDraftService.get = jest service.bescheidResourceService.get = jest
.fn() .fn()
.mockReturnValue(of(createStateResource(bescheidResource))); .mockReturnValue(of(createStateResource(bescheidResource)));
buildSendBescheidCommandPropsSpy = jest buildSendBescheidCommandPropsSpy = jest
...@@ -500,7 +499,7 @@ describe('BescheidService', () => { ...@@ -500,7 +499,7 @@ describe('BescheidService', () => {
it('should get resource', () => { it('should get resource', () => {
service.sendBescheid(bescheidResource, linkRel); service.sendBescheid(bescheidResource, linkRel);
expect(service.bescheidDraftService.get).toHaveBeenCalled(); expect(service.bescheidResourceService.get).toHaveBeenCalled();
}); });
it('should call command service', (done) => { it('should call command service', (done) => {
...@@ -1090,17 +1089,17 @@ describe('BescheidService', () => { ...@@ -1090,17 +1089,17 @@ describe('BescheidService', () => {
describe('exists bescheid draft', () => { describe('exists bescheid draft', () => {
beforeEach(() => { 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(); service.existsBescheidDraft();
expect(service.bescheidDraftService.existResource).toHaveBeenCalled(); expect(service.bescheidResourceService.existResource).toHaveBeenCalled();
}); });
it('should return false on missing resource', () => { 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(); const exists: boolean = service.existsBescheidDraft();
...@@ -1200,19 +1199,19 @@ describe('BescheidService', () => { ...@@ -1200,19 +1199,19 @@ describe('BescheidService', () => {
}); });
describe('get bescheid list', () => { describe('get bescheid list', () => {
it('should call bescheid list service', () => { it('should call bescheid list resource service', () => {
service.bescheidListService.getList = jest.fn(); service.bescheidListResourceService.getList = jest.fn();
service.getBescheidList(); service.getBescheidList();
expect(service.bescheidListService.getList).toHaveBeenCalled(); expect(service.bescheidListResourceService.getList).toHaveBeenCalled();
}); });
it('should return value', () => { it('should return value', () => {
const bescheidList: BescheidListResource = createBescheidListResource(); const bescheidList: BescheidListResource = createBescheidListResource();
const bescheidListStateResource: StateResource<BescheidListResource> = const bescheidListStateResource: StateResource<BescheidListResource> =
createStateResource(bescheidList); createStateResource(bescheidList);
service.bescheidListService.getList = jest service.bescheidListResourceService.getList = jest
.fn() .fn()
.mockReturnValue(singleCold(bescheidListStateResource)); .mockReturnValue(singleCold(bescheidListStateResource));
...@@ -1251,18 +1250,18 @@ describe('BescheidService', () => { ...@@ -1251,18 +1250,18 @@ describe('BescheidService', () => {
const bescheidStateResource: StateResource<BescheidResource> = const bescheidStateResource: StateResource<BescheidResource> =
createStateResource(bescheidResource); createStateResource(bescheidResource);
it('should call bescheid draft service', () => { it('should call bescheid resource service select resource', () => {
service.bescheidDraftService.selectResource = jest service.bescheidResourceService.selectResource = jest
.fn() .fn()
.mockReturnValue(of(bescheidStateResource)); .mockReturnValue(of(bescheidStateResource));
service.getResource(); service.getResource();
expect(service.bescheidDraftService.selectResource).toHaveBeenCalled(); expect(service.bescheidResourceService.selectResource).toHaveBeenCalled();
}); });
it('should return value', () => { it('should return value', () => {
service.bescheidDraftService.selectResource = jest service.bescheidResourceService.selectResource = jest
.fn() .fn()
.mockReturnValue(of(bescheidStateResource)); .mockReturnValue(of(bescheidStateResource));
...@@ -1302,7 +1301,9 @@ describe('BescheidService', () => { ...@@ -1302,7 +1301,9 @@ describe('BescheidService', () => {
sortByGermanDateStrSpy = jest sortByGermanDateStrSpy = jest
.spyOn(DateUtil, 'sortByGermanDateStr') .spyOn(DateUtil, 'sortByGermanDateStr')
.mockReturnValue(bescheide); .mockReturnValue(bescheide);
getItemsSpy = service.bescheidListService.getItems = jest.fn().mockReturnValue(of(bescheide)); getItemsSpy = service.bescheidListResourceService.getItems = jest
.fn()
.mockReturnValue(of(bescheide));
}); });
it('should get items', () => { it('should get items', () => {
...@@ -1341,7 +1342,9 @@ describe('BescheidService', () => { ...@@ -1341,7 +1342,9 @@ describe('BescheidService', () => {
beforeEach(() => { beforeEach(() => {
service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource)); service.getBescheidList = jest.fn().mockReturnValue(of(bescheidListStateResource));
service.filterBySentStatus = jest.fn().mockReturnValue(bescheide); 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', () => { it('should get items', () => {
...@@ -1400,12 +1403,12 @@ describe('BescheidService', () => { ...@@ -1400,12 +1403,12 @@ describe('BescheidService', () => {
}); });
describe('refresh list', () => { describe('refresh list', () => {
it('should call refresh on list service', () => { it('should call refresh on list resource service', () => {
service.bescheidListService.refresh = jest.fn(); service.bescheidListResourceService.refresh = jest.fn();
service.refreshList(); service.refreshList();
expect(service.bescheidListService.refresh).toHaveBeenCalled(); expect(service.bescheidListResourceService.refresh).toHaveBeenCalled();
}); });
}); });
......
alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+ 15
− 15
View file @ 1f2fdca4
...@@ -74,8 +74,8 @@ import { DocumentResource } from './document.model'; ...@@ -74,8 +74,8 @@ import { DocumentResource } from './document.model';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class BescheidService { export class BescheidService {
bescheidDraftService: ResourceService<VorgangWithEingangResource, BescheidResource>; bescheidResourceService: ResourceService<VorgangWithEingangResource, BescheidResource>;
bescheidListService: ResourceListService< bescheidListResourceService: ResourceListService<
VorgangWithEingangResource, VorgangWithEingangResource,
BescheidListResource, BescheidListResource,
BescheidResource BescheidResource
...@@ -117,12 +117,12 @@ export class BescheidService { ...@@ -117,12 +117,12 @@ export class BescheidService {
private readonly binaryFileService: BinaryFileService, private readonly binaryFileService: BinaryFileService,
private readonly repository: ResourceRepository, private readonly repository: ResourceRepository,
) { ) {
this.bescheidDraftService = new CommandResourceService( this.bescheidResourceService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(), this.buildBescheidDraftServiceConfig(),
repository, repository,
this.commandService, this.commandService,
); );
this.bescheidListService = new ResourceListService( this.bescheidListResourceService = new ResourceListService(
this.buildBescheidListServiceConfig(), this.buildBescheidListServiceConfig(),
repository, repository,
); );
...@@ -146,7 +146,7 @@ export class BescheidService { ...@@ -146,7 +146,7 @@ export class BescheidService {
} }
public init(): void { public init(): void {
this.bescheidDraftService = new CommandResourceService( this.bescheidResourceService = new CommandResourceService(
this.buildBescheidDraftServiceConfig(), this.buildBescheidDraftServiceConfig(),
this.repository, this.repository,
this.commandService, this.commandService,
...@@ -159,7 +159,7 @@ export class BescheidService { ...@@ -159,7 +159,7 @@ export class BescheidService {
} }
public getBescheidDraft(): Observable<StateResource<BescheidResource>> { public getBescheidDraft(): Observable<StateResource<BescheidResource>> {
return this.bescheidDraftService.get(); return this.bescheidResourceService.get();
} }
public getBescheidCommand(): Observable<StateResource<CommandResource>> { public getBescheidCommand(): Observable<StateResource<CommandResource>> {
...@@ -249,7 +249,7 @@ export class BescheidService { ...@@ -249,7 +249,7 @@ export class BescheidService {
bescheidResource: BescheidResource, bescheidResource: BescheidResource,
linkRel: string, linkRel: string,
): Observable<StateResource<CommandResource>> { ): Observable<StateResource<CommandResource>> {
return this.bescheidDraftService.get().pipe( return this.bescheidResourceService.get().pipe(
filterIsLoadedOrHasError(), filterIsLoadedOrHasError(),
switchMap((stateResource: StateResource<BescheidResource>) => switchMap((stateResource: StateResource<BescheidResource>) =>
this.commandService.createCommandByProps( this.commandService.createCommandByProps(
...@@ -269,7 +269,7 @@ export class BescheidService { ...@@ -269,7 +269,7 @@ export class BescheidService {
} }
private updateBescheidDraft(command: CommandResource): void { private updateBescheidDraft(command: CommandResource): void {
this.bescheidDraftService.loadByResourceUri(getEffectedResourceUrl(command)); this.bescheidResourceService.loadByResourceUri(getEffectedResourceUrl(command));
} }
public getAttachments(): Observable<BinaryFileResource[]> { public getAttachments(): Observable<BinaryFileResource[]> {
...@@ -454,7 +454,7 @@ export class BescheidService { ...@@ -454,7 +454,7 @@ export class BescheidService {
public existsBescheidDraft(): boolean { public existsBescheidDraft(): boolean {
let exists: boolean; let exists: boolean;
this.bescheidDraftService this.bescheidResourceService
.existResource() .existResource()
.pipe(take(1)) .pipe(take(1))
.subscribe((existsDraft: boolean) => (exists = existsDraft)); .subscribe((existsDraft: boolean) => (exists = existsDraft));
...@@ -475,11 +475,11 @@ export class BescheidService { ...@@ -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 { getResource(): BescheidResource {
let resource: StateResource<BescheidResource> = undefined; let resource: StateResource<BescheidResource> = undefined;
this.bescheidDraftService this.bescheidResourceService
.selectResource() .selectResource()
.pipe(take(1)) .pipe(take(1))
.subscribe((stateResource: StateResource<BescheidResource>) => (resource = stateResource)); .subscribe((stateResource: StateResource<BescheidResource>) => (resource = stateResource));
...@@ -509,7 +509,7 @@ export class BescheidService { ...@@ -509,7 +509,7 @@ export class BescheidService {
} }
public getLastBescheid(): Observable<BescheidResource> { public getLastBescheid(): Observable<BescheidResource> {
return this.bescheidListService.getItems().pipe( return this.bescheidListResourceService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)), map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => this.sortByBeschiedenAm(bescheide)), map((bescheide: BescheidResource[]) => this.sortByBeschiedenAm(bescheide)),
map((bescheide: BescheidResource[]) => bescheide[0]), map((bescheide: BescheidResource[]) => bescheide[0]),
...@@ -524,14 +524,14 @@ export class BescheidService { ...@@ -524,14 +524,14 @@ export class BescheidService {
} }
public existBescheid(): Observable<boolean> { public existBescheid(): Observable<boolean> {
return this.bescheidListService.getItems().pipe( return this.bescheidListResourceService.getItems().pipe(
map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)), map((bescheide: BescheidResource[]) => this.filterBySentStatus(bescheide)),
map((bescheide: BescheidResource[]) => isNotEmpty(bescheide)), map((bescheide: BescheidResource[]) => isNotEmpty(bescheide)),
); );
} }
public getBescheidList(): Observable<StateResource<BescheidListResource>> { public getBescheidList(): Observable<StateResource<BescheidListResource>> {
return this.bescheidListService.getList(); return this.bescheidListResourceService.getList();
} }
filterBySentStatus(bescheide: BescheidResource[]): BescheidResource[] { filterBySentStatus(bescheide: BescheidResource[]): BescheidResource[] {
...@@ -543,7 +543,7 @@ export class BescheidService { ...@@ -543,7 +543,7 @@ export class BescheidService {
} }
public refreshList(): void { public refreshList(): void {
this.bescheidListService.refresh(); this.bescheidListResourceService.refresh();
} }
public uploadAttachment( public uploadAttachment(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit