rework PR comments

backend/src/graphql/resolver/AdminResolver.ts

@@ -41,7 +41,7 @@ import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
 import { communityUser } from '@/util/communityUser'
-import { activationLink, printTimeDuration } from './UserResolver'
+import { findUserByEmail, activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
 import CONFIG from '@/config'
@@ -403,6 +403,7 @@ export class AdminResolver {
       throw new Error('Contribution not found for given id.')
     }
     contribution.contributionStatus = ContributionStatus.DELETED
+    await contribution.save()
     const res = await contribution.softRemove()
     return !!res
   }
@@ -514,16 +515,21 @@ export class AdminResolver {
   @Mutation(() => Boolean)
   async sendActivationEmail(@Arg('email') email: string): Promise<boolean> {
     email = email.trim().toLowerCase()
-    const emailContact = await UserContact.findOne({ email: email })
-    if (!emailContact) {
-      logger.error(`Could not find UserContact with email: ${email}`)
-      throw new Error(`Could not find UserContact with email: ${email}`)
-    }
-    const user = await dbUser.findOne({ id: emailContact.userId })
+    // const user = await dbUser.findOne({ id: emailContact.userId })
+    const user = await findUserByEmail(email)
     if (!user) {
       logger.error(`Could not find User to emailContact: ${email}`)
       throw new Error(`Could not find User to emailContact: ${email}`)
     }
+    if (user.deletedAt) {
+      logger.error(`User with emailContact: ${email} is deleted.`)
+      throw new Error(`User with emailContact: ${email} is deleted.`)
+    }
+    const emailContact = user.emailContact
+    if (emailContact.deletedAt) {
+      logger.error(`The emailContact: ${email} of htis User is deleted.`)
+      throw new Error(`The emailContact: ${email} of htis User is deleted.`)
+    }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const emailSent = await sendAccountActivationEmail({

backend/src/graphql/resolver/TransactionLinkResolver.ts

@@ -283,7 +283,10 @@ export class TransactionLinkResolver {
       return true
     } else {
       const transactionLink = await dbTransactionLink.findOneOrFail({ code })
-      const linkedUser = await dbUser.findOneOrFail({ id: transactionLink.userId })
+      const linkedUser = await dbUser.findOneOrFail(
+        { id: transactionLink.userId },
+        { relations: ['user'] },
+      )
 
       if (user.id === linkedUser.id) {
         throw new Error('Cannot redeem own transaction link.')

backend/src/graphql/resolver/TransactionResolver.ts

@@ -36,6 +36,7 @@ import Decimal from 'decimal.js-light'
 import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
 import { UserContact } from '@entity/UserContact'
+import { findUserByEmail } from './UserResolver'
 
 export const executeTransaction = async (
   amount: Decimal,
@@ -294,13 +295,15 @@ export class TransactionResolver {
     }
 
     // validate recipient user
+    const recipientUser = await findUserByEmail(email)
+    /*
     const emailContact = await UserContact.findOne({ email }, { withDeleted: true })
     if (!emailContact) {
       logger.error(`Could not find UserContact with email: ${email}`)
       throw new Error(`Could not find UserContact with email: ${email}`)
     }
-
-    const recipientUser = await dbUser.findOne({ id: emailContact.userId })
+    */
+    // const recipientUser = await dbUser.findOne({ id: emailContact.userId })
     if (!recipientUser) {
       logger.error(`unknown recipient to UserContact: email=${email}`)
       throw new Error('unknown recipient')
@@ -309,6 +312,7 @@ export class TransactionResolver {
       logger.error(`The recipient account was deleted: recipientUser=${recipientUser}`)
       throw new Error('The recipient account was deleted')
     }
+    const emailContact = recipientUser.emailContact
     if (!emailContact.emailChecked) {
       logger.error(`The recipient account is not activated: recipientUser=${recipientUser}`)
       throw new Error('The recipient account is not activated')

backend/src/graphql/resolver/UserResolver.ts

@@ -873,7 +873,7 @@ export class UserResolver {
   }
 }
 
-async function findUserByEmail(email: string): Promise<DbUser> {
+export async function findUserByEmail(email: string): Promise<DbUser> {
   const dbUserContact = await DbUserContact.findOneOrFail(
     { email: email },
     { withDeleted: true, relations: ['user'] },

backend/src/seeds/factory/user.ts

@@ -40,7 +40,7 @@ export const userFactory = async (
   }
 
   // get last changes of user from database
-  dbUser = await User.findOneOrFail({ id }, { withDeleted: true })
+  // dbUser = await User.findOneOrFail({ id }, { withDeleted: true })
 
   return dbUser
 }