Refactor: Continue implementation plan

supabase/functions/trigger-notification/index.ts

@@ -1,9 +1,10 @@
 import { serve } from "https://deno.land/std@0.168.0/http/server.ts";
 import { Novu } from "npm:@novu/api@1.6.0";
+import { startRequest, endRequest } from "../_shared/logger.ts";
 
 const corsHeaders = {
   'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type',
+  'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type, x-request-id',
 };
 
 serve(async (req) => {
@@ -11,6 +12,8 @@ serve(async (req) => {
     return new Response(null, { headers: corsHeaders });
   }
 
+  const tracking = startRequest('trigger-notification');
+
   try {
     const novuApiKey = Deno.env.get('NOVU_API_KEY');
     
@@ -39,7 +42,7 @@ serve(async (req) => {
       ? { subscriberId }
       : { topicKey: topicKey! };
 
-    console.log('Triggering notification:', { workflowId, recipient });
+    console.log('Triggering notification:', { workflowId, recipient, requestId: tracking.requestId });
 
     const result = await novu.trigger({
       to: recipient,
@@ -50,13 +53,20 @@ serve(async (req) => {
 
     console.log('Notification triggered successfully:', result.data);
 
+    endRequest(tracking, 200);
+
     return new Response(
       JSON.stringify({
         success: true,
         transactionId: result.data.transactionId,
+        requestId: tracking.requestId
       }),
       {
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+        headers: { 
+          ...corsHeaders, 
+          'Content-Type': 'application/json',
+          'X-Request-ID': tracking.requestId
+        },
         status: 200,
       }
     );
@@ -64,13 +74,20 @@ serve(async (req) => {
     const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred';
     console.error('Error triggering notification:', errorMessage);
     
+    endRequest(tracking, 500, errorMessage);
+
     return new Response(
       JSON.stringify({
         success: false,
         error: errorMessage,
+        requestId: tracking.requestId
       }),
       {
-        headers: { ...corsHeaders, 'Content-Type': 'application/json' },
+        headers: { 
+          ...corsHeaders, 
+          'Content-Type': 'application/json',
+          'X-Request-ID': tracking.requestId
+        },
         status: 500,
       }
     );