Add 'last seen' details to the flight and aircraft details pages

src/FlightRecorder.Api/Controllers/SightingsController.cs

@@ -56,27 +56,6 @@ public async Task<ActionResult<List<Sighting>>> GetSightingsByFlightAsync(string
             return sightings;
         }
 
-        [HttpGet]
-        [Route("flight/{date}/{number}/{pageNumber}/{pageSize}")]
-        public async Task<ActionResult<List<Sighting>>> GetSightingsByFlightAndDateAsync(string date, string number, int pageNumber, int pageSize)
-        {
-            DateTime decodedDate = DateTime.ParseExact(HttpUtility.UrlDecode(date), DateTimeFormat, null);
-            string decodedNumber = HttpUtility.UrlDecode(number).ToUpper();
-            List<Sighting> sightings = await _factory.Sightings
-                                                     .ListAsync(s => (s.Flight.Number == decodedNumber) &&
-                                                                     (s.Date == decodedDate),
-                                                                pageNumber,
-                                                                pageSize)
-                                                     .ToListAsync();
-
-            if (!sightings.Any())
-            {
-                return NoContent();
-            }
-
-            return sightings;
-        }
-
         [HttpGet]
         [Route("airline/{airlineId}/{pageNumber}/{pageSize}")]
         public async Task<ActionResult<List<Sighting>>> GetSightingsByAirlineAsync(int airlineId, int pageNumber, int pageSize)
@@ -150,6 +129,37 @@ public async Task<ActionResult<Sighting>> GetSightingAsync(int id)
 
             return sighting;
         }
+
+        [HttpGet]
+        [Route("recent/flight/{number}")]
+        public async Task<ActionResult<Sighting>> GetMostRecentFlightSightingAsync(string number)
+        {
+            string decodedNumber = HttpUtility.UrlDecode(number).ToUpper();
+            Sighting sighting = await _factory.Sightings.GetMostRecent(x => x.Flight.Number == decodedNumber);
+
+            if (sighting == null)
+            {
+                return NoContent();
+            }
+
+            return sighting;
+        }
+
+        [HttpGet]
+        [Route("recent/aircraft/{registration}")]
+        public async Task<ActionResult<Sighting>> GetMostRecentAircraftSightingAsync(string registration)
+        {
+            string decodedRegistration = HttpUtility.UrlDecode(registration);
+            Sighting sighting = await _factory.Sightings.GetMostRecent(x => x.Aircraft.Registration == decodedRegistration);
+
+            if (sighting == null)
+            {
+                return NoContent();
+            }
+
+            return sighting;
+        }
+
 
         [HttpPut]
         [Route("")]

src/FlightRecorder.Api/FlightRecorder.Api.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <ReleaseVersion>1.12.0.0</ReleaseVersion>
-    <FileVersion>1.12.0.0</FileVersion>
-    <ProductVersion>1.12.0</ProductVersion>
+    <ReleaseVersion>1.13.0.0</ReleaseVersion>
+    <FileVersion>1.13.0.0</FileVersion>
+    <ProductVersion>1.13.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/FlightRecorder.BusinessLogic/Database/SightingManager.cs

@@ -83,6 +83,28 @@ public IAsyncEnumerable<Sighting> ListAsync(Expression<Func<Sighting, bool>> pre
         public async Task<int> CountAsync()
             => await _factory.Context.Sightings.CountAsync();
 
+        /// <summary>
+        /// Return the most recent sighting matching the predicate
+        /// </summary>
+        /// <param name="predicate"></param>
+        /// <returns></returns>
+        public async Task<Sighting> GetMostRecent(Expression<Func<Sighting, bool>> predicate)
+        {
+            List<Sighting> sightings = await _factory.Context.Sightings
+                                                             .Include(s => s.Location)
+                                                             .Include(s => s.Flight)
+                                                             .ThenInclude(f => f.Airline)
+                                                             .Include(s => s.Aircraft)
+                                                             .ThenInclude(a => a.Model)
+                                                             .ThenInclude(m => m.Manufacturer)
+                                                             .Where(predicate)
+                                                             .OrderByDescending(x => x.Date)
+                                                             .Take(1)
+                                                             .AsAsyncEnumerable()
+                                                             .ToListAsync();
+            return sightings.FirstOrDefault();
+        }
+
         /// <summary>
         /// Add a new sighting
         /// </summary>

src/FlightRecorder.BusinessLogic/FlightRecorder.BusinessLogic.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <PackageId>FlightRecorder.BusinessLogic</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023, 2024</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/FlightRecorder.Data/FlightRecorder.Data.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <PackageId>FlightRecorder.Data</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023, 2024</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/FlightRecorder.DataExchange/FlightRecorder.DataExchange.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <PackageId>FlightRecorder.DataExchange</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023, 2024</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/FlightRecorder.Entities/FlightRecorder.Entities.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <PackageId>FlightRecorder.Entities</PackageId>
-    <PackageVersion>1.8.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) Dave Walker 2020, 2021, 2022, 2023, 2024</Copyright>
     <Owners>Dave Walker</Owners>
