From 742d90bb98d64557df560cbb2d890c313ec7fa2e Mon Sep 17 00:00:00 2001 From: Serraniel Date: Wed, 1 Mar 2023 17:14:43 +0100 Subject: [PATCH] Refactors queryfilter name attribute --- .../QueryFilter/AttributedQueryFilter.cs | 2 +- src/Utils/QueryFilter/CardQueryFilter.cs | 20 +++++++++---------- ...tribute.cs => QueryFilterNameAttribute.cs} | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) rename src/Utils/QueryFilter/{QueryFilterAttribute.cs => QueryFilterNameAttribute.cs} (57%) diff --git a/src/Utils/QueryFilter/AttributedQueryFilter.cs b/src/Utils/QueryFilter/AttributedQueryFilter.cs index 1429352..8701a44 100644 --- a/src/Utils/QueryFilter/AttributedQueryFilter.cs +++ b/src/Utils/QueryFilter/AttributedQueryFilter.cs @@ -14,7 +14,7 @@ public abstract class AttributedQueryFilter : IQueryFilter var properties = GetType().GetProperties(); foreach (var propertyInfo in properties) { - var attribute = propertyInfo.GetCustomAttribute(); + var attribute = propertyInfo.GetCustomAttribute(); if (attribute == null) continue; diff --git a/src/Utils/QueryFilter/CardQueryFilter.cs b/src/Utils/QueryFilter/CardQueryFilter.cs index bb8a5d7..3f07d18 100644 --- a/src/Utils/QueryFilter/CardQueryFilter.cs +++ b/src/Utils/QueryFilter/CardQueryFilter.cs @@ -2,23 +2,23 @@ public class CardQueryFilter : AttributedQueryFilter { - [QueryFilter("id")] public int? Id { get; set; } + [QueryFilterName("id")] public int? Id { get; set; } - [QueryFilter("name")] public string? Name { get; set; } + [QueryFilterName("name")] public string? Name { get; set; } - [QueryFilter("set_id")] public int? SetId { get; set; } + [QueryFilterName("set_id")] public int? SetId { get; set; } - [QueryFilter("illustrator")] public string? Artist { get; set; } + [QueryFilterName("illustrator")] public string? Artist { get; set; } - [QueryFilter("p_no")] public string? PrintedNumber { get; set; } + [QueryFilterName("p_no")] public string? PrintedNumber { get; set; } - [QueryFilter("uuid")] public int? Uuid { get; set; } + [QueryFilterName("uuid")] public int? Uuid { get; set; } - [QueryFilter("rarity")] public string? Rarity { get; set; } + [QueryFilterName("rarity")] public string? Rarity { get; set; } - [QueryFilter("subtype")] public string? Subtype { get; set; } + [QueryFilterName("subtype")] public string? Subtype { get; set; } - [QueryFilter("type")] public string? Type { get; set; } + [QueryFilterName("type")] public string? Type { get; set; } - [QueryFilter("set_code")] public string? SetCode { get; set; } + [QueryFilterName("set_code")] public string? SetCode { get; set; } } \ No newline at end of file diff --git a/src/Utils/QueryFilter/QueryFilterAttribute.cs b/src/Utils/QueryFilter/QueryFilterNameAttribute.cs similarity index 57% rename from src/Utils/QueryFilter/QueryFilterAttribute.cs rename to src/Utils/QueryFilter/QueryFilterNameAttribute.cs index 160f039..34cdf4e 100644 --- a/src/Utils/QueryFilter/QueryFilterAttribute.cs +++ b/src/Utils/QueryFilter/QueryFilterNameAttribute.cs @@ -3,14 +3,14 @@ namespace JpnCardsPokemonSdk.Utils.QueryFilter; [AttributeUsage(AttributeTargets.Property)] -public class QueryFilterAttribute : Attribute +public class QueryFilterNameAttribute : Attribute { - public QueryFilterAttribute(string? paramName) + public QueryFilterNameAttribute(string? paramName) { ParamName = paramName; } - public QueryFilterAttribute() : this(null) + public QueryFilterNameAttribute() : this(null) { }