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

OZG-6179 add trustlevel

parent 646ce5f9
No related branches found
No related tags found
No related merge requests found
Showing
with 51 additions and 3 deletions
......@@ -41,7 +41,7 @@ interface RueckfrageMapper {
@Mapping(target = "status", expression = "java(setStatus(firstAnswerSentAt))")
@Mapping(target = "statusBytes", ignore = true)
@Mapping(target = "textBytes", ignore = true)
@Mapping(target = "trustLevel", ignore = true) // TODO
@Mapping(target = "trustLevel", source = "vorgang.trustLevel")
@Mapping(target = "trustLevelBytes", ignore = true)
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "vorgangIdBytes", ignore = true)
......
package de.ozgcloud.nachrichten.common.vorgang;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
......@@ -8,5 +9,6 @@ import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN)
interface NachrichtenVorgangMapper {
@Mapping(target = "trustLevel", source = "vorgangWithEingang.header.serviceKonto.trustLevel")
Vorgang fromVorgangWithEingang(GrpcVorgangWithEingang vorgangWithEingang);
}
......@@ -10,4 +10,6 @@ public class Vorgang {
private String id;
private String name;
private String nummer;
private String trustLevel;
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import de.ozgcloud.nachrichten.common.vorgang.GrpcServiceKontoTestFactory;
import de.ozgcloud.nachrichten.common.vorgang.Vorgang;
import de.ozgcloud.nachrichten.common.vorgang.VorgangTestFactory;
import de.ozgcloud.nachrichten.postfach.PostfachAddressTestFactory;
......@@ -125,6 +126,13 @@ class RueckfrageMapperTest {
assertThat(rueckfrage.getVorgangNummer()).isEqualTo(VorgangTestFactory.NUMMER);
}
@Test
void shouldMapTrustLevel() {
var rueckfrage = toRueckfrage();
assertThat(rueckfrage.getTrustLevel()).isEqualTo(GrpcServiceKontoTestFactory.TRUST_LEVEL);
}
@Test
void shouldMapAnsweredAt() {
var rueckfrage = toRueckfrage();
......
package de.ozgcloud.nachrichten.common.vorgang;
import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto;
public class GrpcServiceKontoTestFactory {
public final static String TRUST_LEVEL = LoremIpsum.getInstance().getWords(1);
public static GrpcServiceKonto create() {
return createBuilder().build();
}
public static GrpcServiceKonto.Builder createBuilder() {
return GrpcServiceKonto.newBuilder()
.setTrustLevel(TRUST_LEVEL);
}
}
package de.ozgcloud.nachrichten.common.vorgang;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangHead;
public class GrpcVorgangHeadTestFactory {
public static GrpcVorgangHead create() {
return createBuilder().build();
}
public static GrpcVorgangHead.Builder createBuilder() {
return GrpcVorgangHead.newBuilder()
.setServiceKonto(GrpcServiceKontoTestFactory.create());
}
}
......@@ -12,6 +12,7 @@ public class GrpcVorgangWithEingangTestFactory {
return GrpcVorgangWithEingang.newBuilder()
.setId(VorgangTestFactory.ID)
.setName(VorgangTestFactory.NAME)
.setNummer(VorgangTestFactory.NUMMER);
.setNummer(VorgangTestFactory.NUMMER)
.setHeader(GrpcVorgangHeadTestFactory.create());
}
}
......@@ -18,6 +18,7 @@ public class VorgangTestFactory {
return Vorgang.builder()
.id(ID)
.name(NAME)
.nummer(NUMMER);
.nummer(NUMMER)
.trustLevel(GrpcServiceKontoTestFactory.TRUST_LEVEL);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment