diff --git a/goofy-client/libs/command-shared/src/lib/+state/command.reducer.ts b/goofy-client/libs/command-shared/src/lib/+state/command.reducer.ts index 3c05363034f01a511402ba9678a513b3a4841c53..9fdf7a3f7ce97cf70867a14ab3c5d5107ca3d845 100644 --- a/goofy-client/libs/command-shared/src/lib/+state/command.reducer.ts +++ b/goofy-client/libs/command-shared/src/lib/+state/command.reducer.ts @@ -1,6 +1,6 @@ -import { createAnyErrorStateResource, createEmptyStateResource, createStateResource } from '@goofy-client/tech-shared'; +import { StateResource, createAnyErrorStateResource, createEmptyStateResource, createStateResource } from '@goofy-client/tech-shared'; import { Action, ActionReducer, createReducer, on } from '@ngrx/store'; -import { CreateCommandProps } from '../command.model'; +import { CommandResource, CreateCommandProps } from '../command.model'; import * as Actions from './command.actions'; @@ -11,11 +11,11 @@ export interface CommandPartialState { } export interface CommandState { - commandByOrderMap: any; + commandByOrderMap: {[order: string]: StateResource<CommandResource>}; } export const initialState: CommandState = { - commandByOrderMap: <any>{}, + commandByOrderMap: {}, }; const commandReducer: ActionReducer<CommandState, Action> = createReducer( diff --git a/goofy-client/libs/command-shared/src/lib/+state/command.selectors.spec.ts b/goofy-client/libs/command-shared/src/lib/+state/command.selectors.spec.ts index 73f7406db51840edd74af7246f8a5b9fa6cd5550..58d1d2a7bf3327af64a6745cc85bcf5dfc582b17 100644 --- a/goofy-client/libs/command-shared/src/lib/+state/command.selectors.spec.ts +++ b/goofy-client/libs/command-shared/src/lib/+state/command.selectors.spec.ts @@ -1,6 +1,6 @@ -import { createEmptyStateResource } from '@goofy-client/tech-shared'; +import { StateResource, createEmptyStateResource } from '@goofy-client/tech-shared'; import { createCreateCommand } from 'libs/command-shared/test/command'; -import { CommandOrder, CreateCommand } from '../command.model'; +import { CommandOrder, CommandResource, CreateCommand } from '../command.model'; import { CommandPartialState, initialState } from './command.reducer'; import * as Selectors from './command.selectors'; @@ -34,13 +34,13 @@ describe('Command Selectors', () => { describe('commandByOrder', () => { it('should return command from map by order', () => { - const result: boolean = Selectors.commandByOrder(commandInStateOrder).projector(commandByOrderMap); + const result: StateResource<CommandResource> = Selectors.commandByOrder(commandInStateOrder).projector(commandByOrderMap); expect(result).toBe(commandInState); }) - it('should return empty state resource on undefined', () => { - const result: boolean = Selectors.commandByOrder(commandInStateOrder).projector({}); + it('should return empty state resource on empty object', () => { + const result: StateResource<CommandResource> = Selectors.commandByOrder(commandInStateOrder).projector({}); expect(result).toEqual(createEmptyStateResource()); }) diff --git a/goofy-client/libs/command-shared/src/lib/command.service.spec.ts b/goofy-client/libs/command-shared/src/lib/command.service.spec.ts index 31fc96fc1c0da59e80c5ce26139a8186495e79f7..b398936a9389c0cfc04f04d8835d861cb0249737 100644 --- a/goofy-client/libs/command-shared/src/lib/command.service.spec.ts +++ b/goofy-client/libs/command-shared/src/lib/command.service.spec.ts @@ -343,14 +343,14 @@ describe('CommandService', () => { }) }) - describe('createCommandByOrder', () => { + describe('createCommandByProps', () => { const command: CreateCommand = createCreateCommand(); const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); const createCommandProps: CreateCommandProps = { ...createCreateCommandProps(), command }; it('should dispatch action', () => { - service.createCommandByOrder(createCommandProps); + service.createCommandByProps(createCommandProps); expect(store.dispatch).toHaveBeenCalledWith(Actions.createCommand(createCommandProps)); }) @@ -358,7 +358,7 @@ describe('CommandService', () => { it('should call selector', (done) => { const selectorSpy = jest.spyOn(Selectors, 'commandByOrder'); - service.createCommandByOrder(createCommandProps).subscribe(() => { + service.createCommandByProps(createCommandProps).subscribe(() => { expect(selectorSpy).toHaveBeenCalledWith(command.order); done(); }); @@ -367,7 +367,7 @@ describe('CommandService', () => { }) it('should return selected command', (done) => { - service.createCommandByOrder(createCommandProps).subscribe(selected => { + service.createCommandByProps(createCommandProps).subscribe(selected => { expect(selected).toBe(commandStateResource); done(); }); diff --git a/goofy-client/libs/command-shared/src/lib/command.service.ts b/goofy-client/libs/command-shared/src/lib/command.service.ts index 8b3fa819a0f23f0ccca8f2af5a455dcd6ae98184..8bd8603d7175a33302b8b9e810f1f19069537209 100644 --- a/goofy-client/libs/command-shared/src/lib/command.service.ts +++ b/goofy-client/libs/command-shared/src/lib/command.service.ts @@ -118,7 +118,7 @@ export class CommandService { return this.repository.getEffectedResource(command); } - public createCommandByOrder(createCommandProps: CreateCommandProps): Observable<StateResource<CommandResource>> { + public createCommandByProps(createCommandProps: CreateCommandProps): Observable<StateResource<CommandResource>> { this.store.dispatch(Actions.createCommand(createCommandProps)); return this.store.select(Selectors.commandByOrder(createCommandProps.command.order)); } diff --git a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts index ecba97166f60b39e0edce603eecb7c1ae97577d1..71c488d6a4f744cd7e0a7bf65d81231727017d6f 100644 --- a/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts +++ b/goofy-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-more-menu/vorgang-detail-more-menu.component.spec.ts @@ -142,7 +142,7 @@ describe('VorgangDetailMoreMenuComponent', () => { expect(element).not.toBeInTheDocument(); }) - describe('component call', () => { + describe('input property', () => { beforeEach(() => { component.vorgangWithEingang = vorgangWithEingang; @@ -223,7 +223,7 @@ describe('VorgangDetailMoreMenuComponent', () => { expect(element).not.toBeInTheDocument(); }) - describe('component call', () => { + describe('input property', () => { beforeEach(() => { component.vorgangWithEingang = vorgangWithEingang; diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts index 34f2534148b95845396f8b2a22c611540c3c2694..3ab3d4d26ffbf8c12830edc4406fd7793634fff4 100644 --- a/goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts +++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang.service.ts @@ -158,7 +158,7 @@ export class VorgangService { } public processVorgang(vorgangWithEingang: VorgangWithEingangResource): Observable<StateResource<CommandResource>> { - return this.commandService.createCommandByOrder(this.createProcessVorgangCommandProps(vorgangWithEingang)); + return this.commandService.createCommandByProps(this.createProcessVorgangCommandProps(vorgangWithEingang)); } private createProcessVorgangCommandProps(vorgangWithEingang: VorgangWithEingangResource): CreateCommandProps { diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.spec.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.spec.ts index 9fdf515564db53c05e1b6cd9dc066f1dcc9c6de4..41763ac63767ef5ea15eca018b2db4958e0b60a9 100644 --- a/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.spec.ts +++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.spec.ts @@ -134,9 +134,7 @@ describe('VorgangUtil', () => { describe('create createProcessVorgangCommand', () => { it('should have order', () => { - const processorNames: string[] = ['dummyProcessorName']; - - const command: CreateCommand = createProcessVorgangCommand(processorNames); + const command: CreateCommand = createProcessVorgangCommand([]); expect(command.order).toBe(CommandOrder.PROCESS_VORGANG); })