Skip to content

Commit dc055bc

Browse files
committed
improvement(outbox): source enterprise and document-processing event types from dependency-free modules
1 parent 725a3b3 commit dc055bc

19 files changed

Lines changed: 45 additions & 46 deletions

‎apps/sim/app/api/v1/admin/outbox/[id]/requeue/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { and, eq, sql } from 'drizzle-orm'
66
import { NextResponse } from 'next/server'
77
import { adminV1RequeueOutboxEventContract } from '@/lib/api/contracts/v1/admin'
88
import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
9+
import { enterpriseMetadataSyncPayloadSchema } from '@/lib/billing/enterprise-outbox'
910
import {
1011
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
1112
ENTERPRISE_PROVISION_EVENT_TYPE,
12-
enterpriseMetadataSyncPayloadSchema,
13-
} from '@/lib/billing/enterprise-outbox'
13+
} from '@/lib/billing/enterprise-outbox-events'
1414
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
1515
import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
1616

‎apps/sim/lib/admin/dashboard-credit-grant.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ vi.mock('@/lib/billing/enterprise-provisioning', () => ({
5050
getLatestEnterpriseProvisionings: vi.fn(async () => new Map()),
5151
}))
5252
vi.mock('@/lib/billing/enterprise-outbox', () => ({
53-
ENTERPRISE_METADATA_SYNC_EVENT_TYPE: 'stripe.sync-enterprise-metadata',
5453
resolveEnterpriseMetadataIntent: vi.fn(),
5554
}))
5655
vi.mock('@/lib/core/outbox/service', () => outboxServiceMock)

‎apps/sim/lib/admin/dashboard-organizations.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ vi.mock('@/lib/billing/enterprise-provisioning', () => ({
4848
getLatestEnterpriseProvisionings: vi.fn(async () => hoistedMocks.provisionings),
4949
}))
5050
vi.mock('@/lib/billing/enterprise-outbox', () => ({
51-
ENTERPRISE_METADATA_SYNC_EVENT_TYPE: 'stripe.sync-enterprise-metadata',
5251
enterpriseMetadataSyncPayloadSchema: { safeParse: vi.fn() },
5352
resolveEnterpriseMetadataIntent: hoistedMocks.resolveMetadataIntent,
5453
}))

