Separated models to their own files

Author: lundjrl

README.md

@@ -2,7 +2,6 @@
 
 ![GO](https://github.com/lundjrl/chef/actions/workflows/go.yml/badge.svg)
 
-
 <div>
 <a href="https://github.com/lundjrl/chef">
       <img alt="Screenshot of application home view." src="assets/home.png" width="400px">
@@ -22,12 +21,16 @@
 
 ## Screenshots
 
+### Manage Your Home Inventory
+
 <div>
 <a href="https://github.com/lundjrl/chef">
       <img alt="Screenshot of application inventory view." src="assets/inventory.png" width="400px">
     </a>
 </div>
 
+### Edit Your Grocery List
+
 ## Running Tests
 
 - `go test ./shared/tests -v`

main.go

@@ -25,7 +25,7 @@ func newModel() mainModel {
 		{Title: "Count", Width: 24},
 	}
 
-	var items []db.GroceryItem
+	var items []db.InventoryItem
 	result := db.DBConn.Find(&items)
 
 	if result.Error != nil {
@@ -100,7 +100,7 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "enter":
 			if m.State == shared.InputView {
 				item := m.TextInput.Value()
-				db.CreateGroceryItem(item)
+				db.CreateInventoryItem(item)
 				rows := m.Table.Rows()
 				id := len(m.Table.Rows()) + 1
 				row := []string{fmt.Sprint(id), item, fmt.Sprint(1)}
@@ -115,7 +115,7 @@ func (m mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			id := selected[0]
 			count := 2 // count should be a dynamic string
 
-			db.UpdateGroceryItem(id, count)
+			db.UpdateInventoryItem(id, count)
 		case "tab":
 			switch m.State {
 			case shared.TableView:

run

@@ -1,3 +1,3 @@
 #!/bin/zsh
 
-go build && go run main.go
+go build && go run main.go init

shared/database/api.go

@@ -17,8 +17,8 @@ func InitDatabaseConnection() {
 	}
 	fmt.Println("Database connection started")
 
+	DBConn.AutoMigrate(&InventoryItem{})
 	DBConn.AutoMigrate(&GroceryItem{})
-	DBConn.AutoMigrate(&CheckboxItem{})
 
 	fmt.Println("Database Migrated")
 }

shared/database/grocery.go

@@ -0,0 +1,22 @@
+package database
+
+import (
+	"gorm.io/gorm"
+)
+
+type GroceryItem struct {
+	gorm.Model
+	Name    string `json:"name"`
+	Checked bool   `json:"checked"`
+}
+
+func GetGroceryItems() []GroceryItem {
+	var items []GroceryItem
+	result := DBConn.Find(&items)
+
+	if result.Error != nil {
+		panic(result.Error)
+	}
+
+	return items
+}

shared/database/model.go shared/database/inventory.goshared/database/model.go renamed to shared/database/inventory.go

@@ -8,19 +8,24 @@ import (
 	"gorm.io/gorm"
 )
 
-type GroceryItem struct {
+type InventoryItem struct {
 	gorm.Model
 	Name  string `json:"name"`
 	Count int    `json:"count"`
 }
 
-type CheckboxItem struct {
-	gorm.Model
-	Name    string `json:"name"`
-	Checked bool   `json:"checked"`
+func GetInventoryItems() []InventoryItem {
+	var items []InventoryItem
+	result := DBConn.Find(&items)
+
+	if result.Error != nil {
+		panic(result.Error)
+	}
+
+	return items
 }
 
-func GetGroceryItemByName(itemName string) (string, error) {
+func GetInventoryItemByName(itemName string) (string, error) {
 	name := strings.ToLower(itemName)
 
 	if len(name) <= 0 {
@@ -29,20 +34,20 @@ func GetGroceryItemByName(itemName string) (string, error) {
 
 	db := DBConn
 
-	var item GroceryItem
+	var item InventoryItem
 	result := db.Find(&item, "Name = ?", name)
 	return result.Name(), result.Error
 }
 
-func CreateGroceryItem(itemName string) (string, error) {
+func CreateInventoryItem(itemName string) (string, error) {
 	name := strings.ToLower(itemName)
 
 	if len(name) <= 0 {
 		return "", errors.New("please type a grocery item")
 	}
 
 	db := DBConn
-	item := new(GroceryItem)
+	item := new(InventoryItem)
 	item.Name = name
 	item.Count = 1
 
@@ -51,10 +56,10 @@ func CreateGroceryItem(itemName string) (string, error) {
 	return "", result.Error
 }
 
-func UpdateGroceryItem(id string, count int) (string, error) {
+func UpdateInventoryItem(id string, count int) (string, error) {
 	db := DBConn
 
-	var item GroceryItem
+	var item InventoryItem
 	db.First(&item, "Id")
 
 	item.Count = count
@@ -63,15 +68,15 @@ func UpdateGroceryItem(id string, count int) (string, error) {
 	return "Item updated.", result.Error
 }
 
-func DeleteGroceryItem(itemName string) (string, error) {
+func DeleteInventoryItem(itemName string) (string, error) {
 	name := strings.ToLower(itemName)
 	db := DBConn
 
 	if len(name) <= 0 {
 		return "", errors.New("please type a grocery item")
 	}
 
-	var item GroceryItem
+	var item InventoryItem
 	db.First(&item, "Name = ?", name)
 
 	if item.Name == "" {

shared/table/table.go

@@ -55,13 +55,7 @@ func Main() (tea.Model, error) {
 		{Title: "Count", Width: 10},
 	}
 
-	var items []db.GroceryItem
-	result := db.DBConn.Find(&items)
-
-	if result.Error != nil {
-		panic(result.Error)
-	}
-
+	items := db.GetInventoryItems()
 	tableRows := []table.Row{}
 
 	for _, item := range items {

shared/tests/app.db

@@ -6,10 +6,10 @@ import (
 	model "github.com/lundjrl/chef/shared/database"
 )
 
-func TestGetGroceryItemByName(t *testing.T) {
+func TestGetInventoryItemByName(t *testing.T) {
 	model.InitDatabaseConnection()
 
-	val, err := model.GetGroceryItemByName("avocado")
+	val, err := model.GetInventoryItemByName("avocado")
 
 	if err != nil {
 		t.Log(err)