feat: Use JsonPropertyOrder attribute (#36)

Author: xC0dex

demo/APIWeaver.MinimalApi.Demo/Program.cs

@@ -68,6 +68,7 @@
 
 public class User
 {
+    
     private int _number;
     public required string Id { get; set; }
 
@@ -79,6 +80,7 @@ public class User
     [JsonInclude]
     private string FullName { get; init; } = "awd";
 
+    [JsonPropertyOrder(1)]
     public int Number
     {
         set => _number = value;

src/APIWeaver.Schema/Factories/ContractFactory.cs

@@ -57,10 +57,14 @@ public IContract GetContract(Type type, IEnumerable<Attribute> customAttributes)
 
     private IEnumerable<PropertyContract> GetProperties(Type type)
     {
-        var properties = GetPropertyContractsFromProperties(type);
         var fields = GetPropertyContractsFromFields(type);
+        var properties = GetPropertyContractsFromProperties(type);
 
-        return properties.Concat(fields);
+        return fields.Concat(properties).OrderBy(property =>
+        {
+            var orderAttribute = property.CustomAttributes.OfType<JsonPropertyOrderAttribute>().FirstOrDefault();
+            return orderAttribute?.Order ?? int.MaxValue;
+        });
     }
 
     private IEnumerable<PropertyContract> GetPropertyContractsFromProperties(Type type)

tests/APIWeaver.Schema.Tests/ContractFactoryTests.cs

@@ -331,6 +331,22 @@ public void GetContract_ShouldIgnoreReadOnlyProperties_WhenOptionsSet()
         properties.Should().NotContain(x => x.Name == "fullName");
         properties.Should().NotContain(x => x.Name == "theAge");
     }
+    
+    [Fact]
+    public void GetContract_ShouldReturnPropertyWithOrderAttributeFirst_WhenPropertyHasOrderAttribute()
+    {
+        // Arrange
+        var type = typeof(UserForProperties);
+
+        // Act
+        var contract = _sut.GetContract(type, []);
+
+        // Assert
+        contract.Should().BeOfType<ObjectTypeContract>()
+            .Which.Type.Should().Be(type);
+        var properties = (contract as ObjectTypeContract)!.Properties.ToArray();
+        properties[0].Name.Should().Be("fullName");
+    }
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -362,6 +378,7 @@ file class UserForProperties
     private string? Name { get; init; }
 
     [JsonInclude]
+    [JsonPropertyOrder(1)]
     private string FullName { get; } = null!;
 }
 #pragma warning restore CS0649 // Field is never assigned to, and will always have its default value