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

OZG-6721 OZG-6913 Rename getSignatures to getSettings

parent 93d5b3f6
Branches
Tags
No related merge requests found
...@@ -28,6 +28,6 @@ interface OrganisationsEinheitRepository extends MongoRepository<OrganisationsEi ...@@ -28,6 +28,6 @@ interface OrganisationsEinheitRepository extends MongoRepository<OrganisationsEi
@Query("{'syncResult': { $eq: null }}") @Query("{'syncResult': { $eq: null }}")
Stream<OrganisationsEinheit> findAllWithoutSyncResult(); Stream<OrganisationsEinheit> findAllWithoutSyncResult();
@Query("{'settings.signatur': { $nin: [null,\"\"] } }") @Query("{'settings': { $nin: [null,{}] } }")
Stream<OrganisationsEinheitWithSignatur> getSignatures(); Stream<OrganisationsEinheitWithSettings> getSettings();
} }
package de.ozgcloud.admin.organisationseinheit; package de.ozgcloud.admin.organisationseinheit;
interface OrganisationsEinheitWithSignatur { interface OrganisationsEinheitWithSettings {
String getOrganisationsEinheitId(); String getOrganisationsEinheitId();
Settings getSettings(); OrganisationsEinheitSettings getSettings();
interface Settings {
String getSignatur();
}
} }
...@@ -290,7 +290,7 @@ class OrganisationsEinheitRepositoryITCase { ...@@ -290,7 +290,7 @@ class OrganisationsEinheitRepositoryITCase {
} }
@Nested @Nested
class TestGetSignatures { class TestGetSettings {
private final OrganisationsEinheit withSignatur1 = OrganisationsEinheitTestFactory.createBuilder() private final OrganisationsEinheit withSignatur1 = OrganisationsEinheitTestFactory.createBuilder()
.id(UUID.randomUUID().toString()) .id(UUID.randomUUID().toString())
...@@ -302,30 +302,30 @@ class OrganisationsEinheitRepositoryITCase { ...@@ -302,30 +302,30 @@ class OrganisationsEinheitRepositoryITCase {
.organisationsEinheitId(UUID.randomUUID().toString()) .organisationsEinheitId(UUID.randomUUID().toString())
.settings(withRandomSignatur()) .settings(withRandomSignatur())
.build(); .build();
private final OrganisationsEinheit withNullSignatur = OrganisationsEinheitTestFactory.createBuilder() private final OrganisationsEinheit withNullSettings = OrganisationsEinheitTestFactory.createBuilder()
.id(UUID.randomUUID().toString()) .id(UUID.randomUUID().toString())
.organisationsEinheitId(UUID.randomUUID().toString()) .organisationsEinheitId(UUID.randomUUID().toString())
.settings(withSignatur(null)) .settings(null)
.build(); .build();
private final OrganisationsEinheit withEmptySignatur = OrganisationsEinheitTestFactory.createBuilder() private final OrganisationsEinheit withEmptySettings = OrganisationsEinheitTestFactory.createBuilder()
.id(UUID.randomUUID().toString()) .id(UUID.randomUUID().toString())
.organisationsEinheitId(UUID.randomUUID().toString()) .organisationsEinheitId(UUID.randomUUID().toString())
.settings(withSignatur("")) .settings(new OrganisationsEinheitSettings(null))
.build(); .build();
@BeforeEach @BeforeEach
void setUp() { void setUp() {
operations.save(withSignatur1); operations.save(withSignatur1);
operations.save(withSignatur2); operations.save(withSignatur2);
operations.save(withNullSignatur); operations.save(withNullSettings);
operations.save(withEmptySignatur); operations.save(withEmptySettings);
} }
@Test @Test
void shouldFind() { void shouldFind() {
var found = repository.getSignatures(); var found = repository.getSettings();
assertThat(found).extracting(OrganisationsEinheitWithSignatur::getOrganisationsEinheitId, item -> item.getSettings().getSignatur()) assertThat(found).extracting(OrganisationsEinheitWithSettings::getOrganisationsEinheitId, item -> item.getSettings().getSignatur())
.containsExactlyInAnyOrder( .containsExactlyInAnyOrder(
tuple(withSignatur1.getOrganisationsEinheitId(), withSignatur1.getSettings().getSignatur()), tuple(withSignatur1.getOrganisationsEinheitId(), withSignatur1.getSettings().getSignatur()),
tuple(withSignatur2.getOrganisationsEinheitId(), withSignatur2.getSettings().getSignatur())); tuple(withSignatur2.getOrganisationsEinheitId(), withSignatur2.getSettings().getSignatur()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment