Coerce inputs from Int Value to Float Value

Author: wravery

src/GraphQLResponse.cpp

@@ -363,12 +363,20 @@ void Value::set<BooleanType>(BooleanType value)
 template <>
 void Value::set<IntType>(IntType value)
 {
-	if (type() != Type::Int)
+	if (type() == Type::Float)
 	{
-		throw std::logic_error("Invalid call to Value::set for IntType");
+		// Coerce IntType to FloatType
+		*_data = { static_cast<FloatType>(value) };
 	}
+	else
+	{
+		if (type() != Type::Int)
+		{
+			throw std::logic_error("Invalid call to Value::set for IntType");
+		}
 
-	*_data = { value };
+		*_data = { value };
+	}
 }
 
 template <>
@@ -452,6 +460,12 @@ IntType Value::get<IntType>() const
 template <>
 FloatType Value::get<FloatType>() const
 {
+	if (type() == Type::Int)
+	{
+		// Coerce IntType to FloatType
+		return static_cast<FloatType>(std::get<IntType>(*_data));
+	}
+
 	if (type() != Type::Float)
 	{
 		throw std::logic_error("Invalid call to Value::get for FloatType");

src/GraphQLService.cpp

@@ -677,7 +677,8 @@ response::IntType ModifiedArgument<response::IntType>::convert(const response::V
 template <>
 response::FloatType ModifiedArgument<response::FloatType>::convert(const response::Value& value)
 {
-	if (value.type() != response::Type::Float)
+	if (value.type() != response::Type::Float
+		&& value.type() != response::Type::Int)
 	{
 		throw schema_exception { { "not a float" } };
 	}
@@ -726,8 +727,7 @@ response::IdType ModifiedArgument<response::IdType>::convert(const response::Val
 	return Base64::fromBase64(encoded.c_str(), encoded.size());
 }
 
-template <>
-std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldResult<response::IntType>&& result, ResolverParams&& params)
+void blockSubFields(const ResolverParams& params)
 {
 	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
 	if (params.selection != nullptr)
@@ -739,6 +739,12 @@ std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldRes
 
 		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
 	}
+}
+
+template <>
+std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldResult<response::IntType>&& result, ResolverParams&& params)
+{
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::IntType&& value, const ResolverParams&)
@@ -750,16 +756,7 @@ std::future<response::Value> ModifiedResult<response::IntType>::convert(FieldRes
 template <>
 std::future<response::Value> ModifiedResult<response::FloatType>::convert(FieldResult<response::FloatType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::FloatType&& value, const ResolverParams&)
@@ -771,16 +768,7 @@ std::future<response::Value> ModifiedResult<response::FloatType>::convert(FieldR
 template <>
 std::future<response::Value> ModifiedResult<response::StringType>::convert(FieldResult<response::StringType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::StringType&& value, const ResolverParams&)
@@ -792,16 +780,7 @@ std::future<response::Value> ModifiedResult<response::StringType>::convert(Field
 template <>
 std::future<response::Value> ModifiedResult<response::BooleanType>::convert(FieldResult<response::BooleanType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::BooleanType&& value, const ResolverParams&)
@@ -813,16 +792,7 @@ std::future<response::Value> ModifiedResult<response::BooleanType>::convert(Fiel
 template <>
 std::future<response::Value> ModifiedResult<response::Value>::convert(FieldResult<response::Value>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::Value&& value, const ResolverParams&)
@@ -834,16 +804,7 @@ std::future<response::Value> ModifiedResult<response::Value>::convert(FieldResul
 template <>
 std::future<response::Value> ModifiedResult<response::IdType>::convert(FieldResult<response::IdType>&& result, ResolverParams&& params)
 {
-	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
-	if (params.selection != nullptr)
-	{
-		auto position = params.selection->begin();
-		std::ostringstream error;
-
-		error << "Field may not have sub-fields name: " << params.fieldName;
-
-		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
-	}
+	blockSubFields(params);
 
 	return resolve(std::move(result), std::move(params),
 		[](response::IdType&& value, const ResolverParams&)
@@ -852,8 +813,7 @@ std::future<response::Value> ModifiedResult<response::IdType>::convert(FieldResu
 	});
 }
 
-template <>
-std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::shared_ptr<Object>>&& result, ResolverParams&& params)
+void requireSubFields(const ResolverParams& params)
 {
 	// http://spec.graphql.org/June2018/#sec-Leaf-Field-Selections
 	if (params.selection == nullptr)
@@ -865,6 +825,12 @@ std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::sh
 
 		throw schema_exception { { schema_error{ error.str(), { position.line, position.column }, { params.errorPath } } } };
 	}
+}
+
+template <>
+std::future<response::Value> ModifiedResult<Object>::convert(FieldResult<std::shared_ptr<Object>>&& result, ResolverParams&& params)
+{
+	requireSubFields(params);
 
 	return std::async(params.launch,
 		[](FieldResult<std::shared_ptr<Object>>&& resultFuture, ResolverParams&& paramsFuture)

test/TodayTests.cpp

@@ -1524,3 +1524,32 @@ TEST_F(TodayServiceCase, MutateSetFloat)
 		FAIL() << response::toJSON(ex.getErrors());
 	}
 }
+
+TEST_F(TodayServiceCase, MutateCoerceSetFloat)
+{
+	auto query = R"(mutation {
+			coerceFloat: setFloat(value: 1)
+		})"_graphql;
+	response::Value variables(response::Type::Map);
+	auto state = std::make_shared<today::RequestState>(22);
+	auto result = _service->resolve(state, query, "", std::move(variables)).get();
+
+	try
+	{
+		ASSERT_TRUE(result.type() == response::Type::Map);
+		auto errorsItr = result.find("errors");
+		if (errorsItr != result.get<response::MapType>().cend())
+		{
+			FAIL() << response::toJSON(response::Value(errorsItr->second));
+		}
+		const auto data = service::ScalarArgument::require("data", result);
+		ASSERT_TRUE(data.type() == response::Type::Map);
+		const auto coerceFloat = service::FloatArgument::require("coerceFloat", data);
+		ASSERT_EQ(1.0, coerceFloat) << "should return the value that was coerced from an int";
+		ASSERT_EQ(1.0, today::Mutation::getFloat()) << "should save the value in the Mutation static member";
+	}
+	catch (service::schema_exception & ex)
+	{
+		FAIL() << response::toJSON(ex.getErrors());
+	}
+}