open-condo-software
diff --git a/‎.github/workflows/deploy_development.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/deploy_development.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/deploy_production.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/deploy_production.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/deploy_review.yaml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/deploy_review.yaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.gitmodules‎
Lines changed: 1 addition & 1 deletion b/‎.gitmodules‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.helm‎ b/‎.helm‎
diff --git a/‎apps/b2b-payments-gateway‎ b/‎apps/b2b-payments-gateway‎
diff --git a/‎apps/callcenter‎ b/‎apps/callcenter‎
diff --git a/‎apps/condo/bin/create-subscription-payment-recipient.js‎
Lines changed: 159 additions & 0 deletions b/‎apps/condo/bin/create-subscription-payment-recipient.js‎
Lines changed: 159 additions & 0 deletions
diff --git a/‎apps/condo/bin/prepare.js‎
Lines changed: 16 additions & 1 deletion b/‎apps/condo/bin/prepare.js‎
Lines changed: 16 additions & 1 deletion
diff --git a/‎apps/condo/domains/acquiring/schema/RegisterMultiPaymentService.js‎
Lines changed: 5 additions & 3 deletions b/‎apps/condo/domains/acquiring/schema/RegisterMultiPaymentService.js‎
Lines changed: 5 additions & 3 deletions
@@ -75,6 +75,7 @@ jobs:
           WERF_SET_CI_POS_INTEGRATION_URL: "global.ci_pos_integration_url=pos-integration.d.doma.ai"
           WERF_SET_CI_ACCRUALS_GATEWAY_URL: "global.ci_accruals_gateway_url=accruals-gateway.d.doma.ai"
           WERF_SET_CI_PROPERTY_AI_ASSISTANT_URL: "global.ci_property_ai_assistant_url=property-ai-assistant.d.doma.ai"
+          WERF_SET_CI_B2B_PAYMENTS_GATEWAY_URL: "global.ci_b2b_payments_gateway_url=b2b-payments-gateway.d.doma.ai"
           WERF_SET_CI_NAMESPACE: "global.ci_namespace=development"
           WERF_NAMESPACE: "development"
           WERF_VIRTUAL_MERGE_FROM_COMMIT: "true"
 
@@ -82,6 +82,7 @@ jobs:
           WERF_SET_CI_POS_INTEGRATION_URL: "global.ci_pos_integration_url=pos-integration.doma.ai"
           WERF_SET_CI_ACCRUALS_GATEWAY_URL: "global.ci_accruals_gateway_url=accruals-gateway.doma.ai"
           WERF_SET_CI_PROPERTY_AI_ASSISTANT_URL: "global.ci_property_ai_assistant_url=property-ai-assistant.doma.ai"
+          WERF_SET_CI_B2B_PAYMENTS_GATEWAY_URL: "global.ci_b2b_payments_gateway_url=b2b-payments-gateway.doma.ai"
           WERF_SET_CI_NAMESPACE: "global.ci_namespace=production"
           WERF_NAMESPACE: "production"
           WERF_VIRTUAL_MERGE_FROM_COMMIT: "true"
 
@@ -74,6 +74,7 @@ jobs:
           WERF_SET_CI_METER_IMPORTER_URL: "global.ci_meter_importer_url=meter-importer.r.doma.ai"
           WERF_SET_CI_BILLING_CONNECTOR_URL: "global.ci_billing_connector_url=review-${{ env.REVIEW_URL_PREFIX }}-billing-connector.r.doma.ai"
           WERF_SET_CI_POS_INTEGRATION_URL: "global.ci_pos_integration_url=review-${{ env.REVIEW_URL_PREFIX }}-pos-integration.r.doma.ai"
