Migrate deployment to Gitea Actions and Portainer

pkg/database/channel.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 )
 
 type channelService struct {
@@ -50,6 +50,9 @@ func (s channelService) GuildChannels(g geeksbot.Guild) ([]geeksbot.Channel, err
 	var channels []geeksbot.Channel
 	queryString := "SELECT id FROM channels WHERE guild_id = $1"
 	rows, err := s.db.Query(queryString, g.ID)
+	if err != nil {
+		return channels, err
+	}
 	for rows.Next() {
 		var id string
 		err = rows.Scan(&id)

pkg/database/database.go

@@ -4,8 +4,9 @@ import (
 	"database/sql"
 	"fmt"
 	"log"
+	"time"
 
-	"github.com/dustinpianalto/geeksbot/pkg/database/migrations"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot/pkg/database/migrations"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database/postgres"
 	bindata "github.com/golang-migrate/migrate/v4/source/go_bindata"
@@ -20,18 +21,26 @@ var (
 	RequestService requestService
 	PatreonService patreonService
 	ServerService  serverService
+	RaffleService  raffleService
 )
 
 func ConnectDatabase(dbConnString string) {
 	var err error
 	db, err = sql.Open("postgres", dbConnString)
 	if err != nil {
-		log.Fatal(fmt.Errorf("Can't connect to the database: %w", err))
+		log.Fatal(fmt.Errorf("can't connect to the database: %w", err))
 	}
+
+	db.SetMaxOpenConns(5)
+	db.SetMaxIdleConns(2)
+	db.SetConnMaxLifetime(30 * time.Minute)
+	db.SetConnMaxIdleTime(5 * time.Minute)
+
+	if err = db.Ping(); err != nil {
+		log.Fatal(fmt.Errorf("can't ping the database: %w", err))
+	}
+
 	log.Println("Database Connected.")
-	db.SetMaxOpenConns(75)
-	db.SetMaxIdleConns(5)
-	db.SetConnMaxLifetime(300)
 	initServices()
 	log.Println("Services Initialized")
 }
@@ -73,4 +82,5 @@ func initServices() {
 	PatreonService = patreonService{db: db}
 	RequestService = requestService{db: db}
 	ServerService = serverService{db: db}
+	RaffleService = raffleService{db: db}
 }

pkg/database/guild.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 	"github.com/lib/pq"
 )
 

pkg/database/message.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 	"github.com/lib/pq"
 )
 
@@ -61,7 +61,7 @@ func (s messageService) UpdateMessage(m geeksbot.Message) (geeksbot.Message, err
 	queryString = "UPDATE messages SET modified_at = $2, content = $3, previous_content = $4 WHERE id = $1"
 	_, err = s.db.Exec(queryString, m.ID, m.ModifiedAt, m.Content, previousContent)
 	m.PreviousContent = previousContent
-	return m, nil
+	return m, err
 }
 
 func (s messageService) DeleteMessage(m geeksbot.Message) error {

pkg/database/patreon.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 )
 
 type patreonService struct {

pkg/database/request.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 )
 
 type requestService struct {

pkg/database/server.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"log"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 )
 
 type serverService struct {

pkg/database/user.go

@@ -3,7 +3,7 @@ package database
 import (
 	"database/sql"
 
-	"github.com/dustinpianalto/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
 )
 
 type userService struct {

pkg/services/services.go

@@ -1,8 +1,8 @@
 package services
 
 import (
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/pkg/database"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot"
+	"gitea.wayfinderak.com/wayfinderak/geeksbot/pkg/database"
 )
 
 var (
@@ -13,6 +13,7 @@ var (
 	PatreonService geeksbot.PatreonService
 	RequestService geeksbot.RequestService
 	ServerService  geeksbot.ServerService
+	RaffleService  geeksbot.RaffleService
 )
 
 func InitializeServices() {
@@ -23,4 +24,5 @@ func InitializeServices() {
 	PatreonService = database.PatreonService
 	RequestService = database.RequestService
 	ServerService = database.ServerService
+	RaffleService = database.RaffleService
 }