Fix Creem checkout.completed provisioning flow

Author: EC2 Default User

app/controllers/webhooks/creem_controller.rb

@@ -79,23 +79,7 @@ def handle_subscription_paid(event)
 
       plan = resolve_plan(product_id)
 
-      if user_id.present?
-        user = User.find_by(id: user_id)
-        if user
-          duration = plan&.pass? ? plan.pass_days.days : 1.month
-          user.activate_subscription!(
-            provider: "creem",
-            customer_id: data["customer_id"],
-            duration: duration
-          )
-          user.update(
-            last_payment_at: Time.current,
-            subscription_plan_name: plan&.display_name || "Starter",
-            subscription_amount: plan ? plan.price_dollars : 6.99
-          )
-          Rails.logger.info("[Creem Webhook] Activated #{plan&.id || 'unknown'} for user #{user_id}")
-        end
-      end
+      activate_user_subscription(user_id: user_id, plan: plan, customer_id: data["customer_id"])
 
       if project_id.present?
         project = Project.find_by(id: project_id)
@@ -107,11 +91,7 @@ def handle_subscription_paid(event)
             server_plan: plan&.id || project.server_plan,
             pass_expires_at: plan&.pass? ? plan.pass_days.days.from_now : nil
           )
-          if project.pending_payment?
-            project.mark_paid!
-            ContainerProvisionJob.perform_later(project.id, user_id: project.created_by_id)
-            Rails.logger.info("[Creem Webhook] Project #{project.id} marked paid, provisioning started")
-          end
+          mark_project_paid_and_provision(project)
         end
       end
     end
@@ -166,7 +146,64 @@ def handle_subscription_upgraded(event)
     def handle_checkout_completed(event)
       data = event["object"] || event["data"] || {}
       metadata = data["metadata"] || {}
+      product_id = data["product_id"] || data.dig("product", "id")
+      plan = resolve_plan(product_id)
+      project = find_project(event)
+
       Rails.logger.info("[Creem Webhook] Checkout completed for user #{metadata['user_id']}")
+
+      activate_user_subscription(
+        user_id: metadata["user_id"],
+        plan: plan,
+        customer_id: data["customer_id"]
+      )
+
+      unless project
+        Rails.logger.warn("[Creem Webhook] Checkout completed but no project found for checkout #{data['id']}")
+        return
+      end
+
+      updates = {
+        payment_status: "paid",
+        server_plan: plan&.id || project.server_plan,
+        pass_expires_at: plan&.pass? ? plan.pass_days.days.from_now : nil
+      }
+      updates[:checkout_session_id] = data["id"] if data["id"].present?
+      updates[:subscription_id] = data["subscription_id"] if data["subscription_id"].present?
+      updates[:subscription_status] = "active" if data["subscription_id"].present?
+      project.update(updates)
+
+      mark_project_paid_and_provision(project)
+    end
+
+    def activate_user_subscription(user_id:, plan:, customer_id: nil)
+      return unless user_id.present?
+
+      user = User.find_by(id: user_id)
+      return unless user
+
+      duration = plan&.pass? ? plan.pass_days.days : 1.month
+      user.activate_subscription!(
+        provider: "creem",
+        customer_id: customer_id,
+        duration: duration
+      )
+      user.update(
+        last_payment_at: Time.current,
+        subscription_plan_name: plan&.display_name || "Starter",
+        subscription_amount: plan ? plan.price_dollars : 6.99
+      )
+      Rails.logger.info("[Creem Webhook] Activated #{plan&.id || 'unknown'} for user #{user_id}")
+    end
+
+    def mark_project_paid_and_provision(project)
+      if project.pending_payment?
+        project.mark_paid!
+        ContainerProvisionJob.perform_later(project.id, user_id: project.created_by_id)
+        Rails.logger.info("[Creem Webhook] Project #{project.id} marked paid, provisioning started")
+      else
+        Rails.logger.info("[Creem Webhook] Project #{project.id} already processed (status=#{project.status}, payment_status=#{project.payment_status})")
+      end
     end
 
     def resolve_plan(product_id)