Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1d02666
feat(graphql): schema update for specifying settings when creating te…
golobitch Feb 25, 2025
5537c17
feat(tenant): add possibility to specify initial tenant settings as a…
golobitch Feb 25, 2025
dfb42e9
test(tenant): create with settings
golobitch Feb 25, 2025
ae1ab4b
feat(wallet-address): rename url to address
golobitch Mar 1, 2025
fba2634
fix(tenant-settings): duplicate key for tenant
golobitch Mar 1, 2025
7e5c363
feat(wallet-address): replace url field with address field
golobitch Mar 1, 2025
212ce26
chore(backend): format
golobitch Mar 1, 2025
1a88f2c
fix(tests): some of them
golobitch Mar 2, 2025
1f6c450
fix(frontend): due to wallet address url change
golobitch Mar 2, 2025
f86d832
fix(mase): due to wallet address url change
golobitch Mar 2, 2025
052af1c
fix(backend): tests due to wallet address url change
golobitch Mar 13, 2025
fef7f92
test(integration): fix tests and have default address for operator
golobitch Mar 21, 2025
455a9c3
fix(wallet-address): test for operator can perform cross tenant create@
golobitch Mar 22, 2025
09c0b1f
test(tenant-settings): remove pagination tests for tenant settings
golobitch Mar 22, 2025
194dbec
docs(bruno): rename of the walletaddress url variable
golobitch Mar 22, 2025
0d59233
test(wallet-address): create with tenant settings or not as an operat…
golobitch Mar 29, 2025
63453be
feat(wallet-address): put creation of it into new function
golobitch Mar 30, 2025
98c1ac5
chore(format): everything
golobitch Mar 30, 2025
493c5a2
feat(tenant-settings): add tests for upsert
golobitch Apr 2, 2025
67538ce
feat(tenant-settings): add more tests and remove pagination
golobitch Apr 3, 2025
cfdcfbe
Update packages/backend/src/open_payments/wallet_address/service.ts
golobitch Apr 5, 2025
7c6b938
Update packages/backend/src/graphql/resolvers/tenant_settings.ts
golobitch Apr 5, 2025
b19d84a
Update packages/backend/src/graphql/schema.graphql
golobitch Apr 5, 2025
98fa108
chore(graphql): generate schema
golobitch Apr 5, 2025
312c242
fix(tenant): mapping settings to tenant
golobitch Apr 5, 2025
0302d69
chore(graphql): generate schema
golobitch Apr 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ meta {
}

post {
url: {{RafikiGraphqlHost}}/graphql
address: {{RafikiGraphqlHost}}/graphql
body: graphql
auth: none
}
Expand All @@ -17,7 +17,7 @@ body:graphql {
id
createdAt
publicName
url
address
status
asset {
code
Expand Down
43 changes: 43 additions & 0 deletions bruno/collections/Rafiki/Rafiki Admin APIs/Get Tenant Settings.bru
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
meta {
name: Get Tenant Settings
type: graphql
seq: 60
}

post {
url: {{RafikiGraphqlHost}}/graphql
body: graphql
auth: none
}

headers {
tenant-id: 438fa74a-fa7d-4317-9ced-dde32ece1787
}

body:graphql {
mutation CreateTenantSettings($input: CreateTenantSettingsInput!) {
createTenantSettings(input:$input) {
settings {
key
value
}
}
}
}

body:graphql:vars {
{
"input": {
"settings": [
{ "key": "EXCHANGE_RATES_URL", "value": "https://example.com" }
]
}
}

}

script:pre-request {
const scripts = require('./scripts');

scripts.addApiSignatureHeader();
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body:graphql {
node {
id
publicName
url
address
walletAddressKeys {
edges {
cursor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body:graphql {
node {
id
publicName
url
address
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions localenv/mock-account-servicing-entity/app/lib/requesters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ export async function createWalletAddress(
createWalletAddress(input: $input) {
walletAddress {
id
url
address
publicName
}
}
}
`
const createWalletAddressInput: CreateWalletAddressInput = {
assetId,
url: accountUrl,
address: accountUrl,
publicName: accountName,
additionalProperties: []
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export async function createWallet({
await mockAccounts.setWalletAddress(
accountId,
walletAddress.id,
walletAddress.url
walletAddress.address
)

await createWalletAddressKey({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ export async function handleWalletAddressNotFound(wh: Webhook) {
await mockAccounts.setWalletAddress(
account.id,
walletAddress.id,
walletAddress.url
walletAddress.address
)
}

Expand Down
59 changes: 9 additions & 50 deletions localenv/mock-account-servicing-entity/generated/graphql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function (knex) {
return knex.schema.alterTable('walletAddresses', (table) => {
table.renameColumn('url', 'address')
})
}

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function (knex) {
return knex.schema.alterTable('walletAddresses', (table) => {
table.renameColumn('address', 'url')
})
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function (knex) {
return knex.schema.alterTable('tenantSettings', function (table) {
table.unique(['tenantId', 'key'])
})
}

/**
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function (knex) {
return knex.schema.alterTable('tenantSettings', function (table) {
table.dropUnique(['tenantId', 'key'])
})
}
18 changes: 16 additions & 2 deletions packages/backend/src/asset/service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import {
TenantSettingService
} from '../tenants/settings/service'
import { exchangeRatesSetting } from '../tests/tenantSettings'
import { createTenantSettings } from '../tests/tenantSettings'
import { TenantSettingKeys } from '../tenants/settings/model'

describe('Asset Service', (): void => {
let deps: IocContract<AppServices>
Expand Down Expand Up @@ -71,6 +73,18 @@ describe('Asset Service', (): void => {
await appContainer.shutdown()
})

beforeEach(async () => {
await createTenantSettings(deps, {
tenantId: Config.operatorTenantId,
setting: [
{
key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
value: 'https://alice.me'
}
]
})
})

describe('create', (): void => {
test.each`
withdrawalThreshold | liquidityThreshold
Expand Down Expand Up @@ -370,8 +384,8 @@ describe('Asset Service', (): void => {
const newAssetId = newAsset.id

// make sure there is at least 1 wallet address using asset
const walletAddress = walletAddressService.create({
url: 'https://alice.me/.well-known/pay',
const walletAddress = await walletAddressService.create({
address: 'https://alice.me/.well-known/pay',
tenantId: Config.operatorTenantId,
assetId: newAssetId
})
Expand Down
Loading
Loading