Added search for missing data endpoint to API, solves #27

canonn-science · Apr 20, 2017 · dd48b30 · dd48b30
1 parent 0201fb0
commit dd48b30
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CanonnApi.Backend/CanonnApi.Web/Controllers/RuinSiteController.cs b/CanonnApi.Backend/CanonnApi.Web/Controllers/RuinSiteController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
@@ -140,5 +139,11 @@ public async Task<ActionResult> SaveActiveObelisksForSite(int id, [FromBody] Obe
 				? (ActionResult)Ok()
 				: NotFound();
 		}
+
+		[HttpGet("searchdata/{categoryName}/{entryNumber}")]
+		public async Task<List<RuinSite>> SearchForDataEntries(string categoryName, int entryNumber)
+		{
+			return await Repository.SearchSitesForData(categoryName, entryNumber);
+		}
 	}
 }
diff --git a/CanonnApi.Backend/CanonnApi.Web/Services/RuinSites/IRuinSiteRepository.cs b/CanonnApi.Backend/CanonnApi.Web/Services/RuinSites/IRuinSiteRepository.cs
@@ -15,5 +15,6 @@ public interface IRuinSiteRepository: IBaseDataRepository<RuinSite>
 
 		Task<bool> SaveObeliskGroupsForSite(int siteId, IEnumerable<ObeliskGroup> obeliskGroups);
 		Task<bool> SaveActiveObelisksForSite(int siteId, IEnumerable<Obelisk> obelisks);
+		Task<List<RuinSite>> SearchSitesForData(string categoryName, int entryNumber);
 	}
 }
diff --git a/CanonnApi.Backend/CanonnApi.Web/Services/RuinSites/RuinSiteRepository.cs b/CanonnApi.Backend/CanonnApi.Web/Services/RuinSites/RuinSiteRepository.cs
@@ -183,6 +183,25 @@ public async Task<bool> SaveActiveObelisksForSite(int siteId, IEnumerable<Obelis
 			return true;
 		}
 
+		public async Task<List<RuinSite>> SearchSitesForData(string categoryName, int entryNumber)
+		{
+			var siteIds = (IEnumerable<int>)await RuinsContext.Obelisk
+				.Where(o => o.Codexdata.Category.Name == categoryName && o.Codexdata.EntryNumber == entryNumber)
+				.SelectMany(o => o.RuinsiteActiveobelisks)
+				.Select(rsao => rsao.RuinsiteId)
+				.ToArrayAsync();
+
+			siteIds = siteIds
+				.Where(id => id < 99997) // exclude reference sites
+				.ToImmutableHashSet();
+
+			return await RuinsContext.RuinSite
+				.Include(site => site.Body.System)
+				.Include(site => site.Ruintype)
+				.Where(site => siteIds.Contains(site.Id))
+				.ToListAsync();
+		}
+
 		public override Task<bool> DeleteById(int id)
 		{
 			RuinsContext.RemoveRange(RuinsContext.RuinsiteObeliskgroups.Where(rsog => rsog.RuinsiteId == id));

diff --git a/CanonnApi.Backend/CanonnApi.Web/Startup.cs b/CanonnApi.Backend/CanonnApi.Web/Startup.cs
@@ -63,7 +63,11 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 			}));
 
 			services.AddMvc()
-				.AddJsonOptions(mvcJsonOptions => mvcJsonOptions.SerializerSettings.ContractResolver = new IgnoreEmptyEnumerablesResolver());
+				.AddJsonOptions(mvcJsonOptions =>
+				{
+					mvcJsonOptions.SerializerSettings.ContractResolver = new IgnoreEmptyEnumerablesResolver();
+					mvcJsonOptions.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
+				});
 
 			services.AddLogging();
 			services.AddMemoryCache();