Convert the learn sample to use non-Base64 ID instead of String for id fields

wravery · wravery · commit 62cada588805 · 2022-04-22T16:30:47.000-07:00
diff --git a/samples/learn/DroidData.cpp b/samples/learn/DroidData.cpp
@@ -35,7 +35,7 @@ void Droid::addFriends(
 		});
 }
 
-const std::string& Droid::getId() const noexcept
+const response::IdType& Droid::getId() const noexcept
 {
 	return id_;
 }
diff --git a/samples/learn/DroidData.h b/samples/learn/DroidData.h
@@ -22,14 +22,14 @@ class Droid
 
 	void addFriends(std::vector<SharedHero> friends) noexcept;
 
-	const std::string& getId() const noexcept;
+	const response::IdType& getId() const noexcept;
 	const std::optional<std::string>& getName() const noexcept;
 	std::optional<std::vector<std::shared_ptr<object::Character>>> getFriends() const noexcept;
 	std::optional<std::vector<std::optional<Episode>>> getAppearsIn() const noexcept;
 	const std::optional<std::string>& getPrimaryFunction() const noexcept;
 
 private:
-	const std::string id_;
+	const response::IdType id_;
 	const std::optional<std::string> name_;
 	const std::vector<Episode> appearsIn_;
 	const std::optional<std::string> primaryFunction_;
diff --git a/samples/learn/HumanData.cpp b/samples/learn/HumanData.cpp
@@ -34,7 +34,7 @@ void Human::addFriends(std::vector<SharedHero> friends) noexcept
 		});
 }
 
-const std::string& Human::getId() const noexcept
+const response::IdType& Human::getId() const noexcept
 {
 	return id_;
 }
diff --git a/samples/learn/HumanData.h b/samples/learn/HumanData.h
@@ -20,14 +20,14 @@ class Human
 
 	void addFriends(std::vector<SharedHero> friends) noexcept;
 
-	const std::string& getId() const noexcept;
+	const response::IdType& getId() const noexcept;
 	const std::optional<std::string>& getName() const noexcept;
 	std::optional<std::vector<std::shared_ptr<object::Character>>> getFriends() const noexcept;
 	std::optional<std::vector<std::optional<Episode>>> getAppearsIn() const noexcept;
 	const std::optional<std::string>& getHomePlanet() const noexcept;
 
 private:
-	const std::string id_;
+	const response::IdType id_;
 	const std::optional<std::string> name_;
 	const std::vector<Episode> appearsIn_;
 	const std::optional<std::string> homePlanet_;
diff --git a/samples/learn/QueryData.cpp b/samples/learn/QueryData.cpp
@@ -8,8 +8,8 @@
 namespace graphql::learn {
 
 Query::Query(std::map<Episode, SharedHero>&& heroes,
-	std::map<std::string, std::shared_ptr<Human>>&& humans,
-	std::map<std::string, std::shared_ptr<Droid>>&& droids) noexcept
+	std::map<response::IdType, std::shared_ptr<Human>>&& humans,
+	std::map<response::IdType, std::shared_ptr<Droid>>&& droids) noexcept
 	: heroes_ { std::move(heroes) }
 	, humans_ { std::move(humans) }
 	, droids_ { std::move(droids) }
@@ -29,7 +29,7 @@ std::shared_ptr<object::Character> Query::getHero(std::optional<Episode> episode
 	return result;
 }
 
-std::shared_ptr<object::Human> Query::getHuman(const std::string& idArg) const noexcept
+std::shared_ptr<object::Human> Query::getHuman(const response::IdType& idArg) const noexcept
 {
 	std::shared_ptr<Human> result;
 
@@ -41,7 +41,7 @@ std::shared_ptr<object::Human> Query::getHuman(const std::string& idArg) const n
 	return std::make_shared<object::Human>(std::move(result));
 }
 
