task: tidy up the sample app & fix default file loading

Author: alastairtree

CacheDatabaseQueriesApiSample/Controllers/DbTimeController.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using LazyCache;
 using Microsoft.AspNetCore.Mvc;
 
@@ -21,11 +20,11 @@ public DbTimeController(DbTimeContext context)
 
         [HttpGet]
         [Route("api/dbtime")]
-        public DbTime Get()
+        public DbTimeEntity Get()
         {
-            Func<DbTime> cacheableAsyncFunc = () => dbContext.GeDbTime();
+            Func<DbTimeEntity> actionThatWeWantToCache = () => dbContext.GeDbTime();
 
-            var cachedDatabaseTime = cache.GetOrAdd(cacheKey, cacheableAsyncFunc);
+            var cachedDatabaseTime = cache.GetOrAdd(cacheKey, actionThatWeWantToCache);
 
             return cachedDatabaseTime;
         }

CacheDatabaseQueriesApiSample/DbTime.cs

@@ -12,17 +12,19 @@ public DbTimeContext(DbContextOptions<DbTimeContext> options)
         {
         }
 
-        public virtual DbSet<DbTime> Times { get; set; }
+        // simulate a table in the database so we can get just one row with the current time
+        private DbSet<DbTimeEntity> Times { get; set; }
 
         public static int DatabaseRequestCounter()
         {
             return databaseRequestCounter;
         }
 
-        public DbTime GeDbTime()
+        public DbTimeEntity GeDbTime()
         {
             // get the current time from SQL server right now asynchronously (simulating a slow query)
-            var result = Times.FromSql("WAITFOR DELAY '00:00:00:500'; SELECT 1 as ID, GETDATE() as [TimeNowInTheDatabase]")
+            var result = Times
+                .FromSql("WAITFOR DELAY '00:00:00:500'; SELECT 1 as [ID], GETDATE() as [TimeNowInTheDatabase]")
                 .Single();
 
             databaseRequestCounter++;

CacheDatabaseQueriesApiSample/DbTimeContext.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace CacheDatabaseQueriesApiSample
+{
+    /// <summary>
+    ///     Simulates loading a record from a table, but really just gets the current datatime from the database
+    /// </summary>
+    public class DbTimeEntity
+    {
+        public DbTimeEntity(DateTime now)
+        {
+            TimeNowInTheDatabase = now;
+        }
+
+        public DbTimeEntity()
+        {
+        }
+
+        public virtual int id { get; set; }
+
+        public virtual DateTime TimeNowInTheDatabase { get; set; }
+    }
+}

CacheDatabaseQueriesApiSample/DbTimeEntity.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace CacheDatabaseQueriesApiSample
 {
@@ -17,9 +10,11 @@ public static void Main(string[] args)
             BuildWebHost(args).Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
+        public static IWebHost BuildWebHost(string[] args)
+        {
+            return WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .Build();
+        }
     }
-}
+}

CacheDatabaseQueriesApiSample/Program.cs

@@ -11,15 +11,15 @@
     "IIS Express": {
         "commandName": "IISExpress",
         "launchBrowser": true,
-        "launchUrl": "index.html",
+        "launchUrl": "/",
         "environmentVariables": {
             "ASPNETCORE_ENVIRONMENT": "Development"
         }
     },
     "CacheDatabaseQueriesApiSample": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "index.html",
+      "launchUrl": "/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

CacheDatabaseQueriesApiSample/Properties/launchSettings.json

@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace CacheDatabaseQueriesApiSample
 {
@@ -25,21 +19,20 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc();
-            var connection = @"Server=(localdb)\projectsv13;Database=Master;Trusted_Connection=True;ConnectRetryCount=0";
+            var connection =
+                @"Server=(localdb)\projectsv13;Database=Master;Trusted_Connection=True;ConnectRetryCount=0";
             services.AddDbContext<DbTimeContext>(options => options.UseSqlServer(connection));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             if (env.IsDevelopment())
-            {
                 app.UseDeveloperExceptionPage();
-            }
 
-            app.UseStaticFiles();
             app.UseDefaultFiles();
+            app.UseStaticFiles();
             app.UseMvc();
         }
     }
-}
+}

CacheDatabaseQueriesApiSample/Startup.cs

@@ -17,7 +17,7 @@
         <div class="centre-box">
             <div class="counter pull-right"><span class="counter-val">0</span> Database query(s)</div>
 
-            <h1>Sample app to demonstrate using an async cache in your API to save database SQL queries and speed up API calls</h1>
+            <h1>Sample app to demonstrate using an cache in your API to save database SQL queries and speed up API calls</h1>
 
             <p>
                 Every 3 seconds we fetch the current time from the database, however because the sql query