From f844e08c8d218b12e36ccc6910d59f0c4b4f4adb Mon Sep 17 00:00:00 2001 From: clauspeterhuebner Date: Wed, 27 Aug 2025 16:40:52 +0200 Subject: [PATCH] add invokation of processXComCompleteTransaction in Disbursement-Process --- .../client/1_0/DisbursementClient.ts | 8 +++---- .../src/graphql/logic/processXComSendCoins.ts | 2 +- .../api/1_0/resolver/DisbursementResolver.ts | 21 +++++++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/backend/src/federation/client/1_0/DisbursementClient.ts b/backend/src/federation/client/1_0/DisbursementClient.ts index abaf1818b..8ca859070 100644 --- a/backend/src/federation/client/1_0/DisbursementClient.ts +++ b/backend/src/federation/client/1_0/DisbursementClient.ts @@ -31,10 +31,10 @@ export class DisbursementClient { logger.debug('sendDisburseJwtToSenderCommunity against endpoint=', this.endpoint) try { const { data } = await this.client.rawRequest<{ processDisburseJwtOnSenderCommunity: string }>(processDisburseJwtOnSenderCommunityQuery, { args }) - const responseJwt = data?.processDisburseJwtOnSenderCommunity - if (responseJwt) { - logger.debug('received response jwt', responseJwt) - return responseJwt + const response = data?.processDisburseJwtOnSenderCommunity + if (response) { + logger.debug('received response:', response) + return response } } catch (err) { const errmsg = `sendDisburseJwtToSenderCommunity failed for endpoint=${this.endpoint}, err=${err}` diff --git a/core/src/graphql/logic/processXComSendCoins.ts b/core/src/graphql/logic/processXComSendCoins.ts index 19c75898f..dc8e3127f 100644 --- a/core/src/graphql/logic/processXComSendCoins.ts +++ b/core/src/graphql/logic/processXComSendCoins.ts @@ -42,9 +42,9 @@ export async function processXComCompleteTransaction( amount: string, memo: string, code?: string, - creationDate?: Date, recipientfirstname?: string, recipientalias?: string, + creationDate?: Date, ): Promise { const methodLogger = createLogger(`processXComCompleteTransaction`) // processing a x-community sendCoins diff --git a/federation/src/graphql/api/1_0/resolver/DisbursementResolver.ts b/federation/src/graphql/api/1_0/resolver/DisbursementResolver.ts index 629da9e54..2388aaec0 100644 --- a/federation/src/graphql/api/1_0/resolver/DisbursementResolver.ts +++ b/federation/src/graphql/api/1_0/resolver/DisbursementResolver.ts @@ -5,6 +5,7 @@ import { LOG4JS_BASE_CATEGORY_NAME } from "@/config/const" import { interpretEncryptedTransferArgs } from "core" import { EncryptedTransferArgs } from "core" import { DisburseJwtPayloadType } from "shared" +import { processXComCompleteTransaction } from "core" const createLogger = (method: string) => getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.graphql.api.1_0.resolver.DisbursementResolver.${method}`) @@ -29,5 +30,25 @@ export class DisbursementResolver { if(methodLogger.isDebugEnabled()) { methodLogger.debug(`processDisburseJwtOnSenderCommunity() via apiVersion=1_0 ...`, authArgs) } + let result = 'Disbursement of Redeem-Link failed!' + try { + if(await processXComCompleteTransaction( + authArgs.sendercommunityuuid, + authArgs.sendergradidoid, + authArgs.recipientcommunityuuid, + authArgs.recipientgradidoid, + authArgs.amount, + authArgs.memo, + authArgs.code, + authArgs.recipientfirstname, + authArgs.recipientalias, + )) { + result = 'Disbursement of Redeem-Link successfull!' + } + } catch (err) { + result = `Error in Disbursement of Redeem-Link: ` + err + methodLogger.error(result) + } + return result } } \ No newline at end of file