fix: integration tests

Author: adiffpirate

CLAUDE.md

@@ -4,17 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## About the Project
 
-Read the `README.md` file for information about the project, its architecture,
-how to run it and how to test it.
+Read the `README.md` file for information about the project, its architecture, how to run it and how to test it.
 
-## Current State
-
-Branch: main
-Commit: 45197bc (Initial commit)
-Status: clean
-
-## Next Steps
-
-- CI (34935fb) - add CI to run UnitTests
-- Authentication & authorization not yet implemented
-- Order state transitions not yet implemented
+Don't assume anything about the project, all information should be at `README.md`.
+If it's not, ask the user and update `README.md`.

Makefile

@@ -1,9 +1,10 @@
-.PHONY: help run run-dev test-unit test-integration clean stop
+.PHONY: help run stop test test-unit test-integration clean
 
 help:
 	@echo "Available commands:"
 	@echo "  build            - Build the docker container"
 	@echo "  run              - Run the application (development with auto-reload, debug mode)"
+	@echo "  test             - Run all tests"
 	@echo "  test-unit        - Run unit tests"
 	@echo "  test-integration - Run integration tests with fresh database"
 	@echo "  stop             - Stop the application"
@@ -15,17 +16,17 @@ build:
 run:
 	$(MAKE) build
 	docker compose up -d
-	@echo "Waiting for database to be ready..."
-	until nc -zv localhost 5432; do sleep 1; done
-	@echo "Running migrations..."
-	docker compose run --rm app python -m alembic upgrade head
 	@echo "Application running at http://localhost:8000"
 	@echo "Swagger UI is available at http://localhost:8000/docs"
 
 stop:
 	@echo "Stopping the application..."
 	docker compose stop
 
+test:
+	$(MAKE) test-unit
+	$(MAKE) test-integration
+
 test-unit:
 	$(MAKE) build
 	@echo "Running unit tests..."

README.md

@@ -97,5 +97,6 @@ curl http://localhost:8000/orders/
 | `make run` | Run the app (development with auto-reload) |
 | `make stop` | Stop the app |
 | `make clean` | Clean up Docker containers and volumes |
+| `make test` | Run all tests |
 | `make test-unit` | Run unit tests |
 | `make test-integration` | Run integration tests |

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   postgres:
     image: postgres:15
@@ -13,6 +11,23 @@ services:
       - postgres_data:/var/lib/postgresql/data
     networks:
       - app_network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d app"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  postgres-migrations:
+    image: python-fastapi-example-oms:dev
+    environment:
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/app
+      DEBUG: "true"
+    depends_on:
+      postgres:
+        condition: service_healthy
+    command: alembic -c alembic.ini upgrade head
+    networks:
+      - app_network
 
   app:
     image: python-fastapi-example-oms:dev
@@ -22,7 +37,8 @@ services:
       DATABASE_URL: postgresql://postgres:postgres@postgres:5432/app
       DEBUG: "true"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     volumes:
       - .:/app
     command: uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload