Refactor project structure: add MongoDB support, enhance Redis repository, and implement session management; update Makefile and pre-commit hooks.

Programmer-RD-AI · Programmer-RD-AI · commit 74e8d2fb5414 · 2025-07-13T08:52:18.000+05:30
diff --git a/.husky/hooks/pre-commit b/.husky/hooks/pre-commit
@@ -0,0 +1,2 @@
+#!/bin/sh
+make lint &&  make format
diff --git a/Makefile b/Makefile
@@ -5,8 +5,21 @@ sync:
 	go mod tidy
 
 run:
-	start-redis
+	@start-docker
 	go run ./cmd/main.go
 
-start-redis:
+start-docker:
 	docker compose up -d
+
+format:
+	gofmt -s -w .
+
+lint:
+	# go vet ./...
+	@command -v golangci-lint >/dev/null 2>&1 \
+    || sudo snap install golangci-lint --classic
+	golangci-lint run
+
+build: 
+	go build ./cmd/main.go
+
diff --git a/cmd/main.go b/cmd/main.go
@@ -1,10 +1,3 @@
-package main
-
-import (
-	configLoader "github.com/Programmer-RD-AI/auth-forge/config_loader"
-)
-
-func main() {
-	config := configLoader.LoadConfig()
-
-}
+package main
+
+func main() {}
diff --git a/config/config.go b/config/config.go
@@ -1,12 +1,17 @@
 package config
 
 type RedisConfig struct {
-	Host string
-	Port int
+	Host     string
+	Port     int
 	Password string
 	Database int
 }
 
+type MongoConfig struct {
+	Uri string
+}
+
 type Config struct {
-	RedisConfig	
+	RedisConfig
+	MongoConfig
 }
diff --git a/config/config_loader.go b/config/config_loader.go
@@ -3,23 +3,16 @@ package config
 import (
 	"os"
 	"strconv"
-	"sync"
 
 	"github.com/joho/godotenv"
 )
 
-var (
-	config *Config
-	once   sync.Once
-)
-
 func LoadConfig() *Config {
-	once.Do(func() {
-		godotenv.Load()
-		config = &Config{
-			RedisConfig: loadRedisConfig(),
-		}
-	})
+	godotenv.Load()
+	config := &Config{
+		RedisConfig: loadRedisConfig(),
+		MongoConfig: loadMongoConfig(),
+	}
 	return config
 }
 
@@ -35,6 +28,14 @@ func loadRedisConfig() RedisConfig {
 		Database: db,
 	}
 }
