Merge branch 'master' into 1588-frontend-show-link-information

admin/src/components/CreationTransactionListFormular.spec.js

@@ -6,32 +6,30 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    transactionList: {
-      transactions: [
-        {
-          id: 1,
-          amount: 100,
-          balanceDate: 0,
-          creationDate: new Date(),
-          memo: 'Testing',
-          linkedUser: {
-            firstName: 'Gradido',
-            lastName: 'Akademie',
-          },
+    creationTransactionList: [
+      {
+        id: 1,
+        amount: 100,
+        balanceDate: 0,
+        creationDate: new Date(),
+        memo: 'Testing',
+        linkedUser: {
+          firstName: 'Gradido',
+          lastName: 'Akademie',
         },
-        {
-          id: 2,
-          amount: 200,
-          balanceDate: 0,
-          creationDate: new Date(),
-          memo: 'Testing 2',
-          linkedUser: {
-            firstName: 'Gradido',
-            lastName: 'Akademie',
-          },
+      },
+      {
+        id: 2,
+        amount: 200,
+        balanceDate: 0,
+        creationDate: new Date(),
+        memo: 'Testing 2',
+        linkedUser: {
+          firstName: 'Gradido',
+          lastName: 'Akademie',
         },
-      ],
-    },
+      },
+    ],
   },
 })
 
@@ -67,7 +65,6 @@ describe('CreationTransactionListFormular', () => {
             currentPage: 1,
             pageSize: 25,
             order: 'DESC',
-            onlyCreations: true,
             userId: 1,
           },
         }),

admin/src/components/CreationTransactionListFormular.vue

@@ -5,7 +5,7 @@
   </div>
 </template>
 <script>
