Added some navigation properties

Author: CuddleBunny

Classes/ApiControllerBase.cs

@@ -18,8 +18,25 @@ public ApiController(ToLiDbContext dataContext, DbSet<T> data) {
         }
 
         [HttpGet]
-        public async Task<JsonResult> GetAll([FromQuery] ApiQuery queryOptions) {
-            IQueryable<T> query = data.OrderBy(e => e.Id);
+        public virtual async Task<JsonResult> GetAll([FromQuery] ApiQuery queryOptions) {
+            var query = ApplyFilters(data, queryOptions);
+
+            return Json(await query.ToListAsync());
+        }
+
+        [HttpGet("{id}")]
+        public async Task<JsonResult> Get([FromRoute] int id) {
+            return Json(await data.Where(item => item.Id == id).FirstOrDefaultAsync());
+        }
+
+        protected IQueryable<T> ApplyFilters(IQueryable<T> query, ApiQuery queryOptions) {
+            query = data.OrderBy(e => e.Id);
+
+            if(queryOptions.Offset.HasValue)
+                query = query.Skip(queryOptions.Offset.Value);
+
+            if(queryOptions.Limit.HasValue)
+                query = query.Take(queryOptions.Limit.Value);
 
             if(queryOptions.Include.HasValue && queryOptions.Include.Value) {
                 var entityType = dataContext.Model.FindEntityType(typeof(T));
@@ -28,18 +45,7 @@ public async Task<JsonResult> GetAll([FromQuery] ApiQuery queryOptions) {
                 }
             }
 
-            if(queryOptions.Offset.HasValue)
-                query = query.Skip(queryOptions.Offset.Value);
-
-            if(queryOptions.Limit.HasValue)
-                query = query.Take(queryOptions.Limit.Value);
-
-            return Json(await query.ToListAsync());
-        }
-
-        [HttpGet("{id}")]
-        public async Task<JsonResult> Get([FromRoute] int id) {
-            return Json(await data.Where(item => item.Id == id).FirstOrDefaultAsync());
+            return query;
         }
 
         /* TODO: Let authenticated users add data?

Controllers/CharactersController.cs

@@ -0,0 +1,25 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using ToLiAPI.Api;
+using ToLiAPI.Models;
+
+namespace ToLiAPI {
+	[Route("api/[controller]")]
+    public class CharactersController : ApiController<Characters>
+    {
+        public CharactersController(ToLiDbContext dataContext) : base(dataContext, dataContext.Characters) { }
+
+        public override async Task<JsonResult> GetAll([FromQuery] ApiQuery queryOptions) {
+            var query = ApplyFilters(data, queryOptions);
+        
+            if(queryOptions.Include.HasValue && queryOptions.Include.Value) {
+                query = query.Include(c => c.CharacterPassiveSkills)
+                    .ThenInclude(c => c.PassiveSkill);
+            }
+
+            return Json(await query.ToListAsync());
+        }
+    }
+}

Controllers/ToLiAPIControllers.cs

@@ -69,12 +69,6 @@ public class CharacterResultMessagesController : ApiController<CharacterResultMe
         public CharacterResultMessagesController(ToLiDbContext dataContext) : base(dataContext, dataContext.CharacterResultMessages) { }
     }
 
-	[Route("api/[controller]")]
-    public class CharactersController : ApiController<Characters>
-    {
-        public CharactersController(ToLiDbContext dataContext) : base(dataContext, dataContext.Characters) { }
-    }
-
 	[Route("api/[controller]")]
     public class CoinShopItemContentsController : ApiController<CoinShopItemContents>
     {

Models/AreaAvailables.cs

@@ -7,6 +7,7 @@ public partial class AreaAvailables : Entity
     {
 
         public int AreaId { get; set; }
+        public Areas Area { get; set; }
         public byte Wday { get; set; }
         public TimeSpan WdayStartAt { get; set; }
         public TimeSpan WdayEndAt { get; set; }

Models/AreaBonuses.cs

@@ -7,6 +7,7 @@ public partial class AreaBonuses : Entity
     {
 
         public int AreaId { get; set; }
+        public Areas Area { get; set; }
         public byte BonusType { get; set; }
         public byte Wday { get; set; }
         public TimeSpan WdayStartAt { get; set; }

Models/Areas.cs

@@ -10,7 +10,9 @@ public partial class Areas : Entity
         public string Description { get; set; }
         public string HelpContents { get; set; }
         public int WorldId { get; set; }
+        public Worlds World { get; set; }
         public int PrevAreaId { get; set; }
+        public Areas PrevArea { get; set; }
         public int BackgroundId { get; set; }
         public int? DrawPosX { get; set; }
         public int? DrawPosY { get; set; }

Models/ArtEquipmentCharacters.cs

@@ -5,9 +5,10 @@ namespace ToLiAPI.Models
 {
     public partial class ArtEquipmentCharacters : Entity
     {
-        
         public int ArtEquipmentId { get; set; }
+        public ArtEquipments ArtEquipment { get; set; }
         public int CharacterId { get; set; }
+        public Characters Character { get; set; }
         public DateTime? CreatedAt { get; set; }
         public DateTime? UpdatedAt { get; set; }
     }

Models/ArtEquipments.cs

@@ -5,9 +5,10 @@ namespace ToLiAPI.Models
 {
     public partial class ArtEquipments : Entity
     {
-        
         public int EquipmentId { get; set; }
+        public Equipment Equipment { get; set; }
         public int ArtId { get; set; }
+        public Arts Art { get; set; }
         public int ArtGroupId { get; set; }
         public DateTime? CreatedAt { get; set; }
         public DateTime? UpdatedAt { get; set; }

Models/CharacterPassiveSkills.cs

@@ -4,10 +4,11 @@
 namespace ToLiAPI.Models
 {
     public partial class CharacterPassiveSkills : Entity
-    {
-        
-        public int? CharacterId { get; set; }
+    {        
+        public int? CharacterId { get; set; }     
+        public Characters Character { get; set; }
         public int? PassiveSkillId { get; set; }
+        public PassiveSkills PassiveSkill { get; set; }
         public int? DefeatCount { get; set; }
         public DateTime? CreatedAt { get; set; }
         public DateTime? UpdatedAt { get; set; }

Models/Characters.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace ToLiAPI.Models
 {
@@ -65,5 +66,9 @@ public partial class Characters : Entity
         public int UnisonEffect { get; set; }
         public DateTime? CreatedAt { get; set; }
         public DateTime? UpdatedAt { get; set; }
+        [ForeignKey("CharacterId")]
+        public List<CharacterResultMessages> CharacterResultMessages { get; set; }
+        [ForeignKey("CharacterId")]
+        public ICollection<CharacterPassiveSkills> CharacterPassiveSkills { get; set; }
     }
 }

Startup.cs

@@ -13,6 +13,8 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ToLiAPI.Models;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace ToLiAPI
 {
@@ -28,7 +30,10 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddMvc().AddJsonOptions(options => {
+                options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+                options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+            });;
 
             services.AddDbContext<ToLiDbContext>(options => options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
         }