Merge branch 'listen-payment-webhooks' into develop

bigcapitalhq · Aug 24, 2024 · 959ef7a · 959ef7a
2 parents e44ebb7 + 60f03f5
commit 959ef7a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/server/src/services/Subscription/LemonCancelSubscription.ts b/packages/server/src/services/Subscription/LemonCancelSubscription.ts
@@ -4,8 +4,8 @@ import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { ERRORS, IOrganizationSubscriptionCancel } from './types';
 import events from '@/subscribers/events';
-import { ERRORS, IOrganizationSubscriptionCancelled } from './types';
 
 @Service()
 export class LemonCancelSubscription {
@@ -41,7 +41,7 @@ export class LemonCancelSubscription {
     // Triggers `onSubscriptionCancelled` event.
     await this.eventPublisher.emitAsync(
       events.subscription.onSubscriptionCancel,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionCancelled
+      { tenantId, subscriptionId } as IOrganizationSubscriptionCancel
     );
   }
 }
diff --git a/packages/server/src/services/Subscription/LemonResumeSubscription.ts b/packages/server/src/services/Subscription/LemonResumeSubscription.ts
@@ -1,11 +1,11 @@
 import { Inject, Service } from 'typedi';
+import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
-import { ERRORS, IOrganizationSubscriptionResumed } from './types';
-import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
+import { ERRORS, IOrganizationSubscriptionResume } from './types';
 
 @Service()
 export class LemonResumeSubscription {
@@ -39,7 +39,7 @@ export class LemonResumeSubscription {
     // Triggers `onSubscriptionResume` event.
     await this.eventPublisher.emitAsync(
       events.subscription.onSubscriptionResume,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionResumed
+      { tenantId, subscriptionId } as IOrganizationSubscriptionResume
     );
   }
 }
diff --git a/packages/server/src/services/Subscription/types.ts b/packages/server/src/services/Subscription/types.ts
@@ -4,7 +4,7 @@ export const ERRORS = {
   SUBSCRIPTION_NOT_EXIST: 'SUBSCRIPTION_NOT_EXIST',
   SUBSCRIPTION_ALREADY_CANCELED: 'SUBSCRIPTION_ALREADY_CANCELED',
   SUBSCRIPTION_ALREADY_ACTIVE: 'SUBSCRIPTION_ALREADY_ACTIVE',
-  SOMETHING_WENT_WRONG_WITH_LS: 'SOMETHING_WENT_WRONG_WITH_LS'
+  SOMETHING_WENT_WRONG_WITH_LS: 'SOMETHING_WENT_WRONG_WITH_LS',
 };
 
 export interface IOrganizationSubscriptionChanged {
@@ -13,11 +13,20 @@ export interface IOrganizationSubscriptionChanged {
   newVariantId: number;
 }
 
+export interface IOrganizationSubscriptionCancel {
+  tenantId: number;
+  subscriptionId: string;
+}
+
 export interface IOrganizationSubscriptionCancelled {
   tenantId: number;
   subscriptionId: string;
 }
 
+export interface IOrganizationSubscriptionResume {
+  tenantId: number;
+  subscriptionId: number;
+}
 export interface IOrganizationSubscriptionResumed {
   tenantId: number;
   subscriptionId: number;