-import { transactionList } from '../graphql/transactionList'
+import { creationTransactionList } from '../graphql/creationTransactionList'
 export default {
   name: 'CreationTransactionList',
   props: {
@@ -51,17 +51,16 @@ export default {
     getTransactions() {
       this.$apollo
         .query({
-          query: transactionList,
+          query: creationTransactionList,
           variables: {
             currentPage: 1,
             pageSize: 25,
             order: 'DESC',
-            onlyCreations: true,
             userId: parseInt(this.userId),
           },
         })
         .then((result) => {
-          this.items = result.data.transactionList.transactions
+          this.items = result.data.creationTransactionList
         })
         .catch((error) => {
           this.toastError(error.message)

admin/src/graphql/creationTransactionList.js

@@ -0,0 +1,22 @@
+import gql from 'graphql-tag'
+
+export const creationTransactionList = gql`
+  query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC, $userId: Int!) {
+    creationTransactionList(
+      currentPage: $currentPage
+      pageSize: $pageSize
+      order: $order
+      userId: $userId
+    ) {
+      id
+      amount
+      balanceDate
+      creationDate
+      memo
+      linkedUser {
+        firstName
+        lastName
+      }
+    }
+  }
+`

admin/src/graphql/transactionList.js

@@ -1,31 +0,0 @@
-import gql from 'graphql-tag'
-
-export const transactionList = gql`
-  query (
-    $currentPage: Int = 1
-    $pageSize: Int = 25
-    $order: Order = DESC
-    $onlyCreations: Boolean = false
-    $userId: Int = null
-  ) {
-    transactionList(
-      currentPage: $currentPage
-      pageSize: $pageSize
-      order: $order
-      onlyCreations: $onlyCreations
-      userId: $userId
-    ) {
-      transactions {
-        id
-        amount
-        balanceDate
-        creationDate
-        memo
-        linkedUser {
-          firstName
-          lastName
-        }
-      }
-    }
-  }
-`

backend/jest.config.js

@@ -3,8 +3,9 @@ module.exports = {
   verbose: true,
   preset: 'ts-jest',
   collectCoverage: true,
-  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**'],
+  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
   setupFiles: ['<rootDir>/test/testSetup.ts'],
+  modulePathIgnorePatterns: ['<rootDir>/build/'],
   moduleNameMapper: {
     '@/(.*)': '<rootDir>/src/$1',
     '@model/(.*)': '<rootDir>/src/graphql/model/$1',

backend/package.json

@@ -10,11 +10,11 @@
   "scripts": {
     "build": "tsc --build",
     "clean": "tsc --build --clean",
-    "start": "node build/src/index.js",
-    "dev": "nodemon -w src --ext ts --exec ts-node src/index.ts",
+    "start": "TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
+    "dev": "TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "TZ=UTC ts-node src/seeds/index.ts"
+    "seed": "TZ=UTC ts-node -r tsconfig-paths/register src/seeds/index.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
@@ -32,7 +32,6 @@
     "jest": "^27.2.4",
     "jsonwebtoken": "^8.5.1",
     "lodash.clonedeep": "^4.5.0",
-    "module-alias": "^2.2.2",
     "mysql2": "^2.3.0",
     "nodemailer": "^6.6.5",
     "random-bigint": "^0.0.1",
@@ -60,15 +59,7 @@
     "nodemon": "^2.0.7",
     "prettier": "^2.3.1",
     "ts-node": "^10.0.0",
+    "tsconfig-paths": "^3.14.0",
     "typescript": "^4.3.4"
-  },
-  "_moduleAliases": {
-    "@": "./build/src",
-    "@arg": "./build/src/graphql/arg",
-    "@dbTools": "../database/build/src",
-    "@entity": "../database/build/entity",
-    "@enum": "./build/src/graphql/enum",
-    "@model": "./build/src/graphql/model",
-    "@repository": "./build/src/typeorm/repository"
   }
 }

backend/src/auth/RIGHTS.ts

@@ -33,4 +33,5 @@ export enum RIGHTS {
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
   DELETE_USER = 'DELETE_USER',
   UNDELETE_USER = 'UNDELETE_USER',
+  CREATION_TRANSACTION_LIST = 'CREATION_TRANSACTION_LIST',
 }

backend/src/graphql/arg/Paginated.ts

@@ -11,10 +11,4 @@ export default class Paginated {
 
   @Field(() => Order, { nullable: true })
   order?: Order
-
-  @Field(() => Boolean, { nullable: true })
-  onlyCreations?: boolean
-
-  @Field(() => Int, { nullable: true })
-  userId?: number
 }

backend/src/graphql/directive/isAuthorized.ts

@@ -35,6 +35,7 @@ const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
   const userRepository = await getCustomRepository(UserRepository)
   try {
     const user = await userRepository.findByPubkeyHex(context.pubKey)
+    context.user = user
     const countServerUsers = await ServerUser.count({ email: user.email })
     context.role = countServerUsers > 0 ? ROLE_ADMIN : ROLE_USER
   } catch {

backend/src/graphql/resolver/AdminResolver.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx } from 'type-graphql'
+import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx, Int } from 'type-graphql'
 import {
   getCustomRepository,
   IsNull,
@@ -19,16 +19,21 @@ import { UserRepository } from '@repository/User'
 import CreatePendingCreationArgs from '@arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '@arg/UpdatePendingCreationArgs'
 import SearchUsersArgs from '@arg/SearchUsersArgs'
-import { Transaction } from '@entity/Transaction'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { Transaction } from '@model/Transaction'
 import { TransactionRepository } from '@repository/Transaction'
 import { calculateDecay } from '@/util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
-import { User } from '@entity/User'
+import { User as dbUser } from '@entity/User'
+import { User } from '@model/User'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
 import Decimal from 'decimal.js-light'
 import { Decay } from '@model/Decay'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { communityUser } from '@/util/communityUser'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -123,27 +128,26 @@ export class AdminResolver {
   @Authorized([RIGHTS.DELETE_USER])
   @Mutation(() => Date, { nullable: true })
   async deleteUser(@Arg('userId') userId: number, @Ctx() context: any): Promise<Date | null> {
-    const user = await User.findOne({ id: userId })
+    const user = await dbUser.findOne({ id: userId })
     // user exists ?
     if (!user) {
       throw new Error(`Could not find user with userId: ${userId}`)
     }
     // moderator user disabled own account?
-    const userRepository = getCustomRepository(UserRepository)
-    const moderatorUser = await userRepository.findByPubkeyHex(context.pubKey)
+    const moderatorUser = context.user
     if (moderatorUser.id === userId) {
       throw new Error('Moderator can not delete his own account!')
     }
     // soft-delete user
     await user.softRemove()
-    const newUser = await User.findOne({ id: userId }, { withDeleted: true })
+    const newUser = await dbUser.findOne({ id: userId }, { withDeleted: true })
     return newUser ? newUser.deletedAt : null
   }
 
   @Authorized([RIGHTS.UNDELETE_USER])
   @Mutation(() => Date, { nullable: true })
   async unDeleteUser(@Arg('userId') userId: number): Promise<Date | null> {
-    const user = await User.findOne({ id: userId }, { withDeleted: true })
+    const user = await dbUser.findOne({ id: userId }, { withDeleted: true })
     // user exists ?
     if (!user) {
       throw new Error(`Could not find user with userId: ${userId}`)
@@ -158,7 +162,7 @@ export class AdminResolver {
   async createPendingCreation(
     @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
   ): Promise<number[]> {
-    const user = await User.findOne({ email }, { withDeleted: true })
+    const user = await dbUser.findOne({ email }, { withDeleted: true })
     if (!user) {
       throw new Error(`Could not find user with email: ${email}`)
     }
@@ -215,7 +219,7 @@ export class AdminResolver {
   async updatePendingCreation(
     @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs,
   ): Promise<UpdatePendingCreation> {
-    const user = await User.findOne({ email }, { withDeleted: true })
+    const user = await dbUser.findOne({ email }, { withDeleted: true })
     if (!user) {
       throw new Error(`Could not find user with email: ${email}`)
     }
@@ -265,7 +269,7 @@ export class AdminResolver {
 
     const userIds = pendingCreations.map((p) => p.userId)
     const userCreations = await getUserCreations(userIds)
-    const users = await User.find({ where: { id: In(userIds) }, withDeleted: true })
+    const users = await dbUser.find({ where: { id: In(userIds) }, withDeleted: true })
 
     return pendingCreations.map((pendingCreation) => {
       const user = users.find((u) => u.id === pendingCreation.userId)
@@ -294,12 +298,11 @@ export class AdminResolver {
   @Mutation(() => Boolean)
   async confirmPendingCreation(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
     const pendingCreation = await AdminPendingCreation.findOneOrFail(id)
-    const userRepository = getCustomRepository(UserRepository)
-    const moderatorUser = await userRepository.findByPubkeyHex(context.pubKey)
+    const moderatorUser = context.user
     if (moderatorUser.id === pendingCreation.userId)
       throw new Error('Moderator can not confirm own pending creation')
 
-    const user = await User.findOneOrFail({ id: pendingCreation.userId }, { withDeleted: true })
+    const user = await dbUser.findOneOrFail({ id: pendingCreation.userId }, { withDeleted: true })
     if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a creation.')
 
     const creations = await getUserCreation(pendingCreation.userId, false)
@@ -321,7 +324,7 @@ export class AdminResolver {
     // TODO pending creations decimal
     newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount)).toString())
 
-    const transaction = new Transaction()
+    const transaction = new DbTransaction()
     transaction.typeId = TransactionTypeId.CREATION
     transaction.memo = pendingCreation.memo
     transaction.userId = pendingCreation.userId
@@ -339,6 +342,27 @@ export class AdminResolver {
 
     return true
   }
+
+  @Authorized([RIGHTS.CREATION_TRANSACTION_LIST])
+  @Query(() => [Transaction])
+  async creationTransactionList(
+    @Args()
+    { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
+    @Arg('userId', () => Int) userId: number,
+  ): Promise<Transaction[]> {
+    const offset = (currentPage - 1) * pageSize
+    const transactionRepository = getCustomRepository(TransactionRepository)
+    const [userTransactions] = await transactionRepository.findByUserPaged(
+      userId,
+      pageSize,
+      offset,
+      order,
+      true,
+    )
+
+    const user = await dbUser.findOneOrFail({ id: userId })
+    return userTransactions.map((t) => new Transaction(t, new User(user), communityUser))
+  }
 }
 
 interface CreationMap {

backend/src/graphql/resolver/BalanceResolver.ts

@@ -2,9 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
-import { getCustomRepository } from '@dbTools/typeorm'
 import { Balance } from '@model/Balance'
-import { UserRepository } from '@repository/User'
 import { calculateDecay } from '@/util/decay'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Transaction } from '@entity/Transaction'
@@ -16,9 +14,7 @@ export class BalanceResolver {
   @Query(() => Balance)
   async balance(@Ctx() context: any): Promise<Balance> {
     // load user and balance
-    const userRepository = getCustomRepository(UserRepository)
-
-    const user = await userRepository.findByPubkeyHex(context.pubKey)
+    const { user } = context
     const now = new Date()
 
     const lastTransaction = await Transaction.findOne(

backend/src/graphql/resolver/GdtResolver.ts

@@ -2,12 +2,10 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql'
-import { getCustomRepository } from '@dbTools/typeorm'
 import CONFIG from '@/config'
 import { GdtEntryList } from '@model/GdtEntryList'
 import Paginated from '@arg/Paginated'
 import { apiGet } from '@/apis/HttpRequest'
-import { UserRepository } from '@repository/User'
 import { Order } from '@enum/Order'
 import { RIGHTS } from '@/auth/RIGHTS'
 
@@ -22,8 +20,7 @@ export class GdtResolver {
     @Ctx() context: any,
   ): Promise<GdtEntryList> {
     // load user
-    const userRepository = getCustomRepository(UserRepository)
-    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    const userEntity = context.user
 
     try {
       const resultGDT = await apiGet(

backend/src/graphql/resolver/TransactionLinkResolver.ts

@@ -2,11 +2,9 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query } from 'type-graphql'
-import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLink } from '@model/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { User as dbUser } from '@entity/User'
-import { UserRepository } from '@repository/User'
 import TransactionLinkArgs from '@arg/TransactionLinkArgs'
 import Paginated from '@arg/Paginated'
 import { calculateBalance } from '@/util/validate'
@@ -29,7 +27,7 @@ export const transactionLinkCode = (date: Date): string => {
 
 const CODE_VALID_DAYS_DURATION = 14
 
-const transactionLinkExpireDate = (date: Date): Date => {
+export const transactionLinkExpireDate = (date: Date): Date => {
   const validUntil = new Date(date)
   return new Date(validUntil.setDate(date.getDate() + CODE_VALID_DAYS_DURATION))
 }
@@ -42,8 +40,7 @@ export class TransactionLinkResolver {
     @Args() { amount, memo }: TransactionLinkArgs,
     @Ctx() context: any,
   ): Promise<TransactionLink> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByPubkeyHex(context.pubKey)
+    const { user } = context
 
     const createdDate = new Date()
     const validUntil = transactionLinkExpireDate(createdDate)
@@ -74,8 +71,7 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.DELETE_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async deleteTransactionLink(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByPubkeyHex(context.pubKey)
+    const { user } = context
 
     const transactionLink = await dbTransactionLink.findOne({ id })
     if (!transactionLink) {
@@ -116,8 +112,7 @@ export class TransactionLinkResolver {
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
     @Ctx() context: any,
   ): Promise<TransactionLink[]> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByPubkeyHex(context.pubKey)
+    const { user } = context
     // const now = new Date()
     const transactionLinks = await dbTransactionLink.find({
       where: {
@@ -137,8 +132,7 @@ export class TransactionLinkResolver {
   @Authorized([RIGHTS.REDEEM_TRANSACTION_LINK])
   @Mutation(() => Boolean)
   async redeemTransactionLink(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
-    const userRepository = getCustomRepository(UserRepository)
-    const user = await userRepository.findByPubkeyHex(context.pubKey)
+    const { user } = context
     const transactionLink = await dbTransactionLink.findOneOrFail({ id })
     const linkedUser = await dbUser.findOneOrFail({ id: transactionLink.userId })
 

backend/src/graphql/resolver/TransactionResolver.ts

@@ -17,7 +17,6 @@ import Paginated from '@arg/Paginated'
 
 import { Order } from '@enum/Order'
 
-import { UserRepository } from '@repository/User'
 import { TransactionRepository } from '@repository/Transaction'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
@@ -131,22 +130,11 @@ export class TransactionResolver {
   @Query(() => TransactionList)
   async transactionList(
     @Args()
-    {
-      currentPage = 1,
-      pageSize = 25,
-      order = Order.DESC,
-      onlyCreations = false,
-      userId,
-    }: Paginated,
+    { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
     @Ctx() context: any,
   ): Promise<TransactionList> {
     const now = new Date()
-    // find user
-    const userRepository = getCustomRepository(UserRepository)
-    // TODO: separate those usecases - this is a security issue
-    const user = userId
-      ? await userRepository.findOneOrFail({ id: userId }, { withDeleted: true })
-      : await userRepository.findByPubkeyHex(context.pubKey)
+    const user = context.user
 
     // find current balance
     const lastTransaction = await dbTransaction.findOne(
@@ -182,7 +170,6 @@ export class TransactionResolver {
       pageSize,
       offset,
       order,
-      onlyCreations,
     )
 
     // find involved users; I am involved
@@ -208,7 +195,7 @@ export class TransactionResolver {
       await transactionLinkRepository.summary(user.id, now)
 
     // decay & link transactions
-    if (!onlyCreations && currentPage === 1 && order === Order.DESC) {
+    if (currentPage === 1 && order === Order.DESC) {
       transactions.push(
         virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self),
       )
@@ -256,8 +243,7 @@ export class TransactionResolver {
     @Ctx() context: any,
   ): Promise<boolean> {
     // TODO this is subject to replay attacks
-    const userRepository = getCustomRepository(UserRepository)
-    const senderUser = await userRepository.findByPubkeyHex(context.pubKey)
+    const senderUser = context.user
     if (senderUser.pubKey.length !== 32) {
       throw new Error('invalid sender public key')
     }

backend/src/graphql/resolver/UserResolver.test.ts

@@ -69,7 +69,9 @@ describe('UserResolver', () => {
     })
 
     it('returns success', () => {
-      expect(result).toEqual(expect.objectContaining({ data: { createUser: 'success' } }))
+      expect(result).toEqual(
+        expect.objectContaining({ data: { createUser: { id: expect.any(Number) } } }),
+      )
     })
 
     describe('valid input data', () => {
@@ -331,6 +333,7 @@ describe('UserResolver', () => {
                 email: 'bibi@bloxberg.de',
                 firstName: 'Bibi',
                 hasElopage: false,
+                id: expect.any(Number),
                 isAdmin: false,
                 klickTipp: {
                   newsletterState: false,

backend/src/graphql/resolver/UserResolver.ts

@@ -14,7 +14,6 @@ import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
 import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware'
 import { UserSettingRepository } from '@repository/UserSettingRepository'
 import { Setting } from '@enum/Setting'
-import { UserRepository } from '@repository/User'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { sendResetPasswordEmail } from '@/mailer/sendResetPasswordEmail'
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
@@ -214,8 +213,7 @@ export class UserResolver {
   @UseMiddleware(klicktippNewsletterStateMiddleware)
   async verifyLogin(@Ctx() context: any): Promise<User> {
     // TODO refactor and do not have duplicate code with login(see below)
-    const userRepository = getCustomRepository(UserRepository)
-    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    const userEntity = context.user
     const user = new User(userEntity)
     // user.pubkey = userEntity.pubKey.toString('hex')
     // Elopage Status & Stored PublisherId
@@ -313,10 +311,10 @@ export class UserResolver {
   }
 
   @Authorized([RIGHTS.CREATE_USER])
-  @Mutation(() => String)
+  @Mutation(() => User)
   async createUser(
     @Args() { email, firstName, lastName, language, publisherId }: CreateUserArgs,
-  ): Promise<string> {
+  ): Promise<User> {
     // TODO: wrong default value (should be null), how does graphql work here? Is it an required field?
     // default int publisher_id = 0;
 
@@ -396,7 +394,7 @@ export class UserResolver {
     } finally {
       await queryRunner.release()
     }
-    return 'success'
+    return new User(dbUser)
   }
 
   // THis is used by the admin only - should we move it to the admin resolver?
@@ -585,8 +583,7 @@ export class UserResolver {
     }: UpdateUserInfosArgs,
     @Ctx() context: any,
   ): Promise<boolean> {
-    const userRepository = getCustomRepository(UserRepository)
-    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    const userEntity = context.user
 
     if (firstName) {
       userEntity.firstName = firstName
@@ -664,8 +661,7 @@ export class UserResolver {
   @Authorized([RIGHTS.HAS_ELOPAGE])
   @Query(() => Boolean)
   async hasElopage(@Ctx() context: any): Promise<boolean> {
-    const userRepository = getCustomRepository(UserRepository)
-    const userEntity = await userRepository.findByPubkeyHex(context.pubKey).catch()
+    const userEntity = context.user
     if (!userEntity) {
       return false
     }

backend/src/seeds/factory/creation.ts

@@ -15,14 +15,14 @@ export const creationFactory = async (
 ): Promise<void> => {
   const { mutate, query } = client
 
-  // login as Peter Lustig (admin)
-  await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
+  // login as Peter Lustig (admin) and get his user ID
+  const {
+    data: {
+      login: { id },
+    },
+  } = await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } })
 
-  // get Peter Lustig's user id
-  const peterLustig = await User.findOneOrFail({ where: { email: 'peter@lustig.de' } })
-  const variables = { ...creation, moderator: peterLustig.id }
-
-  await mutate({ mutation: createPendingCreation, variables })
+  await mutate({ mutation: createPendingCreation, variables: { ...creation, moderator: id } })
 
   // get User
   const user = await User.findOneOrFail({ where: { email: creation.email } })

backend/src/seeds/factory/transactionLink.ts

@@ -0,0 +1,43 @@
+import { ApolloServerTestClient } from 'apollo-server-testing'
+import { createTransactionLink } from '@/seeds/graphql/mutations'
+import { login } from '@/seeds/graphql/queries'
+import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface'
+import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver'
+import { TransactionLink } from '@entity/TransactionLink'
+
+export const transactionLinkFactory = async (
+  client: ApolloServerTestClient,
+  transactionLink: TransactionLinkInterface,
+): Promise<void> => {
+  const { mutate, query } = client
+
+  // login
+  await query({ query: login, variables: { email: transactionLink.email, password: 'Aa12345_' } })
+
+  const variables = {
+    amount: transactionLink.amount,
+    memo: transactionLink.memo,
+  }
+
+  // get the transaction links's id
+  const {
+    data: {
+      createTransactionLink: { id },
+    },
+  } = await mutate({ mutation: createTransactionLink, variables })
+
+  if (transactionLink.createdAt || transactionLink.deletedAt) {
+    const dbTransactionLink = await TransactionLink.findOneOrFail({ id })
+
+    if (transactionLink.createdAt) {
+      dbTransactionLink.createdAt = transactionLink.createdAt
+      dbTransactionLink.validUntil = transactionLinkExpireDate(transactionLink.createdAt)
+      await dbTransactionLink.save()
+    }
+
+    if (transactionLink.deletedAt) {
+      dbTransactionLink.deletedAt = new Date()
+      await dbTransactionLink.save()
+    }
+  }
+}

backend/src/seeds/factory/user.ts

@@ -11,36 +11,41 @@ export const userFactory = async (
 ): Promise<void> => {
   const { mutate } = client
 
-  await mutate({ mutation: createUser, variables: user })
-  let dbUser = await User.findOneOrFail({ where: { email: user.email } })
+  const {
+    data: {
+      createUser: { id },
+    },
+  } = await mutate({ mutation: createUser, variables: user })
 
   if (user.emailChecked) {
-    const optin = await LoginEmailOptIn.findOneOrFail({ where: { userId: dbUser.id } })
+    const optin = await LoginEmailOptIn.findOneOrFail({ userId: id })
     await mutate({
       mutation: setPassword,
       variables: { password: 'Aa12345_', code: optin.verificationCode },
     })
   }
 
-  // refetch data
-  dbUser = await User.findOneOrFail({ where: { email: user.email } })
+  if (user.createdAt || user.deletedAt || user.isAdmin) {
+    // get user from database
+    const dbUser = await User.findOneOrFail({ id })
 
-  if (user.createdAt || user.deletedAt) {
-    if (user.createdAt) dbUser.createdAt = user.createdAt
-    if (user.deletedAt) dbUser.deletedAt = user.deletedAt
-    await dbUser.save()
-  }
+    if (user.createdAt || user.deletedAt) {
+      if (user.createdAt) dbUser.createdAt = user.createdAt
+      if (user.deletedAt) dbUser.deletedAt = user.deletedAt
+      await dbUser.save()
+    }
 
-  if (user.isAdmin) {
-    const admin = new ServerUser()
-    admin.username = dbUser.firstName
-    admin.password = 'please_refactor'
-    admin.email = dbUser.email
-    admin.role = 'admin'
-    admin.activated = 1
-    admin.lastLogin = new Date()
-    admin.created = dbUser.createdAt
-    admin.modified = dbUser.createdAt
-    await admin.save()
+    if (user.isAdmin) {
+      const admin = new ServerUser()
+      admin.username = dbUser.firstName
+      admin.password = 'please_refactor'
+      admin.email = dbUser.email
+      admin.role = 'admin'
+      admin.activated = 1
+      admin.lastLogin = new Date()
+      admin.created = dbUser.createdAt
+      admin.modified = dbUser.createdAt
+      await admin.save()
+    }
   }
 }

backend/src/seeds/graphql/mutations.ts

@@ -52,7 +52,9 @@ export const createUser = gql`
       lastName: $lastName
       language: $language
       publisherId: $publisherId
-    )
+    ) {
+      id
+    }
   }
 `
 
@@ -65,6 +67,7 @@ export const sendCoins = gql`
 export const createTransactionLink = gql`
   mutation ($amount: Decimal!, $memo: String!) {
     createTransactionLink(amount: $amount, memo: $memo) {
+      id
       code
     }
   }

backend/src/seeds/graphql/queries.ts

@@ -3,6 +3,7 @@ import gql from 'graphql-tag'
 export const login = gql`
   query ($email: String!, $password: String!, $publisherId: Int) {
     login(email: $email, password: $password, publisherId: $publisherId) {
+      id
       email
       firstName
       lastName

backend/src/seeds/index.ts

@@ -8,8 +8,10 @@ import { name, internet, random } from 'faker'
 
 import { users } from './users/index'
 import { creations } from './creation/index'
+import { transactionLinks } from './transactionLink/index'
 import { userFactory } from './factory/user'
 import { creationFactory } from './factory/creation'
+import { transactionLinkFactory } from './factory/transactionLink'
 import { entities } from '@entity/index'
 
 const context = {
@@ -64,6 +66,11 @@ const run = async () => {
     await creationFactory(seedClient, creations[i])
   }
 
+  // create Transaction Links
+  for (let i = 0; i < transactionLinks.length; i++) {
+    await transactionLinkFactory(seedClient, transactionLinks[i])
+  }
+
   await con.close()
 }
 

backend/src/seeds/transactionLink/TransactionLinkInterface.ts

@@ -0,0 +1,7 @@
+export interface TransactionLinkInterface {
+  email: string
+  amount: number
+  memo: string
+  createdAt?: Date
+  deletedAt?: boolean
+}

backend/src/seeds/transactionLink/index.ts

@@ -0,0 +1,52 @@
+import { TransactionLinkInterface } from './TransactionLinkInterface'
+
+export const transactionLinks: TransactionLinkInterface[] = [
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: 'Leider wollte niemand meine Gradidos zum Neujahr haben :(',
+    createdAt: new Date(2022, 0, 1),
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: `Kein Trick, keine Zauberrei,
+bei Gradidio sei dabei!`,
+  },
+  {
+    email: 'bibi@bloxberg.de',
+    amount: 19.99,
+    memo: 'Da habe ich mich wohl etwas übernommen.',
+    deletedAt: true,
+  },
+]

backend/src/server/createServer.ts

@@ -1,5 +1,4 @@
 import 'reflect-metadata'
-import 'module-alias/register'
 
 import { ApolloServer } from 'apollo-server-express'
 import express, { Express } from 'express'

backend/tsconfig.json

@@ -45,16 +45,17 @@
 
     /* Module Resolution Options */
     // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                             /* Base directory to resolve non-absolute module names. */
+    "baseUrl": ".",                                 /* Base directory to resolve non-absolute module names. */
     "paths": {                                      /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-      "@/*": ["./src/*"],
-      "@arg/*": ["./src/graphql/arg/*"],
-      "@dbTools/*": ["../database/src/*"],
-      "@entity/*": ["../database/entity/*"],
-      "@enum/*": ["./src/graphql/enum/*"],
-      "@model/*": ["./src/graphql/model/*"],
-      "@repository/*": ["./src/typeorm/repository/*"],
-      "@test/*": ["./test/*"]
+      "@/*": ["src/*"],
+      "@arg/*": ["src/graphql/arg/*"],
+      "@enum/*": ["src/graphql/enum/*"],
+      "@model/*": ["src/graphql/model/*"],
+      "@repository/*": ["src/typeorm/repository/*"],
+      "@test/*": ["test/*"],
+      /* external */
+      "@dbTools/*": ["../database/src/*", "../../database/build/src/*"],
+      "@entity/*": ["../database/entity/*", "../../database/build/entity/*"]
     },
     // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                             /* List of folders to include type definitions from. */
@@ -82,7 +83,7 @@
     {
       "path": "../database/tsconfig.json",
       // add 'prepend' if you want to include the referenced project in your output file
-      // "prepend": true,
+      // "prepend": true
     }
   ]
 }

backend/yarn.lock

@@ -4102,11 +4102,6 @@ minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-module-alias@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0"
-  integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -5242,6 +5237,16 @@ tsconfig-paths@^3.11.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
+tsconfig-paths@^3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976"
+  integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"

frontend/src/graphql/mutations.js

@@ -52,7 +52,9 @@ export const createUser = gql`
       lastName: $lastName
       language: $language
       publisherId: $publisherId
-    )
+    ) {
+      id
+    }
   }
 `
 

frontend/src/graphql/queries.js

@@ -43,18 +43,8 @@ export const logout = gql`
 `
 
 export const transactionsQuery = gql`
-  query(
-    $currentPage: Int = 1
-    $pageSize: Int = 25
-    $order: Order = DESC
-    $onlyCreations: Boolean = false
-  ) {
-    transactionList(
-      currentPage: $currentPage
-      pageSize: $pageSize
-      order: $order
-      onlyCreations: $onlyCreations
-    ) {
+  query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
+    transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
       balanceGDT
       count
       linkCount