From 4315eb231f5e2aa66d457aed9a2c3c780d2f496b Mon Sep 17 00:00:00 2001
From: Praburaj <praburaj.t@microsoft.com>
Date: Mon, 15 Dec 2014 13:11:44 -0800
Subject: [PATCH] Some more fixes

---
 .../Areas/Admin/Controllers/StoreManagerController.cs  | 10 +++++-----
 src/MusicStore/Controllers/CheckoutController.cs       |  9 ++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
index f2271dfd51..d07ffca23f 100644
--- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
+++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs
@@ -148,9 +148,9 @@ namespace MusicStore.Areas.Admin.Controllers
 
         //
         // GET: /StoreManager/RemoveAlbum/5
-        public IActionResult RemoveAlbum(int id)
+        public async Task<IActionResult> RemoveAlbum(int id)
         {
-            var album = _dbContext.Albums.Where(a => a.AlbumId == id).FirstOrDefault();
+            var album = await _dbContext.Albums.Where(a => a.AlbumId == id).FirstOrDefaultAsync();
             return View(album);
         }
 
@@ -159,7 +159,7 @@ namespace MusicStore.Areas.Admin.Controllers
         [HttpPost, ActionName("RemoveAlbum")]
         public async Task<IActionResult> RemoveAlbumConfirmed(int id)
         {
-            var album = _dbContext.Albums.Where(a => a.AlbumId == id).FirstOrDefault();
+            var album = await _dbContext.Albums.Where(a => a.AlbumId == id).FirstOrDefaultAsync();
 
             if (album != null)
             {
@@ -182,9 +182,9 @@ namespace MusicStore.Areas.Admin.Controllers
         // GET: /StoreManager/GetAlbumIdFromName
         // Note: Added for automated testing purpose. Application does not use this.
         [HttpGet]
-        public IActionResult GetAlbumIdFromName(string albumName)
+        public async Task<IActionResult> GetAlbumIdFromName(string albumName)
         {
-            var album = _dbContext.Albums.Where(a => a.Title == albumName).FirstOrDefault();
+            var album = await _dbContext.Albums.Where(a => a.Title == albumName).FirstOrDefaultAsync();
 
             if (album == null)
             {
diff --git a/src/MusicStore/Controllers/CheckoutController.cs b/src/MusicStore/Controllers/CheckoutController.cs
index f8d4e1f3f3..34817dd87d 100644
--- a/src/MusicStore/Controllers/CheckoutController.cs
+++ b/src/MusicStore/Controllers/CheckoutController.cs
@@ -12,7 +12,7 @@ namespace MusicStore.Controllers
     {
         private const string PromoCode = "FREE";
         private readonly MusicStoreContext _dbContext;
-        
+
         public CheckoutController(MusicStoreContext dbContext)
         {
             _dbContext = dbContext;
@@ -57,8 +57,7 @@ namespace MusicStore.Controllers
                     // Save all changes
                     await _dbContext.SaveChangesAsync(Context.RequestAborted);
 
-                    return RedirectToAction("Complete",
-                        new { id = order.OrderId });
+                    return RedirectToAction("Complete", new { id = order.OrderId });
                 }
             }
             catch
@@ -71,10 +70,10 @@ namespace MusicStore.Controllers
         //
         // GET: /Checkout/Complete
 
-        public IActionResult Complete(int id)
+        public async Task<IActionResult> Complete(int id)
         {
             // Validate customer owns this order
-            bool isValid = _dbContext.Orders.Any(
+            bool isValid = await _dbContext.Orders.AnyAsync(
                 o => o.OrderId == id &&
                 o.Username == Context.User.Identity.GetUserName());