-std::shared_ptr<object::Droid> Query::getDroid(const std::string& idArg) const noexcept
+std::shared_ptr<object::Droid> Query::getDroid(const response::IdType& idArg) const noexcept
 {
 	std::shared_ptr<Droid> result;
 
diff --git a/samples/learn/QueryData.h b/samples/learn/QueryData.h
@@ -17,17 +17,17 @@ class Query
 {
 public:
 	explicit Query(std::map<Episode, SharedHero>&& heroes,
-		std::map<std::string, std::shared_ptr<Human>>&& humans,
-		std::map<std::string, std::shared_ptr<Droid>>&& droids) noexcept;
+		std::map<response::IdType, std::shared_ptr<Human>>&& humans,
+		std::map<response::IdType, std::shared_ptr<Droid>>&& droids) noexcept;
 
 	std::shared_ptr<object::Character> getHero(std::optional<Episode> episodeArg) const noexcept;
-	std::shared_ptr<object::Human> getHuman(const std::string& idArg) const noexcept;
-	std::shared_ptr<object::Droid> getDroid(const std::string& idArg) const noexcept;
+	std::shared_ptr<object::Human> getHuman(const response::IdType& idArg) const noexcept;
+	std::shared_ptr<object::Droid> getDroid(const response::IdType& idArg) const noexcept;
 
 private:
 	const std::map<Episode, SharedHero> heroes_;
-	const std::map<std::string, std::shared_ptr<Human>> humans_;
-	const std::map<std::string, std::shared_ptr<Droid>> droids_;
+	const std::map<response::IdType, std::shared_ptr<Human>> humans_;
+	const std::map<response::IdType, std::shared_ptr<Droid>> droids_;
 };
 
 } // namespace graphql::learn
diff --git a/samples/learn/StarWarsData.cpp b/samples/learn/StarWarsData.cpp
@@ -97,15 +97,15 @@ std::shared_ptr<service::Request> GetService() noexcept
 		{ learn::Episode::JEDI, { artoo } },
 	};
 
-	std::map<std::string, std::shared_ptr<learn::Human>> humans {
+	std::map<response::IdType, std::shared_ptr<learn::Human>> humans {
 		{ luke->getId(), luke },
 		{ vader->getId(), vader },
 		{ han->getId(), han },
 		{ leia->getId(), leia },
 		{ tarkin->getId(), tarkin },
 	};
 
-	std::map<std::string, std::shared_ptr<learn::Droid>> droids {
+	std::map<response::IdType, std::shared_ptr<learn::Droid>> droids {
 		{ threepio->getId(), threepio },
 		{ artoo->getId(), artoo },
 	};
diff --git a/samples/learn/schema/CharacterObject.cpp b/samples/learn/schema/CharacterObject.cpp
@@ -35,7 +35,7 @@ void Character::endSelectionSet(const service::SelectionSetParams& params) const
 void AddCharacterDetails(const std::shared_ptr<schema::InterfaceType>& typeCharacter, const std::shared_ptr<schema::Schema>& schema)
 {
 	typeCharacter->AddFields({
-		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv))),
+		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv))),
 		schema::Field::Make(R"gql(name)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),
 		schema::Field::Make(R"gql(friends)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Character)gql"sv))),
 		schema::Field::Make(R"gql(appearsIn)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Episode)gql"sv)))
diff --git a/samples/learn/schema/DroidObject.cpp b/samples/learn/schema/DroidObject.cpp
@@ -64,7 +64,7 @@ service::AwaitableResolver Droid::resolveId(service::ResolverParams&& params) co
 	auto result = _pimpl->getId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<std::string>::convert(std::move(result), std::move(params));
+	return service::ModifiedResult<response::IdType>::convert(std::move(result), std::move(params));
 }
 
 service::AwaitableResolver Droid::resolveName(service::ResolverParams&& params) const
@@ -120,7 +120,7 @@ void AddDroidDetails(const std::shared_ptr<schema::ObjectType>& typeDroid, const
 		std::static_pointer_cast<const schema::InterfaceType>(schema->LookupType(R"gql(Character)gql"sv))
 	});
 	typeDroid->AddFields({
-		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv))),
+		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv))),
 		schema::Field::Make(R"gql(name)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),
 		schema::Field::Make(R"gql(friends)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Character)gql"sv))),
 		schema::Field::Make(R"gql(appearsIn)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Episode)gql"sv))),
