Added UTs for GetAllTribes, GetTotalTribes & GetListedTribes

db/config.go

@@ -50,6 +50,7 @@ func InitDB() {
 	fmt.Println("db connected")
 
 	// migrate table changes
+	db.AutoMigrate(&Tribe{})
 	db.AutoMigrate(&Person{})
 	db.AutoMigrate(&Channel{})
 	db.AutoMigrate(&LeaderBoard{})

db/store.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 	"time"
@@ -175,7 +175,7 @@ func Verify(w http.ResponseWriter, r *http.Request) {
 	}
 
 	payload := VerifyPayload{}
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	r.Body.Close()
 	err = json.Unmarshal(body, &payload)
 	if err != nil {
@@ -263,7 +263,7 @@ type Save struct {
 func PostSave(w http.ResponseWriter, r *http.Request) {
 
 	save := Save{}
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	r.Body.Close()
 	err = json.Unmarshal(body, &save)
 	if err != nil {

db/structs.go

@@ -36,6 +36,7 @@ type Tribe struct {
 	Deleted         bool           `json:"deleted"`
 	AppURL          string         `json:"app_url"`
 	FeedURL         string         `json:"feed_url"`
+	SecondBrainUrl  string         `json:"second_brain_url"`
 	FeedType        uint64         `json:"feed_type"`
 	LastActive      int64          `json:"last_active"`
 	Bots            string         `json:"bots"`

feeds/generic.go

@@ -2,7 +2,7 @@ package feeds
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 )
@@ -161,6 +161,6 @@ func httpget(url string) ([]byte, error) {
 	}
 	defer response.Body.Close()
 
-	body, _ := ioutil.ReadAll(response.Body)
+	body, _ := io.ReadAll(response.Body)
 	return body, nil
 }

feeds/podcastindex.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"strconv"
@@ -122,7 +122,7 @@ func PodcastFeed(url string, fulltext bool) (*Podcast, error) {
 	defer resp.Body.Close()
 
 	var r PodcastResponse
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	err = json.Unmarshal(body, &r)
 	if err != nil {
 		fmt.Println("=> json unmarshall error", err)
@@ -158,7 +158,7 @@ func PodcastEpisodes(url string, fulltext bool) ([]Episode, error) {
 	defer resp.Body.Close()
 
 	var r EpisodeResponse
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	err = json.Unmarshal(body, &r)
 	if err != nil {
 		fmt.Println("json unmarshall error", err)
@@ -234,7 +234,7 @@ func PodcastEpisodesByPerson(query string, fulltext bool) ([]Episode, error) {
 	defer resp.Body.Close()
 
 	var r EpisodeResponse
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	err = json.Unmarshal(body, &r)
 	if err != nil {
 		fmt.Println("json unmarshall error", err)

handlers/bots.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -20,7 +20,7 @@ func CreateOrEditBot(w http.ResponseWriter, r *http.Request) {
 	pubKeyFromAuth, _ := ctx.Value(auth.ContextKey).(string)
 
 	bot := db.Bot{}
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	r.Body.Close()
 	err = json.Unmarshal(body, &bot)
 	if err != nil {

handlers/bounties.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"reflect"
@@ -46,7 +46,7 @@ func GetBountiesLeaderboard(w http.ResponseWriter, _ *http.Request) {
 
 func DeleteBountyAssignee(w http.ResponseWriter, r *http.Request) {
 	invoice := db.DeleteBountyAssignee{}
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	var deletedAssignee bool
 
 	r.Body.Close()

handlers/bounty.go

@@ -145,25 +145,25 @@ func GetBountyCount(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(bountyCount)
 }
 
-func GetPersonCreatedBounties(w http.ResponseWriter, r *http.Request) {
-	bounties, err := db.DB.GetCreatedBounties(r)
+func (h *bountyHandler) GetPersonCreatedBounties(w http.ResponseWriter, r *http.Request) {
+	bounties, err := h.db.GetCreatedBounties(r)
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		fmt.Println("Error", err)
 	} else {
-		var bountyResponse []db.BountyResponse = GenerateBountyResponse(bounties)
+		var bountyResponse []db.BountyResponse = h.generateBountyResponse(bounties)
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(bountyResponse)
 	}
 }
 
-func GetPersonAssignedBounties(w http.ResponseWriter, r *http.Request) {
-	bounties, err := db.DB.GetAssignedBounties(r)
+func (h *bountyHandler) GetPersonAssignedBounties(w http.ResponseWriter, r *http.Request) {
+	bounties, err := h.db.GetAssignedBounties(r)
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		fmt.Println("Error", err)
 	} else {
-		var bountyResponse []db.BountyResponse = GenerateBountyResponse(bounties)
+		var bountyResponse []db.BountyResponse = h.generateBountyResponse(bounties)
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(bountyResponse)
 	}