Merge pull request #44 from Zenfulcode/development

Almost complete project rewrite

Author: gustaavik

.env.example

@@ -1,8 +1,19 @@
-DB_HOST=localhost
-DB_PORT=5432
-DB_USER=
-DB_PASSWORD=
-DB_NAME=commercify
+# Database Configuration
+# For local development (SQLite)
+DB_DRIVER=sqlite
+DB_NAME=commercify.db
+
+# For production (PostgreSQL) - uncomment and configure these when using PostgreSQL
+# DB_DRIVER=postgres
+# DB_HOST=localhost
+# DB_PORT=5432
+# DB_USER=postgres
+# DB_PASSWORD=postgres
+# DB_NAME=commercify
+# DB_SSL_MODE=disable
+
+# Debug mode for database queries
+DB_DEBUG=false
 
 AUTH_JWT_SECRET=your_jwt_secret
 
@@ -29,7 +40,6 @@ MOBILEPAY_CLIENT_ID=your_client_id
 MOBILEPAY_CLIENT_SECRET=your_client_secret
 MOBILEPAY_WEBHOOK_URL=https://your-site.com/api/webhooks/mobilepay
 MOBILEPAY_PAYMENT_DESCRIPTION=Commercify Store Purchase
-MOBILEPAY_MARKET=NOK
 
 RETURN_URL=https://your-site.com/payment/complete
 CORS_ALLOWED_ORIGINS=http://localhost:3000,http://localhost:5173

.gitignore

@@ -23,6 +23,13 @@ go.work.sum
 
 # env file
 .env
+.env.local
+.env.production
+
+# SQLite database files
+*.db
+*.sqlite
+*.sqlite3
 
 bin/
 commercify

Dockerfile

@@ -14,7 +14,6 @@ RUN rm -f go.work go.work.sum
 # Build all three applications
 RUN go mod download
 RUN go build -o commercify cmd/api/main.go
-RUN go build -o commercify-migrate cmd/migrate/main.go
 RUN go build -o commercify-seed cmd/seed/main.go
 
 # Create a minimal final image
@@ -27,16 +26,14 @@ RUN apk add --no-cache ca-certificates tzdata bash
 
 # Copy the binaries from the builder stage
 COPY --from=builder /app/commercify /app/commercify
-COPY --from=builder /app/commercify-migrate /app/commercify-migrate
 COPY --from=builder /app/commercify-seed /app/commercify-seed
-COPY --from=builder /app/migrations /app/migrations
 COPY --from=builder /app/templates /app/templates
 
 # Copy .env file if it exists (will be overridden by env_file in docker-compose)
 # COPY --from=builder /app/.env /app/
 
 # Set executable permissions for all binaries
-RUN chmod +x /app/commercify /app/commercify-migrate /app/commercify-seed
+RUN chmod +x /app/commercify /app/commercify-seed
 
 # Expose the port
 EXPOSE 6091

Makefile

@@ -1,11 +1,21 @@
-.PHONY: help db-start db-stop db-restart db-logs db-clean migrate-up migrate-down seed-data build run test clean docker-build docker-build-tag docker-push docker-build-push
+.PHONY: help db-start db-stop db-restart db-logs db-clean seed-data build run test clean docker-build docker-build-tag docker-push docker-build-push dev-sqlite dev-postgres
 
 # Default target
 help: ## Show this help message
 	@echo "Available commands:"
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
 
-# Database commands
+# Development environment setup
+dev-postgres: ## Run the application locally with database
+	@echo "Setting up PostgreSQL development environment..."
+	@cp .env.production .env 2>/dev/null || true
+	@echo "Environment configured for PostgreSQL. Starting application..."
+	@echo "Starting database and waiting for it to be ready..."
+	make db-start
+	@sleep 3
+	go run ./cmd/api
+
+# Database commands (PostgreSQL)
 db-start: ## Start PostgreSQL database container
 	docker compose up -d postgres
 
@@ -22,41 +32,40 @@ db-clean: ## Stop and remove PostgreSQL container and volumes
 	docker compose down postgres
 	docker volume rm commercify_postgres_data 2>/dev/null || true
 
-# Migration commands
-migrate-up: ## Run database migrations up
-	docker compose run --rm migrate -up
-
-migrate-down: ## Run database migrations down
-	docker compose run --rm migrate -down
-
-migrate-status: ## Show migration status
-	docker compose run --rm migrate -status
-
 # Seed data
 seed-data: ## Seed database with sample data
 	docker compose run --rm seed -all
 
 # Application commands
 build: ## Build the application
 	go build -o bin/api ./cmd/api