diff --git a/samples/learn/schema/DroidObject.h b/samples/learn/schema/DroidObject.h
@@ -23,13 +23,13 @@ namespace methods::DroidHas {
 template <class TImpl>
 concept getIdWithParams = requires (TImpl impl, service::FieldParams params)
 {
-	{ service::AwaitableScalar<std::string> { impl.getId(std::move(params)) } };
+	{ service::AwaitableScalar<response::IdType> { impl.getId(std::move(params)) } };
 };
 
 template <class TImpl>
 concept getId = requires (TImpl impl)
 {
-	{ service::AwaitableScalar<std::string> { impl.getId() } };
+	{ service::AwaitableScalar<response::IdType> { impl.getId() } };
 };
 
 template <class TImpl>
@@ -113,7 +113,7 @@ class Droid final
 		virtual void beginSelectionSet(const service::SelectionSetParams& params) const = 0;
 		virtual void endSelectionSet(const service::SelectionSetParams& params) const = 0;
 
-		virtual service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const = 0;
+		virtual service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableScalar<std::optional<std::string>> getName(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableObject<std::optional<std::vector<std::shared_ptr<Character>>>> getFriends(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableScalar<std::optional<std::vector<std::optional<Episode>>>> getAppearsIn(service::FieldParams&& params) const = 0;
@@ -129,7 +129,7 @@ class Droid final
 		{
 		}
 
-		service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const final
+		service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const final
 		{
 			if constexpr (methods::DroidHas::getIdWithParams<T>)
 			{
diff --git a/samples/learn/schema/HumanObject.cpp b/samples/learn/schema/HumanObject.cpp
@@ -64,7 +64,7 @@ service::AwaitableResolver Human::resolveId(service::ResolverParams&& params) co
 	auto result = _pimpl->getId(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)));
 	resolverLock.unlock();
 
-	return service::ModifiedResult<std::string>::convert(std::move(result), std::move(params));
+	return service::ModifiedResult<response::IdType>::convert(std::move(result), std::move(params));
 }
 
 service::AwaitableResolver Human::resolveName(service::ResolverParams&& params) const
@@ -120,7 +120,7 @@ void AddHumanDetails(const std::shared_ptr<schema::ObjectType>& typeHuman, const
 		std::static_pointer_cast<const schema::InterfaceType>(schema->LookupType(R"gql(Character)gql"sv))
 	});
 	typeHuman->AddFields({
-		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv))),
+		schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv))),
 		schema::Field::Make(R"gql(name)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),
 		schema::Field::Make(R"gql(friends)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Character)gql"sv))),
 		schema::Field::Make(R"gql(appearsIn)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Episode)gql"sv))),