@@ -16,7 +16,7 @@
     <PackageProjectUrl>https://github.com/davewalker5/FlightRecorderDb</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/FlightRecorder.Entities/Interfaces/ISightingManager.cs

@@ -12,6 +12,7 @@ public interface ISightingManager
         Task<Sighting> AddAsync(long altitude, DateTime date, long locationId, long flightId, long aircraftId);
         Task<Sighting> AddAsync(FlattenedSighting flattened);
         Task<Sighting> GetAsync(Expression<Func<Sighting, bool>> predicate);
+        Task<Sighting> GetMostRecent(Expression<Func<Sighting, bool>> predicate);
         IAsyncEnumerable<Sighting> ListAsync(Expression<Func<Sighting, bool>> predicate, int pageNumber, int pageSize);
         Task<int> CountAsync();
         Task<IAsyncEnumerable<Sighting>> ListByAircraftAsync(string registration, int pageNumber, int pageSize);

src/FlightRecorder.Manager/FlightRecorder.Manager.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
-    <FileVersion>1.8.0.0</FileVersion>
-    <ProductVersion>1.8.0.0</ProductVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
+    <FileVersion>1.9.0.0</FileVersion>
+    <ProductVersion>1.9.0.0</ProductVersion>
     <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
 

src/FlightRecorder.Mvc/Api/SightingsSearchClient.cs

@@ -55,21 +55,31 @@ public async Task<List<Sighting>> GetSightingsByFlight(string number, int page,
         }
 
         /// <summary>
-        /// Retrieve sightings for the specified flight on the specified date
+        /// Get the most recent sighting of a flight
         /// </summary>
-        /// <param name="date"></param>
         /// <param name="flightNumber"></param>
-        /// <param name="page"></param>
-        /// <param name="pageSize"></param>
         /// <returns></returns>
-        public async Task<List<Sighting>> GetSightingsByFlightAndDate(DateTime date, string flightNumber, int page, int pageSize)
+        public async Task<Sighting> GetMostRecentFlightSighting(string flightNumber)
         {
-            string dateRouteSegment = date.ToString(Settings.Value.DateTimeFormat);
             string baseRoute = Settings.Value.ApiRoutes.First(r => r.Name == RouteKey).Route;
-            string route = $"{baseRoute}/flight/{dateRouteSegment}/{flightNumber}/{page}/{pageSize}";
+            string route = $"{baseRoute}/recent/flight/{flightNumber}";
             string json = await SendDirectAsync(route, null, HttpMethod.Get);
-            List<Sighting> sightings = JsonConvert.DeserializeObject<List<Sighting>>(json, JsonSettings);
-            return sightings;
+            Sighting sighting = JsonConvert.DeserializeObject<Sighting>(json, JsonSettings);
+            return sighting;
+        }
+
+        /// <summary>
+        /// Get the most recent sighting of an aircraft
+        /// </summary>
+        /// <param name="registration"></param>
+        /// <returns></returns>
+        public async Task<Sighting> GetMostRecentAircraftSighting(string registration)
+        {
+            string baseRoute = Settings.Value.ApiRoutes.First(r => r.Name == RouteKey).Route;
+            string route = $"{baseRoute}/recent/aircraft/{registration}";
+            string json = await SendDirectAsync(route, null, HttpMethod.Get);
+            Sighting sighting = JsonConvert.DeserializeObject<Sighting>(json, JsonSettings);
+            return sighting;
         }
 
         /// <summary>

src/FlightRecorder.Mvc/FlightRecorder.Mvc.csproj

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <ReleaseVersion>1.12.0.0</ReleaseVersion>
-    <FileVersion>1.12.0.0</FileVersion>
-    <ProductVersion>1.12.0</ProductVersion>
+    <ReleaseVersion>1.13.0.0</ReleaseVersion>
+    <FileVersion>1.13.0.0</FileVersion>
+    <ProductVersion>1.13.0</ProductVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/FlightRecorder.Mvc/Models/AircraftDetailsViewModel.cs

@@ -34,6 +34,7 @@ public class AircraftDetailsViewModel
 
         [DisplayName("New Model")]
         public string NewModel { get; set; }
+        public Sighting MostRecentSighting { get; set; }
 
         public string Action { get; set; }
 

src/FlightRecorder.Mvc/Models/FlightDetailsViewModel.cs

@@ -32,6 +32,8 @@ public class FlightDetailsViewModel
         [DisplayName("New Airline")]
         public string NewAirline { get; set; }
         public bool IsDuplicate { get; set; }
+        public Sighting MostRecentSighting { get; set; }
+        public int? SightingId { get; set;}
 
         public string Action { get; set; }
         public string AirlineErrorMessage { get; set; }

