feat: consider subscription_status for sync validity and trial handli…

…ng (#14789) Co-authored-by: Joey Marshment-Howell <[email protected]> Co-authored-by: josephkmh <[email protected]>
airbytehq · Dec 17, 2024 · 235018e · 235018e
1 parent c8a0419
commit 235018e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/airbyte-api/problems-api/src/main/openapi/api-problems.yaml b/airbyte-api/problems-api/src/main/openapi/api-problems.yaml
@@ -732,7 +732,7 @@ components:
             title:
               type: string
               default: A subscription is required for this operation to succeed.
-    BillingInsufficientPaymentStatusProblemResponse:
+    BillingInvalidStatusProblemResponse:
       x-implements: io.airbyte.api.problems.ProblemResponse
       type: object
       allOf:
@@ -749,7 +749,7 @@ components:
               type: string
               default: The payment status of the associated Organization is insufficient.
             data:
-              $ref: "#/components/schemas/BillingInsufficientPaymentStatusProblemData"
+              $ref: "#/components/schemas/BillingInvalidStatusProblemData"
     BillingInsufficientCreditBalanceProblemResponse:
       x-implements: io.airbyte.api.problems.ProblemResponse
       type: object
@@ -991,18 +991,13 @@ components:
           type: integer
         message:
           type: string
-    BillingInsufficientPaymentStatusProblemData:
+    BillingInvalidStatusProblemData:
       type: object
-      required:
-        - requiredStatuses
-        - currentStatus
       properties:
-        validPaymentStatuses:
-          type: array
-          items:
-            $ref: "#/components/schemas/PaymentStatusEnum"
-        currentPaymentStatus:
+        invalidPaymentStatus:
           $ref: "#/components/schemas/PaymentStatusEnum"
+        invalidSubscriptionStatus:
+          $ref: "#/components/schemas/SubscriptionStatusEnum"
     PaymentStatusEnum:
       type: string
       enum:
@@ -1012,6 +1007,12 @@ components:
         - disabled
         - locked
         - manual
+    SubscriptionStatusEnum:
+      type: string
+      enum:
+        - pre_subscription
+        - subscribed
+        - unsubscribed
     BillingInsufficientCreditBalanceProblemData:
       type: object
       required:

diff --git a/...-commons-server/src/main/kotlin/io/airbyte/commons/server/services/OrganizationService.kt b/...-commons-server/src/main/kotlin/io/airbyte/commons/server/services/OrganizationService.kt
@@ -159,10 +159,8 @@ open class OrganizationServiceImpl(
         logger.info {
           "Organization $organizationId successfully updated from $currentSubscriptionStatus to ${orgPaymentConfig.subscriptionStatus}"
         }
-        // TODO uncomment this once subscription support is finalized - we do not want to shut down connections until
-        //  sync validation takes subscription status into account.
-        // disableAllConnections(organizationId, ConnectionAutoDisabledReason.UNSUBSCRIBED)
-        // logger.info { "Successfully disabled all syncs for unsubscribed organization $organizationId" }
+        disableAllConnections(organizationId, ConnectionAutoDisabledReason.UNSUBSCRIBED)
+        logger.info { "Successfully disabled all syncs for unsubscribed organization $organizationId" }
       }
     }
   }

diff --git a/...mons-server/src/test/kotlin/io/airbyte/commons/server/services/OrganizationServiceTest.kt b/...mons-server/src/test/kotlin/io/airbyte/commons/server/services/OrganizationServiceTest.kt
@@ -248,13 +248,12 @@ class OrganizationServiceTest {
       slotConfig.captured.subscriptionStatus shouldBe SubscriptionStatus.UNSUBSCRIBED
       verify { organizationPaymentConfigRepository.savePaymentConfig(orgPaymentConfig) }
 
-      // TODO uncomment this once connection disabling is enabled
-//      verify {
-//        connectionService.disableConnections(
-//          setOf(connectionId1, connectionId2),
-//          ConnectionAutoDisabledReason.UNSUBSCRIBED,
-//        )
-//      }
+      verify {
+        connectionService.disableConnections(
+          setOf(connectionId1, connectionId2),
+          ConnectionAutoDisabledReason.UNSUBSCRIBED,
+        )
+      }
     }
   }
 }