Include robot in report API response

equinor · Jul 14, 2022 · cda8d47 · cda8d47
1 parent 9340785
commit cda8d47
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/backend/api.test/Services/RobotService.cs b/backend/api.test/Services/RobotService.cs
@@ -31,7 +31,7 @@ public async Task Read()
             var robotService = new RobotService(_fixture.Context);
             var robots = await robotService.ReadAll();
             var firstRobot = robots.First();
-            var robotById = await robotService.Read(firstRobot.Id);
+            var robotById = await robotService.ReadById(firstRobot.Id);
 
             Assert.Equal(firstRobot, robotById);
         }
@@ -40,7 +40,7 @@ public async Task Read()
         public async Task ReadIdDoesNotExist()
         {
             var robotService = new RobotService(_fixture.Context);
-            var robot = await robotService.Read("some_id_that_does_not_exist");
+            var robot = await robotService.ReadById("some_id_that_does_not_exist");
             Assert.Null(robot);
         }
 

diff --git a/backend/api.test/Services/ScheduledMissionService.cs b/backend/api.test/Services/ScheduledMissionService.cs
@@ -55,7 +55,7 @@ public async Task Create()
             await scheduledMissionService.Create(new ScheduledMission()
             {
                 Robot = robot,
-                IsarMissionId = "",
+                EchoMissionId = "",
                 StartTime = System.DateTimeOffset.UtcNow
             });
             int nScheduledMissionsAfter = scheduledMissionService.ReadAll().Result.Count();

diff --git a/backend/api.test/TestRobotController.cs b/backend/api.test/TestRobotController.cs
@@ -3,7 +3,6 @@
 using Api.Database.Models;
 using Api.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Xunit;
@@ -21,8 +20,6 @@ public TestRobotController(DatabaseFixture fixture)
             var isarLogger = new Mock<ILogger<IsarService>>();
             var reportServiceLogger = new Mock<ILogger<ReportService>>();
 
-            var config = new ConfigurationBuilder().AddJsonFile("appsettings.json").Build();
-
             var context = fixture.Context;
 
             var reportService = new ReportService(context, reportServiceLogger.Object);

diff --git a/backend/api/Services/ReportService.cs b/backend/api/Services/ReportService.cs
@@ -51,6 +51,7 @@ Robot robot
         public async Task<IEnumerable<Report>> ReadAll()
         {
             return await _context.Reports
+                .Include(r => r.Robot)
                 .Include(report => report.Tasks)
                 .ThenInclude(task => task.Steps)
                 .ToListAsync();
@@ -59,14 +60,15 @@ public async Task<IEnumerable<Report>> ReadAll()
         public async Task<Report?> Read(string id)
         {
             return await _context.Reports
+                .Include(r => r.Robot)
                 .Include(report => report.Tasks)
                 .ThenInclude(task => task.Steps)
                 .FirstOrDefaultAsync(report => report.Id.Equals(id));
         }
 
         public async Task<Report?> ReadByIsarMissionId(string isarMissionId)
         {
-            return await _context.Reports.FirstOrDefaultAsync(
+            return await _context.Reports.Include(r => r.Robot).FirstOrDefaultAsync(
                 report => report.IsarMissionId.Equals(isarMissionId)
             );
         }

diff --git a/backend/api/Services/ScheduledMissionService.cs b/backend/api/Services/ScheduledMissionService.cs
@@ -45,11 +45,13 @@ public void Update(ScheduledMission scheduledMission)
 
         public async Task<List<ScheduledMission>> GetScheduledMissionsByStatus(ScheduledMissionStatus status)
         {
-            return await _context.ScheduledMissions
+            // EF Core cannot translate DateTimeOffset ordering to SQL,
+            // so we need to do this on the client side (After getting list from database)
+            var list = await _context.ScheduledMissions
                 .Include(sm => sm.Robot)
                 .Where(sm => sm.Status.Equals(status))
-                .OrderBy(sm => sm.StartTime)
                 .ToListAsync();
+            return list.OrderBy(sm => sm.StartTime).ToList();
         }
 
         public async Task<ScheduledMission?> Delete(string id)