Compare commits

..

No commits in common. "fe0e5f5e71bccec221965ffb9dee601c8578db09" and "2343c8eff983ffc45ecae2b2c6f27df6e1bb6b92" have entirely different histories.

View file

@ -1446,10 +1446,8 @@ deploy_reports() {
\"CREATE DATABASE reports_db OWNER reports;\" 2>/dev/null || true \"CREATE DATABASE reports_db OWNER reports;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d reports_db -c \ docker exec hotel-manage-postgres psql -U postgres -d reports_db -c \
\"GRANT ALL ON SCHEMA public TO reports;\" 2>/dev/null || true \"GRANT ALL ON SCHEMA public TO reports;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d forecasting_db -c \
\"GRANT SELECT ON newbook_bookings_stats, newbook_net_revenue_data, forecasts, monthly_budgets, daily_budgets TO reports;\" 2>/dev/null || true
" &>/dev/null " &>/dev/null
msg_ok "Database reports_db ready + read access to forecasting_db" msg_ok "Database reports_db ready"
msg_info "Deploying reports" msg_info "Deploying reports"
deploy_service 122 "reports" "${REPO_ROOT}/reports" /opt/reports deploy_service 122 "reports" "${REPO_ROOT}/reports" /opt/reports
@ -1458,7 +1456,6 @@ deploy_reports() {
NODE_ENV=production NODE_ENV=production
APP_SLUG=reports APP_SLUG=reports
DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/reports_db DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/reports_db
FORECAST_DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/forecasting_db
CENTRAL_AUTH_SECRET=${CENTRAL_AUTH_SECRET} CENTRAL_AUTH_SECRET=${CENTRAL_AUTH_SECRET}
SETTINGS_URL=http://10.10.10.116:3080 SETTINGS_URL=http://10.10.10.116:3080
SETTINGS_SECRET=${SETTINGS_SECRET} SETTINGS_SECRET=${SETTINGS_SECRET}
@ -1490,9 +1487,8 @@ ${build_out}"
INSERT INTO app_capabilities (app_id, slug, name, description, sort_order) INSERT INTO app_capabilities (app_id, slug, name, description, sort_order)
SELECT a.id, c.slug, c.name, c.description, c.sort_order SELECT a.id, c.slug, c.name, c.description, c.sort_order
FROM apps a, (VALUES FROM apps a, (VALUES
('view', 'View & Run Reports', 'Browse and run all custom reports', 1), ('view', 'View & Run Reports', 'Browse and run all custom reports', 1),
('export', 'Export to CSV', 'Download report results as a CSV file', 2), ('export', 'Export to CSV', 'Download report results as a CSV file', 2)
('edit', 'Edit Directors Forecast','Edit pickup/dry/wet overrides and save forecast snapshots', 3)
) AS c(slug, name, description, sort_order) ) AS c(slug, name, description, sort_order)
WHERE a.slug = 'reports' WHERE a.slug = 'reports'
ON CONFLICT (app_id, slug) DO NOTHING; ON CONFLICT (app_id, slug) DO NOTHING;