‎apps/sim/lib/admin/dashboard.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ import {
4444
} from '@/lib/billing/core/reporting-period'
4545
import { creditsToDollars, dollarsToCredits } from '@/lib/billing/credits/conversion'
4646
import {
47-
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
4847
enterpriseMetadataSyncPayloadSchema,
4948
resolveEnterpriseMetadataIntent,
5049
} from '@/lib/billing/enterprise-outbox'
50+
import { ENTERPRISE_METADATA_SYNC_EVENT_TYPE } from '@/lib/billing/enterprise-outbox-events'
5151
import {
5252
type EnterpriseProvisioningView,
5353
getLatestEnterpriseProvisionings,

‎apps/sim/lib/admin/invitation-operation.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ import { normalizeEmail } from '@sim/utils/string'
55
import { and, count, eq, inArray, sql } from 'drizzle-orm'
66
import { z } from 'zod'
77
import { ADMIN_INVITATION_OPERATION_EVENT_TYPE } from '@/lib/admin/invitation-operation-event'
8-
import {
9-
ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE,
10-
enterpriseInvitePeoplePayloadSchema,
11-
} from '@/lib/billing/enterprise-outbox'
8+
import { enterpriseInvitePeoplePayloadSchema } from '@/lib/billing/enterprise-outbox'
9+
import { ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE } from '@/lib/billing/enterprise-outbox-events'
1210
import { acquireOrganizationMutationLock } from '@/lib/billing/organizations/membership'
1311
import {
1412
deferOutboxHandler,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export const ENTERPRISE_PROVISION_EVENT_TYPE = 'stripe.provision-enterprise'
2+
export const ENTERPRISE_METADATA_SYNC_EVENT_TYPE = 'stripe.sync-enterprise-metadata'
3+
export const ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE = 'enterprise.move-workspace'
4+
export const ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE = 'enterprise.reconcile-members'
5+
export const ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE = 'enterprise.invite-people'

‎apps/sim/lib/billing/enterprise-outbox.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ import { and, desc, eq, sql } from 'drizzle-orm'
44
import type Stripe from 'stripe'
55
import { z } from 'zod'
66
import { MAX_BILLING_CONCURRENCY_LIMIT } from '@/lib/billing/concurrency-defaults'
7+
import {
8+
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
9+
ENTERPRISE_PROVISION_EVENT_TYPE,
10+
} from '@/lib/billing/enterprise-outbox-events'
711
import { MAX_WORKFLOW_EXECUTION_TIMEOUT_SECONDS } from '@/lib/billing/execution-timeout-defaults'
812
import type { DbOrTx } from '@/lib/db/types'
913
import { MAX_INVITE_EMAILS } from '@/lib/invitations/limits'
1014

11-
export const ENTERPRISE_PROVISION_EVENT_TYPE = 'stripe.provision-enterprise'
12-
export const ENTERPRISE_METADATA_SYNC_EVENT_TYPE = 'stripe.sync-enterprise-metadata'
13-
export const ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE = 'enterprise.move-workspace'
14-
export const ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE = 'enterprise.reconcile-members'
15-
export const ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE = 'enterprise.invite-people'
16-
1715
const nonnegativeInteger = z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER)
1816

1917
export const enterpriseProvisionRequestSchema = z.object({

‎apps/sim/lib/billing/enterprise-provisioning.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ import {
4242
import { creditsToDollars, dollarsToCredits } from '@/lib/billing/credits/conversion'
4343
import {
4444
deriveEnterpriseOperationStatus,
45-
ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE,
46-
ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE,
47-
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
48-
ENTERPRISE_PROVISION_EVENT_TYPE,
49-
ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE,
5045
type EnterpriseInvitePeoplePayload,
5146
type EnterpriseMetadataSyncPayload,
5247
type EnterpriseOperationStatus,
@@ -61,6 +56,13 @@ import {
6156
enterpriseWorkspaceMovePayloadSchema,
6257
parseEnterpriseProvisionPayload,
6358
} from '@/lib/billing/enterprise-outbox'
59+
import {
60+
ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE,
61+
ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE,
62+
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
63+
ENTERPRISE_PROVISION_EVENT_TYPE,
64+
ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE,
65+
} from '@/lib/billing/enterprise-outbox-events'
6466
import {
6567
parseWorkflowExecutionTimeoutSeconds,
6668
resolveEnterpriseWorkflowExecutionTimeoutFallbackSeconds,
@@ -3211,5 +3213,3 @@ export async function getLatestEnterpriseProvisionings(
32113213
}
32123214
return result
32133215
}
3214-
3215-
export { ENTERPRISE_METADATA_SYNC_EVENT_TYPE, ENTERPRISE_PROVISION_EVENT_TYPE }

‎apps/sim/lib/billing/webhooks/enterprise.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ import {
1414
} from '@/lib/auth/security-policy'
1515
import { deriveEnterpriseCreditLimits } from '@/lib/billing/enterprise-credit-limits'
1616
import {
17-
ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE,
18-
ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE,
19-
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
20-
ENTERPRISE_PROVISION_EVENT_TYPE,
21-
ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE,
2217
type EnterpriseProvisionPayload,
2318
enterpriseMetadataDeliveryIsVerified,
2419
enterpriseMetadataIntentMatchesStripeSubscription,
2520
enterpriseMetadataSyncPayloadSchema,
2621
enterpriseOperationMatchesStripeSubscription,
2722
parseEnterpriseProvisionPayload,
2823
} from '@/lib/billing/enterprise-outbox'
24+
import {
25+
ENTERPRISE_INVITE_PEOPLE_EVENT_TYPE,
26+
ENTERPRISE_MEMBER_RECONCILIATION_EVENT_TYPE,
27+
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
28+
ENTERPRISE_PROVISION_EVENT_TYPE,
29+
ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE,
30+
} from '@/lib/billing/enterprise-outbox-events'
2931
import { getEnterpriseIssuanceSeatRequirement } from '@/lib/billing/enterprise-provisioning'
3032
import { acquireOrganizationMutationLock } from '@/lib/billing/organizations/membership'
3133
import { requireStripeClient } from '@/lib/billing/stripe-client'

‎apps/sim/lib/core/outbox/handlers.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
ENTERPRISE_METADATA_SYNC_EVENT_TYPE,
77
ENTERPRISE_PROVISION_EVENT_TYPE,
88
ENTERPRISE_WORKSPACE_MOVE_EVENT_TYPE,
9-
} from '@/lib/billing/enterprise-outbox'
9+
} from '@/lib/billing/enterprise-outbox-events'
1010
import {
1111
ENTERPRISE_OWNER_ACTIVATION_EVENT_TYPE,
1212
ENTERPRISE_OWNER_CLAIM_EVENT_TYPE,
@@ -28,7 +28,7 @@ import { KNOWLEDGE_DOCUMENT_CONTINUATION_OUTBOX_EVENT } from '@/lib/knowledge/do
2828
import {
2929
KNOWLEDGE_DOCUMENT_DEFERRED_RETRY_CHECK_EVENT,
3030
KNOWLEDGE_DOCUMENT_PROCESSING_OUTBOX_EVENT,
31-
} from '@/lib/knowledge/documents/processing-outbox-event'
31+
} from '@/lib/knowledge/documents/processing-events'
3232
import { KNOWLEDGE_DOCUMENT_RECOVERY_OUTBOX_EVENT } from '@/lib/knowledge/documents/processing-recovery-event'
3333
import { KNOWLEDGE_STORAGE_CLEANUP_EVENT } from '@/lib/knowledge/documents/storage-cleanup-event'
3434
import { INBOX_CLEANUP_EVENT } from '@/lib/mothership/inbox/cleanup-event'

0 commit comments

Comments
 (0)