1 files changed, 7 insertions, 15 deletions
diff --git a/item/service.go b/item/service.go
index 80faff0..0b2afaf 100644
--- a/item/service.go
+++ b/item/service.go
@@ -21,12 +21,7 @@ import (
 	"vidhukant.com/openbills/errors"
 )
 
-func getBrandItems(items *[]SavedItem, id, userId uint) error {
-	err := checkBrandOwnership(id, userId)
-	if err != nil {
-		return err
-	}
-
+func getBrandItems(items *[]SavedItem, id uint) error {
 	// get items
 	res := db.Model(&SavedItem{}).Where("brand_id = ?", id).Find(&items)
 
@@ -35,7 +30,6 @@ func getBrandItems(items *[]SavedItem, id, userId uint) error {
 		return res.Error
 	}
 
-	// returns 404 if either row doesn't exist or if the user doesn't own it
 	if res.RowsAffected == 0 {
 		return errors.ErrEmptyResponse
 	}
@@ -43,8 +37,8 @@ func getBrandItems(items *[]SavedItem, id, userId uint) error {
 	return nil
 }
 
-func getBrands(brands *[]Brand, userId uint) error {
-	res := db.Where("user_id = ?", userId).Find(&brands)
+func getBrands(brands *[]Brand) error {
+	res := db.Find(&brands)
 
 	// TODO: handle potential errors
 	if res.Error != nil {
@@ -66,14 +60,13 @@ func (b *Brand) upsert() error {
 
 func (b *Brand) del() error {
 	// delete brand
-	res := db.Where("id = ? and user_id = ?", b.ID, b.UserID).Delete(b)
+	res := db.Where("id = ?", b.ID).Delete(b)
 
 	// TODO: handle potential errors
 	if res.Error != nil {
 		return res.Error
 	}
 
-	// returns 404 if either row doesn't exist or if the user doesn't own it
 	if res.RowsAffected == 0 {
 		return errors.ErrNotFound
 	}
@@ -81,8 +74,8 @@ func (b *Brand) del() error {
 	return nil
 }
 
-func getItems(items *[]SavedItem, userId uint) error {
-	res := db.Where("user_id = ?", userId).Preload("Brand").Find(&items)
+func getItems(items *[]SavedItem) error {
+	res := db.Preload("Brand").Find(&items)
 
 	// TODO: handle potential errors
 	if res.Error != nil {
@@ -103,14 +96,13 @@ func (i *SavedItem) upsert() error {
 }
 
 func (i *SavedItem) del() error {
-	res := db.Where("id = ? and user_id = ?", i.ID, i.UserID).Delete(i)
+	res := db.Where("id = ?", i.ID).Delete(i)
 
 	// TODO: handle potential errors
 	if res.Error != nil {
 		return res.Error
 	}
 
-	// returns 404 if either row doesn't exist or if the user doesn't own it
 	if res.RowsAffected == 0 {
 		return errors.ErrNotFound
 	}