diff --git a/API/Services/SoilServices.cs b/API/Services/SoilServices.cs index 8cec9f4..19adf7d 100644 --- a/API/Services/SoilServices.cs +++ b/API/Services/SoilServices.cs @@ -84,6 +84,9 @@ public static SoilsFromDb Search(SoilDbContext context, string name = null, stri // the query to be done in SQL (rather than needing a 'Difference' function). IEnumerable soilsInMemory = soils.Include(s => s.Water) .Include(s => s.Water.SoilCrops) + .Include(s => s.SoilOrganicMatter) + .Include(s => s.SoilWater) + .Include(s => s.Analysis) .ToList(); if (!double.IsNaN(latitude) && !double.IsNaN(longitude)) diff --git a/Tests/UnitTest.cs b/Tests/UnitTest.cs index d39e3d9..ed268d7 100644 --- a/Tests/UnitTest.cs +++ b/Tests/UnitTest.cs @@ -73,18 +73,22 @@ public void GetWithLatLongRadius_ShouldReturnSoilsWithinTheRadius() ResourceFile.FromResourceXML("Tests.testsoil2.xml") ]); - var soils = API.Services.Soil.Search(context, latitude:-28, longitude: 150, radius: 100) + var soils = API.Services.Soil.Search(context, latitude: -28, longitude: 150, radius: 100) .ToSoils(); Assert.That(soils.Length, Is.EqualTo(1)); Assert.That(soils[0].Name, Is.EqualTo("Red Chromosol (Billa Billa No066)")); // Extend the radius to cover the second soil (New Zealand) - soils = API.Services.Soil.Search(context, latitude:-28, longitude: 150, radius: 2500) + soils = API.Services.Soil.Search(context, latitude: -28, longitude: 150, radius: 2500) .ToSoils(); Assert.That(soils.Length, Is.EqualTo(2)); Assert.That(soils[0].Name, Is.EqualTo("Red Chromosol (Billa Billa No066)")); Assert.That(soils[1].Name, Is.EqualTo("Clay (Kerikeri No1353)")); + Assert.That(soils[0].SoilOrganicMatter, Is.Not.Null); + Assert.That(soils[0].Analysis, Is.Not.Null); + Assert.That(soils[0].SoilWater, Is.Not.Null); + Assert.That(soils[0].Water, Is.Not.Null); } [Test]