+          WERF_SET_CI_B2B_PAYMENTS_GATEWAY_URL: "global.ci_b2b_payments_gateway_url=review-${{ env.REVIEW_URL_PREFIX }}-b2b-payments-gateway.r.doma.ai"
           WERF_SET_CI_NAMESPACE: "global.ci_namespace=${{ env.REVIEW_NAMESPACE }}"
           WERF_SET_CI_URL_PREFIX: "global.ci_url_prefix=${{ env.REVIEW_URL_PREFIX }}"
           WERF_NAMESPACE: ${{ env.REVIEW_NAMESPACE }}
 
@@ -78,4 +78,4 @@
 	url = [email protected]:open-condo-software/condo-accruals-gateway.git
 [submodule "apps/b2b-payments-gateway"]
 	path = apps/b2b-payments-gateway
-	url = [email protected]:open-condo-software/condo-b2b-payments-gateway.git
+	url = [email protected]:open-condo-software/condo-b2b-payments-gateway.git
@@ -0,0 +1,159 @@
+const path = require('path')
+
+const conf = require('@open-condo/config')
+const { prepareKeystoneExpressApp } = require('@open-condo/keystone/prepareKeystoneApp')
+
+const { CONTEXT_FINISHED_STATUS } = require('@condo/domains/acquiring/constants/context')
+const { AcquiringIntegration, AcquiringIntegrationContext } = require('@condo/domains/acquiring/utils/serverSchema')
+const { DEFAULT_BILLING_INTEGRATION_GROUP } = require('@condo/domains/billing/constants')
+const { BillingIntegration } = require('@condo/domains/billing/utils/serverSchema')
+const { createTestRecipient } = require('@condo/domains/billing/utils/testSchema')
+const { Organization } = require('@condo/domains/organization/utils/serverSchema')
+
+async function main (args) {
+    const [name] = args
+    if (!name) throw new Error('use: create-subscription-payment-recipient <name>')
+
+    const { keystone: context } = await prepareKeystoneExpressApp(path.resolve('./index.js'), { excludeApps: ['NextApp', 'AdminUIApp'] })
+
+    const dv = 1
+    const sender = { dv: 1, fingerprint: 'create-subscription-payment-recipient' }
+
+    const existingOrgId = conf.SUBSCRIPTION_PAYMENT_RECIPIENT
+    let organization
+
+    if (existingOrgId) {
+        console.info(`Checking existing organization ID from env: ${existingOrgId}`)
+        organization = await Organization.getOne(context, { id: existingOrgId, deletedAt: null })
+        
+        if (organization) {
+            console.info('Organization already exists!')
+        } else {
+            console.warn(`Organization with ID ${existingOrgId} not found, creating new one`)
+            organization = null
+        }
+    }
+
+    if (!organization) {
+        console.info(`Creating organization: ${name}`)
+        
+        try {
+            organization = await Organization.create(context, {
+                dv,
+                sender,
+                name,
+                country: 'ru',
+                type: 'MANAGING_COMPANY',
+                tin: '0000000000',
+                meta: { dv: 1 },
+            })
+            console.info('Organization created!')
+        } catch (e) {
+            console.error('Failed to create organization:', e)
+            if (e.errors) console.error('Errors:', JSON.stringify(e.errors))
+            throw e
+        }
+    }
+    
+    console.info(`ORGANIZATION ID: ${organization.id}`)
+
+    const existingBillingIntegrations = await BillingIntegration.getAll(context, {
+        group: DEFAULT_BILLING_INTEGRATION_GROUP,
+        deletedAt: null,
+    })
+
+    if (existingBillingIntegrations.length === 0) {
+        console.info('Creating BillingIntegration...')
+        try {
+            await BillingIntegration.create(context, {
+                dv,
+                sender,
+                name: 'Test Billing Integration',
+                group: DEFAULT_BILLING_INTEGRATION_GROUP,
+                targetDescription: 'Test billing integration for subscription payments',
+                bannerColor: '#4CD174',
+                bannerTextColor: 'WHITE',
+                receiptsLoadingTime: 'Instant',
+                currencyCode: 'RUB',
+                instruction: 'This is a test billing integration for subscription payments. No setup required.',
+                isHidden: true,
+                shortDescription: 'Test billing integration for internal subscription payments',
+                detailedDescription: 'This integration is used internally for processing subscription payments. It does not require any external setup or configuration.',
+            })
+            console.info('BillingIntegration created!')
+        } catch (e) {
+            console.error('Failed to create BillingIntegration:', e)
+            if (e.errors) console.error('Errors:', JSON.stringify(e.errors))
+            if (e.extensions) console.error('Extensions:', JSON.stringify(e.extensions))
+            throw e
+        }
+    } else {
+        console.info('BillingIntegration already exists!')
+    }
+
+    const existingContext = await AcquiringIntegrationContext.getOne(context, {
+        organization: { id: organization.id },
+        deletedAt: null,
+    })
+
+    let integration
+    if (existingContext) {
+        console.info('AcquiringIntegrationContext already exists!')
+        integration = await AcquiringIntegration.getOne(context, { id: existingContext.integration })
+        console.info(`ACQUIRING INTEGRATION ID: ${integration.id}`)
+    } else {
+        console.info('Creating AcquiringIntegration...')
+        try {
+            integration = await AcquiringIntegration.create(context, {
+                dv,
+                sender,
+                name: 'Test Acquiring Integration',
+                hostUrl: 'http://localhost:3000',
+                canGroupReceipts: true,
+                isHidden: true,
+                explicitFeeDistributionSchema: [{ recipient: 'acquiring', percent: '0.65', minAmount: '0', maxAmount: '0', category: '' }, { recipient: 'service', percent: '0.55', minAmount: '0', maxAmount: '0', category: '' }],
+                vatPercentOptions: '0,5,6,10,15,20',
+            })
+            console.info('AcquiringIntegration created!')
+        } catch (e) {
+            console.error('Failed to create AcquiringIntegration:', e)
+            if (e.errors) console.error('Errors:', JSON.stringify(e.errors))
+            if (e.extensions) console.error('Extensions:', JSON.stringify(e.extensions))
+            throw e
+        }
+        
+        console.info(`ACQUIRING INTEGRATION ID: ${integration.id}`)
+
+        console.info('Creating AcquiringIntegrationContext...')
+        try {
+            await AcquiringIntegrationContext.create(context, {
+                dv,
+                sender,
+                organization: { connect: { id: organization.id } },
+                integration: { connect: { id: integration.id } },
+                settings: { dv: 1 },
+                state: { dv: 1 },
+                invoiceStatus: CONTEXT_FINISHED_STATUS,
+                invoiceImplicitFeeDistributionSchema: [],
+                invoiceRecipient: createTestRecipient(),
+            })
+            console.info('AcquiringIntegrationContext created!')
+        } catch (e) {
+            console.error('Failed to create AcquiringIntegrationContext:', e)
+            if (e.errors) console.error('Errors:', JSON.stringify(e.errors))
+            if (e.extensions) console.error('Extensions:', JSON.stringify(e.extensions))
+            throw e
+        }
+    }
+
+    console.info(organization.id)
+    return organization.id
+}
+
+main(process.argv.slice(2)).then(
+    () => process.exit(),
+    (error) => {
+        console.error(error)
+        process.exit(1)
+    },
+)
@@ -1,4 +1,4 @@
-const { getAppServerUrl, updateAppEnvFile, prepareAppEnvLocalAdminUsers } = require('@open-condo/cli')
+const { getAppServerUrl, updateAppEnvFile, prepareAppEnvLocalAdminUsers, safeExec, getAppEnvValue } = require('@open-condo/cli')
 
 async function updateAppEnvAddressSuggestionConfig (serviceName) {
     const addressServiceUrl = await getAppServerUrl('address-service')
@@ -19,12 +19,27 @@ async function updateAppEnvFileClients (appName) {
     await updateAppEnvFile(appName, 'FILE_SECRET', appName + '-secret')
 }
 
+async function prepareSubscriptionPaymentRecipient (appName) {
+    const existingOrgId = await getAppEnvValue(appName, 'SUBSCRIPTION_PAYMENT_RECIPIENT')
+    if (existingOrgId) {
+        console.log(`SUBSCRIPTION_PAYMENT_RECIPIENT already set: ${existingOrgId}`)
+        return existingOrgId
+    }
+
+    const { stdout } = await safeExec(`yarn workspace @app/${appName} node ./bin/create-subscription-payment-recipient.js "Subscription Payment Recipient"`)
+    const organizationId = stdout.trim().split('\n').pop()
+    await updateAppEnvFile(appName, 'SUBSCRIPTION_PAYMENT_RECIPIENT', organizationId)
+    console.log(`SUBSCRIPTION_PAYMENT_RECIPIENT=${organizationId}`)
+    return organizationId
+}
+
 async function main () {
     // 1) add local admin users!
     const appName = 'condo'
     await prepareAppEnvLocalAdminUsers(appName)
     await updateAppEnvAddressSuggestionConfig(appName)
     await updateAppEnvFileClients(appName)
+    await prepareSubscriptionPaymentRecipient(appName)
     console.log('done')
 }
 
 
@@ -652,7 +652,8 @@ const RegisterMultiPaymentService = new GQLCustomSchema('RegisterMultiPaymentSer
                         throw new GQLError(ERRORS.UNPUBLISHED_INVOICE, context)
                     }
                     // All invoices with client must be related to the current user
-                    if (foundInvoices.some(({ client }) => !!client && client !== context.authedItem.id)) {
+                    const authedItemId = context.authedItem?.id
+                    if (foundInvoices.some(({ client }) => !!client && client !== authedItemId)) {
                         throw new GQLError(ERRORS.INVOICES_FOR_THIRD_USER, context)
                     }
                     // All acquiring contexts must be finished
@@ -755,12 +756,13 @@ const RegisterMultiPaymentService = new GQLCustomSchema('RegisterMultiPaymentSer
                 const recurrentPaymentContextField = recurrentPaymentContext ? {
                     recurrentPaymentContext: { connect: { id: recurrentPaymentContext.id } },
                 } : {}
+                const authedItemId = context.authedItem?.id
                 const multiPayment = await MultiPayment.create(context, {
                     dv: 1,
                     sender,
                     ...Object.fromEntries(Object.entries(totalAmount).map(([key, value]) => ([key, value.toFixed(2)]))),
                     currencyCode,
-                    user: { connect: { id: context.authedItem.id } },
+                    ...isNil(authedItemId) ? {} : { user: { connect: { id: authedItemId } } },
                     integration: { connect: { id: acquiringIntegration.id } },
                     payments: { connect: paymentIds },
                     // TODO(DOMA-1574): add correct category
@@ -773,7 +775,7 @@ const RegisterMultiPaymentService = new GQLCustomSchema('RegisterMultiPaymentSer
                     webViewUrl: `${acquiringIntegration.hostUrl}${WEB_VIEW_PATH.replace('[id]', multiPayment.id)}`,
                     feeCalculationUrl: `${acquiringIntegration.hostUrl}${FEE_CALCULATION_PATH.replace('[id]', multiPayment.id)}`,
                     directPaymentUrl: `${acquiringIntegration.hostUrl}${DIRECT_PAYMENT_PATH.replace('[id]', multiPayment.id)}`,
-                    getCardTokensUrl: `${acquiringIntegration.hostUrl}${GET_CARD_TOKENS_PATH.replace('[id]', context.authedItem.id)}`,
+                    getCardTokensUrl: isNil(authedItemId) ? '' : `${acquiringIntegration.hostUrl}${GET_CARD_TOKENS_PATH.replace('[id]', authedItemId)}`,
                 }
             },
         },