Skip to content

fix admin access in last day #2870

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

Open
MaksymLiaskovskyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix admin access in last day #2870

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
2 changes: 1 addition & 1 deletion EPlast/EPlast.BLL/Services/City/CityAccess/CityAccessGetters/CityAccessForCityAdminGetter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public CityAccessForCityAdminGetter(IRepositoryWrapper repositoryWrapper)
{
var cityAdministration = await _repositoryWrapper.CityAdministration.GetFirstOrDefaultAsync(
predicate: c => c.UserId == userId
&& (DateTime.Now < c.EndDate || c.EndDate == null)
&& (DateTime.Now.Date <= c.EndDate.Value.Date || c.EndDate == null)
&& (c.AdminTypeId == _cityAdminType.ID
|| c.AdminTypeId == _cityAdminDeputyType.ID
|| c.AdminTypeId == _cityReferentUPSType.ID
Expand Down
2 changes: 1 addition & 1 deletion EPlast/EPlast.BLL/Services/Club/ClubAccess/ClubAccessGetters/ClubAccessForClubAdminGetter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ClubAccessForClubAdminGetter(IRepositoryWrapper repositoryWrapper)
public async Task<IEnumerable<DatabaseEntities.Club>> GetClubs(string userId)
{
var ClubAdministration = await _repositoryWrapper.ClubAdministration.GetFirstOrDefaultAsync(
predicate: c => c.UserId == userId && (DateTime.Now < c.EndDate || c.EndDate == null) && (c.AdminTypeId == _ClubAdminType.ID || c.AdminTypeId == _ClubAdminDeputyType.ID));
predicate: c => c.UserId == userId && (DateTime.Now.Date <= c.EndDate.Value.Date || c.EndDate == null) && (c.AdminTypeId == _ClubAdminType.ID || c.AdminTypeId == _ClubAdminDeputyType.ID));
return ClubAdministration != null ? await _repositoryWrapper.Club.GetAllAsync(
predicate: c => c.ID == ClubAdministration.ClubId)
: Enumerable.Empty<DatabaseEntities.Club>();
Expand Down
2 changes: 1 addition & 1 deletion ....BLL/Services/Region/RegionAccess/RegionAccessGetters/RegionAccessForRegionAdminGetter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public RegionAccessForRegionAdminGetter(IRepositoryWrapper repositoryWrapper)
public async Task<IEnumerable<DatabaseEntities.Region>> GetRegionAsync(string userId)
{
var RegionAdministration = await _repositoryWrapper.RegionAdministration.GetFirstOrDefaultAsync(
predicate: c => c.UserId == userId && (DateTime.Now < c.EndDate || c.EndDate == null) &&
predicate: c => c.UserId == userId && (DateTime.Now.Date <= c.EndDate.Value.Date || c.EndDate == null) &&
(c.AdminTypeId == _RegionAdminType.ID || c.AdminTypeId == _RegionAdminDeputyType.ID));
return RegionAdministration != null ? await _repositoryWrapper.Region.GetAllAsync(
predicate: c => c.ID == RegionAdministration.RegionId)
Expand Down