OZG-7092 fix message name; fix tests

token-checker-interface/src/main/protobuf/tokencheck.model.proto

@@ -21,10 +21,10 @@ message GrpcCheckTokenResponse {
 message GrpcTokenAttributes {
   string postfachId = 1;
   string trustLevel = 2;
-  repeated GrpcOtherFields otherFields = 3;
+  repeated GrpcOtherField otherFields = 3;
 }
 
-message GrpcOtherFields {
+message GrpcOtherField {
   string name = 1;
   string value = 2;
 }

token-checker-server/src/main/java/de/ozgcloud/token/CheckTokenResultMapper.java

@@ -33,7 +33,6 @@ interface CheckTokenResultMapper {
 	@Mapping(target = "removeOtherFields", ignore = true)
 	@Mapping(target = "postfachIdBytes", ignore = true)
 	@Mapping(target = "otherFieldsOrBuilderList", ignore = true)
-	@Mapping(target = "otherFieldsList", ignore = true)
 	@Mapping(target = "otherFieldsBuilderList", ignore = true)
 	@Mapping(target = "mergeUnknownFields", ignore = true)
 	@Mapping(target = "mergeFrom", ignore = true)
@@ -41,6 +40,7 @@ interface CheckTokenResultMapper {
 	@Mapping(target = "clearOneof", ignore = true)
 	@Mapping(target = "clearField", ignore = true)
 	@Mapping(target = "allFields", ignore = true)
+	@Mapping(target = "otherFieldsList", source = "attributes")
 	GrpcTokenAttributes toTokenAttributes(TokenValidationResult validationResult);
 
 	@Mapping(target = "unknownFields", ignore = true)
@@ -51,5 +51,6 @@ interface CheckTokenResultMapper {
 	@Mapping(target = "clearOneof", ignore = true)
 	@Mapping(target = "clearField", ignore = true)
 	@Mapping(target = "allFields", ignore = true)
+	@Mapping(target = "message", source = "errorMesssage")
 	GrpcCheckError toCheckError(TokenValidationResult validationResult);
 }

token-checker-server/src/test/java/de/ozgcloud/token/CheckErrorMapperTest.java

-package de.ozgcloud.token;
-
-import static org.assertj.core.api.Assertions.*;
-
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.mapstruct.factory.Mappers;
-
-import de.ozgcloud.token.common.errorhandling.TokenVerificationExceptionTestFactory;
-
-class CheckErrorMapperTest {
-
-	private final CheckErrorMapper mapper = Mappers.getMapper(CheckErrorMapper.class);
-
-	@Nested
-	class TestFromTokenVerificationException {
-
-		@Test
-		void shouldMapToCheckError() {
-			var exception = TokenVerificationExceptionTestFactory.create();
-			var expectedCheckError = GrpcCheckErrorTestFactory.createBuilder().setMessage(exception.getMessage()).build();
-
-			var checkError = mapper.toCheckError(exception);
-
-			assertThat(checkError).isEqualTo(expectedCheckError);
-		}
-	}
-}

token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckMapperTest.java → token-checker-server/src/test/java/de/ozgcloud/token/CheckTokenResultMapperTest.java

@@ -26,35 +26,51 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
-class TokenCheckMapperTest {
+class CheckTokenResultMapperTest {
 
 	private final CheckTokenResultMapper mapper = Mappers.getMapper(CheckTokenResultMapper.class);
 
 	@Nested
-	class TestToTokenCheckResult {
+	class TestToTokenAttributes {
+
 		@Test
 		void shouldMapPostfachHandle() {
-			var grpcTokenCheckResult = toTokenCheckResult();
+			var result = toTokenCheckResult();
 
-			assertThat(grpcTokenCheckResult.getPostfachId()).isEqualTo(CheckTokenResultTestFactory.POSTFACH_ID);
+			assertThat(result.getPostfachId()).isEqualTo(CheckTokenResultTestFactory.POSTFACH_ID);
 		}
 
 		@Test
 		void shouldMapTrustLevel() {
-			var grpcTokenCheckResult = toTokenCheckResult();
+			var result = toTokenCheckResult();
 
-			assertThat(grpcTokenCheckResult.getTrustLevel()).isEqualTo(CheckTokenResultTestFactory.TRUST_LEVEL);
+			assertThat(result.getTrustLevel()).isEqualTo(CheckTokenResultTestFactory.TRUST_LEVEL);
 		}
 
 		@Test
 		void shouldMapOtherFields() {
-			var grpcTokenCheckResult = toTokenCheckResult();
+			var result = toTokenCheckResult();
+
+			assertThat(result.getOtherFieldsList()).containsExactly(GrpcTokenCheckResultTestFactory.TOKEN_ATTRIBUTE);
+		}
+
+		private GrpcTokenAttributes toTokenCheckResult() {
+			return mapper.toTokenAttributes(CheckTokenResultTestFactory.createValid());
+		}
+	}
+
+	@Nested
+	class TestToCheckError {
+
+		@Test
+		void shouldMapErrorMessage() {
+			var result = toCheckError();
 
-			assertThat(grpcTokenCheckResult.getOtherFieldsList()).containsExactly(GrpcTokenCheckResultTestFactory.TOKEN_ATTRIBUTE);
+			assertThat(result.getMessage()).isEqualTo(CheckTokenResultTestFactory.ERROR_MESSAGE);
 		}
 
-		private GrpcCheckTokenResult toTokenCheckResult() {
-			return mapper.toTokenAttributes(CheckTokenResultTestFactory.create());
+		private GrpcCheckError toCheckError() {
+			return mapper.toCheckError(CheckTokenResultTestFactory.createInvalid());
 		}
 	}
 }
\ No newline at end of file

token-checker-server/src/test/java/de/ozgcloud/token/GrpcOtherFieldsTestFactory.java

@@ -5,12 +5,12 @@ public class GrpcOtherFieldsTestFactory {
 	private static final String VALUE = TokenAttributeTestFactory.VALUE;
 	private static final String NAME = TokenAttributeTestFactory.NAME;
 
-	public static GrpcOtherFields create() {
+	public static GrpcOtherField create() {
 		return createBuilder().build();
 	}
 
-	private static GrpcOtherFields.Builder createBuilder() {
-		return GrpcOtherFields.newBuilder()
+	private static GrpcOtherField.Builder createBuilder() {
+		return GrpcOtherField.newBuilder()
 				.setName(NAME)
 				.setValue(VALUE);
 	}

token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckResultTestFactory.java

@@ -28,7 +28,7 @@ class GrpcTokenCheckResultTestFactory {
 
 	public static final String POSTFACH_ID = CheckTokenResultTestFactory.POSTFACH_ID;
 	public static final String TRUST_LEVEL = CheckTokenResultTestFactory.TRUST_LEVEL;
-	public static final GrpcOtherFields TOKEN_ATTRIBUTE = GrpcOtherFieldsTestFactory.create();
+	public static final GrpcOtherField TOKEN_ATTRIBUTE = GrpcOtherFieldsTestFactory.create();
 
 	public static GrpcTokenAttributes create() {
 		return createBuilder().build();