Skip to content

Make address fields nullable, improve phone regex to support dashes #77

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
hanastasov merged 2 commits into from
Aug 28, 2025
Merged

Make address fields nullable, improve phone regex to support dashes #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b880ac
Make address fields nullable
ddidgdimitrov-infragistics Aug 26, 2025
551ee27
improve phone pattern to support dashes and phones starting with zero
ddidgdimitrov-infragistics Aug 26, 2025
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
10 changes: 5 additions & 5 deletions NorthwindCRUD/Models/Contracts/IAddress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ namespace NorthwindCRUD.Models.Contracts
{
public interface IAddress
{
string Street { get; set; }
string? Street { get; set; }

string City { get; set; }
string? City { get; set; }

string Region { get; set; }
string? Region { get; set; }

string PostalCode { get; set; }
string? PostalCode { get; set; }

string Country { get; set; }
string? Country { get; set; }

string? Phone { get; set; }
}
Expand Down
10 changes: 5 additions & 5 deletions NorthwindCRUD/Models/DbModels/AddressDb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ public class AddressDb : IAddress
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public string AddressId { get; set; }

public string Street { get; set; }
public string? Street { get; set; }

public string City { get; set; }
public string? City { get; set; }

public string Region { get; set; }
public string? Region { get; set; }

public string PostalCode { get; set; }
public string? PostalCode { get; set; }

public string Country { get; set; }
public string? Country { get; set; }

public string? Phone { get; set; }

Expand Down
17 changes: 6 additions & 11 deletions NorthwindCRUD/Models/Dtos/AddressDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,22 @@ namespace NorthwindCRUD.Models.Dtos
{
public class AddressDto : IAddress
{
[Required(ErrorMessage = "Street is required.")]
[StringLength(100, ErrorMessage = "Street cannot exceed 100 characters.")]
public string Street { get; set; }
public string? Street { get; set; }

[Required(ErrorMessage = "City is required.")]
[StringLength(50, ErrorMessage = "City cannot exceed 50 characters.")]
public string City { get; set; }
public string? City { get; set; }

[Required(ErrorMessage = "Region is required.")]
[StringLength(50, ErrorMessage = "Region cannot exceed 50 characters.")]
public string Region { get; set; }
public string? Region { get; set; }

[Required(ErrorMessage = "PostalCode is required.")]
[StringLength(20, ErrorMessage = "Postal code cannot exceed 20 characters.")]
public string PostalCode { get; set; }
public string? PostalCode { get; set; }

[Required(ErrorMessage = "Country is required.")]
[StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
public string Country { get; set; }
public string? Country { get; set; }

[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
[RegularExpression(@"^\+?[0-9][0-9\-]{1,14}$", ErrorMessage = "Phone number is not valid.")]
public string? Phone { get; set; }
}
}
2 changes: 1 addition & 1 deletion NorthwindCRUD/Services/SalesService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public SalesDto[] RetrieveSalesDataByCountry(string startDate, string endDate, s
.ToList();

var filteredData = salesData
.Where(od => od.Order.ShipAddress?.Country.ToLower(CultureInfo.InvariantCulture) == normalizedCountry && DateTime.Parse(od.Order.OrderDate, CultureInfo.InvariantCulture) >= parsedStartDate && DateTime.Parse(od.Order.RequiredDate, CultureInfo.InvariantCulture) <= parsedEndDate)
.Where(od => od.Order.ShipAddress?.Country?.ToLower(CultureInfo.InvariantCulture) == normalizedCountry && DateTime.Parse(od.Order.OrderDate, CultureInfo.InvariantCulture) >= parsedStartDate && DateTime.Parse(od.Order.RequiredDate, CultureInfo.InvariantCulture) <= parsedEndDate)
.ToList();

var sales = filteredData.Select(od => new SalesDto
Expand Down