Merge pull request #1478 from stakwork/fix/modify_next_bounty

Fix/modify next bounty
stakwork · Jan 30, 2024 · d38bbd0 · d38bbd0
2 parents d54fb48 + 453bc55
commit d38bbd0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 56 deletions.
diff --git a/.github/workflows/prjob_build.yml b/.github/workflows/prjob_build.yml
diff --git a/.github/workflows/prjob_eslint.yml b/.github/workflows/prjob_eslint.yml
diff --git a/.github/workflows/prjob_prettier.yml b/.github/workflows/prjob_prettier.yml
diff --git a/db/db.go b/db/db.go
@@ -643,25 +643,25 @@ func (db database) GetBountyById(id string) ([]Bounty, error) {
 
 func (db database) GetNextBountyById(id string) ([]Bounty, error) {
 	ms := []Bounty{}
-	err := db.db.Raw(`SELECT * FROM public.bounty WHERE id > '` + id + `' ORDER BY id ASC LIMIT 1`).Find(&ms).Error
+	err := db.db.Raw(`SELECT * FROM public.bounty WHERE id > '` + id + `' AND show = true ORDER BY id ASC LIMIT 1`).Find(&ms).Error
 	return ms, err
 }
 
 func (db database) GetPreviousBountyById(id string) ([]Bounty, error) {
 	ms := []Bounty{}
-	err := db.db.Raw(`SELECT * FROM public.bounty WHERE id < '` + id + `' ORDER BY id DESC LIMIT 1`).Find(&ms).Error
+	err := db.db.Raw(`SELECT * FROM public.bounty WHERE id < '` + id + `' AND show = true ORDER BY id DESC LIMIT 1`).Find(&ms).Error
 	return ms, err
 }
 
 func (db database) GetNextOrganizationBountyById(uuid string, id string) ([]Bounty, error) {
 	ms := []Bounty{}
-	err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id > '` + id + `' ORDER BY id ASC LIMIT 1`).Find(&ms).Error
+	err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id > '` + id + `' AND show = true ORDER BY id ASC LIMIT 1`).Find(&ms).Error
 	return ms, err
 }
 
 func (db database) GetPreviousOrganizationBountyById(uuid string, id string) ([]Bounty, error) {
 	ms := []Bounty{}
-	err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id < '` + id + `' ORDER BY id DESC LIMIT 1`).Find(&ms).Error
+	err := db.db.Raw(`SELECT * FROM public.bounty WHERE org_uuid = '` + uuid + `' AND id < '` + id + `' AND show = true ORDER BY id DESC LIMIT 1`).Find(&ms).Error
 	return ms, err
 }