adapt seeding using User and UserContact

backend/src/graphql/model/UserContact.ts

@@ -1,5 +1,5 @@
 import { ObjectType, Field } from 'type-graphql'
-import { UserContact as dbUserContact} from '@entity/UserContact'
+import { UserContact as dbUserContact } from '@entity/UserContact'
 
 @ObjectType()
 export class UserContact {

backend/src/graphql/resolver/AdminResolver.ts

@@ -32,7 +32,6 @@ import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
 import { Contribution } from '@entity/Contribution'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
-import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User as dbUser } from '@entity/User'
 import { User } from '@model/User'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
@@ -44,7 +43,7 @@ import Paginated from '@arg/Paginated'
 import TransactionLinkFilters from '@arg/TransactionLinkFilters'
 import { Order } from '@enum/Order'
 import { communityUser } from '@/util/communityUser'
-import { checkEmailVerificationCode, activationLink, printTimeDuration } from './UserResolver'
+import { activationLink, printTimeDuration } from './UserResolver'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
 import CONFIG from '@/config'
@@ -247,6 +246,9 @@ export class AdminResolver {
     @Args() { email, amount, memo, creationDate }: AdminCreateContributionArgs,
     @Ctx() context: Context,
   ): Promise<Decimal[]> {
+    logger.info(
+      `adminCreateContribution(email=${email}, amount=${amount}, memo=${memo}, creationDate=${creationDate})`,
+    )
     const emailContact = await UserContact.findOne({ email }, { withDeleted: true })
     if (!emailContact) {
       logger.error(`Could not find user with email: ${email}`)
@@ -263,8 +265,9 @@ export class AdminResolver {
     const moderator = getUser(context)
     logger.trace('moderator: ', moderator.id)
     const creations = await getUserCreation(emailContact.userId)
-    logger.trace('creations', creations)
+    logger.trace('creations:', creations)
     const creationDateObj = new Date(creationDate)
+    logger.trace('creationDateObj:', creationDateObj)
     validateContribution(creations, amount, creationDateObj)
     const contribution = Contribution.create()
     contribution.userId = emailContact.userId

backend/src/graphql/resolver/UserResolver.ts

@@ -16,7 +16,6 @@ import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
 import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
 import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware'
 import { OptInType } from '@enum/OptInType'
-import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { sendResetPasswordEmail as sendResetPasswordEmailMailer } from '@/mailer/sendResetPasswordEmail'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { sendAccountMultiRegistrationEmail } from '@/mailer/sendAccountMultiRegistrationEmail'
@@ -148,6 +147,7 @@ const SecretKeyCryptographyCreateKey = (salt: string, password: string): Buffer[
   return [encryptionKeyHash, encryptionKey]
 }
 
+/*
 const getEmailHash = (email: string): Buffer => {
   logger.trace('getEmailHash...')
   const emailHash = Buffer.alloc(sodium.crypto_generichash_BYTES)
@@ -155,6 +155,7 @@ const getEmailHash = (email: string): Buffer => {
   logger.debug(`getEmailHash...successful: ${emailHash}`)
   return emailHash
 }
+*/
 
 const SecretKeyCryptographyEncrypt = (message: Buffer, encryptionKey: Buffer): Buffer => {
   logger.trace('SecretKeyCryptographyEncrypt...')
@@ -191,7 +192,7 @@ const newEmailContact = (email: string, userId: number): DbUserContact => {
   logger.debug(`newEmailContact...successful: ${emailContact}`)
   return emailContact
 }
-
+/*
 const newEmailOptIn = (userId: number): LoginEmailOptIn => {
   logger.trace('newEmailOptIn...')
   const emailOptIn = new LoginEmailOptIn()
@@ -201,7 +202,7 @@ const newEmailOptIn = (userId: number): LoginEmailOptIn => {
   logger.debug(`newEmailOptIn...successful: ${emailOptIn}`)
   return emailOptIn
 }
-
+*/
 /*
 // needed by AdminResolver
 // checks if given code exists and can be resent

backend/src/graphql/resolver/util/creations.ts

@@ -15,14 +15,21 @@ export const validateContribution = (
   amount: Decimal,
   creationDate: Date,
 ): void => {
-  logger.trace('isContributionValid', creations, amount, creationDate)
+  logger.trace('isContributionValid: ', creations, amount, creationDate)
   const index = getCreationIndex(creationDate.getMonth())
 
   if (index < 0) {
+    logger.error(
+      'No information for available creations with the given creationDate=',
+      creationDate,
+    )
     throw new Error('No information for available creations for the given date')
   }
 
   if (amount.greaterThan(creations[index].toString())) {
+    logger.error(
+      `The amount (${amount} GDD) to be created exceeds the amount (${creations[index]} GDD) still available for this month.`,
+    )
     throw new Error(
       `The amount (${amount} GDD) to be created exceeds the amount (${creations[index]} GDD) still available for this month.`,
     )
@@ -41,7 +48,7 @@ export const getUserCreations = async (
   await queryRunner.connect()
 
   const dateFilter = 'last_day(curdate() - interval 3 month) + interval 1 day'
-  logger.trace('getUserCreations dateFilter', dateFilter)
+  logger.trace('getUserCreations dateFilter=', dateFilter)
 
   const unionString = includePending
     ? `
@@ -51,6 +58,7 @@ export const getUserCreations = async (
         AND contribution_date >= ${dateFilter}
         AND confirmed_at IS NULL AND deleted_at IS NULL`
     : ''
+  logger.trace('getUserCreations unionString=', unionString)
 
   const unionQuery = await queryRunner.manager.query(`
     SELECT MONTH(date) AS month, sum(amount) AS sum, userId AS id FROM
@@ -62,6 +70,7 @@ export const getUserCreations = async (
     GROUP BY month, userId
     ORDER BY date DESC
   `)
+  logger.trace('getUserCreations unionQuery=', unionQuery)
 
   await queryRunner.release()
 
@@ -82,6 +91,7 @@ export const getUserCreations = async (
 export const getUserCreation = async (id: number, includePending = true): Promise<Decimal[]> => {
   logger.trace('getUserCreation', id, includePending)
   const creations = await getUserCreations([id], includePending)
+  logger.trace('getUserCreation  creations=', creations)
   return creations[0] ? creations[0].creations : FULL_CREATION_AVAILABLE
 }
 

backend/src/seeds/factory/creation.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { backendLogger as logger } from '@/server/logger'
 import { adminCreateContribution, confirmContribution } from '@/seeds/graphql/mutations'
 import { login } from '@/seeds/graphql/queries'
 import { CreationInterface } from '@/seeds/creation/CreationInterface'
@@ -8,6 +9,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing'
 import { User } from '@entity/User'
 import { Transaction } from '@entity/Transaction'
 import { Contribution } from '@entity/Contribution'
+import { UserContact } from '@entity/UserContact'
 // import CONFIG from '@/config/index'
 
 export const nMonthsBefore = (date: Date, months = 1): string => {
@@ -19,29 +21,46 @@ export const creationFactory = async (
   creation: CreationInterface,
 ): Promise<Contribution | void> => {
   const { mutate, query } = client
-
+  logger.trace('creationFactory...')
   await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
+  logger.trace('creationFactory... after login')
 
   // TODO it would be nice to have this mutation return the id
   await mutate({ mutation: adminCreateContribution, variables: { ...creation } })
+  logger.trace('creationFactory... after adminCreateContribution')
 
-  const user = await User.findOneOrFail({ where: { email: creation.email } })
+  const userContact = await UserContact.findOneOrFail({ where: { email: creation.email } })
+  logger.trace('creationFactory... after UserContact.findOneOrFail userContact=', userContact)
+  const user = await User.findOneOrFail({ where: { id: userContact.userId } })
+  logger.trace('creationFactory... after User.findOneOrFail user=', user)
 
   const pendingCreation = await Contribution.findOneOrFail({
     where: { userId: user.id, amount: creation.amount },
     order: { createdAt: 'DESC' },
   })
+  logger.trace(
+    'creationFactory... after Contribution.findOneOrFail pendingCreation=',
+    pendingCreation,
+  )
 
   if (creation.confirmed) {
+    logger.trace('creationFactory... creation.confirmed=', creation.confirmed)
     await mutate({ mutation: confirmContribution, variables: { id: pendingCreation.id } })
+    logger.trace('creationFactory... after confirmContribution')
 
     const confirmedCreation = await Contribution.findOneOrFail({ id: pendingCreation.id })
+    logger.trace(
+      'creationFactory... after Contribution.findOneOrFail confirmedCreation=',
+      confirmedCreation,
+    )
 
     if (creation.moveCreationDate) {
+      logger.trace('creationFactory... creation.moveCreationDate=', creation.moveCreationDate)
       const transaction = await Transaction.findOneOrFail({
         where: { userId: user.id, creationDate: new Date(creation.creationDate) },
         order: { balanceDate: 'DESC' },
       })
+      logger.trace('creationFactory... after Transaction.findOneOrFail transaction=', transaction)
       if (transaction.decay.equals(0) && transaction.creationDate) {
         confirmedCreation.contributionDate = new Date(
           nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
@@ -52,11 +71,17 @@ export const creationFactory = async (
         transaction.balanceDate = new Date(
           nMonthsBefore(transaction.balanceDate, creation.moveCreationDate),
         )
+        logger.trace('creationFactory... before transaction.save transaction=', transaction)
         await transaction.save()
+        logger.trace(
+          'creationFactory... before confirmedCreation.save confirmedCreation=',
+          confirmedCreation,
+        )
         await confirmedCreation.save()
       }
     }
   } else {
+    logger.trace('creationFactory... pendingCreation=', pendingCreation)
     return pendingCreation
   }
 }