add reading feature

Author: nevzattalhaozcan

.env.docker

@@ -3,6 +3,9 @@ HOST=0.0.0.0
 DATABASE_URL=postgres://forgotten_user:123456@postgres:5432/forgotten_db?sslmode=disable
 JWT_SECRET=your-super-secret-jwt-key-change-this-in-production
 ENVIRONMENT=development
+DB_AUTO_MIGRATE=true
+DB_RUN_MIGRATIONS=false
+MIGRATIONS_PATH=internal/database/migrations
 
 DB_MAX_OPEN_CONNS=25
 DB_MAX_IDLE_CONNS=5

.env.example

@@ -3,6 +3,9 @@ HOST=localhost
 DATABASE_URL=postgres://user:password@localhost:5432/myapp_db?sslmode=disable
 JWT_SECRET=your-super-secret-jwt-key
 ENVIRONMENT=development
+DB_AUTO_MIGRATE=true
+DB_RUN_MIGRATIONS=false
+MIGRATIONS_PATH=path/to/migrations
 
 DB_MAX_OPEN_CONNS=1
 DB_MAX_IDLE_CONNS=1

internal/config/config.go

@@ -26,6 +26,9 @@ type DatabaseConfig struct {
 	URL string
 	MaxOpenConns int
 	MaxIdleConns int
+	AutoMigrate bool
+	RunMigrations bool
+	MigrationsPath string
 }
 
 type JWTConfig struct {
@@ -52,16 +55,22 @@ func Load() *Config {
 		log.Printf("no .env file found or error loading it: %v", err)
 	}
 
+	env := getEnv("ENVIRONMENT", "development")
+    defaultAutoMigrate := env != "production"
+
 	return &Config{
 		Server: ServerConfig{
 			Port: getEnv("PORT", "8080"),
 			Host: getEnv("HOST", "localhost"),
-			Environment: getEnv("ENVIRONMENT", "development"),
+			Environment: getEnv("ENVIRONMENT", env),
 		},
 		Database: DatabaseConfig{
 			URL: getEnv("DATABASE_URL", "postgres://user:password@localhost:5432/dbname?sslmode=disable"),
 			MaxOpenConns: getEnvAsInt("DB_MAX_OPEN_CONNS", 25),
 			MaxIdleConns: getEnvAsInt("DB_MAX_IDLE_CONNS", 5),
+			AutoMigrate:    getEnvAsBool("DB_AUTO_MIGRATE", defaultAutoMigrate),
+            RunMigrations:  getEnvAsBool("DB_RUN_MIGRATIONS", false),
+            MigrationsPath: getEnv("MIGRATIONS_PATH", "internal/database/migrations"),
 		},
 		JWT: JWTConfig{
 			Secret: getEnv("JWT_SECRET", "default_secret"),

internal/database/connection.go

@@ -12,7 +12,7 @@ import (
 	"gorm.io/gorm/logger"
 )
 
-func Connect(cfg *config.Config) (*gorm.DB, error)  {
+func Connect(cfg *config.Config) (*gorm.DB, error) {
 	logLevel := logger.Silent
 	if cfg.Server.Environment == "development" {
 		logLevel = logger.Info
@@ -34,28 +34,46 @@ func Connect(cfg *config.Config) (*gorm.DB, error)  {
 	sqlDB.SetMaxIdleConns(cfg.Database.MaxIdleConns)
 
 	// Periodically publish DB connection stats
-    go func() {
-        ticker := time.NewTicker(5 * time.Second)
-        defer ticker.Stop()
-        for range ticker.C {
-            stats := sqlDB.Stats()
-            metrics.UpdateDBMetrics(stats.OpenConnections, stats.Idle)
-        }
-    }()
+	go func() {
+		ticker := time.NewTicker(5 * time.Second)
+		defer ticker.Stop()
+		for range ticker.C {
+			stats := sqlDB.Stats()
+			metrics.UpdateDBMetrics(stats.OpenConnections, stats.Idle)
+		}
+	}()
 
 	if err := autoMigrate(db); err != nil {
 		log.Printf("migration error: %v", err)
 		return nil, err
 	}
 
-	// Seed the database with initial data for testing
-	if cfg.Server.Environment == "development" {
-		if err := SeedForTest(db); err != nil {
-			log.Printf("seeding error: %v", err)
-			// Don't fail if seeding fails, just log it
+	if cfg.Server.Environment == "production" {
+		if cfg.Database.RunMigrations {
+			if err := RunMigrations(db, cfg.Database.MigrationsPath); err != nil {
+				log.Printf("migration error: %v", err)
+				return nil, err
+			}
+		} else {
+			log.Println("Production: skipping AutoMigrate; run SQL migrations externally (make migrate-up).")
+		}
+	} else {
+		// dev/test automigrate if enabled
+		if cfg.Database.AutoMigrate {
+			if err := autoMigrate(db); err != nil {
+				log.Printf("autoMigrate error: %v", err)
+				return nil, err
+			}
 		}
 	}
 
+	if cfg.Server.Environment == "development" {
+        if err := SeedForTest(db); err != nil {
+            log.Printf("seeding error: %v", err)
+            // non-fatal
+        }
+    }
+
 	log.Println("Database connected successfully")
 	return db, nil
 }
@@ -67,12 +85,13 @@ func autoMigrate(db *gorm.DB) error {
 		models.Club{},
 		models.ClubMembership{},
 		models.Event{},
-        models.EventRSVP{},
-		models.Annotation{},
-		models.AnnotationLike{},
+		models.EventRSVP{},
 		models.Comment{},
 		models.CommentLike{},
 		models.Post{},
 		models.PostLike{},
+		models.UserBookProgress{},
+		models.ClubBookAssignment{},
+		models.ReadingLog{},
 	)
-}
+}

internal/database/migrations/000004_create_reading_table.down.sql

@@ -0,0 +1,9 @@
+BEGIN;
+DROP TRIGGER IF EXISTS trg_club_assignments_updated ON club_book_assignments;
+DROP TRIGGER IF EXISTS trg_user_book_progress_updated ON user_book_progress;
+DROP FUNCTION IF EXISTS set_updated_at();
+
+DROP TABLE IF EXISTS club_book_assignments;
+DROP TABLE IF EXISTS reading_logs;
+DROP TABLE IF EXISTS user_book_progress;
+COMMIT;

internal/database/migrations/000004_create_reading_table.up.sql

@@ -0,0 +1,73 @@
+BEGIN;
+
+-- Track per-user progress on a book
+CREATE TABLE IF NOT EXISTS user_book_progress (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    book_id BIGINT NOT NULL REFERENCES books(id) ON DELETE CASCADE,
+    status TEXT NOT NULL DEFAULT 'reading', -- not_started|reading|paused|finished
+    current_page INT,
+    percent NUMERIC(5,2), -- denorm
+    started_at TIMESTAMPTZ DEFAULT NOW(),
+    finished_at TIMESTAMPTZ,
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE (user_id, book_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_book_progress_user ON user_book_progress(user_id);
+CREATE INDEX IF NOT EXISTS idx_user_book_progress_book ON user_book_progress(book_id);
+
+-- stores each update with deltas for history and reporting
+CREATE TABLE IF NOT EXISTS reading_logs (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    book_id BIGINT NOT NULL REFERENCES books(id) ON DELETE CASCADE,
+    club_id BIGINT REFERENCES clubs(id) ON DELETE SET NULL,
+    assignment_id BIGINT, -- forward ref; not FK to avoid circular on create order
+    pages_delta INT,      -- how many pages were read in this session
+    from_page INT,
+    to_page INT,
+    minutes INT,
+    note TEXT,
+    created_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_reading_logs_user ON reading_logs(user_id);
+CREATE INDEX IF NOT EXISTS idx_reading_logs_book ON reading_logs(book_id);
+CREATE INDEX IF NOT EXISTS idx_reading_logs_club ON reading_logs(club_id);
+
+-- Club-level assignments (what the club is reading now / history)
+CREATE TABLE IF NOT EXISTS club_book_assignments (
+    id BIGSERIAL PRIMARY KEY,
+    club_id BIGINT NOT NULL REFERENCES clubs(id) ON DELETE CASCADE,
+    book_id BIGINT NOT NULL REFERENCES books(id) ON DELETE CASCADE,
+    status TEXT NOT NULL DEFAULT 'active', -- active|completed|archived
+    start_date DATE DEFAULT CURRENT_DATE,
+    due_date DATE,
+    completed_at TIMESTAMPTZ,
+    target_page INT,       -- "checkpoint" page for the club
+    checkpoint TEXT,       -- description
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_club_assignments_club ON club_book_assignments(club_id);
+CREATE INDEX IF NOT EXISTS idx_club_assignments_book ON club_book_assignments(book_id);
+
+-- trigger to keep updated_at current
+CREATE OR REPLACE FUNCTION set_updated_at() RETURNS TRIGGER AS $$
+BEGIN
+  NEW.updated_at = NOW();
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_user_book_progress_updated ON user_book_progress;
+CREATE TRIGGER trg_user_book_progress_updated BEFORE UPDATE ON user_book_progress
+FOR EACH ROW EXECUTE FUNCTION set_updated_at();
+
+DROP TRIGGER IF EXISTS trg_club_assignments_updated ON club_book_assignments;
+CREATE TRIGGER trg_club_assignments_updated BEFORE UPDATE ON club_book_assignments
+FOR EACH ROW EXECUTE FUNCTION set_updated_at();
+
+COMMIT;

internal/database/migrations/000005_club_fk.down.sql

@@ -0,0 +1,11 @@
+BEGIN;
+
+ALTER TABLE clubs ALTER COLUMN owner_id SET NOT NULL;
+
+ALTER TABLE clubs DROP CONSTRAINT IF EXISTS fk_users_owned_clubs;
+
+ALTER TABLE clubs
+  ADD CONSTRAINT fk_users_owned_clubs
+  FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE RESTRICT;
+
+COMMIT;

internal/database/migrations/000005_club_fk.up.sql

@@ -0,0 +1,42 @@
+BEGIN;
+
+-- allow NULL owner_id
+ALTER TABLE clubs ALTER COLUMN owner_id DROP NOT NULL;
+
+-- drop old FK (name may vary by environment; drop both if present)
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.table_constraints
+        WHERE constraint_name = 'fk_users_owned_clubs' AND table_name = 'clubs'
+    ) THEN
+        ALTER TABLE clubs DROP CONSTRAINT fk_users_owned_clubs;
+    END IF;
+EXCEPTION WHEN undefined_object THEN
+    -- ignore
+END$$;
+
+-- try dropping any default-named FK as a fallback
+DO $$
+DECLARE
+    conname text;
+BEGIN
+    SELECT tc.constraint_name INTO conname
+    FROM information_schema.table_constraints tc
+    JOIN information_schema.key_column_usage kcu
+      ON tc.constraint_name = kcu.constraint_name
+    WHERE tc.table_name = 'clubs'
+      AND tc.constraint_type = 'FOREIGN KEY'
+      AND kcu.column_name = 'owner_id'
+    LIMIT 1;
+    IF conname IS NOT NULL THEN
+        EXECUTE format('ALTER TABLE clubs DROP CONSTRAINT %I', conname);
+    END IF;
+END$$;
+
+-- recreate with SET NULL
+ALTER TABLE clubs
+  ADD CONSTRAINT fk_users_owned_clubs
+  FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE SET NULL;
+
+COMMIT;

internal/database/seed.go

@@ -32,13 +32,10 @@ type SeedData struct {
 func Seed(db *gorm.DB) error {
 	log.Println("starting database seeding")
 
-	var userCount int64
-
-	db.Model(&models.User{}).Count(&userCount)
-	if userCount > 0 {
-		log.Println("database already seeded")
-		return nil
-	}
+	if err := truncateAll(db); err != nil {
+        log.Printf("truncate error: %v", err)
+        return err
+    }
 
 	data, err := os.ReadFile("data/seed_users.json")
 	if err != nil {
@@ -87,13 +84,32 @@ func Seed(db *gorm.DB) error {
 func SeedForTest(db *gorm.DB) error {
 	log.Println("starting test database seeding")
 
-	if err := db.Exec("DELETE FROM users").Error; err != nil {
-		return err
-	}
+	if err := truncateAll(db); err != nil {
+        log.Printf("truncate error: %v", err)
+        return err
+    }
 
 	if err := db.Exec("ALTER SEQUENCE users_id_seq RESTART WITH 1").Error; err != nil {
 		log.Printf("could not reset user ID sequence: %v", err)
 	}
 
 	return Seed(db)
 }
+
+func truncateAll(db *gorm.DB) error {
+    return db.Exec(`
+        TRUNCATE TABLE 
+            post_likes,
+            comment_likes,
+            comments,
+            posts,
+            event_rsvps,
+            events,
+            club_moderators,
+            club_memberships,
+            clubs,
+            books,
+            users
+        RESTART IDENTITY CASCADE
+    `).Error
+}