+
+func loadMongoConfig() MongoConfig {
+	uri, _ := GetEnv("MONGODB_URI", "mongodb://localhost:27017")
+	return MongoConfig{
+		Uri: uri,
+	}
+}
+
 func GetEnv[T string | int](key string, defaultVal T) (T, error) {
 	rawEnv, ok := os.LookupEnv(key)
 	if !ok {
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,12 +2,22 @@ version: "3.8"
 
 services:
   redis:
-    image: redis:6-alphine
+    image: redis:8.0-alphine
     container_name: auth-redis
     ports:
       - "6379:6379"
     volumes:
       - redis-data:/data
 
+  mongodb:
+    image: mongo:8.0.12-rc0
+    container_name: auth-mongo
+    ports:
+      - "27017:27017"
+    volumes:
+      - mongo-data:/data/db
+
 volumes:
   redis-data: {}
+  mongo-data: {}
+
diff --git a/go.mod b/go.mod
@@ -2,9 +2,12 @@ module github.com/Programmer-RD-AI/auth-forge
 
 go 1.24.4
 
+require (
+	github.com/joho/godotenv v1.5.1
+	github.com/redis/go-redis/v9 v9.11.0
+)
+
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
-	github.com/redis/go-redis/v9 v9.11.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,3 +1,7 @@
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
diff --git a/internal/session/model.go b/internal/session/model.go
@@ -0,0 +1,18 @@
+package session
+
+import (
+	"time"
+)
+
+type Metadata = map[string]any
+
+type Session struct {
+	SessionID  string
+	ExpireTime time.Duration
+	SessionValue
+}
+
+type SessionValue struct {
+	UserID   string
+	Metadata Metadata
+}
diff --git a/internal/session/repository.go b/internal/session/repository.go
@@ -0,0 +1,12 @@
+package session
+
+import "github.com/Programmer-RD-AI/auth-forge/internal/store"
+
+
+type SessionRepository struct {
+	store.RedisStore
+}
+
+func CreateSession() {}
+
+func RefreshSession() {}
diff --git a/internal/session/service.go b/internal/session/service.go
@@ -0,0 +1 @@
+package session
diff --git a/internal/store/mongodb.go b/internal/store/mongodb.go
@@ -0,0 +1 @@
+package store
diff --git a/internal/store/redis.go b/internal/store/redis.go
@@ -1,89 +1,101 @@
-package repository
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/Programmer-RD-AI/auth-forge/config"
-	errors "github.com/Programmer-RD-AI/auth-forge/pkg/authforge/"
-	"github.com/redis/go-redis/v9"
-)
-
-type RedisRepository struct {
-	name   string
-	config config.RedisConfig
-	client *redis.Client
-	ctx    context.Context
-}
-
-func NewRedisRepository(config config.RedisConfig) *RedisRepository {
-	return &RedisRepository{
-		name:   "Redis",
-		config: config,
-		client: nil,
-		ctx:    nil,
-	}
-}
-
-func (r *RedisRepository) Connect() {
-	redisClient := redis.NewClient(createRedisOption(&r.config))
-	initCtx := context.Background()
-	r.client = redisClient
-	r.ctx = initCtx
-}
-
-func (r *RedisRepository) HealthCheck() (bool, error) {
-	if err := r.client.Ping(r.ctx).Err(); err != nil {
-		return false, errors.NewDbHealthCheckFail(r.name, fmt.Sprintf("Failed to connect to Redis: %v", err))
-	}
-	return true, nil
-}
-
-func (r *RedisRepository) Read(key string) (string, error) {
-	val, err := r.client.Get(r.ctx, key).Result()
-	if err == redis.Nil {
-		return "", &errors.KeyDoesNotExistError{key: key}
-	} else if err != nil {
-		return "", err
-	} else {
-		return val, nil
-	}
-}
-
-func (r *RedisRepository) Close() bool {
-	if err := r.client.Close(); err != nil {
-		return false
-	}
-	return true
-}
-
-func (r *RedisRepository) Create(key string, value string) bool {
-	if err := r.client.Set(r.ctx, key, &value, 0).Err(); err != nil {
-		fmt.Println("Error creating key:", err)
-		return true
-	}
-	return false
-}
-
-func (r *RedisRepository) Delete(key string) (int64, error) {
-	deleted, err := r.client.Del(r.ctx, key).Result()
-	if err != nil {
-		return 0, err
-	}
-	return deleted, nil
-}
-
-func (r *RedisRepository) Update(key string, value *any) bool {
-	if err := r.client.Set(r.ctx, key, value, 0).Err(); err != nil {
-		return false
-	}
-	return true
-}
-
-func createRedisOption(redisConfig *config.RedisConfig) *redis.Options {
-	return &redis.Options{
-		Addr:     fmt.Sprintf("%s:%d", redisConfig.Host, redisConfig.Port),
-		Password: redisConfig.Password,
-		DB:       redisConfig.Database,
-	}
-}
+package store
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/Programmer-RD-AI/auth-forge/config"
+	"github.com/Programmer-RD-AI/auth-forge/pkg/authforge"
+	"github.com/redis/go-redis/v9"
+)
+
+const (
+	defaultExpire time.Duration = 0 * time.Second
+	providerName                = "redis"
+)
+
+type RedisStore struct {
+	name   string
+	config config.RedisConfig
+	client *redis.Client
+	ctx    context.Context
+}
+
+func NewRedisStore(config config.RedisConfig) *RedisStore {
+	return &RedisStore{
+		name:   providerName,
+		config: config,
+		client: nil,
+		ctx:    nil,
+	}
+}
+
+func (r *RedisStore) Connect() {
+	redisClient := redis.NewClient(createRedisOption(&r.config))
+	initCtx := context.Background()
+	r.client = redisClient
+	r.ctx = initCtx
+}
+
+func (r *RedisStore) HealthCheck() (bool, error) {
+	if err := r.client.Ping(r.ctx).Err(); err != nil {
+		return false, authforge.NewDbHealthCheckFail(r.name, fmt.Sprintf("Failed to connect to Redis: %v", err))
+	}
+	return true, nil
+}
+
+func (r *RedisStore) Read(key string) (string, error) {
+	val, err := r.client.Get(r.ctx, key).Result()
+	if err == redis.Nil {
+		return "", authforge.NewKeyDoesNotExistError(key)
+	} else if err != nil {
+		return "", err
+	} else {
+		return val, nil
+	}
+}
+
+func (r *RedisStore) Close() bool {
+	if err := r.client.Close(); err != nil {
+		return false
+	}
+	return true
+}
+
+func (r *RedisStore) Create(key string, value string, TTL *int) bool {
+	var expire time.Duration
+	if TTL != nil {
+		expire = time.Duration(*TTL) * time.Second
+	} else {
+		expire = defaultExpire
+	}
+	if err := r.client.Set(r.ctx, key, &value, expire).Err(); err != nil {
+		fmt.Println("Error creating key:", err)
+		return true
+	}
+	return false
+}
+
+func (r *RedisStore) Delete(key string) (int64, error) {
+	deleted, err := r.client.Del(r.ctx, key).Result()
+	if err != nil {
+		return 0, err
+	}
+	return deleted, nil
+}
+
+func (r *RedisStore) Update(key string, value *any) bool {
+	if err := r.client.Set(r.ctx, key, value, 0).Err(); err != nil {
+		return false
+	}
+	return true
+}
+
+func createRedisOption(redisConfig *config.RedisConfig) *redis.Options {
+	return &redis.Options{
+		Addr:     fmt.Sprintf("%s:%d", redisConfig.Host, redisConfig.Port),
+		Password: redisConfig.Password,
+		DB:       redisConfig.Database,
+	}
+}
diff --git a/internal/util/helper.go b/internal/util/helper.go
diff --git a/pkg/authforge/errors.go b/pkg/authforge/errors.go
diff --git a/pkg/authforge/session.go b/pkg/authforge/session.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/sh`
	`2`	`+make lint && make format`