OZG-928 Eingang um zustaendige Stelle erweitert

goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.ts

@@ -3,6 +3,7 @@ import { FormGroup } from '@angular/forms';
 import { CommandResource } from '@goofy-client/command-shared';
 import { StateResource } from '@goofy-client/tech-shared';
 import { VorgangForwardFormService } from './vorgang-forward.formservice';
+import { VorgangWithEingangResource } from '@goofy-client/vorgang-shared';
 
 @Component({
 	selector: 'goofy-client-vorgang-forward-form',
@@ -12,12 +13,16 @@ import { VorgangForwardFormService } from './vorgang-forward.formservice';
 export class VorgangForwardFormComponent {
 
 	@Input() forwardStateResource: StateResource<CommandResource>;
+	@Input() vorgang: VorgangWithEingangResource;
 
 	@Output('doSubmit') submit: EventEmitter<void> = new EventEmitter();
 
 	readonly formServiceClass = VorgangForwardFormService;
 
-	constructor(private formService: VorgangForwardFormService) { }
+	constructor(private formService: VorgangForwardFormService) {
+		this.formService.patch({'email': 'test'})
+		this.formService.patchField('email', this.vorgang.aktenzeichen)
+	}
 
 	get form(): FormGroup {
 		return this.formService.form;

goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward.formservice.ts

@@ -20,6 +20,10 @@ export class VorgangForwardFormService extends AbstractFormService {
 		super(formBuilder);
 	}
 
+	patchField(fieldName: string, value: string) {
+		this.form.controls[fieldName].patchValue(value);
+	}
+
 	protected initForm(): FormGroup {
 		return this.form = this.formBuilder.group({
 			[VorgangForwardFormService.FIELD_EMAIL]: new FormControl(),

goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-formular.component.html

@@ -6,6 +6,7 @@
 </goofy-client-spinner>
 
 <goofy-client-vorgang-forward-form *ngIf="vorgang | hasLink: vorgangLinkRel.FORWARD" data-test-id="forward-form"
+		[vorgang]="vorgang"
 		[forwardStateResource]="pendingForwardCommand"
 		(doSubmit)="submit.emit()">
 </goofy-client-vorgang-forward-form>

goofy-client/libs/vorgang-shared/src/lib/vorgang.model.ts

@@ -17,6 +17,7 @@ export interface VorgangWithEingang extends Vorgang {
 export interface Eingang {
 	id: string,
 	antragsteller: Antragsteller,
+	zustaendigeStelle: string,
 	header: EingangHeader,
 	formData: ReadonlyMap<number, string> | object
 }

goofy-server/src/main/java/de/itvsh/goofy/vorgang/Eingang.java

@@ -14,7 +14,7 @@ public class Eingang {
 	private int numberOfAttachments;
 	private int numberOfRepresentations;
 
-	private String zustaendigestelle;
+	private ZustaendigeStelle zustaendigeStelle;
 	private Antragsteller antragsteller;
 	private EingangHeader header;
 

goofy-server/src/main/java/de/itvsh/goofy/vorgang/EingangMapper.java

@@ -16,7 +16,7 @@ import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
 import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
 
 @Mapper(uses = { AntragstellerMapper.class,
-		EingangHeaderMapper.class }, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
+		EingangHeaderMapper.class, ZustaendigeStelleMapper.class }, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
 interface EingangMapper {
 
 	@Mapping(source = "formData", target = "formData")

goofy-server/src/main/java/de/itvsh/goofy/vorgang/ZustaendigeStelle.java

+package de.itvsh.goofy.vorgang;
+
+import lombok.Builder;
+
+@Builder
+public class ZustaendigeStelle {
+    private String organisationseinheitenId;
+    private String email;
+}

goofy-server/src/main/java/de/itvsh/goofy/vorgang/ZustaendigeStelleMapper.java

+package de.itvsh.goofy.vorgang;
+
+import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+import org.mapstruct.Mapper;
+
+@Mapper
+interface ZustaendigeStelleMapper {
+
+    ZustaendigeStelle mapToZustaendigeStelle(GrpcZustaendigeStelle grpcZustaendigeStelle);
+}

goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcZustaendigeStelleTestFactory.java

+package de.itvsh.goofy.vorgang;
+
+import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+
+public class GrpcZustaendigeStelleTestFactory {
+    private static final String EMAIL = ZustaendigeStelleTestFactory.EMAIL;
+    private static final String ORGANISATIONSEINHEITEN_ID = ZustaendigeStelleTestFactory.ORGANISATIONSEINHEITEN_ID;
+
+    public static GrpcZustaendigeStelle create() {
+        return createBuilder().build();
+    }
+
+    public static GrpcZustaendigeStelle.Builder createBuilder() {
+        return GrpcZustaendigeStelle.newBuilder()
+                .setEmail(EMAIL)
+                .setOrganisationseinheitenId(ORGANISATIONSEINHEITEN_ID);
+    }
+}

goofy-server/src/test/java/de/itvsh/goofy/vorgang/ZustaendigeStelleMapperTest.java

+package de.itvsh.goofy.vorgang;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+import static org.assertj.core.api.Assertions.*;
+
+public class ZustaendigeStelleMapperTest {
+    private final ZustaendigeStelleMapper mapper = Mappers.getMapper(ZustaendigeStelleMapper.class);
+
+    @Nested
+    class TestMapToZustaendigeStelle {
+
+        @Test
+        void shouldMap() {
+            var zustaendigeStelle = mapper.mapToZustaendigeStelle(GrpcZustaendigeStelleTestFactory.create());
+            assertThat(zustaendigeStelle).usingRecursiveComparison().isEqualTo(ZustaendigeStelleTestFactory.create());
+        }
+    }
+}

goofy-server/src/test/java/de/itvsh/goofy/vorgang/ZustaendigeStelleTestFactory.java

+package de.itvsh.goofy.vorgang;
+
+public class ZustaendigeStelleTestFactory {
+    public static final String EMAIL = "test@test.de";
+    public static final String ORGANISATIONSEINHEITEN_ID = "123456";
+
+    public static ZustaendigeStelle create() {
+        return createBuilder().build();
+    }
+
+    public static ZustaendigeStelle.ZustaendigeStelleBuilder createBuilder() {
+        return ZustaendigeStelle.builder()
+                .email(EMAIL)
+                .organisationseinheitenId(ORGANISATIONSEINHEITEN_ID);
+    }
+}