From bb91863bd3b2d5d6f85f8b415b8bb425e90d04f5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 3 Nov 2023 17:54:40 +0100
Subject: [PATCH] OZG-4461 OZG-4509 remove spezific vorgangOrder -> use
commandOrder instead
---
.../src/lib/forwarding.service.spec.ts | 12 +++++------
.../src/lib/forwarding.util.spec.ts | 7 +++----
.../src/lib/forwarding.util.ts | 7 +++----
.../vorgang-shared/src/lib/vorgang.model.ts | 18 +----------------
.../src/lib/vorgang.util.spec.ts | 20 +++++++++----------
.../vorgang-shared/src/lib/vorgang.util.ts | 20 +++++++++----------
6 files changed, 33 insertions(+), 51 deletions(-)
diff --git a/goofy-client/libs/forwarding-shared/src/lib/forwarding.service.spec.ts b/goofy-client/libs/forwarding-shared/src/lib/forwarding.service.spec.ts
index 6d48e0bfff..efae571792 100644
--- a/goofy-client/libs/forwarding-shared/src/lib/forwarding.service.spec.ts
+++ b/goofy-client/libs/forwarding-shared/src/lib/forwarding.service.spec.ts
@@ -21,11 +21,11 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CommandResource, CommandService } from '@goofy-client/command-shared';
+import { CommandOrder, CommandResource, CommandService } from '@goofy-client/command-shared';
import { NavigationService } from '@goofy-client/navigation-shared';
import { StateResource, createEmptyStateResource, createErrorStateResource, createStateResource } from '@goofy-client/tech-shared';
import { Mock, mock, useFromMock } from '@goofy-client/test-utils';
-import { CreateForwardCommand, ForwardRequest, VorgangOrder, VorgangResource, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
+import { CreateForwardCommand, ForwardRequest, VorgangResource, VorgangService, VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
import { cold, hot } from 'jest-marbles';
import { CommandLinkRel } from 'libs/command-shared/src/lib/command.linkrel';
import { createCommandResource } from 'libs/command-shared/test/command';
@@ -72,7 +72,7 @@ describe('ForwardingService', () => {
})
it('should call commandService', () => {
- const command: CreateForwardCommand = { order: VorgangOrder.FORWARD, redirectRequest: forwardRequest, body: null };
+ const command: CreateForwardCommand = { order: CommandOrder.REDIRECT_VORGANG, redirectRequest: forwardRequest, body: null };
service.forward(vorgang, forwardRequest);
@@ -239,7 +239,7 @@ describe('ForwardingService', () => {
describe('createMarkAsCommand', () => {
it('should return value', () => {
- const result = service.createMarkAsCommand(forwading, ForwardingLinkRel.MARK_AS_SUCCESS, { order: VorgangOrder.FORWARD_SUCCESSFULL, body: null });
+ const result = service.createMarkAsCommand(forwading, ForwardingLinkRel.MARK_AS_SUCCESS, { order: CommandOrder.FORWARD_SUCCESSFULL, body: null });
expect(result).toBeObservable(cold('ab', { a: createEmptyStateResource(true), b: stateResource }));
})
@@ -250,7 +250,7 @@ describe('ForwardingService', () => {
it('should call command service', () => {
service.markAsSuccess(forwading);
- expect(commandService.createCommand).toHaveBeenCalledWith(forwading, ForwardingLinkRel.MARK_AS_SUCCESS, { order: VorgangOrder.FORWARD_SUCCESSFULL, body: null });
+ expect(commandService.createCommand).toHaveBeenCalledWith(forwading, ForwardingLinkRel.MARK_AS_SUCCESS, { order: CommandOrder.FORWARD_SUCCESSFULL, body: null });
})
it('should update list on valid response', () => {
@@ -269,7 +269,7 @@ describe('ForwardingService', () => {
it('should call command service', () => {
service.markAsFail(forwading);
- expect(commandService.createCommand).toHaveBeenCalledWith(forwading, ForwardingLinkRel.MARK_AS_FAIL, { order: VorgangOrder.FORWARD_FAILED, body: null });
+ expect(commandService.createCommand).toHaveBeenCalledWith(forwading, ForwardingLinkRel.MARK_AS_FAIL, { order: CommandOrder.FORWARD_FAILED, body: null });
})
it('should update vorgang on valid response', () => {
diff --git a/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.spec.ts b/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.spec.ts
index f732b69e0b..2e53798f0c 100644
--- a/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.spec.ts
+++ b/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.spec.ts
@@ -21,8 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CreateCommand } from '@goofy-client/command-shared';
-import { VorgangOrder } from '@goofy-client/vorgang-shared';
+import { CommandOrder, CreateCommand } from '@goofy-client/command-shared';
import { createForwardingMarkAsFailCommand, createForwardingMarkAsSuccessCommand } from './forwarding.util';
describe('ForwardingUtil', () => {
@@ -32,7 +31,7 @@ describe('ForwardingUtil', () => {
it('should return command', () => {
const command: CreateCommand = createForwardingMarkAsSuccessCommand();
- expect(command.order).toBe(VorgangOrder.FORWARD_SUCCESSFULL);
+ expect(command.order).toBe(CommandOrder.FORWARD_SUCCESSFULL);
})
})
@@ -41,7 +40,7 @@ describe('ForwardingUtil', () => {
it('should return command', () => {
const command: CreateCommand = createForwardingMarkAsFailCommand();
- expect(command.order).toBe(VorgangOrder.FORWARD_FAILED);
+ expect(command.order).toBe(CommandOrder.FORWARD_FAILED);
})
})
})
\ No newline at end of file
diff --git a/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.ts b/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.ts
index 94f2cd3d8b..d8ed01d77e 100644
--- a/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.ts
+++ b/goofy-client/libs/forwarding-shared/src/lib/forwarding.util.ts
@@ -21,13 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { CreateCommand } from '@goofy-client/command-shared';
-import { VorgangOrder } from '@goofy-client/vorgang-shared';
+import { CommandOrder, CreateCommand } from '@goofy-client/command-shared';
export function createForwardingMarkAsSuccessCommand(): CreateCommand {
- return { order: VorgangOrder.FORWARD_SUCCESSFULL, body: null };
+ return { order: CommandOrder.FORWARD_SUCCESSFULL, body: null };
}
export function createForwardingMarkAsFailCommand(): CreateCommand {
- return { order: VorgangOrder.FORWARD_FAILED, body: null };
+ return { order: CommandOrder.FORWARD_FAILED, body: null };
}
\ No newline at end of file
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
index 27c7bd07a0..93c69d1d6d 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts
@@ -95,22 +95,6 @@ export enum VorgangStatus {
ZU_LOESCHEN = 'ZU_LOESCHEN'
}
-//TODO Use CommandOrder from command-shared lib
-export enum VorgangOrder {
- ANNEHMEN = 'VORGANG_ANNEHMEN',
- VERWERFEN = 'VORGANG_VERWERFEN',
- ZURUECKHOLEN = 'VORGANG_ZURUECKHOLEN',
- BEARBEITEN = 'VORGANG_BEARBEITEN',
- BESCHEIDEN = 'VORGANG_BESCHEIDEN',
- ZURUECKSTELLEN = 'VORGANG_ZURUECKSTELLEN',
- ABSCHLIESSEN = 'VORGANG_ABSCHLIESSEN',
- WIEDEREROEFFNEN = 'VORGANG_WIEDEREROEFFNEN',
- FORWARD = 'REDIRECT_VORGANG',
- FORWARD_SUCCESSFULL = 'FORWARD_SUCCESSFULL',
- FORWARD_FAILED = 'FORWARD_FAILED',
- ASSIGN_USER = 'ASSIGN_USER'
-}
-
export interface VorgangResource extends Vorgang, Resource { }
export interface VorgangListResource extends ListResource {
@@ -141,7 +125,7 @@ export interface VorgangDetailSnackBarData {
}
export interface CreateForwardCommand extends CreateCommand {
- order: VorgangOrder,
+ order: CommandOrder,
redirectRequest: ForwardRequest
}
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 8b7795cab0..de2fa7f2de 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
@@ -24,7 +24,7 @@
import { CommandOrder, CreateCommand } from '@goofy-client/command-shared';
import { createVorgangForwardRequest, createVorgangListResource } from 'libs/vorgang-shared/test/vorgang';
import { VorgangListLinkRel } from './vorgang.linkrel';
-import { ForwardRequest, VorgangOrder, VorgangResource } from './vorgang.model';
+import { ForwardRequest, VorgangResource } from './vorgang.model';
import { createAbschliessenCommand, createAnnehmenCommand, createAssignUserCommand, createBearbeitenCommand, createBescheidenCommand, createExecuteProcessorCommand, createForwardCommand, createVerwerfenCommand, createZurueckholenCommand, createZurueckstellenCommand, getVorgaengeFromList } from './vorgang.util';
import faker from '@faker-js/faker';
@@ -36,7 +36,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createZurueckholenCommand();
- expect(command.order).toBe(VorgangOrder.ZURUECKHOLEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_ZURUECKHOLEN);
})
})
@@ -45,7 +45,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createAnnehmenCommand();
- expect(command.order).toBe(VorgangOrder.ANNEHMEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_ANNEHMEN);
})
})
@@ -54,7 +54,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createVerwerfenCommand();
- expect(command.order).toBe(VorgangOrder.VERWERFEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_VERWERFEN);
})
})
@@ -63,7 +63,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createBearbeitenCommand();
- expect(command.order).toBe(VorgangOrder.BEARBEITEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_BEARBEITEN);
})
})
@@ -72,7 +72,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createBescheidenCommand();
- expect(command.order).toBe(VorgangOrder.BESCHEIDEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_BESCHEIDEN);
})
})
@@ -81,7 +81,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createZurueckstellenCommand();
- expect(command.order).toBe(VorgangOrder.ZURUECKSTELLEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_ZURUECKSTELLEN);
})
})
@@ -90,7 +90,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const command: CreateCommand = createAbschliessenCommand();
- expect(command.order).toBe(VorgangOrder.ABSCHLIESSEN);
+ expect(command.order).toBe(CommandOrder.VORGANG_ABSCHLIESSEN);
})
})
@@ -101,7 +101,7 @@ describe('VorgangUtil', () => {
const result: CreateCommand = createForwardCommand(forwardRequest);
- expect(result).toEqual({ order: VorgangOrder.FORWARD, redirectRequest: forwardRequest, body: null })
+ expect(result).toEqual({ order: CommandOrder.REDIRECT_VORGANG, redirectRequest: forwardRequest, body: null })
})
})
@@ -127,7 +127,7 @@ describe('VorgangUtil', () => {
it('should return command', () => {
const result: CreateCommand = createAssignUserCommand(userProfileUri);
- expect(result).toEqual({ order: VorgangOrder.ASSIGN_USER, body: { assignedTo: userProfileUri } })
+ expect(result).toEqual({ order: CommandOrder.ASSIGN_USER, body: { assignedTo: userProfileUri } })
})
})
diff --git a/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.ts b/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.ts
index 385ab08b57..a32e181595 100644
--- a/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.ts
+++ b/goofy-client/libs/vorgang-shared/src/lib/vorgang.util.ts
@@ -26,42 +26,42 @@ import { EMPTY_ARRAY, isNotNil } from '@goofy-client/tech-shared';
import { ResourceUri, getEmbeddedResource } from '@ngxp/rest';
import { isNull } from 'lodash-es';
import { VorgangListLinkRel } from './vorgang.linkrel';
-import { CreateAssignUserCommand, CreateForwardCommand, ForwardRequest, VorgangListResource, VorgangOrder, VorgangResource } from './vorgang.model';
+import { CreateAssignUserCommand, CreateForwardCommand, ForwardRequest, VorgangListResource, VorgangResource } from './vorgang.model';
export function createZurueckholenCommand(): CreateCommand {
- return { order: VorgangOrder.ZURUECKHOLEN, body: null };
+ return { order: CommandOrder.VORGANG_ZURUECKHOLEN, body: null };
}
export function createAnnehmenCommand(): CreateCommand {
- return { order: VorgangOrder.ANNEHMEN, body: null };
+ return { order: CommandOrder.VORGANG_ANNEHMEN, body: null };
}
export function createVerwerfenCommand(): CreateCommand {
- return { order: VorgangOrder.VERWERFEN, body: null };
+ return { order: CommandOrder.VORGANG_VERWERFEN, body: null };
}
export function createBearbeitenCommand(): CreateCommand {
- return { order: VorgangOrder.BEARBEITEN, body: null };
+ return { order: CommandOrder.VORGANG_BEARBEITEN, body: null };
}
export function createBescheidenCommand(): CreateCommand {
- return { order: VorgangOrder.BESCHEIDEN, body: null };
+ return { order: CommandOrder.VORGANG_BESCHEIDEN, body: null };
}
export function createZurueckstellenCommand(): CreateCommand {
- return { order: VorgangOrder.ZURUECKSTELLEN, body: null };
+ return { order: CommandOrder.VORGANG_ZURUECKSTELLEN, body: null };
}
export function createAbschliessenCommand(): CreateCommand {
- return { order: VorgangOrder.ABSCHLIESSEN, body: null };
+ return { order: CommandOrder.VORGANG_ABSCHLIESSEN, body: null };
}
export function createWiedereroeffnenCommand(): CreateCommand {
- return { order: VorgangOrder.WIEDEREROEFFNEN, body: null };
+ return { order: CommandOrder.VORGANG_WIEDEREROEFFNEN, body: null };
}
export function createForwardCommand(redirectRequest: ForwardRequest): CreateForwardCommand {
- return { order: VorgangOrder.FORWARD, redirectRequest, body: null };
+ return { order: CommandOrder.REDIRECT_VORGANG, redirectRequest, body: null };
}
export function getVorgaengeFromList(vorgangList: VorgangListResource): VorgangResource[] {
--
GitLab