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

OZG-5690 Convert vorgang.id to UUID for xDomea export

parent ea9e68b3
No related branches found
No related tags found
No related merge requests found
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
*/ */
package de.ozgcloud.alfa.vorgang; package de.ozgcloud.alfa.vorgang;
import static de.ozgcloud.alfa.common.TestUtils.*;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum; import com.thedeanda.lorem.LoremIpsum;
...@@ -34,7 +35,7 @@ import de.ozgcloud.common.test.TestUtils; ...@@ -34,7 +35,7 @@ import de.ozgcloud.common.test.TestUtils;
public class VorgangHeaderTestFactory { public class VorgangHeaderTestFactory {
public static final String ID = UUID.randomUUID().toString(); public static final String ID = createMongoDbObjectId();
public static final long VERSION = 42L; public static final long VERSION = 42L;
public static final String NAME = LoremIpsum.getInstance().getWords(10); public static final String NAME = LoremIpsum.getInstance().getWords(10);
public static final VorgangStatus STATUS = VorgangStatus.NEU; public static final VorgangStatus STATUS = VorgangStatus.NEU;
......
...@@ -6,6 +6,7 @@ import java.time.ZonedDateTime; ...@@ -6,6 +6,7 @@ import java.time.ZonedDateTime;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import de.ozgcloud.alfa.common.DateConverter; import de.ozgcloud.alfa.common.DateConverter;
import de.ozgcloud.alfa.common.UUIDConverter;
import de.ozgcloud.alfa.export.XdomeaProperties; import de.ozgcloud.alfa.export.XdomeaProperties;
import de.xoev.xdomea.BehoerdenkennungType; import de.xoev.xdomea.BehoerdenkennungType;
import de.xoev.xdomea.Code; import de.xoev.xdomea.Code;
...@@ -29,7 +30,7 @@ class KopfCreator { ...@@ -29,7 +30,7 @@ class KopfCreator {
public NkAbgabeType createKopf(VorgangWithEingang vorgang) { public NkAbgabeType createKopf(VorgangWithEingang vorgang) {
var nkAbgabeType = new NkAbgabeType(); var nkAbgabeType = new NkAbgabeType();
nkAbgabeType.setProzessID(vorgang.getId()); nkAbgabeType.setProzessID(UUIDConverter.fromObjectId(vorgang.getId()));
nkAbgabeType.setNachrichtentyp(createNachrichtentyp()); nkAbgabeType.setNachrichtentyp(createNachrichtentyp());
nkAbgabeType.setErstellungszeitpunkt(DateConverter.toXmlGregorianCalendar(ZonedDateTime.now(ZoneOffset.UTC))); nkAbgabeType.setErstellungszeitpunkt(DateConverter.toXmlGregorianCalendar(ZonedDateTime.now(ZoneOffset.UTC)));
nkAbgabeType.setAbsender(createAbsender(vorgang.getEingang().getZustaendigeStelle().getOrganisationseinheitenId())); nkAbgabeType.setAbsender(createAbsender(vorgang.getEingang().getZustaendigeStelle().getOrganisationseinheitenId()));
......
...@@ -9,15 +9,19 @@ import java.time.ZonedDateTime; ...@@ -9,15 +9,19 @@ import java.time.ZonedDateTime;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockedStatic;
import org.mockito.Spy; import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum; import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.alfa.common.DateConverter; import de.ozgcloud.alfa.common.DateConverter;
import de.ozgcloud.alfa.common.UUIDConverter;
import de.ozgcloud.alfa.export.XdomeaProperties; import de.ozgcloud.alfa.export.XdomeaProperties;
import de.xoev.xdomea.BehoerdenkennungType; import de.xoev.xdomea.BehoerdenkennungType;
import de.xoev.xdomea.Code; import de.xoev.xdomea.Code;
...@@ -43,11 +47,26 @@ class KopfCreatorTest { ...@@ -43,11 +47,26 @@ class KopfCreatorTest {
static final ZonedDateTime CREATION_TIME = ZonedDateTime.now(); static final ZonedDateTime CREATION_TIME = ZonedDateTime.now();
private MockedStatic<UUIDConverter> mockedUUIDConverter;
@BeforeEach
void setUpUUIDMock() {
mockedUUIDConverter = mockStatic(UUIDConverter.class);
}
@AfterEach
void tearDown() {
mockedUUIDConverter.close();
}
@Test @Test
void shouldSetProcessId() { void shouldSetProcessId() {
var uuid = LoremIpsum.getInstance().getWords(1);
mockedUUIDConverter.when(() -> UUIDConverter.fromObjectId(VorgangHeaderTestFactory.ID)).thenReturn(uuid);
var kopf = createKopf(); var kopf = createKopf();
assertThat(kopf.getProzessID()).isEqualTo(VorgangHeaderTestFactory.ID); assertThat(kopf.getProzessID()).isEqualTo(uuid);
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment