Remove Area #2015
Remove Area #2015
Conversation
Christdej
added
backend
|
🔔 Changes in database folder detected 🔔 |
|
Will now give warnings on Return to Home missions if they fail becuase we dont have an Area, awaiting Return Home functionallity to be removed aswell. |
Christdej
force-pushed
the
removearea
branch
3 times, most recently
from
1e99cac to
8029def
Compare
| @@ -397,7 +339,6 @@ [.. missionInspectionAreaNames] | |||
| Name = missionDefinition.Name, | |||
| InspectionFrequency = scheduledMissionQuery.InspectionFrequency, | |||
| InstallationCode = scheduledMissionQuery.InstallationCode, | |||
| InspectionArea = area.InspectionArea, | |||
There was a problem hiding this comment.
Won't this cause the created MissionRun to always have no inspection area?
There was a problem hiding this comment.
It either uses a existing missionDefinition or creates a new mission definition here. Since this is the only way new mission definitions are created, and since we don't give the mission definition an inspection area, none of the mission definitions and mission runs will have inspection areas. And since the robots get inspection areas from the first mission they run, they also won't have inspection areas.
There was a problem hiding this comment.
Yeah, that is true. Im trying to find a good way of adding inspection area while still removing area. Any suggestions?
| if ( | ||
| missionRun.Robot.CurrentInspectionArea != null | ||
| && !await localizationService.RobotIsOnSameInspectionAreaAsMission( | ||
| missionRun.Robot.Id, | ||
| missionRun.InspectionArea!.Id | ||
| ) | ||
| ) |
There was a problem hiding this comment.
This change should ideally be in a separate commit
There was a problem hiding this comment.
Perhaps it should yeah. Also need to remove the localizationService.RobotIsOnSameInspectionAreaAsMission function perhaps.
| List<Area?> missionAreas; | ||
| missionAreas = missionTasks | ||
| .Where(t => t.TagId != null) | ||
| .Select(t => | ||
| stidService.GetTagArea(t.TagId!, scheduledMissionQuery.InstallationCode).Result | ||
| ) | ||
| .ToList(); | ||
|
|
||
| var missionInspectionAreaNames = missionAreas | ||
| .Where(a => a != null) | ||
| .Select(a => a!.InspectionArea.Name) | ||
| .Distinct() | ||
| .ToList(); | ||
| if (missionInspectionAreaNames.Count > 1) | ||
| { | ||
| string joinedMissionInspectionAreaNames = string.Join( | ||
| ", ", | ||
| [.. missionInspectionAreaNames] | ||
| ); | ||
| logger.LogWarning( | ||
| "Mission {missionDefinition} has tags on more than one inspection area. The inspection areas are: {joinedMissionInspectionAreaNames}.", | ||
| missionDefinition.Name, | ||
| joinedMissionInspectionAreaNames | ||
| ); | ||
| } | ||
|
|
||
| var sortedAreas = missionAreas | ||
| .GroupBy(i => i) | ||
| .OrderByDescending(grp => grp.Count()) | ||
| .Select(grp => grp.Key); | ||
| var area = sortedAreas.First(); | ||
|
|
||
| if (area == null && sortedAreas.Count() > 1) | ||
| { | ||
| logger.LogWarning( | ||
| "Most common area in mission {missionDefinition} is null. Will use second most common area.", | ||
| missionDefinition.Name | ||
| ); | ||
| area = sortedAreas.Skip(1).First(); | ||
| } | ||
| if (area == null) | ||
| { | ||
| logger.LogError( | ||
| $"Mission {missionDefinition.Name} doesn't have any tags with valid area." | ||
| ); | ||
| return NotFound($"No area found for mission '{missionDefinition.Name}'."); | ||
| } |
There was a problem hiding this comment.
Could we perhaps keep this block of code in order to find which inspection area to assign the mission definition? We do not need to have an Area model in the database to do this, as it fetches them from an external API (STID). We do however need the inspection area to have an understanding of STID areas though.
There was a problem hiding this comment.
Originally we planned InspectionAreas to be a list or graph of Areas. Could we potentially store the references to STID areas as a list in InspectionAreas still, but without storing them as Area objects, for instance by only storing the area name?
Christdej
force-pushed
the
removearea
branch
2 times, most recently
from
4d9b2be to
1c92591
Compare
|
We could potentially link this issue: #1840, but that will depend on how we solve the inspection area issue |
Christdej
force-pushed
the
removearea
branch
from
1c92591 to
ce5b9d9
Compare
|
Rest of work to be done documented in: |
Christdej
force-pushed
the
removearea
branch
from
ce5b9d9 to
3bf85c3
Compare
|
Done once per asset (possible with multiple inspection areas per asset) (not per mission) awaiting
|
Ready for review checklist: