feat: tenanted quotes - first iteration with dummy tenant

interledger · Dec 10, 2024 · 8ef2027 · 8ef2027
1 parent ea7e660
commit 8ef2027
Show file tree

Hide file tree

Showing 45 changed files with 497 additions and 76 deletions.
diff --git a/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru b/bruno/collections/Rafiki/Examples/Open Payments/Create Quote.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/quotes
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes
   body: json
   auth: none
 }
@@ -17,7 +17,7 @@ headers {
 body:json {
   {
       "walletAddress": "{{senderWalletAddress}}",
-      "receiver": "{{receiverOpenPaymentsHost}}/incoming-payments/{{incomingPaymentId}}",
+      "receiver": "{{receiverOpenPaymentsHost}}/{{receiverTenantId}}/incoming-payments/{{incomingPaymentId}}",
       "method": "ilp"
   }
 }

diff --git a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Create Quote.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: {{senderOpenPaymentsHost}}/quotes
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes
   body: json
   auth: none
 }

diff --git a/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru b/bruno/collections/Rafiki/Open Payments APIs/Quotes/Get Quote.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 get {
-  url: {{senderOpenPaymentsHost}}/quotes/{{quoteId}}
+  url: {{senderOpenPaymentsHost}}/{{senderTenantId}}/quotes/{{quoteId}}
   body: none
   auth: none
 }

diff --git a/localenv/mock-account-servicing-entity/generated/graphql.ts b/localenv/mock-account-servicing-entity/generated/graphql.ts
diff --git a/packages/backend/migrations/20241203140018_seed_tenant_operator.js b/packages/backend/migrations/20241203140018_seed_tenant_operator.js
@@ -0,0 +1,22 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex('tenants').insert({
+    id: '8e1db008-ab2f-4f1d-8c44-593354084100',
+    email: 'admin@example.com',
+    publicName: 'Super tenant',
+    apiSecret: 'secret'
+  })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex('tenants')
+    .where('id', '8e1db008-ab2f-4f1d-8c44-593354084100')
+    .del()
+}
diff --git a/packages/backend/migrations/20241208214023_add_tenant_id_to_quote.js b/packages/backend/migrations/20241208214023_add_tenant_id_to_quote.js
@@ -0,0 +1,22 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.alterTable('quotes', function (table) {
+    // TODO update default value
+    table.uuid('tenantId').notNullable()
+    table.foreign('tenantId').references('tenants.id').onDelete('CASCADE')
+  })
+}
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('quotes', function (table) {
+    table.dropForeign('tenantId')
+    table.dropColumn('tenantId')
+  })
+}
diff --git a/packages/backend/src/graphql/generated/graphql.schema.json b/packages/backend/src/graphql/generated/graphql.schema.json
diff --git a/packages/backend/src/graphql/generated/graphql.ts b/packages/backend/src/graphql/generated/graphql.ts
diff --git a/packages/backend/src/graphql/resolvers/combined_payments.test.ts b/packages/backend/src/graphql/resolvers/combined_payments.test.ts
@@ -23,6 +23,7 @@ describe('Payment', (): void => {
   let deps: IocContract<AppServices>
   let appContainer: TestContainer
   let asset: Asset
+  let tenantId: string
 
   beforeAll(async (): Promise<void> => {
     deps = initIocContainer(Config)
@@ -31,6 +32,7 @@ describe('Payment', (): void => {
 
   beforeEach(async (): Promise<void> => {
     asset = await createAsset(deps)
+    tenantId = '8e1db008-ab2f-4f1d-8c44-593354084100'
   })
 
   afterEach(async (): Promise<void> => {
@@ -55,6 +57,7 @@ describe('Payment', (): void => {
 
     const client = 'client-test'
     const outgoingPayment = await createOutgoingPayment(deps, {
+      tenantId,
       walletAddressId: outWalletAddressId,
       client: client,
       method: 'ilp',
@@ -161,6 +164,7 @@ describe('Payment', (): void => {
 
     const client = 'client-test-type-wallet-address'
     const outgoingPayment = await createOutgoingPayment(deps, {
+      tenantId,
       walletAddressId: outWalletAddressId,
       client: client,
       method: 'ilp',
@@ -171,6 +175,7 @@ describe('Payment', (): void => {
       assetId: asset.id
     })
     await createOutgoingPayment(deps, {
+      tenantId,
       walletAddressId: outWalletAddressId2,
       client: client,
       method: 'ilp',

diff --git a/packages/backend/src/graphql/resolvers/liquidity.test.ts b/packages/backend/src/graphql/resolvers/liquidity.test.ts
@@ -1742,11 +1742,13 @@ describe('Liquidity Resolvers', (): void => {
   )
 
   describe('Event Liquidity', (): void => {
+    let tenantId: string
     let walletAddress: WalletAddress
     let incomingPayment: IncomingPayment
     let payment: OutgoingPayment
 
     beforeEach(async (): Promise<void> => {
+      tenantId = '8e1db008-ab2f-4f1d-8c44-593354084100'
       walletAddress = await createWalletAddress(deps)
       const walletAddressId = walletAddress.id
       incomingPayment = await createIncomingPayment(deps, {
@@ -1759,6 +1761,7 @@ describe('Liquidity Resolvers', (): void => {
         expiresAt: new Date(Date.now() + 60 * 1000)
       })
       payment = await createOutgoingPayment(deps, {
+        tenantId,
         walletAddressId,
         method: 'ilp',
         receiver: `${Config.openPaymentsUrl}/incoming-payments/${uuid()}`,
@@ -2152,11 +2155,13 @@ describe('Liquidity Resolvers', (): void => {
   })
 
   describe('Payment Liquidity', (): void => {
+    let tenantId: string
     let walletAddress: WalletAddress
     let incomingPayment: IncomingPayment
     let outgoingPayment: OutgoingPayment
 
     beforeEach(async (): Promise<void> => {
+      tenantId = '8e1db008-ab2f-4f1d-8c44-593354084100'
       walletAddress = await createWalletAddress(deps)
       const walletAddressId = walletAddress.id
       incomingPayment = await createIncomingPayment(deps, {
@@ -2169,6 +2174,7 @@ describe('Liquidity Resolvers', (): void => {
         expiresAt: new Date(Date.now() + 60 * 1000)
       })
       outgoingPayment = await createOutgoingPayment(deps, {
+        tenantId,
         walletAddressId,
         method: 'ilp',
         receiver: `${