Skip to content
Snippets Groups Projects
Commit 106550f4 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4461 impl PR comments

parent 8d484fa1
No related branches found
No related tags found
No related merge requests found
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 { Action, ActionReducer, createReducer, on } from '@ngrx/store';
import { CreateCommandProps } from '../command.model'; import { CommandResource, CreateCommandProps } from '../command.model';
import * as Actions from './command.actions'; import * as Actions from './command.actions';
...@@ -11,11 +11,11 @@ export interface CommandPartialState { ...@@ -11,11 +11,11 @@ export interface CommandPartialState {
} }
export interface CommandState { export interface CommandState {
commandByOrderMap: any; commandByOrderMap: {[order: string]: StateResource<CommandResource>};
} }
export const initialState: CommandState = { export const initialState: CommandState = {
commandByOrderMap: <any>{}, commandByOrderMap: {},
}; };
const commandReducer: ActionReducer<CommandState, Action> = createReducer( const commandReducer: ActionReducer<CommandState, Action> = createReducer(
......
import { createEmptyStateResource } from '@goofy-client/tech-shared'; import { StateResource, createEmptyStateResource } from '@goofy-client/tech-shared';
import { createCreateCommand } from 'libs/command-shared/test/command'; 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 { CommandPartialState, initialState } from './command.reducer';
import * as Selectors from './command.selectors'; import * as Selectors from './command.selectors';
...@@ -34,13 +34,13 @@ describe('Command Selectors', () => { ...@@ -34,13 +34,13 @@ describe('Command Selectors', () => {
describe('commandByOrder', () => { describe('commandByOrder', () => {
it('should return command from map by order', () => { 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); expect(result).toBe(commandInState);
}) })
it('should return empty state resource on undefined', () => { it('should return empty state resource on empty object', () => {
const result: boolean = Selectors.commandByOrder(commandInStateOrder).projector({}); const result: StateResource<CommandResource> = Selectors.commandByOrder(commandInStateOrder).projector({});
expect(result).toEqual(createEmptyStateResource()); expect(result).toEqual(createEmptyStateResource());
}) })
......
...@@ -343,14 +343,14 @@ describe('CommandService', () => { ...@@ -343,14 +343,14 @@ describe('CommandService', () => {
}) })
}) })
describe('createCommandByOrder', () => { describe('createCommandByProps', () => {
const command: CreateCommand = createCreateCommand(); const command: CreateCommand = createCreateCommand();
const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource());
const createCommandProps: CreateCommandProps = { ...createCreateCommandProps(), command }; const createCommandProps: CreateCommandProps = { ...createCreateCommandProps(), command };
it('should dispatch action', () => { it('should dispatch action', () => {
service.createCommandByOrder(createCommandProps); service.createCommandByProps(createCommandProps);
expect(store.dispatch).toHaveBeenCalledWith(Actions.createCommand(createCommandProps)); expect(store.dispatch).toHaveBeenCalledWith(Actions.createCommand(createCommandProps));
}) })
...@@ -358,7 +358,7 @@ describe('CommandService', () => { ...@@ -358,7 +358,7 @@ describe('CommandService', () => {
it('should call selector', (done) => { it('should call selector', (done) => {
const selectorSpy = jest.spyOn(Selectors, 'commandByOrder'); const selectorSpy = jest.spyOn(Selectors, 'commandByOrder');
service.createCommandByOrder(createCommandProps).subscribe(() => { service.createCommandByProps(createCommandProps).subscribe(() => {
expect(selectorSpy).toHaveBeenCalledWith(command.order); expect(selectorSpy).toHaveBeenCalledWith(command.order);
done(); done();
}); });
...@@ -367,7 +367,7 @@ describe('CommandService', () => { ...@@ -367,7 +367,7 @@ describe('CommandService', () => {
}) })
it('should return selected command', (done) => { it('should return selected command', (done) => {
service.createCommandByOrder(createCommandProps).subscribe(selected => { service.createCommandByProps(createCommandProps).subscribe(selected => {
expect(selected).toBe(commandStateResource); expect(selected).toBe(commandStateResource);
done(); done();
}); });
......
...@@ -118,7 +118,7 @@ export class CommandService { ...@@ -118,7 +118,7 @@ export class CommandService {
return this.repository.getEffectedResource(command); 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)); this.store.dispatch(Actions.createCommand(createCommandProps));
return this.store.select(Selectors.commandByOrder(createCommandProps.command.order)); return this.store.select(Selectors.commandByOrder(createCommandProps.command.order));
} }
......
...@@ -142,7 +142,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -142,7 +142,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
expect(element).not.toBeInTheDocument(); expect(element).not.toBeInTheDocument();
}) })
describe('component call', () => { describe('input property', () => {
beforeEach(() => { beforeEach(() => {
component.vorgangWithEingang = vorgangWithEingang; component.vorgangWithEingang = vorgangWithEingang;
...@@ -223,7 +223,7 @@ describe('VorgangDetailMoreMenuComponent', () => { ...@@ -223,7 +223,7 @@ describe('VorgangDetailMoreMenuComponent', () => {
expect(element).not.toBeInTheDocument(); expect(element).not.toBeInTheDocument();
}) })
describe('component call', () => { describe('input property', () => {
beforeEach(() => { beforeEach(() => {
component.vorgangWithEingang = vorgangWithEingang; component.vorgangWithEingang = vorgangWithEingang;
......
...@@ -158,7 +158,7 @@ export class VorgangService { ...@@ -158,7 +158,7 @@ export class VorgangService {
} }
public processVorgang(vorgangWithEingang: VorgangWithEingangResource): Observable<StateResource<CommandResource>> { 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 { private createProcessVorgangCommandProps(vorgangWithEingang: VorgangWithEingangResource): CreateCommandProps {
......
...@@ -134,9 +134,7 @@ describe('VorgangUtil', () => { ...@@ -134,9 +134,7 @@ describe('VorgangUtil', () => {
describe('create createProcessVorgangCommand', () => { describe('create createProcessVorgangCommand', () => {
it('should have order', () => { it('should have order', () => {
const processorNames: string[] = ['dummyProcessorName']; const command: CreateCommand = createProcessVorgangCommand([]);
const command: CreateCommand = createProcessVorgangCommand(processorNames);
expect(command.order).toBe(CommandOrder.PROCESS_VORGANG); expect(command.order).toBe(CommandOrder.PROCESS_VORGANG);
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment