commit a7df8b81ae024889759f604ddd1bd26e845fee7c · bretton.dev/coves

+19 -7

.env.dev

···

       3
       3
        
       # DO NOT commit secrets to version control in production!

     

       4
       4
        
       

     

       5
       5
        
       # =============================================================================

     

       6
       6
       -
       # PostgreSQL Configuration (Shared Database)

     

       6
       6
       +
       # PostgreSQL Configuration (Development Database)

     

       7
       7
        
       # =============================================================================

     

       8
       8
       -
       # Uses existing database from internal/db/local_dev_db_compose/

     

       8
       8
       +
       # Development database for Coves AppView (runs on port 5433)

     

       9
       9
        
       POSTGRES_HOST=localhost

     

       10
       10
        
       POSTGRES_PORT=5433

     

       11
       11
        
       POSTGRES_DB=coves_dev

     
···

       48
       48
        
       PDS_URL=http://localhost:3001

     

       49
       49
        
       

     

       50
       50
        
       # =============================================================================

     

       51
       51
       +
       # Test Database Configuration

     

       52
       52
       +
       # =============================================================================

     

       53
       53
       +
       # Test database runs on port 5434 (separate from dev on 5433)

     

       54
       54
       +
       POSTGRES_TEST_DB=coves_test

     

       55
       55
       +
       POSTGRES_TEST_USER=test_user

     

       56
       56
       +
       POSTGRES_TEST_PASSWORD=test_password

     

       57
       57
       +
       POSTGRES_TEST_PORT=5434

     

       58
       58
       +
       

     

       59
       59
       +
       # =============================================================================

     

       51
       60
        
       # Development Settings

     

       52
       61
        
       # =============================================================================

     

       53
       62
        
       # Environment

     
···

       61
       70
        
       # =============================================================================

     

       62
       71
        
       # Notes

     

       63
       72
        
       # =============================================================================

     

       64
       64
       -
       # - PDS port 3001 avoids conflict with your production PDS on :3000

     

       65
       65
       -
       # - AppView port 8081 avoids conflicts

     

       66
       66
       -
       # - PostgreSQL port 5433 matches your existing local dev database

     

       67
       67
       -
       # - All services connect to the shared PostgreSQL database

     

       68
       68
       -
       # - AppView subscribes directly to PDS firehose (no relay needed for local dev)

     

       73
       73
       +
       # All local development configuration in one file!

     

       74
       74
       +
       # - Dev PostgreSQL:  port 5433

     

       75
       75
       +
       # - Test PostgreSQL: port 5434 (via --profile test)

     

       76
       76
       +
       # - PDS:             port 3001 (avoids conflict with production on :3000)

     

       77
       77
       +
       # - AppView:         port 8081

     

       78
       78
       +
       # - PDS is self-contained (SQLite + CAR files)

     

       79
       79
       +
       # - PostgreSQL is only for Coves AppView indexing

     

       80
       80
       +
       # - AppView subscribes directly to PDS firehose (no relay needed)

     

       69
       81
        
       # - PDS firehose: ws://localhost:3001/xrpc/com.atproto.sync.subscribeRepos

+3 -3

Makefile

···

       92
       92
        
       	@echo "Waiting for test database to be ready..."

     

       93
       93
        
       	@sleep 3

     

       94
       94
        
       	@echo "$(GREEN)Running migrations on test database...$(RESET)"

     

       95
       95
       -
       	@goose -dir internal/db/migrations postgres "postgresql://test_user:test_password@localhost:5434/coves_test?sslmode=disable" up || true

     

       95
       95
       +
       	@. .env.dev && goose -dir internal/db/migrations postgres "postgresql://$$POSTGRES_TEST_USER:$$POSTGRES_TEST_PASSWORD@localhost:$$POSTGRES_TEST_PORT/$$POSTGRES_TEST_DB?sslmode=disable" up || true

     

       96
       96
        
       	@echo "$(GREEN)Running tests...$(RESET)"

     

       97
       97
       -
       	@TEST_DATABASE_URL="postgresql://test_user:test_password@localhost:5434/coves_test?sslmode=disable" go test ./... -v

     

       97
       97
       +
       	@. .env.dev && TEST_DATABASE_URL="postgresql://$$POSTGRES_TEST_USER:$$POSTGRES_TEST_PASSWORD@localhost:$$POSTGRES_TEST_PORT/$$POSTGRES_TEST_DB?sslmode=disable" go test ./... -v

     

       98
       98
        
       	@echo "$(GREEN)✓ Tests complete$(RESET)"

     

       99
       99
        
       

     

       100
       100
        
       test-db-reset: ## Reset test database

     
