Merge pull request #1402 from stakwork/fix/lang_status_sort

fixed bounty status/languages

db/db.go

@@ -518,19 +518,6 @@ func (db database) GetOrganizationBounties(r *http.Request, org_uuid string) []B
 	paidQuery := ""
 	languageQuery := ""
 
-	if languageLength > 0 {
-		for i, val := range languageArray {
-			if val != "" {
-				if i == 0 {
-					languageQuery = "AND coding_languages && ARRAY['" + val + "']"
-				} else {
-					query := "OR coding_languages && ARRAY['" + val + "']"
-					languageQuery = languageQuery + " " + query
-				}
-			}
-		}
-	}
-
 	if sortBy != "" && direction != "" {
 		orderQuery = "ORDER BY " + sortBy + " " + direction
 	} else {
@@ -565,6 +552,19 @@ func (db database) GetOrganizationBounties(r *http.Request, org_uuid string) []B
 			paidQuery = "AND paid = true"
 		}
 	}
+	if languageLength > 0 {
+		langs := ""
+		for i, val := range languageArray {
+			if val != "" {
+				if i == 0 {
+					langs = "'" + val + "'"
+				} else {
+					langs = langs + ", '" + val + "'"
+				}
+				languageQuery = "AND coding_languages && ARRAY[" + langs + "]"
+			}
+		}
+	}
 
 	query := `SELECT * FROM bounty WHERE org_uuid = '` + org_uuid + `'`
 	allQuery := query + " " + openQuery + " " + assignedQuery + " " + paidQuery + " " + searchQuery + " " + languageQuery + " " + orderQuery + " " + limitQuery
@@ -614,8 +614,6 @@ func (db database) GetCreatedBounties(r *http.Request) ([]Bounty, error) {
 	orderQuery := ""
 	limitQuery := ""
 
-	fmt.Println("Sort BY", sortBy, limit)
-
 	if sortBy != "" && direction != "" {
 		orderQuery = "ORDER BY " + sortBy + " " + "ASC"
 	} else {
@@ -716,14 +714,15 @@ func (db database) GetAllBounties(r *http.Request) []Bounty {
 		orgQuery = "AND org_uuid = '" + orgUuid + "'"
 	}
 	if languageLength > 0 {
+		langs := ""
 		for i, val := range languageArray {
 			if val != "" {
 				if i == 0 {
-					languageQuery = "AND coding_languages && ARRAY['" + val + "']"
+					langs = "'" + val + "'"
 				} else {
-					query := "OR coding_languages && ARRAY['" + val + "']"
-					languageQuery = languageQuery + " " + query
+					langs = langs + ", '" + val + "'"
 				}
+				languageQuery = "AND coding_languages && ARRAY[" + langs + "]"
 			}
 		}
 	}