Merge pull request #6 from richa008/swapnag-backendservice

fixing post api
richa008 · Jul 25, 2018 · c45ba39 · c45ba39
2 parents 9372a61 + c84ef9d
commit c45ba39
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 11 deletions.
diff --git a/MirysList/Controllers/FamilyController.cs b/MirysList/Controllers/FamilyController.cs
@@ -40,7 +40,7 @@ public IActionResult GetFamilies(string sort)
         [Route("families/{id}")]
         public IActionResult GetFamily(int id)
         {
-            var family = _dbContext.Families.Include(p => p.FamilyMembers).SingleOrDefault(m => m.Id == id);
+            var family = _dbContext.Families.Include(p => p.FamilyMembers).Include(i => i.listItems).SingleOrDefault(m => m.Id == id);
             if (family == null)
             {
                 return NotFound("No record found with this Id");

diff --git a/MirysList/Controllers/ShopController.cs b/MirysList/Controllers/ShopController.cs
@@ -36,6 +36,7 @@ public IActionResult Catalog()
         public IActionResult CataLogItems(int catalogId)
         {
 
+
             Catalog catalog = _dbContext.Catalogs.Where(x => x.Id == catalogId).Include(c => c.Items).FirstOrDefault();
             if (catalog != null)
             {
@@ -59,9 +60,16 @@ public IActionResult ShoppingList(int familyId)
             if (familyObj != null)
             {
                 List<ShoppingListItem> listItems = familyObj.listItems;
+                List<ShoppingListItem> resultItems = new List<ShoppingListItem>();
                 if (listItems != null)
                 {
-                    return Ok(listItems);
+                    foreach(ShoppingListItem item in listItems)
+                    {
+                        ShoppingListItem it = _dbContext.ShoppingListItems.Where(x => x.Id == item.Id).FirstOrDefault();
+                        resultItems.Add(it);
+                    }
+
+                    return Ok(resultItems);
                 }
             }
 
@@ -93,21 +101,29 @@ public IActionResult ShoppingListItems(int shoppinglistId)
         [Route("api/Shop/CreateList/{familyId}")]        
         public IActionResult CreateList([FromBody]List<ShoppingListItem> listItems, int familyId)
         {
+            List<UpdatedShoppingListItem> result = new List<UpdatedShoppingListItem>();
             Family familyObj = null;
             try
             {
-                familyObj = _dbContext.Families.Where(x => x.Id == familyId).FirstOrDefault();
+                familyObj = _dbContext.Families.Where(x => x.Id == familyId).Include(y => y.listItems).FirstOrDefault();
                 if (familyObj != null)
                 {                   
                     foreach (ShoppingListItem item in listItems)
                     {
-                        _dbContext.ShoppingListItems.Add(item);
-                        familyObj.listItems.Add(item);
-                        _dbContext.Families.Update(familyObj);
+                        CatalogItem i = _dbContext.CataLogItems.Where(x => x.Id == item.CatalogItemId).FirstOrDefault();
+                        if (i != null)
+                        {
+                            _dbContext.ShoppingListItems.Add(item);
+                            UpdatedShoppingListItem resultItem = new UpdatedShoppingListItem(item);                            
+                            resultItem.CatalogItem = i;
+                            familyObj.listItems.Add(item);
+                            result.Add(resultItem);
+                        }
                     }
-
+
+                    _dbContext.Families.Update(familyObj);
                     _dbContext.SaveChanges();
-                    return Ok(familyObj);
+                    return Ok(result);
                 }
             }
             catch(Exception e)

diff --git a/MirysList/Models/ShoppingListItem.cs b/MirysList/Models/ShoppingListItem.cs
@@ -1,21 +1,44 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace MirysList.Models
 {
     public class ShoppingListItem
     {
+        public ShoppingListItem()
+        {
+
+        }
+
+        public ShoppingListItem(ShoppingListItem item)
+        {
+            this.Id = item.Id;
+            this.CatalogItemId = item.CatalogItemId;
+            this.ItemNotes = item.ItemNotes;
+            this.Quantity = item.Quantity;
+        }
+
         [Required]
-        public int Id { get; set; }
-        [Required]
-        public CatalogItem CatalogItem { get; set; }
+        public int Id { get; set; }        
+        public int CatalogItemId { get; set; }
         [Required]
         public int Quantity { get; set; }
       //  public ShoppingList ShoppingList { get; set; }
         //[Required]
        public string ItemNotes { get; set; }
     }
+
+    public class UpdatedShoppingListItem : ShoppingListItem
+    {
+        public UpdatedShoppingListItem(ShoppingListItem item) :base(item)
+        {
+
+        }
+
+        public CatalogItem CatalogItem { get; set; }
+    }
 }