···

       104
       104
        
       	@docker-compose -f docker-compose.dev.yml --env-file .env.dev --profile test up -d postgres-test

     

       105
       105
        
       	@echo "Waiting for PostgreSQL to be ready..."

     

       106
       106
        
       	@sleep 3

     

       107
       107
       -
       	@goose -dir internal/db/migrations postgres "postgresql://test_user:test_password@localhost:5434/coves_test?sslmode=disable" up || true

     

       107
       107
       +
       	@. .env.dev && goose -dir internal/db/migrations postgres "postgresql://$$POSTGRES_TEST_USER:$$POSTGRES_TEST_PASSWORD@localhost:$$POSTGRES_TEST_PORT/$$POSTGRES_TEST_DB?sslmode=disable" up || true

     

       108
       108
        
       	@echo "$(GREEN)✓ Test database reset$(RESET)"

     

       109
       109
        
       

     

       110
       110
        
       test-db-stop: ## Stop test database

+5 -5

docker-compose.dev.yml

···

       41
       41
        
           image: postgres:15

     

       42
       42
        
           container_name: coves-test-postgres

     

       43
       43
        
           ports:

     

       44
       44
       -
             - "5434:5432"

     

       44
       44
       +
             - "${POSTGRES_TEST_PORT:-5434}:5432"

     

       45
       45
        
           environment:

     

       46
       46
       -
             POSTGRES_DB: coves_test

     

       47
       47
       -
             POSTGRES_USER: test_user

     

       48
       48
       -
             POSTGRES_PASSWORD: test_password

     

       46
       46
       +
             POSTGRES_DB: ${POSTGRES_TEST_DB:-coves_test}

     

       47
       47
       +
             POSTGRES_USER: ${POSTGRES_TEST_USER:-test_user}

     

       48
       48
       +
             POSTGRES_PASSWORD: ${POSTGRES_TEST_PASSWORD:-test_password}

     

       49
       49
        
           volumes:

     

       50
       50
        
             - postgres-test-data:/var/lib/postgresql/data

     

       51
       51
        
           networks:

     

       52
       52
        
             - coves-dev

     

       53
       53
        
           healthcheck:

     

       54
       54
       -
             test: ["CMD-SHELL", "pg_isready -U test_user -d coves_test"]

     

       54
       54
       +
             test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_TEST_USER:-test_user} -d ${POSTGRES_TEST_DB:-coves_test}"]

     

       55
       55
        
             interval: 5s

     

       56
       56
        
             timeout: 5s

     

       57
       57
        
             retries: 5

-50

run-tests.sh

···

       1
       1
       -
       #!/bin/bash

     

       2
       2
       -
       # Helper script to run tests with the test database

     

       3
       3
       -
       

     

       4
       4
       -
       # Colors for output

     

       5
       5
       -
       GREEN='\033[0;32m'

     

       6
       6
       -
       RED='\033[0;31m'

     

       7
       7
       -
       NC='\033[0m' # No Color

     

       8
       8
       -
       

     

       9
       9
       -
       echo "🧪 Coves Test Runner"

     

       10
       10
       -
       echo "==================="

     

       11
       11
       -
       echo ""

     

       12
       12
       -
       

     

       13
       13
       -
       # Check if test database is running

     

       14
       14
       -
       if ! nc -z localhost 5434 2>/dev/null; then

     

       15
       15
       -
           echo -e "${RED}❌ Test database is not running${NC}"

     

       16
       16
       -
           echo ""

     

       17
       17
       -
           echo "Starting test database..."

     

       18
       18
       -
           cd internal/db/test_db_compose && ./start-test-db.sh

     

       19
       19
       -
           cd ../../..

     

       20
       20
       -
           echo ""

     

       21
       21
       -
       fi

     

       22
       22
       -
       

     

       23
       23
       -
       # Load test environment

     

       24
       24
       -
       if [ -f .env.test ]; then

     

       25
       25
       -
           export $(cat .env.test | grep -v '^#' | xargs)

     

       26
       26
       -
       fi

     

       27
       27
       -
       

     

       28
       28
       -
       # Run tests

     

       29
       29
       -
       echo "Running tests..."

     

       30
       30
       -
       echo ""

     

       31
       31
       -
       

     

       32
       32
       -
       if [ $# -eq 0 ]; then

     

       33
       33
       -
           # No arguments, run all tests

     

       34
       34
       -
           go test -v ./...

     

       35
       35
       -
       else

     

       36
       36
       -
           # Pass arguments to go test

     

       37
       37
       -
           go test -v "$@"

     

       38
       38
       -
       fi

     

       39
       39
       -
       

     

       40
       40
       -
       TEST_RESULT=$?

     

       41
       41
       -
       

     

       42
       42
       -
       if [ $TEST_RESULT -eq 0 ]; then

     

       43
       43
       -
           echo ""

     

       44
       44
       -
           echo -e "${GREEN}✅ All tests passed!${NC}"

     

       45
       45
       -
       else

     

       46
       46
       -
           echo ""

     

       47
       47
       -
           echo -e "${RED}❌ Some tests failed${NC}"

     

       48
       48
       -
       fi

     

       49
       49
       -
       

     

       50
       50
       -
       exit $TEST_RESULT