feat(underattack): custom datastore

.env.example

@@ -2,6 +2,6 @@ ENVIRONMENT=
 BOT_TOKEN=
 SENTRY_DSN=
 REDIS_URL=
-DATABASE_URL=
+POSTGRES_URL=
 MONGO_URL=
 TZ=

.github/workflows/deploy.yml

@@ -73,7 +73,7 @@ jobs:
         run: go test -v -coverprofile=coverage.out -covermode=atomic ./...
         env:
           ENVIRONMENT: development
-          DATABASE_URL: postgres://postgres:password@db:5432/captcha?sslmode=disable
+          POSTGRES_URL: postgres://postgres:password@db:5432/captcha?sslmode=disable
           REDIS_URL: redis://@cache:6379/
           MONGO_URL: mongodb://root:password@mongo:27017/captcha?useNewUrlParser=true&useUnifiedTopology=true&authSource=admin
           MONGO_DBNAME: captcha

.github/workflows/pr.yml

@@ -73,7 +73,7 @@ jobs:
         run: go test -v -coverprofile=coverage.out -covermode=atomic ./...
         env:
           ENVIRONMENT: development
-          DATABASE_URL: postgres://postgres:password@db:5432/captcha?sslmode=disable
+          POSTGRES_URL: postgres://postgres:password@db:5432/captcha?sslmode=disable
           REDIS_URL: redis://@cache:6379/
           MONGO_URL: mongodb://root:password@mongo:27017/captcha?useNewUrlParser=true&useUnifiedTopology=true&authSource=admin
           MONGO_DBNAME: captcha

analytics/analytics.go

@@ -9,10 +9,10 @@ import (
 // Dependency is the dependency injection struct
 // for the analytics package.
 type Dependency struct {
-	Memory   *bigcache.BigCache
-	Bot      *tb.Bot
-	DB       *sqlx.DB
-	TeknumID string
+	Memory      *bigcache.BigCache
+	Bot         *tb.Bot
+	DB          *sqlx.DB
+	HomeGroupID int64
 }
 
 // HourMapper is meant to use for mapping a time.Hour() to a string

analytics/analytics_test.go

@@ -20,7 +20,7 @@ import (
 var dependency *analytics.Dependency
 
 func TestMain(m *testing.M) {
-	databaseUrl, ok := os.LookupEnv("DATABASE_URL")
+	databaseUrl, ok := os.LookupEnv("POSTGRES_URL")
 	if !ok {
 		databaseUrl = "postgresql://postgres:password@localhost:5432/captcha?sslmode=disable"
 	}
@@ -48,9 +48,9 @@ func TestMain(m *testing.M) {
 	}
 
 	dependency = &analytics.Dependency{
-		DB:       db,
-		Memory:   memory,
-		TeknumID: "123456789",
+		DB:          db,
+		Memory:      memory,
+		HomeGroupID: 123456789,
 	}
 
 	setupCtx, setupCancel := context.WithTimeout(context.Background(), time.Second*30)

analytics/join.go

@@ -3,7 +3,6 @@ package analytics
 import (
 	"context"
 	"database/sql"
-	"strconv"
 	"time"
 
 	"github.com/teknologi-umum/captcha/shared"
@@ -21,7 +20,7 @@ import (
 // reason, their data should still be here. But, their joined date
 // will be updated to their newest join date.
 func (d *Dependency) NewUser(ctx context.Context, m *tb.Message, user *tb.User) {
-	if !m.FromGroup() || strconv.FormatInt(m.Chat.ID, 10) != d.TeknumID {
+	if !m.FromGroup() || m.Chat.ID != d.HomeGroupID {
 		return
 	}
 

analytics/msg.go

@@ -2,7 +2,6 @@ package analytics
 
 import (
 	"context"
-	"strconv"
 	"time"
 
 	tb "gopkg.in/telebot.v3"
@@ -16,7 +15,7 @@ func (d *Dependency) NewMessage(m *tb.Message) error {
 		return nil
 	}
 
-	if strconv.FormatInt(m.Chat.ID, 10) != d.TeknumID {
+	if m.Chat.ID != d.HomeGroupID {
 		return nil
 	}
 

analytics/server/server_test.go

@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 		mongoDbName = "captcha"
 	}
 
-	databaseUrl, ok := os.LookupEnv("DATABASE_URL")
+	databaseUrl, ok := os.LookupEnv("POSTGRES_URL")
 	if !ok {
 		databaseUrl = "postgresql://postgres:password@localhost:5432/captcha?sslmode=disable"
 	}

analytics/swarm.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/teknologi-umum/captcha/shared"
@@ -14,7 +13,7 @@ import (
 )
 
 func (d *Dependency) SwarmLog(user *tb.User, groupID int64, finishedCaptcha bool) {
-	if strconv.FormatInt(groupID, 10) != d.TeknumID {
+	if groupID != d.HomeGroupID {
 		return
 	}
 
@@ -70,7 +69,7 @@ func (d *Dependency) SwarmLog(user *tb.User, groupID int64, finishedCaptcha bool
 }
 
 func (d *Dependency) UpdateSwarm(user *tb.User, groupID int64, finishedCaptcha bool) {
-	if strconv.FormatInt(groupID, 10) != d.TeknumID {
+	if groupID != d.HomeGroupID {
 		return
 	}
 

captcha/captcha.go

@@ -1,17 +1,14 @@
 package captcha
 
 import (
-	"github.com/teknologi-umum/captcha/analytics"
-
 	"github.com/allegro/bigcache/v3"
 	tb "gopkg.in/telebot.v3"
 )
 
 // Dependencies contains the dependency injection struct for
 // methods in the captcha package.
 type Dependencies struct {
-	Memory    *bigcache.BigCache
-	Bot       *tb.Bot
-	Analytics *analytics.Dependency
-	TeknumID  string
+	Memory        *bigcache.BigCache
+	Bot           *tb.Bot
+	TeknumGroupID int64
 }

captcha/welcome.go

@@ -70,7 +70,7 @@ func (d *Dependencies) sendWelcomeMessage(ctx context.Context, m *tb.Message) er
 
 	var msgToSend string = regularWelcomeMessage
 
-	if strconv.FormatInt(m.Chat.ID, 10) == d.TeknumID {
+	if m.Chat.ID == d.TeknumGroupID {
 		msgToSend = currentWelcomeMessages[randomNum()]
 	}