Skip to content
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

Update: Phone number is optional when unblocking the provider #1246

Merged
merged 5 commits into from
Sep 25, 2023
Merged

Update: Phone number is optional when unblocking the provider #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
709fe8c
Added the RequiredIfAttribute class for property validation
VitaliyYuras Sep 22, 2023
f4dc67e
Made phone number optional for provider unblocking.
VitaliyYuras Sep 22, 2023
cdb9f65
Moved BlockPhoneNumber field from ProviderBaseDto to the ProviderDto …
VitaliyYuras Sep 25, 2023
1ecff27
Removed all validations in BlockPhoneNumber.
VitaliyYuras Sep 25, 2023
22e3964
Added BlockPhoneNumber mapping ignoring
VitaliyYuras Sep 25, 2023
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
9 changes: 0 additions & 9 deletions OutOfSchool/OutOfSchool.WebApi/Models/Providers/ProviderBaseDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@ public class ProviderBaseDto

public bool IsBlocked { get; set; }

[DataType(DataType.PhoneNumber)]
[RegularExpression(
Constants.PhoneNumberRegexModel,
ErrorMessage = Constants.PhoneErrorMessage)]
[DisplayFormat(DataFormatString = Constants.PhoneNumberFormat)]
[MaxLength(Constants.UnifiedPhoneLength)]
[Required(ErrorMessage = "PhoneNumber is required")]
public string BlockPhoneNumber { get; set; } = string.Empty;

[MaxLength(500)]
public string BlockReason { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions OutOfSchool/OutOfSchool.WebApi/Models/Providers/ProviderBlockDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;

using OutOfSchool.WebApi.Validators;
namespace OutOfSchool.WebApi.Models.Providers;

public class ProviderBlockDto
Expand All @@ -16,7 +16,7 @@ public class ProviderBlockDto
ErrorMessage = Constants.PhoneErrorMessage)]
[DisplayFormat(DataFormatString = Constants.PhoneNumberFormat)]
[MaxLength(Constants.UnifiedPhoneLength)]
[Required(ErrorMessage = "PhoneNumber is required")]
[RequiredIf("IsBlocked", true, ErrorMessage = "PhoneNumber is required")]
public string BlockPhoneNumber { get; set; } = string.Empty;

[MaxLength(500)]
Expand Down
2 changes: 2 additions & 0 deletions OutOfSchool/OutOfSchool.WebApi/Models/Providers/ProviderDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ public class ProviderDto : ProviderBaseDto
[Required]
[EnumDataType(typeof(OwnershipType), ErrorMessage = Constants.EnumErrorMessage)]
public OwnershipType Ownership { get; set; }

public string BlockPhoneNumber { get; set; } = string.Empty;
}
2 changes: 1 addition & 1 deletion OutOfSchool/OutOfSchool.WebApi/Services/ProviderService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public async Task<ResponseDto> Block(ProviderBlockDto providerBlockDto, string t

provider.IsBlocked = providerBlockDto.IsBlocked;
provider.BlockReason = providerBlockDto.IsBlocked ? providerBlockDto.BlockReason : null;
provider.BlockPhoneNumber = providerBlockDto.IsBlocked ? providerBlockDto.BlockPhoneNumber : null;
provider.BlockPhoneNumber = providerBlockDto.IsBlocked ? providerBlockDto.BlockPhoneNumber : string.Empty;

await providerRepository.RunInTransaction(async () =>
{
Expand Down
3 changes: 2 additions & 1 deletion OutOfSchool/OutOfSchool.WebApi/Util/MappingProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ public MappingProfile()
.ForMember(dest => dest.Status, opt => opt.Ignore())
.ForMember(dest => dest.StatusReason, opt => opt.Ignore())
.ForMember(dest => dest.LicenseStatus, opt => opt.Ignore())
.ForMember(dest => dest.ProviderAdmins, opt => opt.Ignore());
.ForMember(dest => dest.ProviderAdmins, opt => opt.Ignore())
.ForMember(dest => dest.BlockPhoneNumber, opt => opt.Ignore());

CreateMap<Provider, ProviderUpdateDto>()
.ForMember(dest => dest.ActualAddress, opt => opt.MapFrom(src => src.ActualAddress))
Expand Down
38 changes: 38 additions & 0 deletions OutOfSchool/OutOfSchool.WebApi/Validators/RequiredIfAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
using System.ComponentModel.DataAnnotations;

namespace OutOfSchool.WebApi.Validators;

public class RequiredIfAttribute : ValidationAttribute
{
private readonly string otherProperty;
private readonly bool requiredValue;

public RequiredIfAttribute(string otherProperty, bool requiredValue)
{
this.otherProperty = otherProperty;
this.requiredValue = requiredValue;
}

protected override ValidationResult IsValid(object value, ValidationContext validationContext)
{
var propertyInfo = validationContext.ObjectType.GetProperty(otherProperty);

if (propertyInfo == null)
{
return new ValidationResult($"Property {otherProperty} not found.");
}

var otherPropertyValue = propertyInfo.GetValue(validationContext.ObjectInstance);

if ((otherPropertyValue is bool otherValue) && otherValue == requiredValue)
{
if (value == null || string.IsNullOrWhiteSpace(value.ToString()))
{
return new ValidationResult(ErrorMessage);
}
}

return ValidationResult.Success;
}
}

Loading