Merge pull request 'OZG-6720 OZG-7051 fix signatur patching' (#56) from...

Merge pull request 'OZG-6720 OZG-7051 fix signatur patching' (#56) from OZG-6720-fix-patch-signatur into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/administration/pulls/56


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

src/main/java/de/ozgcloud/admin/organisationseinheit/OrganisationsEinheitService.java

@@ -50,10 +50,11 @@ class OrganisationsEinheitService {
 	}
 
 	OrganisationsEinheit patchOrganisationsEinheit(OrganisationsEinheit organisationsEinheit, OrganisationsEinheitPatch patch) {
-		var organisationsEinheitBuilder = organisationsEinheit.toBuilder();
-		if (Objects.nonNull(patch.getSignatur())) {
-			organisationsEinheitBuilder.settings(organisationsEinheit.getSettings().toBuilder().signatur(patch.getSignatur()).build());
-		}
-		return organisationsEinheitBuilder.build();
+		return organisationsEinheit.toBuilder()
+				.settings(
+						organisationsEinheit.getSettings().toBuilder()
+								.signatur(patch.getSignatur())
+								.build())
+				.build();
 	}
 }

src/test/java/de/ozgcloud/admin/organisationseinheit/OrganisationsEinheitServiceTest.java

@@ -252,15 +252,5 @@ class OrganisationsEinheitServiceTest {
 					.ignoringFields(OrganisationsEinheit.FIELD_SETTINGS)
 					.isEqualTo(organisationsEinheit);
 		}
-
-		@Test
-		void shouldNotPatchSignaturIfNull() {
-			var organisationsEinheit = OrganisationsEinheitTestFactory.create();
-			var organisationsEinheitPatch = OrganisationsEinheitPatchTestFactory.createBuilder().signatur(null).build();
-
-			var patched = service.patchOrganisationsEinheit(organisationsEinheit, organisationsEinheitPatch);
-
-			assertThat(patched.getSettings().getSignatur()).isEqualTo(OrganisationsEinheitSettingsTestFactory.SIGNATUR);
-		}
 	}
 }
\ No newline at end of file