Merge branch 'stakwork:master' into Refactor-TestGetListedBots-UT

stakwork · Jun 25, 2024 · b77d526 · b77d526
2 parents 4cb68e5 + c901d7a
commit b77d526
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 85 deletions.
diff --git a/db/db.go b/db/db.go
@@ -1477,6 +1477,7 @@ func (db database) SearchBots(s string, limit, offset int) []BotRes {
 	// set limit
 	limitStr := strconv.Itoa(limit)
 	offsetStr := strconv.Itoa(offset)
+	s = strings.ReplaceAll(s, " ", " & ")
 	db.db.Raw(
 		`SELECT uuid, owner_pub_key, name, unique_name, img, description, tags, price_per_use, ts_rank(tsv, q) as rank
 		FROM bots, to_tsquery(?) q

diff --git a/db/structs.go b/db/structs.go
@@ -64,6 +64,7 @@ type Bot struct {
 	Deleted        bool           `json:"deleted"`
 	MemberCount    uint64         `json:"member_count"`
 	OwnerRouteHint string         `json:"owner_route_hint"`
+	Tsv            string         `gorm:"type:tsvector"`
 }
 
 // Bot struct
@@ -73,7 +74,7 @@ type BotRes struct {
 	Name        string         `json:"name"`
 	UniqueName  string         `json:"unique_name"`
 	Description string         `json:"description"`
-	Tags        pq.StringArray `json:"tags"`
+	Tags        pq.StringArray `gorm:"type:text[]" json:"tags"`
 	Img         string         `json:"img"`
 	PricePerUse int64          `json:"price_per_use"`
 }