fff1ed2e6d
Resolve the operational/config sprawl (#10-#14 from the review): the app read NORMOGEN_*/MONGODB_* env vars but every env/compose file set SERVER_*/DATABASE_*, the ports were all over the place (8080/8000/6500/6800), there were 5 inconsistent Dockerfiles (rust:1.82 vs rust:1.93, missing curl), and an 18 MB binary was committed. Env-var names — standardize on what the code reads: * config/mod.rs: NORMOGEN_PORT default 8080 -> 6500 (avoid the over-common 8000/8080). * db/mod.rs: create_database() now reads MONGODB_DATABASE (was DATABASE_NAME). * .env.example, defaults.env, docker-compose.yml, docker-compose.dev.yml, DEPLOYMENT_GUIDE.md, deployment/README.md, deploy-and-test-solaria.sh, deploy-local-build.sh: use NORMOGEN_HOST/NORMOGEN_PORT/MONGODB_URI/ MONGODB_DATABASE/APP_ENVIRONMENT; drop the dead SERVER_*/DATABASE_URI/ DATABASE_NAME names. Ports — canonical container port 6500 everywhere: * Both Dockerfiles EXPOSE 6500; prod compose maps 6500:6500, dev 6501:6500. * Bulk-replaced the long tail of solaria:8000/localhost:8000/localhost:8080 in docs and test scripts -> 6500. Dockerfiles — 2 canonical, rust:latest, curl + healthcheck: * backend/Dockerfile (prod): rust:latest builder, debian runtime now installs curl (so the compose HEALTHCHECK actually works), EXPOSE 6500. * backend/docker/Dockerfile.dev (dev): rust:latest both stages, EXPOSE 6500. * Deleted 3 redundant Dockerfiles (Dockerfile.improved x2, docker/Dockerfile). * Deleted the committed 18 MB binary backend/docker/normogen-backend. * Deleted 2 stray fix-notes in backend/docker/. Compose: * docker-compose.yml: correct env names, 6500:6500, APP_ENVIRONMENT=production, JWT_SECRET/ENCRYPTION_KEY required via compose interpolation, dropped the obsolete top-level version: key. * docker-compose.dev.yml: correct env names, 6501:6500, mongo:7 (was 6.0), added a working backend healthcheck. * Deleted docker/docker-compose.improved.yml + backend/deploy-to-solaria-improved.sh (built around the now-deleted 'improved' Docker files). Verified: cargo fmt --check clean, build + clippy --all-targets clean, 18 unit tests pass; grep confirms no SERVER_*/DATABASE_* env names and no rust:1.x tags remain outside docs/archive and docs/adr (historical).
128 lines
3.7 KiB
Bash
Executable file
128 lines
3.7 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Phase 2.8 Test Suite
|
|
# Tests Pill Identification, Drug Interactions, and Reminder System
|
|
|
|
API_URL="http://localhost:6500/api"
|
|
TEST_USER="test_phase28@example.com"
|
|
TEST_PASSWORD="TestPassword123!"
|
|
|
|
echo "=========================================="
|
|
echo "Phase 2.8 Feature Tests"
|
|
echo "=========================================="
|
|
|
|
# Test 1: Register and Login
|
|
echo "Test 1: User Registration & Login..."
|
|
REGISTER_RESPONSE=$(curl -s -X POST "$API_URL/auth/register" \
|
|
-H "Content-Type: application/json" \
|
|
-d '{
|
|
"email": "$TEST_USER",
|
|
"password": "$TEST_PASSWORD",
|
|
"username": "testuser28"
|
|
}')
|
|
|
|
TOKEN=$(curl -s -X POST "$API_URL/auth/login" \
|
|
-H "Content-Type: application/json" \
|
|
-d "{
|
|
\"email\": \"$TEST_USER\",
|
|
\"password\": \"$TEST_PASSWORD\"
|
|
}" | jq -r '.access_token // empty')
|
|
|
|
if [ -n "$TOKEN" ] && [ "$TOKEN" != "null" ]; then
|
|
echo "✅ PASS: Authentication successful"
|
|
else
|
|
echo "❌ FAIL: Authentication failed"
|
|
exit 1
|
|
fi
|
|
|
|
# Test 2: Create Medication with Pill Identification (Phase 2.8)
|
|
echo ""
|
|
echo "Test 2: Create Medication with Pill Identification..."
|
|
MED_RESPONSE=$(curl -s -X POST "$API_URL/medications" \
|
|
-H "Content-Type: application/json" \
|
|
-H "Authorization: Bearer $TOKEN" \
|
|
-d '{
|
|
"name": "Aspirin",
|
|
"dosage": "100mg",
|
|
"frequency": "Once daily",
|
|
"pill_identification": {
|
|
"size": "small",
|
|
"shape": "round",
|
|
"color": "white"
|
|
}
|
|
}')
|
|
|
|
if echo "$MED_RESPONSE" | grep -q "pill_identification"; then
|
|
echo "✅ PASS: Pill identification supported"
|
|
else
|
|
echo "⚠️ PARTIAL: Medication created but pill_identification not in response"
|
|
fi
|
|
|
|
# Test 3: Check Drug Interactions (Phase 2.8)
|
|
echo ""
|
|
echo "Test 3: Check Drug Interactions..."
|
|
INTERACTION_RESPONSE=$(curl -s -X POST "$API_URL/interactions/check" \
|
|
-H "Content-Type: application/json" \
|
|
-H "Authorization: Bearer $TOKEN" \
|
|
-d '{
|
|
"medications": ["warfarin", "aspirin"]
|
|
}')
|
|
|
|
if echo "$INTERACTION_RESPONSE" | grep -q "interactions"; then
|
|
echo "✅ PASS: Drug interaction check working"
|
|
echo " Response: $INTERACTION_RESPONSE" | head -c 200
|
|
else
|
|
echo "❌ FAIL: Drug interaction check failed"
|
|
echo " Response: $INTERACTION_RESPONSE"
|
|
fi
|
|
|
|
# Test 4: Check New Medication Against Existing (Phase 2.8)
|
|
echo ""
|
|
echo "Test 4: Check New Medication Interactions..."
|
|
NEW_MED_RESPONSE=$(curl -s -X POST "$API_URL/interactions/check-new" \
|
|
-H "Content-Type: application/json" \
|
|
-H "Authorization: Bearer $TOKEN" \
|
|
-d '{
|
|
"new_medication": "ibuprofen",
|
|
"existing_medications": ["warfarin", "aspirin"]
|
|
}')
|
|
|
|
if echo "$NEW_MED_RESPONSE" | grep -q "has_severe"; then
|
|
echo "✅ PASS: New medication check working"
|
|
else
|
|
echo "⚠️ PARTIAL: New medication check response unexpected"
|
|
fi
|
|
|
|
# Test 5: List Medications with Pill Identification
|
|
echo ""
|
|
echo "Test 5: List Medications (verify pill_identification field)..."
|
|
LIST_RESPONSE=$(curl -s -X GET "$API_URL/medications" \
|
|
-H "Authorization: Bearer $TOKEN")
|
|
|
|
if echo "$LIST_RESPONSE" | grep -q "pill_identification"; then
|
|
echo "✅ PASS: Pill identification in medication list"
|
|
else
|
|
echo "⚠️ PARTIAL: Medications listed but pill_identification not shown"
|
|
fi
|
|
|
|
# Test 6: Drug Interaction Disclaimer
|
|
echo ""
|
|
echo "Test 6: Verify Interaction Disclaimer..."
|
|
if echo "$INTERACTION_RESPONSE" | grep -q "advisory only"; then
|
|
echo "✅ PASS: Disclaimer included"
|
|
else
|
|
echo "❌ FAIL: Disclaimer missing"
|
|
fi
|
|
|
|
# Summary
|
|
echo ""
|
|
echo "=========================================="
|
|
echo "Phase 2.8 Test Summary"
|
|
echo "=========================================="
|
|
echo "Pill Identification: ✅ Implemented"
|
|
echo "Drug Interaction Checker: ✅ Implemented"
|
|
echo "EU-US Ingredient Mapping: ✅ Implemented"
|
|
echo "OpenFDA Integration: ✅ MVP Mode"
|
|
echo "Disclaimer: ✅ Included"
|
|
echo ""
|
|
|