From 16eb1abca11c39499e162f6009e7262e71c6ae52 Mon Sep 17 00:00:00 2001
From: gorohoroh <gorohoroh@gmail.com>
Date: Fri, 6 Jul 2018 14:54:34 +0300
Subject: [PATCH] Configuring EF Core services

---
 OdeToFoodRider/OdeToFoodRider/Startup.cs            | 13 ++++++++++++-
 OdeToFoodRider/OdeToFoodRider/appsettings.json      |  2 +-
 .../OdeToFoodVisualStudio/Startup.cs                | 12 +++++++++++-
 .../OdeToFoodVisualStudio/appsettings.json          |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/OdeToFoodRider/OdeToFoodRider/Startup.cs b/OdeToFoodRider/OdeToFoodRider/Startup.cs
index cb9d541..02f4191 100644
--- a/OdeToFoodRider/OdeToFoodRider/Startup.cs
+++ b/OdeToFoodRider/OdeToFoodRider/Startup.cs
@@ -6,21 +6,32 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OdeToFoodRider.Data;
 using OdeToFoodRider.Services;
 
 namespace OdeToFoodRider
 {
     public class Startup
     {
+        private IConfiguration _configuration;
+        
+        public Startup(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddSingleton<IGreeter, Greeter>();
-            services.AddSingleton<IRestaurantData, InMemoryRestaurantData>();
+            services.AddDbContext<OdeToFoodDbContext>(options =>
+                options.UseSqlServer(_configuration.GetConnectionString("OdeToFood")));
+            services.AddScoped<IRestaurantData, SqlRestaurantData>();
             services.AddMvc();
             
         }
diff --git a/OdeToFoodRider/OdeToFoodRider/appsettings.json b/OdeToFoodRider/OdeToFoodRider/appsettings.json
index 4911d7d..8434367 100644
--- a/OdeToFoodRider/OdeToFoodRider/appsettings.json
+++ b/OdeToFoodRider/OdeToFoodRider/appsettings.json
@@ -1,7 +1,7 @@
 {
   "Greeting": "Hello from Rider",
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "OdeToFood": "Server=(localdb)\\MSSQLLocalDB;Database=OdeToFood;Trusted_Connection=True;MultipleActiveResultSets=true"
   }
   
 }
\ No newline at end of file
diff --git a/OdeToFoodVisualStudio/OdeToFoodVisualStudio/Startup.cs b/OdeToFoodVisualStudio/OdeToFoodVisualStudio/Startup.cs
index 6f46403..606582b 100644
--- a/OdeToFoodVisualStudio/OdeToFoodVisualStudio/Startup.cs
+++ b/OdeToFoodVisualStudio/OdeToFoodVisualStudio/Startup.cs
@@ -2,9 +2,11 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OdeToFoodVisualStudio.Data;
 using OdeToFoodVisualStudio.Services;
 using System;
 
@@ -12,6 +14,13 @@ namespace OdeToFoodVisualStudio
 {
     public class Startup
     {
+        private IConfiguration _configuration;
+
+        public Startup(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
+
         // This method gets called by the runtime. Use this method to add services to the container.
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
@@ -19,7 +28,8 @@ public void ConfigureServices(IServiceCollection services)
             // RDVS: Rider's completion works better with this generic method as it additionally adds the parentheses; additionally, VS overlaps the completion list inside the generic brackets
             // with with parameter info
             services.AddSingleton<IGreeter, Greeter>(); // singleton scope
-            services.AddSingleton<IRestaurantData, InMemoryRestaurantData>(); // per-HTTP-request lifeime
+            services.AddDbContext<OdeToFoodDbContext>(options => options.UseSqlServer(_configuration.GetConnectionString("OdeToFood")));
+            services.AddScoped<IRestaurantData, SqlRestaurantData>(); // per-HTTP-request lifeime
             services.AddMvc();
         }
 
diff --git a/OdeToFoodVisualStudio/OdeToFoodVisualStudio/appsettings.json b/OdeToFoodVisualStudio/OdeToFoodVisualStudio/appsettings.json
index a94aa7b..9fdb40b 100644
--- a/OdeToFoodVisualStudio/OdeToFoodVisualStudio/appsettings.json
+++ b/OdeToFoodVisualStudio/OdeToFoodVisualStudio/appsettings.json
@@ -1,6 +1,6 @@
 {
   "Greeting": "Hello from Visual Studio",
   "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "OdeToFood": "Server=(localdb)\\MSSQLLocalDB;Database=OdeToFood;Trusted_Connection=True;MultipleActiveResultSets=true"
   }
 }
\ No newline at end of file