Saving ItemLocationData to Database now

IsaacMorris1980 · Jul 23, 2022 · fa9689f · fa9689f
1 parent ff6fa88
commit fa9689f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 14 deletions.
diff --git a/ShoppingList/Model/Item.cs b/ShoppingList/Model/Item.cs
@@ -31,6 +31,7 @@ public class Item : ObservableObject
     [Column("iscompleted")]
     public bool IsCompleted { get; set; }
 
-    [Ignore]
+    [OneToOne]
+    [Column("itemlocationdata")]
     public ItemLocationData LocationData { get; set; }
 }
diff --git a/ShoppingList/Model/ItemLocationData.cs b/ShoppingList/Model/ItemLocationData.cs
@@ -6,15 +6,37 @@
 
 namespace ShoppingList.Model
 {
+    [Table("ItemLocationData")]
     public class ItemLocationData
     {
+        [AutoIncrement, PrimaryKey]
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("baynumber")]
         public string BayNumber { get; set; }
+
+        [Column("description")]
         public string Description { get; set; }
+
+        [Column("number")]
         public string Number { get; set; }
+
+        [Column("numberoffacing")]
         public string NumberOfFacing { get; set; }
+
+        [Column("side")]
         public string Side { get; set; }
+
+        [Column("shelfnumber")]
         public string ShelfNumber { get; set; }
+
+        [Column("shelfpositioninbay")]
         public string ShelfPositionInBay { get; set; }
 
+        [ForeignKey(typeof(Item))]
+        [Column("parentid")]
+        public int ParentId { get; set; }
+
     }
 }
diff --git a/ShoppingList/Services/DatabaseHandler.cs b/ShoppingList/Services/DatabaseHandler.cs
@@ -19,6 +19,7 @@ public DatabaseHandler()
         _pathToDb = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), "shoppinglist_sqlite.db");
         _db = new SQLiteConnection(_pathToDb);
         _db.CreateTable<Item>();
+        _db.CreateTable<ItemLocationData>();
         _db.CreateTable<UserList>();
     }
 
@@ -34,6 +35,7 @@ public DatabaseHandler(string newDBName)
         _pathToDb = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), newDBName);
         _db = new SQLiteConnection(_pathToDb);
         _db.CreateTable<Item>();
+        _db.CreateTable<ItemLocationData>(); 
         _db.CreateTable<UserList>();
     }
 

diff --git a/ShoppingList/Services/ItemService.cs b/ShoppingList/Services/ItemService.cs
@@ -45,7 +45,11 @@ public List<Item> GetItemByParentId(UserList ul)
 
     public Item CreateItem(Item newItem)
     {
-        return _db.Insert(newItem); 
+        var item = _db.Insert(newItem);
+        newItem.LocationData.ParentId = item.Id; 
+        newItem.Id = item.Id;
+        _db.Insert<ItemLocationData>(newItem.LocationData); 
+        return newItem; 
 
     }
 

diff --git a/ShoppingList/Services/ListSorter.cs b/ShoppingList/Services/ListSorter.cs
@@ -13,9 +13,11 @@ public static List<Item> SortUserListItems(UserList userList)
         {
             // Code to sort the Aisles here, let's do aphabetical for now
 
-            List<Item> list = userList.Items; 
+            List<Item> list = userList.Items;
+            //var sortedItems = List<Item>(); 
 
-            var sortedItems = list.OrderBy(x => x.Aisle).ToList();
+
+            var sortedItems = list.OrderBy(x => x.LocationData?.Number).ToList();
 
             var anotherSort = sortedItems.OrderBy(x => x.IsCompleted).ToList(); 
 

diff --git a/ShoppingList/ViewModel/ItemInputViewModel.cs b/ShoppingList/ViewModel/ItemInputViewModel.cs
@@ -13,8 +13,6 @@ public partial class ItemInputViewModel : BaseViewModel
     [ObservableProperty]
     UserList userList;
 
-    public ObservableCollection<Item> Items { get; set; } = new();     
-
     [ObservableProperty]
     public string itemName;
 
@@ -71,19 +69,12 @@ public async void OnItemEntryCompleted()
 
         newItem = _itemService.CreateItem(newItem);
 
-
+        newItem.LocationData.ParentId = newItem.Id; 
         UserList.Items.Add(newItem);
 
         ListSorter.SortUserListItems(UserList);
         ListSorter.SortUserListItems(userList); 
 
-
-        Items.Clear(); 
-        foreach (var item in UserList.Items)
-        {
-            Items.Add(item);
-        }
-
         await Shell.Current.GoToAsync($"{nameof(UserListDetails)}?", true,
             new Dictionary<string, object>
             {