Use configured STJ options for null/default value inclusion

Bugfix: do not break out of method on first attribute

Author: Bart Koelman

src/JsonApiDotNetCore/Serialization/Building/ResourceObjectBuilder.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Resources.Internal;
 using JsonApiDotNetCore.Serialization.Objects;
-using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Serialization.Building
 {
@@ -168,15 +168,15 @@ private void ProcessAttributes(IIdentifiable resource, IEnumerable<AttrAttribute
             {
                 object value = attr.GetValue(resource);
 
-                if (_options.SerializerSettings.NullValueHandling == NullValueHandling.Ignore && value == null)
+                if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull && value == null)
                 {
-                    return;
+                    continue;
                 }
 
-                if (_options.SerializerSettings.DefaultValueHandling == DefaultValueHandling.Ignore &&
+                if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingDefault &&
                     Equals(value, RuntimeTypeConverter.GetDefaultValue(attr.Property.PropertyType)))
                 {
-                    return;
+                    continue;
                 }
 
                 ro.Attributes.Add(attr.PublicName, value);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs

@@ -11,6 +11,9 @@ public sealed class Calendar : Identifiable
         [Attr]
         public string TimeZone { get; set; }
 
+        [Attr]
+        public bool ShowWeekNumbers { get; set; }
+
         [Attr]
         public int DefaultAppointmentDurationInMinutes { get; set; }
 

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs

@@ -0,0 +1,85 @@
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using FluentAssertions;
+using FluentAssertions.Extensions;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Serialization.Objects;
+using Microsoft.Extensions.DependencyInjection;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+{
+    public sealed class SerializerIgnoreConditionTests : IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>
+    {
+        private readonly QueryStringFakers _fakers = new();
+
+        public SerializerIgnoreConditionTests()
+        {
+            UseController<CalendarsController>();
+        }
+
+        [Theory]
+        [InlineData(JsonIgnoreCondition.Never, true, true)]
+        [InlineData(JsonIgnoreCondition.WhenWritingDefault, false, false)]
+        [InlineData(JsonIgnoreCondition.WhenWritingNull, false, true)]
+        public async Task Applies_configuration_for_ignore_condition(JsonIgnoreCondition configurationValue, bool expectNullValueInDocument,
+            bool expectDefaultValueInDocument)
+        {
+            // Arrange
+            var options = (JsonApiOptions)Factory.Services.GetRequiredService<IJsonApiOptions>();
+            options.SerializerOptions.DefaultIgnoreCondition = configurationValue;
+
+            Calendar calendar = _fakers.Calendar.Generate();
+            calendar.TimeZone = null;
+            calendar.DefaultAppointmentDurationInMinutes = default;
+            calendar.ShowWeekNumbers = true;
+            calendar.Appointments = _fakers.Appointment.Generate(1).ToHashSet();
+            calendar.Appointments.Single().Title = null;
+            calendar.Appointments.Single().StartTime = default;
+            calendar.Appointments.Single().EndTime = 1.January(2001);
+
+            await RunOnDatabaseAsync(async dbContext =>
+            {
+                dbContext.Calendars.Add(calendar);
+                await dbContext.SaveChangesAsync();
+            });
+
+            string route = $"/calendars/{calendar.StringId}?include=appointments";
+
+            // Act
+            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+
+            // Assert
+            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+            responseDocument.SingleData.Should().NotBeNull();
+            responseDocument.Included.Should().HaveCount(1);
+
+            if (expectNullValueInDocument)
+            {
+                responseDocument.SingleData.Attributes.Should().ContainKey("timeZone");
+                responseDocument.Included[0].Attributes.Should().ContainKey("title");
+            }
+            else
+            {
+                responseDocument.SingleData.Attributes.Should().NotContainKey("timeZone");
+                responseDocument.Included[0].Attributes.Should().NotContainKey("title");
+            }
+
+            if (expectDefaultValueInDocument)
+            {
+                responseDocument.SingleData.Attributes.Should().ContainKey("defaultAppointmentDurationInMinutes");
+                responseDocument.Included[0].Attributes.Should().ContainKey("startTime");
+            }
+            else
+            {
+                responseDocument.SingleData.Attributes.Should().NotContainKey("defaultAppointmentDurationInMinutes");
+                responseDocument.Included[0].Attributes.Should().NotContainKey("startTime");
+            }
+        }
+    }
+}