Merge pull request 'fix/subscription-status' (#4) from fix/subscription-status into master

Reviewed-on: http://gitea.lan:3000/robbond/pleskSaas/pulls/4

components/dashboard/dashboard-controls.tsx

@@ -52,19 +52,13 @@ type Props = {
 function getDomainStatusBadge(status: string | null) {
   const normalized = (status ?? "unknown").toLowerCase();
 
-  if (
+  if (normalized.includes("suspend") || normalized.includes("disabled")) {
-    normalized.includes("active") ||
-    normalized.includes("ok") ||
-    normalized.includes("enabled")
-  ) {
-    return "bg-emerald-100 text-emerald-700";
-  }
-
-  if (normalized.includes("suspended") || normalized.includes("disabled")) {
     return "bg-rose-100 text-rose-700";
   }
 
-  if (normalized.includes("inactive")) return "bg-amber-100 text-amber-700";
+  if (normalized.includes("active") || normalized.includes("enabled")) {
+    return "bg-emerald-100 text-emerald-700";
+  }
 
   return "bg-slate-100 text-slate-600";
 }

lib/plesk/client.ts

@@ -9,6 +9,7 @@ export type PleskConnection = {
 };
 
 export type PleskSubscription = {
+  plesk_subscription_id?: string;
   id?: string | number;
   guid?: string;
   subscription_id?: string | number;
@@ -137,51 +138,50 @@ export async function testPleskConnection(connection: PleskConnection) {
 }
 
 export async function listPleskSubscriptions(connection: PleskConnection) {
-  try {
+  const listOutput = await pleskCliCall(connection, "subscription", ["--list"]);
-    const all: PleskSubscription[] = [];
 
-    for (let page = 1; page <= 20; page += 1) {
+  const subscriptionNames = listOutput
-      const payload = await pleskRequest<PleskSubscription[]>(
-        connection,
-        `/api/v2/subscriptions?page=${page}&per_page=100`,
-      );
-      const rows = Array.isArray(payload) ? payload : [];
-      all.push(...rows);
-      if (rows.length < 100) break;
-    }
-
-    return all;
-  } catch {
-    const cli = await pleskRequest<PleskCliResult>(
-      connection,
-      "/api/v2/cli/subscription/call",
-      {
-        method: "POST",
-        body: JSON.stringify({ params: ["--list"] }),
-      },
-    );
-
-    const stdout = cli?.stdout ?? "";
-    if (!stdout.trim()) {
-      return [];
-    }
-
-    return stdout
     .split(/\r?\n/)
     .map((line) => line.trim())
-      .filter(Boolean)
+    .filter(Boolean);
-      .map((line) => {
+
-        const columns = line.split(/\s+/);
+  const subscriptions: PleskSubscription[] = [];
-        const externalId = columns[0] ?? line;
+
-        return {
+  for (const subscriptionName of subscriptionNames) {
-          id: externalId,
+    let status = "unknown";
-          subscription_id: externalId,
+
-          external_id: externalId,
+    try {
-          name: columns.slice(1).join(" ") || externalId,
+      const infoOutput = await pleskCliCall(connection, "subscription", [
-          status: null,
+        "--info",
-        };
+        subscriptionName,
+      ]);
+      const normalizedInfo = infoOutput.toLowerCase();
+
+      const hasSuspendedMarker =
+        normalizedInfo.includes("suspended") ||
+        normalizedInfo.includes("webspace-off") ||
+        normalizedInfo.includes("disabled");
+
+      const hasActiveMarker =
+        normalizedInfo.includes("active") ||
+        normalizedInfo.includes("enabled") ||
+        normalizedInfo.includes("ok");
+
+      if (hasSuspendedMarker) status = "suspended";
+      else if (hasActiveMarker || !hasSuspendedMarker) status = "active";
+    } catch {
+      status = "unknown";
+    }
+
+    subscriptions.push({
+      plesk_subscription_id: subscriptionName,
+      subscription_id: subscriptionName,
+      name: subscriptionName,
+      status,
     });
   }
+
+  return subscriptions;
 }
 
 export async function pleskCliCall(
@@ -208,7 +208,7 @@ export async function pleskCliCall(
     );
   }
 
-  return { code, stdout, stderr };
+  return stdout;
 }
 
 export async function listPleskDomains(connection: PleskConnection) {

lib/plesk/sync.ts

@@ -82,13 +82,18 @@ export async function syncPleskInstance(
 
     const subscriptionsForUpsert = subscriptionsRaw
       .map((item: any) => {
-        const sourceId = item?.id ?? item?.guid ?? item?.subscription_id;
+        const sourceId =
+          item?.plesk_subscription_id ??
+          item?.name ??
+          item?.id ??
+          item?.guid ??
+          item?.subscription_id;
         if (!sourceId) return null;
         return {
           agency_id: instance.agency_id,
           plesk_instance_id: instance.id,
           plesk_subscription_id: String(sourceId),
-          name: item?.name ? String(item.name) : null,
+          name: item?.name ? String(item.name) : String(sourceId),
           status: item?.status ? String(item.status) : null,
           owner_login: item?.owner_login
             ? String(item.owner_login)

supabase/migrations/CL37_domain_status_backfill_from_subscription.sql

@@ -3,4 +3,9 @@ update public.plesk_domains d
 set status = s.status
 from public.plesk_subscriptions s
 where d.subscription_id = s.id
-  and d.agency_id = s.agency_id;
+  and d.agency_id = s.agency_id
+  and (d.status is null or d.status = 'unknown');
+
+update public.plesk_subscriptions
+set status = 'unknown'
+where status is null;