Skip to content

HEEDLS-429 Notification preferences endpoints case insensitivity #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2021
Merged

HEEDLS-429 Notification preferences endpoints case insensitivity #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions DigitalLearningSolutions.Data/Enums/Enumeration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,14 @@ public override bool Equals(object? obj)

public static bool TryGetFromIdOrName<T>(
string idOrName,
out T enumeration)
out T enumeration,
bool ignoreCase = false
)
where T : Enumeration
{
return TryParse(item => item.Name == idOrName, out enumeration) ||
var comparison =
ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
return TryParse(item => string.Equals(item.Name, idOrName, comparison), out enumeration) ||
int.TryParse(idOrName, out var id) &&
TryParse(item => item.Id == id, out enumeration);
}
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/ModelBinders/EnumerationModelBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
{
bindingContext.Result = ModelBindingResult.Success(default(T));
}
else if (Enumeration.TryGetFromIdOrName<T>(enumerationName.FirstValue, out var result))
else if (Enumeration.TryGetFromIdOrName<T>(enumerationName.FirstValue, out var result, true))
{
bindingContext.Result = ModelBindingResult.Success(result);
}
Expand Down