diff --git a/samples/learn/schema/HumanObject.h b/samples/learn/schema/HumanObject.h
@@ -23,13 +23,13 @@ namespace methods::HumanHas {
 template <class TImpl>
 concept getIdWithParams = requires (TImpl impl, service::FieldParams params)
 {
-	{ service::AwaitableScalar<std::string> { impl.getId(std::move(params)) } };
+	{ service::AwaitableScalar<response::IdType> { impl.getId(std::move(params)) } };
 };
 
 template <class TImpl>
 concept getId = requires (TImpl impl)
 {
-	{ service::AwaitableScalar<std::string> { impl.getId() } };
+	{ service::AwaitableScalar<response::IdType> { impl.getId() } };
 };
 
 template <class TImpl>
@@ -113,7 +113,7 @@ class Human final
 		virtual void beginSelectionSet(const service::SelectionSetParams& params) const = 0;
 		virtual void endSelectionSet(const service::SelectionSetParams& params) const = 0;
 
-		virtual service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const = 0;
+		virtual service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableScalar<std::optional<std::string>> getName(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableObject<std::optional<std::vector<std::shared_ptr<Character>>>> getFriends(service::FieldParams&& params) const = 0;
 		virtual service::AwaitableScalar<std::optional<std::vector<std::optional<Episode>>>> getAppearsIn(service::FieldParams&& params) const = 0;
@@ -129,7 +129,7 @@ class Human final
 		{
 		}
 
-		service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const final
+		service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const final
 		{
 			if constexpr (methods::HumanHas::getIdWithParams<T>)
 			{
diff --git a/samples/learn/schema/QueryObject.cpp b/samples/learn/schema/QueryObject.cpp
@@ -73,7 +73,7 @@ service::AwaitableResolver Query::resolveHero(service::ResolverParams&& params)
 
 service::AwaitableResolver Query::resolveHuman(service::ResolverParams&& params) const
 {
-	auto argId = service::ModifiedArgument<std::string>::require("id", params.arguments);
+	auto argId = service::ModifiedArgument<response::IdType>::require("id", params.arguments);
 	std::unique_lock resolverLock(_resolverMutex);
 	auto directives = std::move(params.fieldDirectives);
 	auto result = _pimpl->getHuman(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argId));
@@ -84,7 +84,7 @@ service::AwaitableResolver Query::resolveHuman(service::ResolverParams&& params)
 
 service::AwaitableResolver Query::resolveDroid(service::ResolverParams&& params) const
 {
-	auto argId = service::ModifiedArgument<std::string>::require("id", params.arguments);
+	auto argId = service::ModifiedArgument<response::IdType>::require("id", params.arguments);
 	std::unique_lock resolverLock(_resolverMutex);
 	auto directives = std::move(params.fieldDirectives);
 	auto result = _pimpl->getDroid(service::FieldParams(service::SelectionSetParams{ params }, std::move(directives)), std::move(argId));
@@ -121,10 +121,10 @@ void AddQueryDetails(const std::shared_ptr<schema::ObjectType>& typeQuery, const
 			schema::InputValue::Make(R"gql(episode)gql"sv, R"md()md"sv, schema->LookupType(R"gql(Episode)gql"sv), R"gql()gql"sv)
 		}),
 		schema::Field::Make(R"gql(human)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(Human)gql"sv), {
-			schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv)), R"gql()gql"sv)
+			schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
 		}),
 		schema::Field::Make(R"gql(droid)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(Droid)gql"sv), {
-			schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv)), R"gql()gql"sv)
+			schema::InputValue::Make(R"gql(id)gql"sv, R"md()md"sv, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv)), R"gql()gql"sv)
 		})
 	});
 }
diff --git a/samples/learn/schema/QueryObject.h b/samples/learn/schema/QueryObject.h
@@ -26,25 +26,25 @@ concept getHero = requires (TImpl impl, std::optional<Episode> episodeArg)
 };
 
 template <class TImpl>
-concept getHumanWithParams = requires (TImpl impl, service::FieldParams params, std::string idArg)
+concept getHumanWithParams = requires (TImpl impl, service::FieldParams params, response::IdType idArg)
 {
 	{ service::AwaitableObject<std::shared_ptr<Human>> { impl.getHuman(std::move(params), std::move(idArg)) } };
 };
 
 template <class TImpl>
-concept getHuman = requires (TImpl impl, std::string idArg)
+concept getHuman = requires (TImpl impl, response::IdType idArg)
 {
 	{ service::AwaitableObject<std::shared_ptr<Human>> { impl.getHuman(std::move(idArg)) } };
 };
 
 template <class TImpl>
-concept getDroidWithParams = requires (TImpl impl, service::FieldParams params, std::string idArg)
+concept getDroidWithParams = requires (TImpl impl, service::FieldParams params, response::IdType idArg)
 {
 	{ service::AwaitableObject<std::shared_ptr<Droid>> { impl.getDroid(std::move(params), std::move(idArg)) } };
 };
 
 template <class TImpl>
-concept getDroid = requires (TImpl impl, std::string idArg)
+concept getDroid = requires (TImpl impl, response::IdType idArg)
 {
 	{ service::AwaitableObject<std::shared_ptr<Droid>> { impl.getDroid(std::move(idArg)) } };
 };
@@ -85,8 +85,8 @@ class Query final
 		virtual void endSelectionSet(const service::SelectionSetParams& params) const = 0;
 
 		virtual service::AwaitableObject<std::shared_ptr<Character>> getHero(service::FieldParams&& params, std::optional<Episode>&& episodeArg) const = 0;
