Merge pull request #43 from GenerateNU/cc-07-searchbar-backend

Cc 07 searchbar backend

api/src/controller/controller.go

@@ -153,6 +153,29 @@ func (pg *PgController) Serve() *gin.Engine {
 		}
 		c.JSON(http.StatusOK, responses)
 	})
+	r.GET("/search/:giftCollectionId", func(c *gin.Context) {
+		searchTerm := c.Query("q")
+		minPriceStr := c.Query("minPrice")
+		maxPriceStr := c.Query("maxPrice")
+		occasion := c.Query("occasion")
+		demographic := c.Query("demographic")
+		category := c.QueryArray("category")
+
+		id := c.Param("giftCollectionId")
+		intId, err := strconv.Atoi(id)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, "Invalid giftCollectionId")
+			return
+		}
+
+		minPrice, _ := strconv.Atoi(minPriceStr)
+		maxPrice, _ := strconv.Atoi(maxPriceStr)
+		gifts, err := pg.SearchGifts(int64(intId), searchTerm, minPrice, maxPrice, occasion, demographic, category)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, "Oops")
+		}
+		c.JSON(http.StatusOK, gifts)
+	})
 	r.GET("/collections", func(c *gin.Context) {
 		collections, err := pg.AllCollections()
 		if err != nil {
@@ -195,19 +218,6 @@ func (pg *PgController) Serve() *gin.Engine {
 
 		c.JSON(http.StatusOK, insertedGift)
 	})
-	r.GET("/search", func(c *gin.Context) {
-		searchTerm := c.Query("q")
-		minPriceStr := c.Query("minPrice")
-		maxPriceStr := c.Query("maxPrice")
-
-		minPrice, _ := strconv.Atoi(minPriceStr)
-		maxPrice, _ := strconv.Atoi(maxPriceStr)
-		gifts, err := pg.SearchGifts(searchTerm, minPrice, maxPrice)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, "Oops")
-		}
-		c.JSON(http.StatusOK, gifts)
-	})
 	// Update Gift Record Given Gift ID
 	r.PUT("/gifts/:id", func(c *gin.Context) {
 

api/src/main.go

@@ -190,6 +190,7 @@ func main() {
 	err = db.Create(&randomGift2).Error
 
 	// Check for errors
+
 	if err != nil {
 		fmt.Println("Error auto-migrating:", err)
 		return

api/src/model/model.go

@@ -24,7 +24,7 @@ type Model interface {
 	UpdateGift(int64, Gift) (Gift, error)
 	DeleteGift(int64) error
 	DeleteGiftCollection(int64) error
-	SearchGifts(string, int, int) ([]Gift, error)
+	SearchGifts(int64, string, int, int, string, string, []string) ([]Gift, error)
 	AllGiftResponses() ([]GiftResponse, error)
 	AllCollections() ([]GiftCollection, error)
 	AllCustomerCollections(id int64) ([]GiftCollection, error)
@@ -34,6 +34,7 @@ type Model interface {
 	DeleteGiftFromGiftCollection(int64, int64) (GiftCollection, error)
 }
 
+
 func (m *PgModel) AddRequest(inputRequest GiftRequest) (GiftRequest, error) {
 
 	createdRequest, err := WriteRequestToDb(m.Conn, inputRequest)
@@ -148,10 +149,11 @@ func (m *PgModel) DeleteGift(id int64) error {
 
 	return nil
 }
-func (m *PgModel) SearchGifts(searchTerm string, minPrice int, maxPrice int) ([]Gift, error) {
+func (m *PgModel) SearchGifts(id int64, searchTerm string, minPrice int, maxPrice int, occasion string, demographic string, category []string) ([]Gift, error) {
 	var gifts []Gift
 	searchTerm = strings.TrimSpace(searchTerm)
 
+
 	// Convert to lowercase
 	searchTerm = strings.ToLower(searchTerm)
 
@@ -164,7 +166,7 @@ func (m *PgModel) SearchGifts(searchTerm string, minPrice int, maxPrice int) ([]
 		searchTerms[i] = term + ":*"
 	}
 	formattedSearchTerm := strings.Join(searchTerms, " | ")
-	gifts, err := SearchGiftsDb(m.Conn, formattedSearchTerm, minPrice, maxPrice)
+	gifts, err := SearchGiftsDb(m.Conn, id, formattedSearchTerm, minPrice, maxPrice, occasion, demographic, category)
 
 	if err != nil {
 		return nil, err

api/src/model/transactions.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"github.com/lib/pq"
 	"gorm.io/gorm"
 )
 
@@ -171,17 +172,44 @@ func DeleteGiftCollectionFromDb(db *gorm.DB, id int64) error {
 
 	return nil
 }
-func SearchGiftsDb(db *gorm.DB, searchTerm string, minPrice int, maxPrice int) ([]Gift, error) {
+func SearchGiftsDb(db *gorm.DB, id int64, searchTerm string, minPrice int, maxPrice int, occasion string, demographic string, category []string) ([]Gift, error) {
 	var gifts []Gift
 
-	if err := db.Where("to_tsvector('english', name || ' ' || description) @@ to_tsquery('english', ?)", searchTerm).
-		Where("price >= ? AND price <= ?", minPrice, maxPrice).
-		Find(&gifts).Error; err != nil {
+	query := db.Joins("JOIN gift_collection_gifts ON gifts.id = gift_collection_gifts.gift_id").
+		Where("gift_collection_gifts.gift_collection_id = ?", id)
+
+	if minPrice >= 0 {
+		query = query.Where("price >= ?", minPrice)
+	}
+
+	if searchTerm != "" {
+		query = query.Where("to_tsvector('english', name || ' ' || description) @@ to_tsquery('english', ?)", searchTerm)
+	}
+
+	if maxPrice > 0 {
+		query = query.Where("price <= ?", maxPrice)
+	}
+
+	if occasion != "" {
+		query = query.Where("occasion = ?", occasion)
+	}
+
+	if demographic != "" {
+		query = query.Where("demographic = ?", demographic)
+	}
+
+	if len(category) > 0 {
+		query = query.Where("category && ?", pq.StringArray(category))
+	}
+	query = query.Preload("GiftCollections")
+
+	if err := query.Find(&gifts).Error; err != nil {
 		return nil, err
 	}
 
 	return gifts, nil
 }
+
 func GetCompleteGiftRequestsFromDB(db *gorm.DB) ([]GiftRequest, error) {
 	var requests []GiftRequest
 	if err := db.Where("gift_response_id IS NOT NULL").Preload("GiftResponse").Preload("GiftResponse.GiftCollection").Find(&requests).Error; err != nil {

api/src/model/types.go

@@ -16,7 +16,7 @@ type Gift struct {
 	Demographic     string
 	Category        pq.StringArray `gorm:"type:text[]"`
 	Occasion        string
-	GiftCollections []*GiftCollection `gorm:"many2many:gift_request_gifts;"`
+	GiftCollections []*GiftCollection `gorm:"many2many:gift_collection_gifts;"`
 }
 
 type GiftRequest struct {
@@ -38,7 +38,7 @@ type GiftCollection struct {
 	CustomerID     *uint
 	Customer       *Customer
 	CollectionName string
-	Gifts          []*Gift `gorm:"many2many:gift_request_gifts;"`
+	Gifts          []*Gift `gorm:"many2many:gift_collection_gifts;"`
 }
 
 type GiftResponse struct {