bugfix(shopify): only set shopify current_period_end on cancel

Author: skeptrunedev

clients/trieve-shopify-extension/app/routes/webhooks.app.app_subscriptions.update.tsx

@@ -1,17 +1,17 @@
 import type { ActionFunctionArgs } from "@remix-run/node";
 import { authenticate } from "../shopify.server";
-import { useAppBridge } from "@shopify/app-bridge-react";
 import { ShopifyPlanChangePayload } from "trieve-ts-sdk";
 import db from "../db.server";
-import { useTrieve } from "app/context/trieveContext";
 import { sdkFromKey, validateTrieveAuthWehbook } from "app/auth";
 
 async function hashString(str: string) {
   const textEncoder = new TextEncoder();
   const data = textEncoder.encode(str);
-  const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map(byte => byte.toString(16).padStart(2, '0')).join('');
+  const hashHex = hashArray
+    .map((byte) => byte.toString(16).padStart(2, "0"))
+    .join("");
   return hashHex;
 }
 
@@ -20,13 +20,12 @@ export const action = async ({ request }: ActionFunctionArgs) => {
   const key = await validateTrieveAuthWehbook(shop);
   const trieve = sdkFromKey(key);
 
-
   console.log(`Received ${topic} webhook for ${shop}`);
   const organization_id = await db.apiKey.findFirst({
     where: {
       shop: `https://${shop}`,
-    }
-  })
+    },
+  });
   if (!organization_id) {
     return new Response("Organization not found", { status: 404 });
   }
@@ -40,22 +39,30 @@ export const action = async ({ request }: ActionFunctionArgs) => {
         }
       }
     }
-  `
-  )
+  `,
+  );
 
   const trievePayload: ShopifyPlanChangePayload = {
     organization_id: organization_id?.organizationId,
-    idempotency_key: await hashString(`${payload.app_subscription.updated_at}-${payload.app_subscription.admin_graphql_api_id}`),
+    idempotency_key: await hashString(
+      `${payload.app_subscription.updated_at}-${payload.app_subscription.admin_graphql_api_id}`,
+    ),
     shopify_plan: {
-      handle: payload.app_subscription.name.replace("\n", "").replace(/ /g, "-").toLowerCase(),
+      handle: payload.app_subscription.name
+        .replace("\n", "")
+        .replace(/ /g, "-")
+        .toLowerCase(),
       status: payload.app_subscription.status,
-      current_period_end: (await data?.json())?.data.currentAppInstallation.activeSubscriptions?.[0]?.currentPeriodEnd ?? undefined,
+      current_period_end:
+        (await data?.json())?.data.currentAppInstallation
+          .activeSubscriptions?.[0]?.currentPeriodEnd ?? undefined,
     },
   };
 
-  console.log(trievePayload)
-
-  await trieve.handleShopifyPlanChange(trievePayload, process.env.SHOPIFY_SECRET_KEY || "");
+  await trieve.handleShopifyPlanChange(
+    trievePayload,
+    process.env.SHOPIFY_SECRET_KEY || "",
+  );
 
   return new Response();
 };

server/src/data/models.rs

@@ -3922,7 +3922,7 @@ impl Default for StripePlan {
             updated_at: chrono::Utc::now().naive_local(),
             name: "Free".to_string(),
             visible: true,
-            messages_per_month: Some(1000),
+            messages_per_month: Some(50),
         }
     }
 }

server/src/handlers/payment_handler.rs

@@ -27,7 +27,6 @@ use crate::{
     },
 };
 use actix_web::{web, HttpRequest, HttpResponse};
-use dateparser::DateTimeUtc;
 use serde::{Deserialize, Serialize};
 use stripe::{EventObject, EventType, Object, Webhook};
 use utoipa::ToSchema;
@@ -777,19 +776,16 @@ pub async fn handle_shopify_plan_change(
 
     if let Some(organization_plan) = organization_plan {
         if organization_plan.stripe_id == payload.idempotency_key {
-            // No changes
             return Ok(HttpResponse::NoContent().finish());
         }
 
         if organization_plan.plan_id == plan.id
             && payload.shopify_plan.status.to_lowercase() == "active"
         {
-            // No changes
             return Ok(HttpResponse::NoContent().finish());
         } else if organization_plan.plan_id == plan.id
             && payload.shopify_plan.status.to_lowercase() != "active"
         {
-            // Cancel the old plan
             set_stripe_subscription_current_period_end(
                 organization_plan.stripe_id,
                 chrono::Utc::now().naive_utc(),
@@ -799,35 +795,21 @@ pub async fn handle_shopify_plan_change(
         } else if organization_plan.plan_id != plan.id
             && payload.shopify_plan.status.to_lowercase() == "active"
         {
-            // Create a new plan
             create_stripe_subscription_query(
                 payload.idempotency_key.clone(),
                 plan.id,
                 payload.organization_id,
-                payload.shopify_plan.current_period_end.clone().map(|s| {
-                    s.parse::<DateTimeUtc>()
-                        .unwrap()
-                        .0
-                        .with_timezone(&chrono::Utc)
-                        .naive_utc()
-                }),
+                None,
                 pool.clone(),
             )
             .await?;
         }
     } else if payload.shopify_plan.status.to_lowercase() == "active" {
-        // Create a new plan
         create_stripe_subscription_query(
             payload.idempotency_key.clone(),
             plan.id,
             payload.organization_id,
-            payload.shopify_plan.current_period_end.clone().map(|s| {
-                s.parse::<DateTimeUtc>()
-                    .unwrap()
-                    .0
-                    .with_timezone(&chrono::Utc)
-                    .naive_utc()
-            }),
+            None,
             pool.clone(),
         )
         .await?;