ac88e17856
- Add "Catatan" field display in consulting order detail page - Add dedicated "Cancelled Order" section with rebooking option - Update status alert to show proper message for cancelled orders - Refactor edge function to focus on calendar cleanup only - Set payment_status to 'failed' when auto-cancelling expired orders 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
102 lines
3.4 KiB
PL/PgSQL
102 lines
3.4 KiB
PL/PgSQL
-- ============================================
|
|
-- SQL Function for Expired Consulting Orders Cleanup
|
|
-- ============================================
|
|
-- This creates a reusable SQL function that can be called from
|
|
-- Coolify Scheduled Tasks to cancel expired consulting orders
|
|
--
|
|
-- NOTE: We use Coolify for ALL cron jobs (single source of truth)
|
|
-- instead of mixing pg_cron and Coolify scheduled tasks
|
|
|
|
-- Drop existing function if exists (to handle return type change)
|
|
DROP FUNCTION IF EXISTS cancel_expired_consulting_orders_sql();
|
|
|
|
-- Create SQL function to cancel expired orders
|
|
CREATE OR REPLACE FUNCTION cancel_expired_consulting_orders_sql()
|
|
RETURNS jsonb
|
|
LANGUAGE plpgsql
|
|
SECURITY DEFINER
|
|
AS $$
|
|
DECLARE
|
|
expired_order RECORD;
|
|
expired_session RECORD;
|
|
processed_count INTEGER := 0;
|
|
BEGIN
|
|
-- Log start
|
|
RAISE NOTICE '[CANCEL-EXPIRED] Starting check for expired consulting orders';
|
|
|
|
-- Loop through expired consulting orders
|
|
FOR expired_order IN
|
|
SELECT o.id, o.payment_status, o.qr_expires_at
|
|
FROM orders o
|
|
INNER JOIN consulting_sessions cs ON cs.order_id = o.id
|
|
WHERE o.payment_status = 'pending'
|
|
AND o.qr_expires_at < NOW()
|
|
AND o.status != 'cancelled'
|
|
LOOP
|
|
RAISE NOTICE '[CANCEL-EXPIRED] Processing order: %', expired_order.id;
|
|
|
|
-- Update order status to cancelled AND payment status to failed
|
|
UPDATE orders
|
|
SET status = 'cancelled',
|
|
payment_status = 'failed'
|
|
WHERE id = expired_order.id;
|
|
|
|
-- Cancel all consulting sessions for this order
|
|
FOR expired_session IN
|
|
SELECT id, calendar_event_id
|
|
FROM consulting_sessions
|
|
WHERE order_id = expired_order.id
|
|
AND status != 'cancelled'
|
|
LOOP
|
|
-- Update session status to cancelled
|
|
UPDATE consulting_sessions
|
|
SET status = 'cancelled'
|
|
WHERE id = expired_session.id;
|
|
|
|
-- Delete time slots to release them for re-booking
|
|
DELETE FROM consulting_time_slots
|
|
WHERE session_id = expired_session.id;
|
|
|
|
RAISE NOTICE '[CANCEL-EXPIRED] Cancelled session: %', expired_session.id;
|
|
END LOOP;
|
|
|
|
processed_count := processed_count + 1;
|
|
END LOOP;
|
|
|
|
RAISE NOTICE '[CANCEL-EXPIRED] Successfully processed % expired orders', processed_count;
|
|
|
|
RETURN jsonb_build_object(
|
|
'success', true,
|
|
'processed', processed_count,
|
|
'message', format('Successfully cancelled %s expired consulting orders', processed_count)
|
|
);
|
|
END;
|
|
$$;
|
|
|
|
-- ============================================
|
|
-- Coolify Scheduled Tasks Configuration
|
|
-- ============================================
|
|
-- Instead of using pg_cron, configure these in Coolify:
|
|
--
|
|
-- Task 1: Database Cleanup (every 10 minutes)
|
|
-- -------------------------------------------
|
|
-- Name: cancel-expired-consulting-orders-db
|
|
-- Command: psql -h supabase-db -U postgres -d postgres -c "SELECT cancel_expired_consulting_orders_sql();"
|
|
-- Frequency: */10 * * * *
|
|
-- Timeout: 30 seconds
|
|
-- Container: supabase-db (or supabase-rest if it has psql client)
|
|
--
|
|
-- Task 2: Calendar Cleanup (every 15 minutes)
|
|
-- -------------------------------------------
|
|
-- Name: cancel-expired-consulting-orders-calendar
|
|
-- Command: curl -X POST http://supabase-edge-functions:8000/functions/v1/cancel-expired-consulting-orders
|
|
-- Frequency: */15 * * * *
|
|
-- Timeout: 30 seconds
|
|
-- Container: supabase-edge-functions
|
|
|
|
-- ============================================
|
|
-- Manual Testing
|
|
-- ============================================
|
|
-- Test the function directly:
|
|
-- SELECT cancel_expired_consulting_orders_sql();
|