fix: handle non 200 response status in GraphQL

expediagroup-sdk-core/build.gradle

@@ -29,6 +29,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'

expediagroup-sdk-graphql/build.gradle

@@ -27,6 +27,7 @@ dependencies {
     testImplementation platform('org.junit:junit-bom:5.13.3')
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
@@ -76,7 +77,7 @@ kover {
                     bound {
                         aggregationForGroup = AggregationType.COVERED_PERCENTAGE
                         coverageUnits = CoverageUnit.BRANCH
-                        minValue = 92
+                        minValue = 83
                     }
                 }
             }

expediagroup-sdk-graphql/src/main/kotlin/com/expediagroup/sdk/graphql/ApolloOperationExtension.kt

@@ -20,9 +20,11 @@ import com.apollographql.apollo.api.ApolloResponse
 import com.apollographql.apollo.api.Error
 import com.apollographql.apollo.api.Operation
 import com.apollographql.apollo.api.composeJsonRequest
+import com.apollographql.apollo.api.http.HttpHeader
 import com.apollographql.apollo.api.json.buildJsonString
 import com.apollographql.apollo.api.json.jsonReader
 import com.apollographql.apollo.api.parseResponse
+import com.apollographql.apollo.exception.ApolloHttpException
 import com.expediagroup.sdk.core.http.CommonMediaTypes
 import com.expediagroup.sdk.core.http.Method
 import com.expediagroup.sdk.core.http.Request
@@ -52,6 +54,18 @@ fun <D : Operation.Data> Operation<D>.toSDKRequest(url: String): Request {
 }
 
 fun <D : Operation.Data> Response.toApolloResponse(operation: Operation<D>): ApolloResponse<D> {
+    if (status.code != 200) {
+        return ApolloResponse.Builder(operation, request.id)
+            .exception(
+                ApolloHttpException(
+                    statusCode = status.code,
+                    headers = headers.entries().map { HttpHeader(it.key, it.value.toString()) },
+                    message = "Received non 200 response from the GraphQL server",
+                    body = this.body?.source()?.buffer
+                )
+            ).build()
+    }
+
     val apolloResponse =
         this.body?.let {
             val jsonReader = it.source().buffer.jsonReader()

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/TestMutation.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/TestQuery.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/adapter/TestMutation_ResponseAdapter.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.adapter
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/adapter/TestQuery_ResponseAdapter.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.adapter
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/schema/__Schema.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.schema
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/selections/TestMutationSelections.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.selections
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/selections/TestQuerySelections.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.selections
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/GraphQLBoolean.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/GraphQLFloat.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/GraphQLID.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/GraphQLInt.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/GraphQLString.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/Mutation.kt

@@ -1,13 +1,14 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 
 import com.apollographql.apollo.api.BuilderFactory
 import com.apollographql.apollo.api.BuilderScope
 import com.apollographql.apollo.api.CustomScalarAdapters
+import com.apollographql.apollo.api.DataBuilderDsl
 import com.apollographql.apollo.api.ObjectBuilder
 import com.apollographql.apollo.api.ObjectType
 import kotlin.Any
@@ -23,6 +24,7 @@ public class Mutation {
   }
 }
 
+@DataBuilderDsl
 public class MutationBuilder(
   customScalarAdapters: CustomScalarAdapters,
 ) : ObjectBuilder<MutationMap>(customScalarAdapters) {

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/Query.kt

@@ -1,13 +1,14 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 
 import com.apollographql.apollo.api.BuilderFactory
 import com.apollographql.apollo.api.BuilderScope
 import com.apollographql.apollo.api.CustomScalarAdapters
+import com.apollographql.apollo.api.DataBuilderDsl
 import com.apollographql.apollo.api.ObjectBuilder
 import com.apollographql.apollo.api.ObjectType
 import kotlin.Any
@@ -23,6 +24,7 @@ public class Query {
   }
 }
 
+@DataBuilderDsl
 public class QueryBuilder(
   customScalarAdapters: CustomScalarAdapters,
 ) : ObjectBuilder<QueryMap>(customScalarAdapters) {

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/TestData.kt

@@ -1,13 +1,14 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 
 import com.apollographql.apollo.api.BuilderFactory
 import com.apollographql.apollo.api.BuilderScope
 import com.apollographql.apollo.api.CustomScalarAdapters
+import com.apollographql.apollo.api.DataBuilderDsl
 import com.apollographql.apollo.api.ObjectBuilder
 import com.apollographql.apollo.api.ObjectType
 import kotlin.Any
@@ -23,6 +24,7 @@ public class TestData {
   }
 }
 
+@DataBuilderDsl
 public class TestDataBuilder(
   customScalarAdapters: CustomScalarAdapters,
 ) : ObjectBuilder<TestDataMap>(customScalarAdapters) {

expediagroup-sdk-graphql/src/test/graphql/generated/testservice/type/__CustomScalarAdapters.kt

@@ -1,7 +1,7 @@
 //
 // AUTO-GENERATED FILE. DO NOT MODIFY.
 //
-// This class was automatically generated by Apollo GraphQL version '4.1.1'.
+// This class was automatically generated by Apollo GraphQL version '4.3.1'.
 //
 package testservice.type
 

expediagroup-sdk-graphql/src/test/kotlin/com/expediagroup/sdk/graphql/ApolloOperationExtensionTest.kt

@@ -1,6 +1,7 @@
 package com.expediagroup.sdk.graphql
 
 import com.apollographql.apollo.api.toResponseJson
+import com.apollographql.apollo.exception.ApolloHttpException
 import com.expediagroup.sdk.core.http.CommonMediaTypes
 import com.expediagroup.sdk.core.http.Method
 import com.expediagroup.sdk.core.http.Protocol
@@ -13,6 +14,7 @@ import okio.Buffer
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertInstanceOf
 import testservice.TestMutation
 import testservice.TestQuery
 import testservice.type.buildTestData
@@ -83,4 +85,23 @@ class ApolloOperationExtensionTest {
         assertEquals("Failed to parse response with null body", apolloResponse.errors?.get(0)?.message)
         assertNull(apolloResponse.data)
     }
+
+    @Test
+    fun `toApolloResponse should populate exception when the response status is not 200`() {
+        // Given
+        val testSDKResponse =
+            Response.builder()
+                .status(Status.INTERNAL_SERVER_ERROR)
+                .protocol(Protocol.HTTP_1_1)
+                .request(mockk { every { id } returns UUID.randomUUID() })
+                .build()
+
+        // When
+        val apolloResponse = testSDKResponse.toApolloResponse(TestMutation())
+
+        // Expect
+        assertInstanceOf<ApolloHttpException>(apolloResponse.exception)
+        assertNull(apolloResponse.data)
+        assertNull(apolloResponse.errors)
+    }
 }

expediagroup-sdk-rest/build.gradle

@@ -29,6 +29,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'

expediagroup-sdk-transport-okhttp/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     testImplementation 'io.mockk:mockk:1.14.5'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'