src/FlightRecorder.Mvc/Views/AircraftDetails/Index.cshtml

@@ -20,6 +20,15 @@
         </div>
         <hr />
 
+        @if (Model.MostRecentSighting != null)
+        {
+            <div class="row">
+                <div class="col-md-12 message">
+                    <span>This aircraft was last seen from @Model.MostRecentSighting.Location.Name on @Model.MostRecentSighting.Date.ToShortDateString(), flight @Model.MostRecentSighting.Flight.Number</span>
+                </div>
+            </div>
+        }
+
         <div class="row">
             <div class="col">
                 <strong>@Html.LabelFor(m => m.Registration)</strong>

src/FlightRecorder.Mvc/Views/FlightDetails/Index.cshtml

@@ -26,6 +26,14 @@
                 </div>
             </div>
         }
+        else if (Model.MostRecentSighting != null)
+        {
+            <div class="row">
+                <div class="col-md-12 message">
+                    <span>This flight was last seen from @Model.MostRecentSighting.Location.Name on @Model.MostRecentSighting.Date.ToShortDateString()</span>
+                </div>
+            </div>
+        }
 
         <div class="row">
             <div class="col">

src/FlightRecorder.Mvc/Wizard/AddSightingWizard.cs

@@ -203,12 +203,12 @@ public async Task<FlightDetailsViewModel> GetFlightDetailsModelAsync(string user
                 model.Embarkation = flight.Embarkation;
                 model.Destination = flight.Destination;
                 model.AirlineId = flight.AirlineId;
-            }
 
-            // See if this is a potential duplicate - only need to return the first page with 1 result to do the
-            // duplicate check
-            var duplicates = await _sightingsSearch.GetSightingsByFlightAndDate((DateTime)sighting.Date, sighting.FlightNumber, 1, 1);
-            model.IsDuplicate = duplicates?.Count > 0;
+                // Retrive the most recent sighting of this flight and see if this is a duplicate. Note that duplicates
+                // are not reported when editing an existing sighting
+                model.MostRecentSighting = await _sightingsSearch.GetMostRecentFlightSighting(sighting.FlightNumber);
+                model.IsDuplicate = sighting.SightingId > 0 ? false : model.MostRecentSighting?.Date == sighting.Date;
+            }
 
             return model;
         }
@@ -250,6 +250,9 @@ public async Task<AircraftDetailsViewModel> GetAircraftDetailsModelAsync(string
                 // Load the models for the aircraft's manufacturer
                 List<Model> models = await GetModelsAsync(model.ManufacturerId ?? 0);
                 model.SetModels(models);
+
+                // Retrive the most recent sighting of this aircraft
+                model.MostRecentSighting = await _sightingsSearch.GetMostRecentAircraftSighting(aircraft.Registration);
             }
 
             return model;

src/FlightRecorder.Mvc/appsettings.json

@@ -9,7 +9,7 @@
   "AllowedHosts": "*",
   "AppSettings": {
     "Secret": "e2b6e7fe16ef469d9862d43eb76d00e2802ab769b85848048cc9387743ca2cc38c0f4fd8a0de46798f347bedf676bc31",
-    "ApiUrl": "https://localhost:5001",
+    "ApiUrl": "http://localhost:5000",
     "ApiDateFormat": "yyyy-MM-dd H:mm:ss",
     "ApiRoutes": [
       {

src/FlightRecorder.Tests/FlightRecorder.Tests.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>1.8.0.0</ReleaseVersion>
+    <ReleaseVersion>1.9.0.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/FlightRecorder.Tests/SightingManagerTest.cs

@@ -202,5 +202,30 @@ public async Task ListByMissingLocation()
                                                                  .ListByLocationAsync("Missing", 1, 100);
             Assert.IsNull(sightings);
         }
+
+        [TestMethod]
+        public async Task GetMostRecentFlightSighting()
+        {
+            var sighting = await _factory.Sightings.GetMostRecent(x => x.Flight.Number == FlightNumber);
+            Assert.IsNotNull(sighting);
+            Assert.AreEqual(FlightNumber, sighting.Flight.Number);
+            Assert.AreEqual(SightingDate, sighting.Date);
+        }
+
+        [TestMethod]
+        public async Task GetMostRecentAircraftSighting()
+        {
+            var sighting = await _factory.Sightings.GetMostRecent(x => x.Aircraft.Registration == Registration);
+            Assert.IsNotNull(sighting);
+            Assert.AreEqual(Registration, sighting.Aircraft.Registration);
+            Assert.AreEqual(SightingDate, sighting.Date);
+        }
+
+        [TestMethod]
+        public async Task GetMissingRecentSighting()
+        {
+            var sighting = await _factory.Sightings.GetMostRecent(x => x.Flight.Embarkation == "Missing");
+            Assert.IsNull(sighting);
+        }
     }
 }