Skip to content

Commit 0f164fc

Browse files
jenschudejenschude
authored
fix resolving of custom fields in GraphQL module (#336)
1 parent 8ee0c1c commit 0f164fc

File tree

3 files changed

+86
-2
lines changed

3 files changed

+86
-2
lines changed

‎commercetools.Sdk/IntegrationTests/commercetools.Api.IntegrationTests/Type/TypeIntegrationTests.cs

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
using System.Collections.Generic;
2+
using System.Text.Json;
3+
using System.Text.Json.Nodes;
24
using System.Threading.Tasks;
35
using commercetools.Sdk.Api.Client;
46
using commercetools.Sdk.Api.Models.Common;
57
using commercetools.Sdk.Api.Models.Types;
8+
using commercetools.Sdk.GraphQL.Api;
69
using Xunit;
710
using static commercetools.Api.IntegrationTests.Type.TypeFixtures;
11+
using static commercetools.Api.IntegrationTests.Cart.CartFixture;
12+
using CustomFieldsDraft = commercetools.Sdk.Api.Models.Types.CustomFieldsDraft;
13+
using FieldDefinition = commercetools.Sdk.Api.Models.Types.FieldDefinition;
14+
using FieldType = commercetools.Sdk.Api.Models.Types.FieldType;
15+
using LocalizedString = commercetools.Sdk.Api.Models.Common.LocalizedString;
816

917
namespace commercetools.Api.IntegrationTests.Type
1018
{
@@ -71,6 +79,80 @@ await WithType(
7179
});
7280
}
7381

82+
[Fact]
83+
public async Task CartWithCustomType()
84+
{
85+
var gqlClient = _client.GraphQLClient();
86+
87+
var key = $"QueryType-{TestingUtility.RandomString()}";
88+
89+
await WithType(
90+
_client,
91+
typeDraft =>
92+
{
93+
var draft = DefaultTypeDraftWithKey(typeDraft, key);
94+
draft.FieldDefinitions = new List<IFieldDefinition>()
95+
{
96+
new FieldDefinition()
97+
{
98+
Type = new CustomFieldStringType()
99+
{
100+
},
101+
Label = new LocalizedString()
102+
{
103+
{"en", "test-string"}
104+
},
105+
Required = false,
106+
Name = "test-string"
107+
},
108+
new FieldDefinition()
109+
{
110+
Type = new CustomFieldSetType()
111+
{
112+
ElementType = new CustomFieldStringType()
113+
},
114+
Label = new LocalizedString()
115+
{
116+
{"en", "test-set"}
117+
},
118+
Required = false,
119+
Name = "test-set"
120+
}
121+
};
122+
return draft;
123+
},
124+
async type =>
125+
{
126+
await WithCart(_client, cartDraft =>
127+
{
128+
var draft = DefaultCartDraft(cartDraft);
129+
draft.Custom = new CustomFieldsDraft()
130+
{
131+
Type = new TypeResourceIdentifier() { Key = type.Key },
132+
Fields = new FieldContainer()
133+
{
134+
{ "test-set", new List<string>()
135+
{
136+
"abc",
137+
"def"
138+
}
139+
},
140+
{ "test-string", "foo"
141+
}
142+
}
143+
};
144+
return draft;
145+
}, async cart =>
146+
{
147+
var cartId = cart.Id;
148+
var t = await gqlClient.Query(o => o.Cart(id: cartId, selector: cart => new { Custom = cart.Custom(custom => new { Field = custom.CustomFieldsRaw(selector: field => field.Value) })}));
149+
Assert.Equal("abc", t.Data.Custom.Field[0].Deserialize<List<string>>()[0]);
150+
Assert.Equal("def", t.Data.Custom.Field[0].Deserialize<List<string>>()[1]);
151+
Assert.Equal("foo", t.Data.Custom.Field[1].ToString());
152+
});
153+
});
154+
}
155+
74156
[Fact]
75157
public async Task UpdateTypeByIdChangeDescription()
76158
{

‎commercetools.Sdk/IntegrationTests/commercetools.Api.IntegrationTests/commercetools.Api.IntegrationTests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<UserSecretsId>6e42aa04-1612-4e1c-8bb2-190e5c88343f</UserSecretsId>
77
<IsTestProject>true</IsTestProject>
@@ -15,6 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
1616
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.21" />
1717
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
1819
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
1920
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
2021
<PackageReference Include="xunit" Version="2.5.0" />
@@ -32,6 +33,7 @@
3233
<ProjectReference Include="..\..\commercetools.Base.Serialization\commercetools.Base.Serialization.csproj" />
3334
<ProjectReference Include="..\..\commercetools.Sdk.Api\commercetools.Sdk.Api.csproj" />
3435
<ProjectReference Include="..\..\commercetools.Sdk.ImportApi\commercetools.Sdk.ImportApi.csproj" />
36+
<ProjectReference Include="..\..\commercetools.Sdk.GraphQL.Api\commercetools.Sdk.GraphQL.Api.csproj" />
3537
</ItemGroup>
3638
<ItemGroup>
3739
<None Update="appsettings.test.Development.json">

‎commercetools.Sdk/commercetools.Sdk.GraphQL.Api/config.zeroql.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BigDecimal": "System.Decimal",
99
"Country": "System.String",
1010
"Locale": "System.String",
11-
"Json": "System.String",
11+
"Json": "System.Text.Json.Nodes.JsonValue",
1212
"KeyReferenceInput": "System.String",
1313
"Set": "System.String",
1414
"Time": "System.String",

0 commit comments

Comments
 (0)