Fix ordering

- Check for `[Display]` before any `[JsonPropertyName]`.
- Add test case for records.

Author: martincostello

src/Validation/gen/Parsers/ValidationsGenerator.TypesParser.cs

@@ -196,8 +196,8 @@ internal ImmutableArray<ValidatableProperty> ExtractValidatableMembers(ITypeSymb
 
                         var displayName =
                             parameter.GetDisplayName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_DisplayAttribute)) ??
-                            parameter.GetJsonPropertyName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Text_Json_Serialization_JsonPropertyNameAttribute)) ??
                             correspondingProperty.GetDisplayName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_ComponentModel_DataAnnotations_DisplayAttribute)) ??
+                            parameter.GetJsonPropertyName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Text_Json_Serialization_JsonPropertyNameAttribute)) ??
                             correspondingProperty.GetJsonPropertyName(wellKnownTypes.Get(WellKnownTypeData.WellKnownType.System_Text_Json_Serialization_JsonPropertyNameAttribute)) ??
                             parameter.Name ??
                             correspondingProperty.Name;

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.ComplexType.cs

@@ -15,14 +15,14 @@ public async Task CanValidateComplexTypesWithJsonIgnore()
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Validation;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Mvc;
-using System.Text.Json.Serialization;
 
 var builder = WebApplication.CreateBuilder();
 

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.RecordType.cs

@@ -15,6 +15,7 @@ public async Task CanValidateRecordTypes()
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
@@ -31,6 +32,7 @@ public async Task CanValidateRecordTypes()
 var app = builder.Build();
 
 app.MapPost("/validatable-record", (ValidatableRecord validatableRecord) => Results.Ok("Passed"!));
+app.MapPost("/validatable-record-with-json-property-name", (ValidatableRecordWithJsonPropertyNames validatableRecord) => Results.Ok("Passed"!));
 
 app.Run();
 
@@ -95,7 +97,20 @@ public record ValidatableRecord(
     [DerivedValidation, Range(10, 100)]
     int PropertyWithMultipleAttributes = 10,
     [FromServices] [Required] TestService ServiceProperty = null!, // This should be ignored because of [FromServices]
-    [FromKeyedServices("serviceKey")] [Range(10, 100)] int KeyedServiceProperty = 5 // This should be ignored because of [FromKeyedServices]
+    [FromKeyedServices("serviceKey")] [Range(10, 100)] int KeyedServiceProperty = 5, // This should be ignored because of [FromKeyedServices]
+    [Display(Name = "display-name")] [Range(10, 100)] int IntegerWithRangeAndDisplay = 10
+);
+
+public record ValidatableRecordWithJsonPropertyNames(
+    [Range(10, 100)]
+    int DefaultPropertyName = 10,
+    [Range(10, 100)]
+    [property: JsonPropertyName("custom-property-name")]
+    int CustomJsonPropertyName = 20,
+    [Display(Name = "display-name")]
+    [Range(10, 100)]
+    [property: JsonPropertyName("custom-property-name-with-display-name")]
+    int CustomJsonPropertyNameWithDisplayName = 30
 );
 """;
         await Verify(source, out var compilation);

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/snapshots/ValidationsGeneratorTests.CanValidateRecordTypes#ValidatableInfoResolver.g.verified.cs

@@ -193,6 +193,39 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.
                             name: "PropertyWithMultipleAttributes",
                             displayName: "PropertyWithMultipleAttributes"
                         ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecord),
+                            propertyType: typeof(int),
+                            name: "IntegerWithRangeAndDisplay",
+                            displayName: "display-name"
+                        ),
+                    ]
+                );
+                return true;
+            }
+            if (type == typeof(global::ValidatableRecordWithJsonPropertyNames))
+            {
+                validatableInfo = new GeneratedValidatableTypeInfo(
+                    type: typeof(global::ValidatableRecordWithJsonPropertyNames),
+                    members: [
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecordWithJsonPropertyNames),
+                            propertyType: typeof(int),
+                            name: "DefaultPropertyName",
+                            displayName: "DefaultPropertyName"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecordWithJsonPropertyNames),
+                            propertyType: typeof(int),
+                            name: "CustomJsonPropertyName",
+                            displayName: "custom-property-name"
+                        ),
+                        new GeneratedValidatablePropertyInfo(
+                            containingType: typeof(global::ValidatableRecordWithJsonPropertyNames),
+                            propertyType: typeof(int),
+                            name: "CustomJsonPropertyNameWithDisplayName",
+                            displayName: "display-name"
+                        ),
                     ]
                 );
                 return true;