Fixes #116

Assisted-by: Claude Code

@@ -15,2 +15,4 @@
 SETTINGS_FILE := ./conf/settings.py
 
+# Check if running inside a devcontainer (DB is managed by compose)
+IS_DEVCONTAINER := $(shell (test -f /.dockerenv || test -f /run/.containerenv) && echo true || echo false)

@@ -6,0 +20,4 @@
+### PyCharm
+
+PyCharm supports Dev Containers natively (requires Docker; Podman support is
+under development).

@@ -0,0 +3,4 @@
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/opt/app-root/src",
+  // Root is required for rootless Podman: the host UID is mapped to UID 0

@@ -0,0 +18,4 @@
+    ports:
+      - "5050:5050"
+    depends_on:
+      db:

@@ -0,0 +16,4 @@
+# First container creation may take longer as PostgreSQL initializes its data directory
+echo "Waiting for PostgreSQL..."
+for i in $(seq 1 60); do
+    if python -c "

@@ -15,3 +15,4 @@
           POSTGRESQL_USER: testdays-web
           POSTGRESQL_PASSWORD: testdays-web
           POSTGRESQL_DATABASE: testdays-web
+          POSTGRESQL_ADMIN_PASSWORD: admin

@@ -33,0 +34,4 @@
+      - name: Create test database
+        run: |
+          python3.12 -c "
+          import psycopg2

@@ -101,3 +124,3 @@
+test: start_db ## Run pytest tests. Add optional pytest arguments separated by '--'
 	@echo "Note: You may add optional pytest arguments after '--' separator like this: 'make test -- -v'."
 	@echo "Executing: 'RUNMODE=test pytest $(CLI_ARGS)'"
-	@echo "Note: make sure to remove db test container by running 'make clean-test' after you finish testing"

@@ -17,0 +18,4 @@
+# IS_DEVCONTAINER is set explicitly in .devcontainer/docker-compose.yml,
+# so this is devcontainer-specific and does not trigger inside other containers
+# (e.g. CI runners) that happen to have /.dockerenv or /run/.containerenv.
+IS_DEVCONTAINER := $(if $(filter true,$(IS_DEVCONTAINER)),true,false)

@@ -22,2 +28,4 @@
+	COMPOSE_CMD := flatpak-spawn --host podman compose
 else
 	PODMAN_CMD := podman
+	COMPOSE_CMD := podman compose

@@ -49,0 +60,4 @@
+	@$(COMPOSE_CMD) up -d db
+	@echo "Waiting for PostgreSQL to be healthy..."
+	@RETRIES=30; \
+	  DB_CONTAINER=$$($(PODMAN_CMD) ps -q --filter label=com.docker.compose.project=testdaysweb --filter label=com.docker.compose.service=db); \

@@ -49,0 +66,4 @@
+	    DB_CONTAINER=$$($(PODMAN_CMD) ps -q --filter label=com.docker.compose.project=testdaysweb --filter label=com.docker.compose.service=db); \
+	  done; \
+	  [ -n "$$DB_CONTAINER" ] || { echo "ERROR: DB container did not start in time"; exit 1; }; \
+	  $(PODMAN_CMD) wait --condition=healthy $$DB_CONTAINER

@@ -49,0 +63,4 @@
+	  DB_CONTAINER=$$($(PODMAN_CMD) ps -q --filter label=com.docker.compose.project=testdaysweb --filter label=com.docker.compose.service=db); \
+	  while [ -z "$$DB_CONTAINER" ] && [ "$$RETRIES" -gt 0 ]; do \
+	    sleep 1; RETRIES=$$((RETRIES - 1)); \
+	    DB_CONTAINER=$$($(PODMAN_CMD) ps -q --filter label=com.docker.compose.project=testdaysweb --filter label=com.docker.compose.service=db); \

@@ -68,3 +82,1 @@
-remove_db: stop_db ## Stop and remove PostgreSQL DB container
-	@echo "Removing PostgreSQL DB Container '$(DB_DATABASE)db'"
-	@$(PODMAN_CMD) container rm $(DB_DATABASE)db
+remove_db: $(_STOP_DB_PREREQS) ## Stop and remove PostgreSQL DB container and ALL project volumes (data + test db)

@@ -71,0 +90,4 @@
+	@$(COMPOSE_CMD) exec db bash -c \
+	  "psql -c \"SELECT 1 FROM pg_database WHERE datname = '\$${POSTGRESQL_DATABASE}-test'\" | grep -q 1 \
+	   || createdb --owner=\"\$${POSTGRESQL_USER}\" \"\$${POSTGRESQL_DATABASE}-test\""
+	@echo "Test database ready: $(DB_DATABASE)-test"

@@ -99,1 +178,3 @@
-```
+You can find more details regarding the PostgreSQL image here: <https://quay.io/repository/fedora/postgresql-16>
+
+> **Existing volumes:** If you already have a `testdays-pgdata` volume from before the

@@ -24,0 +28,4 @@
+
+_APP_PREREQS :=
+IS_DB_RUNNING := true
+ifneq ($(IS_DEVCONTAINER), true)

@@ -24,0 +24,4 @@
+# and podman status checks are not executed.
+# Container name follows podman-compose convention: <project>_<service>_<index>.
+# The project name "testdaysweb" is fixed in docker-compose.yml.
+DB_CONTAINER := testdaysweb_db_1

@@ -0,0 +8,4 @@
+    environment:
+      RUNMODE: dev
+      # Explicit devcontainer marker used by the Makefile to skip DB management
+      # (DB is managed by compose) and skip settings setup (done by postCreateCommand).

@@ -23,1 +14,3 @@
-	PODMAN_CMD := podman
+endif
+
+# In a devcontainer the DB is managed by compose and settings are configured