-	go build -o bin/migrate ./cmd/migrate
 	go build -o bin/seed ./cmd/seed
 	go build -o bin/expire-checkouts ./cmd/expire-checkouts
 
-run: db-start ## Run the application locally with database
-	@echo "Starting database and waiting for it to be ready..."
-	@sleep 3
+run:
+	@echo "Setting up SQLite development environment..."
+	@cp .env.local .env 2>/dev/null || true
+	@echo "Environment configured for SQLite. Starting application..."
 	go run ./cmd/api
 
-run-docker: ## Run the entire application stack with Docker
+run-docker: ## Run the entire application stack with Docker (PostgreSQL)
 	docker compose up -d
 
+run-docker-sqlite: ## Run the application with Docker using SQLite
+	docker compose -f docker-compose.local.yml up -d
+
 stop-docker: ## Stop the entire application stack
 	docker compose down
 
+stop-docker-sqlite: ## Stop the SQLite application stack
+	docker compose -f docker-compose.local.yml down
+
 logs: ## Show application logs
 	docker compose logs -f api
 
+logs-sqlite: ## Show SQLite application logs
+	docker compose -f docker-compose.local.yml logs -f api
+
 # Docker image commands
 docker-build: ## Build Docker image
 	docker build -t ghcr.io/zenfulcode/commercifygo:latest .
@@ -76,8 +85,9 @@ docker-push: ## Push Docker image to registry (use REGISTRY and TAG)
 
 docker-build-push: docker-build-tag docker-push ## Build and push Docker image (use REGISTRY and TAG)
 
-docker-dev-build: ## Build Docker image for development
-	docker build -t ghcr.io/zenfulcode/commercifygo:dev .
+docker-dev-push: ## Build Docker image for development
+	docker build -t ghcr.io/zenfulcode/commercifygo:v2-dev .
+	docker push ghcr.io/zenfulcode/commercifygo:v2-dev
 
 # Development commands
 test: ## Run tests
@@ -90,12 +100,21 @@ clean: ## Clean build artifacts
 	rm -rf bin/
 	go clean
 
-# Database setup for development
-dev-setup: db-start migrate-up seed-data ## Setup development environment (start db, migrate, seed)
-	@echo "Development environment ready!"
+# Database setup commands
+dev-setup: ## Setup development environment with PostgreSQL (start db, seed)
+	make db-start
+	@sleep 3
+	make seed-data
+	@echo "Development environment ready with PostgreSQL!"
+
+dev-reset: db-clean db-start seed-data ## Reset PostgreSQL development environment
+	@echo "Development environment reset with PostgreSQL!"
 
-dev-reset: db-clean db-start migrate-up seed-data ## Reset development environment
-	@echo "Development environment reset!"
+dev-reset-sqlite: ## Reset SQLite development environment
+	@echo "Resetting SQLite development environment..."
+	@rm -f commercify.db 2>/dev/null || true
+	@cp .env.local .env 2>/dev/null || true
+	@echo "SQLite database reset!"
 
 # Format and lint
 fmt: ## Format Go code

cmd/api/main.go

@@ -34,16 +34,11 @@ func main() {
 	}
 
 	// Connect to database
-	db, err := database.NewPostgresConnection(cfg.Database)
+	db, err := database.InitDB(cfg.Database)
 	if err != nil {
 		logger.Fatal("Failed to connect to database: %v", err)
 	}
-	defer db.Close()
-
-	// Run database migrations
-	if err := database.RunMigrations(db, cfg.Database); err != nil {
-		logger.Fatal("Failed to run database migrations: %v", err)
-	}
+	defer database.Close(db)
 
 	// Initialize API server
 	server := api.NewServer(cfg, db, logger)

cmd/expire-checkouts/main.go

@@ -27,11 +27,11 @@ func main() {
 	}
 
 	// Connect to database
-	db, err := database.NewPostgresConnection(cfg.Database)
+	db, err := database.InitDB(cfg.Database)
 	if err != nil {
 		logger.Fatal("Failed to connect to database: %v", err)
 	}
-	defer db.Close()
+	defer database.Close(db)
 
 	// Initialize dependency container
 	diContainer := container.NewContainer(cfg, db, logger)