-		virtual service::AwaitableObject<std::shared_ptr<Human>> getHuman(service::FieldParams&& params, std::string&& idArg) const = 0;
-		virtual service::AwaitableObject<std::shared_ptr<Droid>> getDroid(service::FieldParams&& params, std::string&& idArg) const = 0;
+		virtual service::AwaitableObject<std::shared_ptr<Human>> getHuman(service::FieldParams&& params, response::IdType&& idArg) const = 0;
+		virtual service::AwaitableObject<std::shared_ptr<Droid>> getDroid(service::FieldParams&& params, response::IdType&& idArg) const = 0;
 	};
 
 	template <class T>
@@ -111,7 +111,7 @@ class Query final
 			}
 		}
 
-		service::AwaitableObject<std::shared_ptr<Human>> getHuman(service::FieldParams&& params, std::string&& idArg) const final
+		service::AwaitableObject<std::shared_ptr<Human>> getHuman(service::FieldParams&& params, response::IdType&& idArg) const final
 		{
 			if constexpr (methods::QueryHas::getHumanWithParams<T>)
 			{
@@ -124,7 +124,7 @@ class Query final
 			}
 		}
 
-		service::AwaitableObject<std::shared_ptr<Droid>> getDroid(service::FieldParams&& params, std::string&& idArg) const final
+		service::AwaitableObject<std::shared_ptr<Droid>> getDroid(service::FieldParams&& params, response::IdType&& idArg) const final
 		{
 			if constexpr (methods::QueryHas::getDroidWithParams<T>)
 			{
diff --git a/samples/learn/schema/schema.learn.graphql b/samples/learn/schema/schema.learn.graphql
@@ -4,22 +4,22 @@
 enum Episode { NEW_HOPE, EMPIRE, JEDI }
 
 interface Character {
-  id: String!
+  id: ID!
   name: String
   friends: [Character]
   appearsIn: [Episode]
 }
 
 type Human implements Character {
-  id: String!
+  id: ID!
   name: String
   friends: [Character]
   appearsIn: [Episode]
   homePlanet: String
 }
 
 type Droid implements Character {
-  id: String!
+  id: ID!
   name: String
   friends: [Character]
   appearsIn: [Episode]
@@ -28,8 +28,8 @@ type Droid implements Character {
 
 type Query {
   hero(episode: Episode): Character
-  human(id: String!): Human
-  droid(id: String!): Droid
+  human(id: ID!): Human
+  droid(id: ID!): Droid
 }
 
 input ReviewInput {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void Droid::addFriends(`
`35`	`35`	`});`
`36`	`36`	`}`
`37`	`37`
`38`		`-const std::string& Droid::getId() const noexcept`
	`38`	`+const response::IdType& Droid::getId() const noexcept`
`39`	`39`	`{`
`40`	`40`	`return id_;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ void Human::addFriends(std::vector<SharedHero> friends) noexcept`
`34`	`34`	`});`
`35`	`35`	`}`
`36`	`36`
`37`		`-const std::string& Human::getId() const noexcept`
	`37`	`+const response::IdType& Human::getId() const noexcept`
`38`	`38`	`{`
`39`	`39`	`return id_;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`namespace graphql::learn {`
`9`	`9`
`10`	`10`	`Query::Query(std::map<Episode, SharedHero>&& heroes,`
`11`		`- std::map<std::string, std::shared_ptr<Human>>&& humans,`
`12`		`- std::map<std::string, std::shared_ptr<Droid>>&& droids) noexcept`
	`11`	`+ std::map<response::IdType, std::shared_ptr<Human>>&& humans,`
	`12`	`+ std::map<response::IdType, std::shared_ptr<Droid>>&& droids) noexcept`
`13`	`13`	`: heroes_ { std::move(heroes) }`
`14`	`14`	`, humans_ { std::move(humans) }`
`15`	`15`	`, droids_ { std::move(droids) }`
`@@ -29,7 +29,7 @@ std::shared_ptr<object::Character> Query::getHero(std::optional<Episode> episode`
`29`	`29`	`return result;`
`30`	`30`	`}`
`31`	`31`
`32`		`-std::shared_ptr<object::Human> Query::getHuman(const std::string& idArg) const noexcept`
	`32`	`+std::shared_ptr<object::Human> Query::getHuman(const response::IdType& idArg) const noexcept`
`33`	`33`	`{`
`34`	`34`	`std::shared_ptr<Human> result;`
`35`	`35`
`@@ -41,7 +41,7 @@ std::shared_ptr<object::Human> Query::getHuman(const std::string& idArg) const n`
`41`	`41`	`return std::make_shared<object::Human>(std::move(result));`
`42`	`42`	`}`
`43`	`43`
`44`		`-std::shared_ptr<object::Droid> Query::getDroid(const std::string& idArg) const noexcept`
	`44`	`+std::shared_ptr<object::Droid> Query::getDroid(const response::IdType& idArg) const noexcept`
`45`	`45`	`{`
`46`	`46`	`std::shared_ptr<Droid> result;`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void Character::endSelectionSet(const service::SelectionSetParams& params) const`
`35`	`35`	`void AddCharacterDetails(const std::shared_ptr<schema::InterfaceType>& typeCharacter, const std::shared_ptr<schema::Schema>& schema)`
`36`	`36`	`{`
`37`	`37`	`typeCharacter->AddFields({`
`38`		`- schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(String)gql"sv))),`
	`38`	`+ schema::Field::Make(R"gql(id)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::NON_NULL, schema->LookupType(R"gql(ID)gql"sv))),`
`39`	`39`	`schema::Field::Make(R"gql(name)gql"sv, R"md()md"sv, std::nullopt, schema->LookupType(R"gql(String)gql"sv)),`
`40`	`40`	`schema::Field::Make(R"gql(friends)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Character)gql"sv))),`
`41`	`41`	`schema::Field::Make(R"gql(appearsIn)gql"sv, R"md()md"sv, std::nullopt, schema->WrapType(introspection::TypeKind::LIST, schema->LookupType(R"gql(Episode)gql"sv)))`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ namespace methods::DroidHas {`
`23`	`23`	`template <class TImpl>`
`24`	`24`	`concept getIdWithParams = requires (TImpl impl, service::FieldParams params)`
`25`	`25`	`{`
`26`		`- { service::AwaitableScalar<std::string> { impl.getId(std::move(params)) } };`
	`26`	`+ { service::AwaitableScalar<response::IdType> { impl.getId(std::move(params)) } };`
`27`	`27`	`};`
`28`	`28`
`29`	`29`	`template <class TImpl>`
`30`	`30`	`concept getId = requires (TImpl impl)`
`31`	`31`	`{`
`32`		`- { service::AwaitableScalar<std::string> { impl.getId() } };`
	`32`	`+ { service::AwaitableScalar<response::IdType> { impl.getId() } };`
`33`	`33`	`};`
`34`	`34`
`35`	`35`	`template <class TImpl>`
`@@ -113,7 +113,7 @@ class Droid final`
`113`	`113`	`virtual void beginSelectionSet(const service::SelectionSetParams& params) const = 0;`
`114`	`114`	`virtual void endSelectionSet(const service::SelectionSetParams& params) const = 0;`
`115`	`115`
`116`		`- virtual service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const = 0;`
	`116`	`+ virtual service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const = 0;`
`117`	`117`	`virtual service::AwaitableScalar<std::optional<std::string>> getName(service::FieldParams&& params) const = 0;`
`118`	`118`	`virtual service::AwaitableObject<std::optional<std::vector<std::shared_ptr<Character>>>> getFriends(service::FieldParams&& params) const = 0;`
`119`	`119`	`virtual service::AwaitableScalar<std::optional<std::vector<std::optional<Episode>>>> getAppearsIn(service::FieldParams&& params) const = 0;`
`@@ -129,7 +129,7 @@ class Droid final`
`129`	`129`	`{`
`130`	`130`	`}`
`131`	`131`
`132`		`- service::AwaitableScalar<std::string> getId(service::FieldParams&& params) const final`
	`132`	`+ service::AwaitableScalar<response::IdType> getId(service::FieldParams&& params) const final`
`133`	`133`	`{`
`134`	`134`	`if constexpr (methods::DroidHas::getIdWithParams<T>)`
`135`	`135`	`{`