removed references and implemented implicit active record queries

backend/src/graphql/directive/isAuthorized.ts

@@ -5,10 +5,10 @@ import { AuthChecker } from 'type-graphql'
 import { decode, encode } from '../../auth/JWT'
 import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '../../auth/ROLES'
 import { RIGHTS } from '../../auth/RIGHTS'
-import { ServerUserRepository } from '../../typeorm/repository/ServerUser'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { UserRepository } from '../../typeorm/repository/User'
 import { INALIENABLE_RIGHTS } from '../../auth/INALIENABLE_RIGHTS'
+import { ServerUser } from '@entity/ServerUser'
 
 const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
   context.role = ROLE_UNAUTHORIZED // unauthorized user
@@ -38,8 +38,7 @@ const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
     // TODO this implementation is bullshit - two database queries cause our user identifiers are not aligned and vary between email, id and pubKey
     const userRepository = await getCustomRepository(UserRepository)
     const user = await userRepository.findByPubkeyHex(context.pubKey)
-    const serverUserRepository = await getCustomRepository(ServerUserRepository)
-    const countServerUsers = await serverUserRepository.count({ email: user.email })
+    const countServerUsers = await ServerUser.count({ email: user.email })
     context.role = countServerUsers > 0 ? ROLE_ADMIN : ROLE_USER
 
     context.setHeaders.push({ key: 'token', value: encode(decoded.pubKey) })

backend/src/graphql/resolver/AdminResolver.ts

@@ -9,7 +9,6 @@ import { CreatePendingCreations } from '../model/CreatePendingCreations'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { TransactionRepository } from '../../typeorm/repository/Transaction'
-import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation'
 import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
@@ -75,8 +74,7 @@ export class AdminResolver {
       adminPendingCreation.memo = memo
       adminPendingCreation.moderator = moderator
 
-      await AdminPendingCreation.save(adminPendingCreation)
-    }
+      await AdminPendingCreation.save(adminPendingCreation)    }
     return getUserCreations(user.id)
   }
 
@@ -198,13 +196,12 @@ export class AdminResolver {
     transaction = await transactionRepository.save(transaction)
     if (!transaction) throw new Error('Could not create transaction')
 
-    const transactionCreationRepository = getCustomRepository(TransactionCreationRepository)
     let transactionCreation = new TransactionCreation()
     transactionCreation.transactionId = transaction.id
     transactionCreation.userId = pendingCreation.userId
     transactionCreation.amount = parseInt(pendingCreation.amount.toString())
     transactionCreation.targetDate = pendingCreation.date
-    transactionCreation = await transactionCreationRepository.save(transactionCreation)
+    transactionCreation = await TransactionCreation.save(transactionCreation)
     if (!transactionCreation) throw new Error('Could not create transactionCreation')
 
     const userTransactionRepository = getCustomRepository(UserTransactionRepository)
@@ -256,9 +253,7 @@ async function getUserCreations(id: number): Promise<number[]> {
   const lastMonthNumber = moment().subtract(1, 'month').format('M')
   const currentMonthNumber = moment().format('M')
 
-  const transactionCreationRepository = getCustomRepository(TransactionCreationRepository)
-  const createdAmountsQuery = await transactionCreationRepository
-    .createQueryBuilder('transaction_creations')
+  const createdAmountsQuery = await TransactionCreation.createQueryBuilder('transaction_creations')
     .select('MONTH(transaction_creations.target_date)', 'target_month')
     .addSelect('SUM(transaction_creations.amount)', 'sum')
     .where('transaction_creations.state_user_id = :id', { id })

backend/src/graphql/resolver/UserResolver.ts

@@ -19,11 +19,11 @@ import { UserRepository } from '../../typeorm/repository/User'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { sendResetPasswordEmail } from '../../mailer/sendResetPasswordEmail'
 import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
-import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys'
 import { klicktippSignIn } from '../../apis/KlicktippController'
 import { RIGHTS } from '../../auth/RIGHTS'
-import { ServerUserRepository } from '../../typeorm/repository/ServerUser'
 import { ROLE_ADMIN } from '../../auth/ROLES'
+import { LoginElopageBuys } from '@entity/LoginElopageBuys'
+import { ServerUser } from '@entity/ServerUser'
 
 const EMAIL_OPT_IN_RESET_PASSWORD = 2
 const EMAIL_OPT_IN_REGISTER = 1
@@ -303,8 +303,7 @@ export class UserResolver {
     user.coinanimation = coinanimation
 
     // context.role is not set to the actual role yet on login
-    const serverUserRepository = await getCustomRepository(ServerUserRepository)
-    const countServerUsers = await serverUserRepository.count({ email: user.email })
+    const countServerUsers = await ServerUser.count({ email: user.email })
     user.isAdmin = countServerUsers > 0
 
     context.setHeaders.push({
@@ -718,8 +717,7 @@ export class UserResolver {
       return false
     }
 
-    const loginElopageBuysRepository = getCustomRepository(LoginElopageBuysRepository)
-    const elopageBuyCount = await loginElopageBuysRepository.count({ payerEmail: userEntity.email })
+    const elopageBuyCount = await LoginElopageBuys.count({ payerEmail: userEntity.email })
     return elopageBuyCount > 0
   }
 }

backend/src/webhook/elopage.ts

@@ -30,14 +30,12 @@
 import { LoginElopageBuys } from '@entity/LoginElopageBuys'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { UserResolver } from '../graphql/resolver/UserResolver'
-import { LoginElopageBuysRepository } from '../typeorm/repository/LoginElopageBuys'
 import { User as dbUser } from '@entity/User'
 
 export const elopageWebhook = async (req: any, res: any): Promise<void> => {
   // eslint-disable-next-line no-console
   console.log('Elopage Hook received', req.body)
   res.status(200).end() // Responding is important
-  const loginElopageBuyRepository = await getCustomRepository(LoginElopageBuysRepository)
   const loginElopageBuy = new LoginElopageBuys()
 
   const {
@@ -82,7 +80,7 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
   }
 
   // Save the hook data
-  await loginElopageBuyRepository.save(loginElopageBuy)
+  await LoginElopageBuys.save(loginElopageBuy)
 
   // create user for certain products
   /*