Merge pull request #393 from tobiascadee/tobias/automatically-create-order-rounds

automatically-create-order-rounds

Author: tobiascadee

Makefile

@@ -5,93 +5,80 @@ help:
 	@echo "VOKO Development Environment"
 	@echo "============================"
 	@echo "Available commands:"
-	@echo "  setup      - Complete setup of development environment (recommended)"
-	@echo "  build      - Build Docker images"
-	@echo "  up         - Start all services"
-	@echo "  down       - Stop all services"
-	@echo "  restart    - Restart all services"
-	@echo "  logs       - View all logs"
-	@echo "  logs-web   - View web application logs"
-	@echo "  logs-db    - View database logs"
-	@echo "  shell      - Access web container shell"
-	@echo "  db-shell   - Access database shell"
-	@echo "  clean      - Clean up containers and volumes"
-	@echo "  test       - Run tests"
-	@echo "  migrate    - Run database migrations"
-	@echo "  superuser  - Create Django superuser"
-	@echo "  validate   - Validate setup is working correctly"
-	@echo "  reset      - Reset database (WARNING: deletes all data)"
+	@echo ""
+	@echo "Docker commands:"
+	@echo "  docker-setup     - Complete setup of development environment (recommended)"
+	@echo "  docker-build     - Build Docker images"
+	@echo "  docker-up        - Start all services"
+	@echo "  docker-down      - Stop all services"
+	@echo "  docker-clean     - Clean up containers and volumes"
+	@echo "  docker-flush     - Flush SQLite database in Docker"
+	@echo "  docker-migrate   - Run database migrations in Docker"
+	@echo "  docker-superuser - Create Django superuser in Docker"
+	@echo "  docker-runcrons  - Run crons in Docker"
+	@echo "  docker-runserver - Start development server in Docker"
+	@echo "  docker-test      - Run tests in Docker"
+	@echo "  docker-reset     - Reset database (WARNING: deletes all data)"
+	@echo ""
+	@echo "Local development commands:"
+	@echo "  migrate          - Make and run database migrations locally"
+	@echo "  create-superuser - Create Django superuser locally"
+	@echo "  run-crons        - Run crons locally"
+	@echo "  test             - Run tests locally"
+	@echo "  start-webapp     - Start web application locally"
+	@echo "  flush            - Flush SQLite database locally"
 
 # Complete setup - simplified one-command setup
-setup:
+docker-setup:
 	@echo "Starting VOKO development environment..."
 	@echo "This will build and start all services with automatic setup."
 	docker-compose up --build
 
 # Build Docker images
-build:
+docker-build:
 	docker-compose build
 
 # Start services
-up:
+docker-up:
 	docker-compose up -d
 
 # Stop services
-down:
+docker-down:
 	docker-compose down
 
-# Restart services
-restart:
-	docker-compose restart
-
-# View logs
-logs:
-	docker-compose logs -f
-
-# View web logs
-logs-web:
-	docker-compose logs -f web
-
-# View database logs
-logs-db:
-	docker-compose logs -f db
-
-# Access web container shell
-shell:
-	docker exec -it voko_web bash
-
-# Access database shell
-db-shell:
-	docker exec -it voko_db psql -U postgres
-
 # Clean up
-clean:
+docker-clean:
 	docker-compose down -v
 	docker system prune -f
 
-# Run tests
-test:
-	docker exec voko_web uv run python manage.py test --settings=vokou.settings.testing
+# Flush database
+docker-flush:
+	@echo "Flushing SQLite database in Docker..."
+	docker exec voko_web uv run python manage.py flush --no-input --settings=vokou.settings.development
 
 # Run migrations
-migrate:
+docker-migrate:
 	docker exec voko_web uv run python manage.py makemigrations --settings=vokou.settings.development
 	docker exec voko_web uv run python manage.py migrate --settings=vokou.settings.development
 
 # Create superuser
-superuser:
+docker-superuser:
 	docker exec -it voko_web uv run python manage.py createsuperuser --noinput --settings=vokou.settings.development
 
 # Run crons
-crons:
+docker-runcrons:
 	docker exec voko_web uv run python manage.py runcrons --settings=vokou.settings.development
 
 # Start development server (if not using docker-compose)
-runserver:
+docker-runserver:
 	docker exec voko_web uv run python manage.py runserver 0.0.0.0:8000 --settings=vokou.settings.development
 
+# Run tests
+docker-test:
+	docker exec voko_web uv run python manage.py test --settings=vokou.settings.testing
+
 # Reset database (WARNING: deletes all data)
-reset:
+docker-reset:
 	@echo "WARNING: This will delete all data!"
 	@read -p "Are you sure? [y/N] " -n 1 -r; \
 	echo; \
@@ -102,16 +89,33 @@ reset:
 		echo "Reset cancelled."; \
 	fi
 
-# Flush sqlite database (if using sqlite)
-flush:
-	@echo "Flushing SQLite database..."
-	uv run python webapp/manage.py flush --no-input --settings=vokou.settings.development
-
-flush-docker:
-	@echo "Flushing SQLite database in Docker..."
-	docker exec voko_web uv run python manage.py flush --no-input --settings=vokou.settings.development
+# make migrations
+migrate:
+	@echo "Making migrations..."
+	uv run python webapp/manage.py makemigrations --settings=vokou.settings.development
+	uv run python webapp/manage.py migrate --settings=vokou.settings.development
+
+# create superuser
+create-superuser:
+	@echo "Creating superuser..."
+	uv run python webapp/manage.py createsuperuser --noinput --settings=vokou.settings.development
+
+# run crons
+runcrons:
+	@echo "Running crons..."
+	uv run python webapp/manage.py runcrons --force --settings=vokou.settings.development
+	
+# test
+test:
+	@echo "Running tests..."
+	uv run python webapp/manage.py test --settings=vokou.settings.testing
 
 # start webapp
 start-webapp:
 	@echo "Starting web application..."
-	uv run python webapp/manage.py runserver --settings=vokou.settings.development
+	uv run python webapp/manage.py runserver --settings=vokou.settings.development
+
+# Flush sqlite database
+flush:
+	@echo "Flushing SQLite database..."
+	uv run python webapp/manage.py flush --no-input --settings=vokou.settings.development

pyproject.toml

@@ -26,6 +26,7 @@ dependencies = [
     "gunicorn==22.0.0",
     "python-dateutil==2.8.2",
     "tzlocal>=5.2",
+    "freezegun>=1.5.5",
 ]
 
 [project.optional-dependencies]