mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
correct store foreign user in case of different name or alias
This commit is contained in:
parent
a165b588af
commit
b9dc65f123
@ -476,7 +476,7 @@ export class TransactionResolver {
|
||||
amount,
|
||||
memo,
|
||||
senderUser,
|
||||
pendingResult.recipGradidoID,
|
||||
pendingResult,
|
||||
)
|
||||
logger.debug('processXComCommittingSendCoins result: ', committingResult)
|
||||
if (!committingResult.vote) {
|
||||
|
||||
@ -159,7 +159,7 @@ export async function processXComCommittingSendCoins(
|
||||
amount: Decimal,
|
||||
memo: string,
|
||||
sender: dbUser,
|
||||
recipUuid: string,
|
||||
recipient: SendCoinsResult,
|
||||
): Promise<SendCoinsResult> {
|
||||
const sendCoinsResult = new SendCoinsResult()
|
||||
try {
|
||||
@ -171,7 +171,7 @@ export async function processXComCommittingSendCoins(
|
||||
amount,
|
||||
memo,
|
||||
sender,
|
||||
recipUuid,
|
||||
recipient,
|
||||
)
|
||||
// first find pending Tx with given parameters
|
||||
const pendingTx = await DbPendingTransaction.findOneBy({
|
||||
@ -180,7 +180,7 @@ export async function processXComCommittingSendCoins(
|
||||
userName: fullName(sender.firstName, sender.lastName),
|
||||
linkedUserCommunityUuid:
|
||||
receiverCom.communityUuid ?? CONFIG.FEDERATION_XCOM_RECEIVER_COMMUNITY_UUID,
|
||||
linkedUserGradidoID: recipUuid,
|
||||
linkedUserGradidoID: recipient.recipGradidoID ? recipient.recipGradidoID : undefined,
|
||||
typeId: TransactionTypeId.SEND,
|
||||
state: PendingTransactionState.NEW,
|
||||
balanceDate: creationDate,
|
||||
@ -237,6 +237,7 @@ export async function processXComCommittingSendCoins(
|
||||
)
|
||||
}
|
||||
sendCoinsResult.recipGradidoID = pendingTx.linkedUserGradidoID
|
||||
sendCoinsResult.recipAlias = recipient.recipAlias
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error(`Error in writing sender pending transaction: `, err)
|
||||
|
||||
@ -50,7 +50,18 @@ export async function storeForeignUser(
|
||||
user,
|
||||
committingResult,
|
||||
)
|
||||
return false
|
||||
if (committingResult.recipFirstName !== null) {
|
||||
user.firstName = committingResult.recipFirstName
|
||||
}
|
||||
if (committingResult.recipLastName !== null) {
|
||||
user.lastName = committingResult.recipLastName
|
||||
}
|
||||
if (committingResult.recipAlias !== null) {
|
||||
user.alias = committingResult.recipAlias
|
||||
}
|
||||
await DbUser.save(user)
|
||||
logger.debug('update recipient successful.', user)
|
||||
return true
|
||||
} else {
|
||||
logger.debug('X-Com: foreignUser still exists...:', user)
|
||||
return true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user