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

Simplify getAccessible functions #2013

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

Simplify getAccessible functions #2013

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
57 changes: 21 additions & 36 deletions backend/api/Services/AreaService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ public async Task<PagedList<Area>> ReadAll(

public async Task<Area?> ReadById(string id, bool readOnly = true)
{
return await GetAreas(readOnly: readOnly).FirstOrDefaultAsync(a => a.Id.Equals(id));
return await GetAccessibleAreas(readOnly: readOnly)
.FirstOrDefaultAsync(a => a.Id.Equals(id));
}

public async Task<IEnumerable<Area?>> ReadByInspectionAreaId(
Expand All @@ -88,7 +89,7 @@ public async Task<PagedList<Area>> ReadAll(
{
return [];
}
return await GetAreas(readOnly: readOnly)
return await GetAccessibleAreas(readOnly: readOnly)
.Where(a =>
a.InspectionArea != null && a.InspectionArea.Id.Equals(inspectionAreaId)
)
Expand All @@ -110,7 +111,7 @@ public async Task<PagedList<Area>> ReadAll(
return null;
}

return await GetAreas(readOnly: readOnly)
return await GetAccessibleAreas(readOnly: readOnly)
.Where(a =>
a.Installation.Id.Equals(installation.Id)
&& a.Name.ToLower().Equals(areaName.ToLower())
Expand All @@ -129,7 +130,7 @@ public async Task<IEnumerable<Area>> ReadByInstallation(string installationCode)
return [];
}

return await GetAreas()
return await GetAccessibleAreas()
.Where(a => a.Installation.Id.Equals(installation.Id))
.ToListAsync();
}
Expand Down Expand Up @@ -224,7 +225,7 @@ public async Task<Area> Update(Area area)

public async Task<Area?> Delete(string id)
{
var area = await GetAreas().FirstOrDefaultAsync(ev => ev.Id.Equals(id));
var area = await GetAccessibleAreas().FirstOrDefaultAsync(ev => ev.Id.Equals(id));
if (area is null)
{
return null;
Expand Down Expand Up @@ -252,9 +253,21 @@ private async Task ApplyDatabaseUpdate(Installation? installation)
);
}

private IQueryable<Area> GetAreas(bool readOnly = true)
private IQueryable<Area> GetAccessibleAreas(bool readOnly = true)
{
var accessibleInstallationCodes = accessRoleService.GetAllowedInstallationCodes();
var query = GetAreasWithSubModels(readOnly: readOnly)
.Where(
(area) =>
accessibleInstallationCodes.Result.Contains(
area.Installation.InstallationCode.ToUpper()
)
);
return query;
}

private IQueryable<Area> GetAreasWithSubModels(bool readOnly = true)
{
var query = context
.Areas.Include(area => area.DefaultLocalizationPose)
.Include(area => area.InspectionArea)
Expand All @@ -268,35 +281,7 @@ private IQueryable<Area> GetAreas(bool readOnly = true)
.ThenInclude(inspectionArea => inspectionArea.Installation)
.Include(area => area.Plant)
.ThenInclude(plant => plant.Installation)
.Include(area => area.Installation)
.Where(
(area) =>
accessibleInstallationCodes.Result.Contains(
area.Installation.InstallationCode.ToUpper()
)
);
return readOnly ? query.AsNoTracking() : query.AsTracking();
}

private IQueryable<Area> GetAreasWithSubModels(bool readOnly = true)
{
var accessibleInstallationCodes = accessRoleService.GetAllowedInstallationCodes();

// Include related entities using the Include method
var query = context
.Areas.Include(a => a.InspectionArea)
.ThenInclude(inspectionArea => inspectionArea != null ? inspectionArea.Plant : null)
.ThenInclude(plant => plant != null ? plant.Installation : null)
.Include(a => a.Plant)
.ThenInclude(plant => plant != null ? plant.Installation : null)
.Include(a => a.Installation)
.Include(a => a.DefaultLocalizationPose)
.Where(a =>
a.Installation != null
&& accessibleInstallationCodes.Result.Contains(
a.Installation.InstallationCode.ToUpper()
)
);
.Include(area => area.Installation);
return readOnly ? query.AsNoTracking() : query.AsTracking();
}

Expand All @@ -308,7 +293,7 @@ private IQueryable<Area> GetAreasWithSubModels(bool readOnly = true)
bool readOnly = true
)
{
return await GetAreas(readOnly: readOnly)
return await GetAccessibleAreas(readOnly: readOnly)
.Where(a =>
a.InspectionArea != null
&& a.InspectionArea.Id.Equals(inspectionArea.Id)
Expand Down
32 changes: 20 additions & 12 deletions backend/api/Services/InspectionAreaService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ ISignalRService signalRService
{
public async Task<IEnumerable<InspectionArea>> ReadAll(bool readOnly = true)
{
return await GetInspectionAreas(readOnly: readOnly).ToListAsync();
return await GetAccessibleInspectionAreas(readOnly: readOnly).ToListAsync();
}

public async Task<InspectionArea?> ReadById(string id, bool readOnly = true)
{
return await GetInspectionAreas(readOnly: readOnly)
return await GetAccessibleInspectionAreas(readOnly: readOnly)
.FirstOrDefaultAsync(a => a.Id.Equals(id));
}

Expand All @@ -84,7 +84,7 @@ public async Task<IEnumerable<InspectionArea>> ReadByInstallation(
{
return [];
}
return await GetInspectionAreas(readOnly: readOnly)
return await GetAccessibleInspectionAreas(readOnly: readOnly)
.Where(a => a.Installation != null && a.Installation.Id.Equals(installation.Id))
.ToListAsync();
}
Expand All @@ -99,7 +99,7 @@ public async Task<IEnumerable<InspectionArea>> ReadByInstallation(
{
return null;
}
return await GetInspectionAreas(readOnly: readOnly)
return await GetAccessibleInspectionAreas(readOnly: readOnly)
.Where(a =>
a.Installation != null
&& a.Installation.InstallationCode.ToLower().Equals(installationCode.ToLower())
Expand All @@ -115,7 +115,7 @@ public async Task<IEnumerable<InspectionArea>> ReadByInstallation(
bool readOnly = true
)
{
return await GetInspectionAreas(readOnly: readOnly)
return await GetAccessibleInspectionAreas(readOnly: readOnly)
.Where(a =>
a.Plant != null
&& a.Plant.Id.Equals(plant.Id)
Expand Down Expand Up @@ -213,7 +213,7 @@ public async Task<InspectionArea> Update(InspectionArea inspectionArea)

public async Task<InspectionArea?> Delete(string id)
{
var inspectionArea = await GetInspectionAreas()
var inspectionArea = await GetAccessibleInspectionAreas()
.FirstOrDefaultAsync(ev => ev.Id.Equals(id));
if (inspectionArea is null)
{
Expand All @@ -231,20 +231,28 @@ public async Task<InspectionArea> Update(InspectionArea inspectionArea)
return inspectionArea;
}

private IQueryable<InspectionArea> GetInspectionAreas(bool readOnly = true)
private IQueryable<InspectionArea> GetAccessibleInspectionAreas(bool readOnly = true)
{
var accessibleInstallationCodes = accessRoleService.GetAllowedInstallationCodes();
var query = context
.InspectionAreas.Include(p => p.Plant)
.ThenInclude(p => p.Installation)
.Include(i => i.Installation)
.Include(d => d.DefaultLocalizationPose)
var query = GetInspectionAreas(readOnly: readOnly)
.Where(
(d) =>
accessibleInstallationCodes.Result.Contains(
d.Installation.InstallationCode.ToUpper()
)
);
return query;
}

private IQueryable<InspectionArea> GetInspectionAreas(bool readOnly = true)
{
var accessibleInstallationCodes = accessRoleService.GetAllowedInstallationCodes();
var query = context
.InspectionAreas.Include(p => p.Plant)
.ThenInclude(p => p.Installation)
.Include(i => i.Installation)
.Include(d => d.DefaultLocalizationPose);

return readOnly ? query.AsNoTracking() : query.AsTracking();
}

Expand Down
47 changes: 27 additions & 20 deletions backend/api/Services/MissionRunService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public async Task<PagedList<MissionRun>> ReadAll(
bool readOnly = true
)
{
var query = GetMissionRunsWithSubModels(readOnly: readOnly);
var query = GetAccessibleMissionRuns(readOnly: readOnly);
var filter = ConstructFilter(parameters);

query = query.Where(filter);
Expand All @@ -184,7 +184,7 @@ public async Task<PagedList<MissionRun>> ReadAll(

public async Task<MissionRun?> ReadById(string id, bool readOnly = true)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.FirstOrDefaultAsync(missionRun => missionRun.Id.Equals(id));
}

Expand All @@ -194,7 +194,7 @@ public async Task<IList<MissionRun>> ReadMissionRunQueue(
bool readOnly = true
)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.Where(missionRun =>
missionRun.Robot.Id == robotId
&& missionRun.Status == MissionStatus.Pending
Expand All @@ -210,7 +210,7 @@ public async Task<IList<MissionRun>> ReadMissionRunQueue(
bool readOnly = true
)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.OrderBy(missionRun => missionRun.DesiredStartTime)
.FirstOrDefaultAsync(missionRun =>
missionRun.Robot.Id == robotId
Expand All @@ -236,7 +236,7 @@ public async Task<IList<MissionRun>> ReadMissionRuns(
}
);

return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.Where(missionFilter)
.OrderBy(missionRun => missionRun.DesiredStartTime)
.ToListAsync();
Expand All @@ -247,7 +247,7 @@ public async Task<IList<MissionRun>> ReadMissionRuns(
bool readOnly = true
)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.Where(m => m.MissionId == missionId && m.EndTime == null)
.OrderBy(m => m.DesiredStartTime)
.FirstOrDefaultAsync();
Expand All @@ -258,7 +258,7 @@ public async Task<IList<MissionRun>> ReadMissionRuns(
bool readOnly = true
)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.Where(m => m.Robot.Id == robotId)
.Where(m => m.EndTime != null)
.OrderByDescending(m => m.EndTime)
Expand All @@ -267,7 +267,7 @@ public async Task<IList<MissionRun>> ReadMissionRuns(

public async Task<bool> PendingOrOngoingReturnToHomeMissionRunExists(string robotId)
{
var pendingAndOngoingMissionRuns = await GetMissionRunsWithSubModels(readOnly: true)
var pendingAndOngoingMissionRuns = await GetAccessibleMissionRuns(readOnly: true)
.Where(missionRun =>
missionRun.Robot.Id == robotId
&& (
Expand Down Expand Up @@ -341,7 +341,7 @@ public async Task UpdateWithInspections(MissionRun missionRun)

public async Task<MissionRun?> Delete(string id)
{
var missionRun = await GetMissionRunsWithSubModels()
var missionRun = await GetAccessibleMissionRuns()
.FirstOrDefaultAsync(ev => ev.Id.Equals(id));
if (missionRun is null)
{
Expand All @@ -358,9 +358,24 @@ public async Task UpdateWithInspections(MissionRun missionRun)
return missionRun;
}

private IQueryable<MissionRun> GetMissionRunsWithSubModels(bool readOnly = true)
private IQueryable<MissionRun> GetAccessibleMissionRuns(bool readOnly = true)
{
var accessibleInstallationCodes = accessRoleService.GetAllowedInstallationCodes();
var query = GetMissionRunsWithSubModels(readOnly);
query = query
.Where(
(m) =>
m.InspectionArea == null
|| accessibleInstallationCodes.Result.Contains(
m.InspectionArea.Installation.InstallationCode.ToUpper()
)
)
.Where((m) => m.IsDeprecated == false);
return query;
}

private IQueryable<MissionRun> GetMissionRunsWithSubModels(bool readOnly = true)
{
var query = context
.MissionRuns.Include(missionRun => missionRun.InspectionArea)
.ThenInclude(inspectionArea => inspectionArea != null ? inspectionArea.Plant : null)
Expand Down Expand Up @@ -393,15 +408,7 @@ private IQueryable<MissionRun> GetMissionRunsWithSubModels(bool readOnly = true)
inspections != null ? inspections.InspectionFindings : null
)
.Include(missionRun => missionRun.Robot)
.ThenInclude(robot => robot.CurrentInstallation)
.Where(
(m) =>
m.InspectionArea == null
|| accessibleInstallationCodes.Result.Contains(
m.InspectionArea.Installation.InstallationCode.ToUpper()
)
)
.Where((m) => m.IsDeprecated == false);
.ThenInclude(robot => robot.CurrentInstallation);
return readOnly ? query.AsNoTracking() : query.AsTracking();
}

Expand Down Expand Up @@ -642,7 +649,7 @@ is null
bool readOnly = true
)
{
return await GetMissionRunsWithSubModels(readOnly: readOnly)
return await GetAccessibleMissionRuns(readOnly: readOnly)
.FirstOrDefaultAsync(missionRun =>
missionRun.IsarMissionId != null
&& missionRun.IsarMissionId.Equals(isarMissionId)
Expand Down