Chore: FilterByRange method names altered to be more clear.

LibardiFelipe · Dec 28, 2022 · 71ddf83 · 71ddf83
1 parent 7510e52
commit 71ddf83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/TemplateBase.Application/Queries/Base/Query.cs b/TemplateBase.Application/Queries/Base/Query.cs
@@ -27,14 +27,14 @@ public Query(string id)
  _id = guidId;
  }
 
- public TQuery FilterByRangeCreation(DateTime? startDate, DateTime? endDate)
+ public TQuery FilterByCreationRange(DateTime? startDate, DateTime? endDate)
  {
  _createdAtStart = startDate;
  _createdAtEnd = endDate;
  return (TQuery)this;
  }
 
- public TQuery FilterByRangeUpdate(DateTime? startDate, DateTime? endDate)
+ public TQuery FilterByUpdateRange(DateTime? startDate, DateTime? endDate)
  {
  _updatedAtStart = startDate;
  _updatedAtEnd = endDate;

diff --git a/TemplateBase.Application/Queries/Users/UserQuery.cs b/TemplateBase.Application/Queries/Users/UserQuery.cs
@@ -49,10 +49,10 @@ public override ISpecification<User> ToSpecification()
  spec.FilterById(_id.Value);
 
  if (_createdAtStart.HasValue && _createdAtEnd.HasValue)
- spec.FilterByRangeCreation(_createdAtStart.Value, _createdAtEnd.Value);
+ spec.FilterByCreationRange(_createdAtStart.Value, _createdAtEnd.Value);
 
  if (_updatedAtStart.HasValue && _updatedAtEnd.HasValue)
- spec.FilterByRangeUpdate(_updatedAtStart.Value, _updatedAtEnd.Value);
+ spec.FilterByUpdateRange(_updatedAtStart.Value, _updatedAtEnd.Value);
 
  if (!string.IsNullOrWhiteSpace(_name))
  spec.FilterByName(_name);

diff --git a/TemplateBase.Domain/Specifications/Base/BaseSpecification.cs b/TemplateBase.Domain/Specifications/Base/BaseSpecification.cs
@@ -43,15 +43,15 @@ public virtual TImplementation FilterById(Guid id)
  return (TImplementation)this;
  }
 
- public virtual TImplementation FilterByRangeCreation(DateTime start, DateTime end)
+ public virtual TImplementation FilterByCreationRange(DateTime start, DateTime end)
  {
  CriteriaAnd((T x) => x.CreatedAt.Date >= start.Date && x.CreatedAt.Date <= end.Date);
  return (TImplementation)this;
  }
 
- public virtual TImplementation FilterByRangeUpdate(DateTime start, DateTime end)
+ public virtual TImplementation FilterByUpdateRange(DateTime start, DateTime end)
  {
- CriteriaAnd((T x) => x.UpdatedAt.HasValue ? (x.UpdatedAt.Value.Date >= start.Date && x.UpdatedAt.Value.Date <= end) : false);
+ CriteriaAnd((T x) => x.UpdatedAt.HasValue && (x.UpdatedAt.Value.Date >= start.Date && x.UpdatedAt.Value.Date <= end));
  return (TImplementation)this;
  }
 

diff --git a/TemplateBase.WebAPI/AutoMapper/RequestsToQueries.cs b/TemplateBase.WebAPI/AutoMapper/RequestsToQueries.cs
@@ -15,8 +15,8 @@ public RequestsToQueries()
  .FilterByName(src.Name)
  .FilterByEmail(src.Email)
  .FilterByType(src.Type)
- .FilterByRangeCreation(src.CreatedAtStart, src.CreatedAtEnd)
- .FilterByRangeUpdate(src.UpdatedAtStart, src.UpdatedAtEnd);
+ .FilterByCreationRange(src.CreatedAtStart, src.CreatedAtEnd)
+ .FilterByUpdateRange(src.UpdatedAtStart, src.UpdatedAtEnd);
  })
  .IgnoreAllPropertiesWithAnInaccessibleSetter()
  .AfterMap((_, src) => src.Validate());