Merge branch 'master' into test-login-user-resolver

backend/jest.config.js

@@ -6,6 +6,11 @@ module.exports = {
   collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
   setupFiles: ['<rootDir>/test/testSetup.ts'],
   moduleNameMapper: {
+    '@/(.*)': '<rootDir>/src/$1',
+    '@model/(.*)': '<rootDir>/src/graphql/model/$1',
+    '@arg/(.*)': '<rootDir>/src/graphql/arg/$1',
+    '@enum/(.*)': '<rootDir>/src/graphql/enum/$1',
+    '@repository/(.*)': '<rootDir>/src/typeorm/repository/$1',
     '@entity/(.*)':
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/entity/$1'

backend/package.json

@@ -60,7 +60,12 @@
     "typescript": "^4.3.4"
   },
   "_moduleAliases": {
+    "@": "./src",
+    "@arg": "./src/graphql/arg",
+    "@dbTools": "../database/build/src",
     "@entity": "../database/build/entity",
-    "@dbTools": "../database/build/src"
+    "@enum": "./src/graphql/enum",
+    "@model": "./src/graphql/model",
+    "@repository": "./src/typeorm/repository"
   }
 }

backend/src/apis/KlicktippController.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { KlicktippConnector } from './klicktippConnector'
-import CONFIG from '../config'
+import CONFIG from '@/config'
 
 const klicktippConnector = new KlicktippConnector()
 

backend/src/auth/JWT.ts

@@ -1,5 +1,5 @@
 import jwt from 'jsonwebtoken'
-import CONFIG from '../config/'
+import CONFIG from '@/config/'
 import { CustomJwtPayload } from './CustomJwtPayload'
 
 export const decode = (token: string): CustomJwtPayload | null => {

backend/src/graphql/arg/Paginated.ts

@@ -1,5 +1,5 @@
 import { ArgsType, Field, Int } from 'type-graphql'
-import { Order } from '../enum/Order'
+import { Order } from '@enum/Order'
 
 @ArgsType()
 export default class Paginated {

backend/src/graphql/directive/isAuthorized.ts

@@ -2,12 +2,12 @@
 
 import { AuthChecker } from 'type-graphql'
 
-import { decode, encode } from '../../auth/JWT'
+import { decode, encode } from '@/auth/JWT'
-import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '../../auth/ROLES'
+import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
 import { getCustomRepository } from '@dbTools/typeorm'
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
-import { INALIENABLE_RIGHTS } from '../../auth/INALIENABLE_RIGHTS'
+import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS'
 import { ServerUser } from '@entity/ServerUser'
 
 const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {

backend/src/graphql/model/GdtEntry.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field } from 'type-graphql'
-import { GdtEntryType } from '../enum/GdtEntryType'
+import { GdtEntryType } from '@enum/GdtEntryType'
 
 @ObjectType()
 export class GdtEntry {

backend/src/graphql/model/GdtSumPerEmail.ts

@@ -1,19 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/*
-import { ObjectType, Field } from 'type-graphql'
-
-@ObjectType()
-export class GdtSumPerEmail {
-  constructor(email: string, summe: number) {
-    this.email = email
-    this.summe = summe
-  }
-
-  @Field(() => String)
-  email: string
-
-  @Field(() => Number)
-  summe: number
-}
-*/

backend/src/graphql/model/Transaction.ts

@@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql'
 import { Decay } from './Decay'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import Decimal from 'decimal.js-light'
-import { TransactionTypeId } from '../enum/TransactionTypeId'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
 import { User } from './User'
 
 @ObjectType()

backend/src/graphql/model/TransactionList.ts

@@ -1,5 +1,5 @@
 import { ObjectType, Field } from 'type-graphql'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
 import Decimal from 'decimal.js-light'
 import { Transaction } from './Transaction'
 

backend/src/graphql/resolver/AdminResolver.ts

@@ -10,25 +10,25 @@ import {
   getConnection,
   In,
 } from '@dbTools/typeorm'
-import { UserAdmin, SearchUsersResult } from '../model/UserAdmin'
+import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
-import { PendingCreation } from '../model/PendingCreation'
+import { PendingCreation } from '@model/PendingCreation'
-import { CreatePendingCreations } from '../model/CreatePendingCreations'
+import { CreatePendingCreations } from '@model/CreatePendingCreations'
-import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
+import { UpdatePendingCreation } from '@model/UpdatePendingCreation'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
-import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
+import CreatePendingCreationArgs from '@arg/CreatePendingCreationArgs'
-import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
+import UpdatePendingCreationArgs from '@arg/UpdatePendingCreationArgs'
-import SearchUsersArgs from '../arg/SearchUsersArgs'
+import SearchUsersArgs from '@arg/SearchUsersArgs'
 import { Transaction } from '@entity/Transaction'
-import { TransactionRepository } from '../../typeorm/repository/Transaction'
+import { TransactionRepository } from '@repository/Transaction'
-import { calculateDecay } from '../../util/decay'
+import { calculateDecay } from '@/util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
-import { hasElopageBuys } from '../../util/hasElopageBuys'
+import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
-import { TransactionTypeId } from '../enum/TransactionTypeId'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
 import Decimal from 'decimal.js-light'
-import { Decay } from '../model/Decay'
+import { Decay } from '@model/Decay'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?

backend/src/graphql/resolver/BalanceResolver.ts

@@ -3,10 +3,10 @@
 
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
-import { Balance } from '../model/Balance'
+import { Balance } from '@model/Balance'
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
-import { calculateDecay } from '../../util/decay'
+import { calculateDecay } from '@/util/decay'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
 import { Transaction } from '@entity/Transaction'
 import Decimal from 'decimal.js-light'
 

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

@@ -2,10 +2,10 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { createTestClient } from 'apollo-server-testing'
-import createServer from '../../server/createServer'
+import createServer from '@/server/createServer'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
 
-jest.mock('../../config')
+jest.mock('@/config')
 
 let query: any
 

backend/src/graphql/resolver/CommunityResolver.ts

@@ -2,9 +2,9 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Authorized } from 'type-graphql'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
-import { Community } from '../model/Community'
+import { Community } from '@model/Community'
 
 @Resolver()
 export class CommunityResolver {

backend/src/graphql/resolver/GdtResolver.ts

@@ -3,13 +3,13 @@
 
 import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
-import { GdtEntryList } from '../model/GdtEntryList'
+import { GdtEntryList } from '@model/GdtEntryList'
-import Paginated from '../arg/Paginated'
+import Paginated from '@arg/Paginated'
-import { apiGet } from '../../apis/HttpRequest'
+import { apiGet } from '@/apis/HttpRequest'
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
-import { Order } from '../enum/Order'
+import { Order } from '@enum/Order'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
 
 @Resolver()
 export class GdtResolver {

backend/src/graphql/resolver/KlicktippResolver.ts

@@ -7,9 +7,9 @@ import {
   getKlicktippTagMap,
   unsubscribe,
   klicktippSignIn,
-} from '../../apis/KlicktippController'
+} from '@/apis/KlicktippController'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
-import SubscribeNewsletterArgs from '../arg/SubscribeNewsletterArgs'
+import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
 
 @Resolver()
 export class KlicktippResolver {

backend/src/graphql/resolver/TransactionResolver.ts

@@ -6,32 +6,32 @@
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection } from '@dbTools/typeorm'
 
-import CONFIG from '../../config'
+import CONFIG from '@/config'
-import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail'
+import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail'
 
-import { Transaction } from '../model/Transaction'
+import { Transaction } from '@model/Transaction'
-import { TransactionList } from '../model/TransactionList'
+import { TransactionList } from '@model/TransactionList'
 
-import TransactionSendArgs from '../arg/TransactionSendArgs'
+import TransactionSendArgs from '@arg/TransactionSendArgs'
-import Paginated from '../arg/Paginated'
+import Paginated from '@arg/Paginated'
 
-import { Order } from '../enum/Order'
+import { Order } from '@enum/Order'
 
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
-import { TransactionRepository } from '../../typeorm/repository/Transaction'
+import { TransactionRepository } from '@repository/Transaction'
 
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 
-import { apiPost } from '../../apis/HttpRequest'
+import { apiPost } from '@/apis/HttpRequest'
-import { TransactionTypeId } from '../enum/TransactionTypeId'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { calculateBalance, isHexPublicKey } from '../../util/validate'
+import { calculateBalance, isHexPublicKey } from '@/util/validate'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
-import { User } from '../model/User'
+import { User } from '@model/User'
-import { communityUser } from '../../util/communityUser'
+import { communityUser } from '@/util/communityUser'
-import { virtualDecayTransaction } from '../../util/virtualDecayTransaction'
+import { virtualDecayTransaction } from '@/util/virtualDecayTransaction'
 import Decimal from 'decimal.js-light'
-import { calculateDecay } from '../../util/decay'
+import { calculateDecay } from '@/util/decay'
 
 @Resolver()
 export class TransactionResolver {

backend/src/graphql/resolver/UserResolver.ts

@@ -4,24 +4,24 @@
 import fs from 'fs'
 import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
 import { getConnection, getCustomRepository, QueryRunner } from '@dbTools/typeorm'
-import CONFIG from '../../config'
+import CONFIG from '@/config'
-import { User } from '../model/User'
+import { User } from '@model/User'
 import { User as DbUser } from '@entity/User'
-import { encode } from '../../auth/JWT'
+import { encode } from '@/auth/JWT'
-import CreateUserArgs from '../arg/CreateUserArgs'
+import CreateUserArgs from '@arg/CreateUserArgs'
-import UnsecureLoginArgs from '../arg/UnsecureLoginArgs'
+import UnsecureLoginArgs from '@arg/UnsecureLoginArgs'
-import UpdateUserInfosArgs from '../arg/UpdateUserInfosArgs'
+import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs'
-import { klicktippNewsletterStateMiddleware } from '../../middleware/klicktippMiddleware'
+import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware'
-import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository'
+import { UserSettingRepository } from '@repository/UserSettingRepository'
-import { Setting } from '../enum/Setting'
+import { Setting } from '@enum/Setting'
-import { UserRepository } from '../../typeorm/repository/User'
+import { UserRepository } from '@repository/User'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
-import { sendResetPasswordEmail } from '../../mailer/sendResetPasswordEmail'
+import { sendResetPasswordEmail } from '@/mailer/sendResetPasswordEmail'
-import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
+import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
-import { klicktippSignIn } from '../../apis/KlicktippController'
+import { klicktippSignIn } from '@/apis/KlicktippController'
-import { RIGHTS } from '../../auth/RIGHTS'
+import { RIGHTS } from '@/auth/RIGHTS'
-import { ROLE_ADMIN } from '../../auth/ROLES'
+import { ROLE_ADMIN } from '@/auth/ROLES'
-import { hasElopageBuys } from '../../util/hasElopageBuys'
+import { hasElopageBuys } from '@/util/hasElopageBuys'
 import { ServerUser } from '@entity/ServerUser'
 
 const EMAIL_OPT_IN_RESET_PASSWORD = 2

backend/src/mailer/sendEMail.test.ts

@@ -1,6 +1,6 @@
 import { sendEMail } from './sendEMail'
 import { createTransport } from 'nodemailer'
-import CONFIG from '../config'
+import CONFIG from '@/config'
 
 CONFIG.EMAIL = false
 CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'

backend/src/mailer/sendEMail.ts

@@ -1,6 +1,6 @@
 import { createTransport } from 'nodemailer'
 
-import CONFIG from '../config'
+import CONFIG from '@/config'
 
 export const sendEMail = async (emailDef: {
   to: string

backend/src/middleware/klicktippMiddleware.ts

@@ -1,7 +1,7 @@
 import { MiddlewareFn } from 'type-graphql'
-import { /* klicktippSignIn, */ getKlickTippUser } from '../apis/KlicktippController'
+import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController'
-import { KlickTipp } from '../graphql/model/KlickTipp'
+import { KlickTipp } from '@model/KlickTipp'
-import CONFIG from '../config/index'
+import CONFIG from '@/config'
 
 // export const klicktippRegistrationMiddleware: MiddlewareFn = async (
 //   // Only for demo

backend/src/server/createServer.ts

@@ -5,8 +5,8 @@ import { ApolloServer } from 'apollo-server-express'
 import express, { Express } from 'express'
 
 // database
-import connection from '../typeorm/connection'
+import connection from '@/typeorm/connection'
-import { checkDBVersion } from '../typeorm/DBVersion'
+import { checkDBVersion } from '@/typeorm/DBVersion'
 
 // server
 import cors from './cors'
@@ -14,13 +14,13 @@ import serverContext from './context'
 import plugins from './plugins'
 
 // config
-import CONFIG from '../config'
+import CONFIG from '@/config'
 
 // graphql
-import schema from '../graphql/schema'
+import schema from '@/graphql/schema'
 
 // webhooks
-import { elopageWebhook } from '../webhook/elopage'
+import { elopageWebhook } from '@/webhook/elopage'
 import { Connection } from '@dbTools/typeorm'
 
 // TODO implement

backend/src/typeorm/connection.ts

@@ -1,7 +1,7 @@
 // TODO This is super weird - since the entities are defined in another project they have their own globals.
 //      We cannot use our connection here, but must use the external typeorm installation
 import { Connection, createConnection, FileLogger } from '@dbTools/typeorm'
-import CONFIG from '../config'
+import CONFIG from '@/config'
 import { entities } from '@entity/index'
 
 const connection = async (): Promise<Connection | null> => {

backend/src/typeorm/repository/Transaction.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { Transaction } from '@entity/Transaction'
-import { Order } from '../../graphql/enum/Order'
+import { Order } from '@enum/Order'
-import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
 
 @EntityRepository(Transaction)
 export class TransactionRepository extends Repository<Transaction> {

backend/src/typeorm/repository/UserSettingRepository.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from '@dbTools/typeorm'
 import { UserSetting } from '@entity/UserSetting'
-import { Setting } from '../../graphql/enum/Setting'
+import { Setting } from '@enum/Setting'
-import { isStringBoolean } from '../../util/validate'
+import { isStringBoolean } from '@/util/validate'
 
 @EntityRepository(UserSetting)
 export class UserSettingRepository extends Repository<UserSetting> {

backend/src/util/communityUser.ts

@@ -2,7 +2,7 @@
 
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
-import { User } from '../graphql/model/User'
+import { User } from '@model/User'
 
 const communityDbUser: dbUser = {
   id: -1,

backend/src/util/decay.ts

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js-light'
-import CONFIG from '../config'
+import CONFIG from '@/config'
-import { Decay } from '../graphql/model/Decay'
+import { Decay } from '@model/Decay'
 
 // TODO: externalize all those definitions and functions into an external decay library
 

backend/src/util/validate.ts

@@ -1,7 +1,7 @@
 import { calculateDecay } from './decay'
 import Decimal from 'decimal.js-light'
 import { Transaction } from '@entity/Transaction'
-import { Decay } from '../graphql/model/Decay'
+import { Decay } from '@model/Decay'
 
 function isStringBoolean(value: string): boolean {
   const lowerValue = value.toLowerCase()

backend/src/util/virtualDecayTransaction.ts

@@ -3,9 +3,9 @@ import Decimal from 'decimal.js-light'
 import { SaveOptions, RemoveOptions } from '@dbTools/typeorm'
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { calculateDecay } from './decay'
-import { TransactionTypeId } from '../graphql/enum/TransactionTypeId'
+import { TransactionTypeId } from '@enum/TransactionTypeId'
-import { Transaction } from '../graphql/model/Transaction'
+import { Transaction } from '@model/Transaction'
-import { User } from '../graphql/model/User'
+import { User } from '@model/User'
 
 const virtualDecayTransaction = (
   balance: Decimal,

backend/src/webhook/elopage.ts

@@ -28,7 +28,7 @@
 */
 
 import { LoginElopageBuys } from '@entity/LoginElopageBuys'
-import { UserResolver } from '../graphql/resolver/UserResolver'
+import { UserResolver } from '@/graphql/resolver/UserResolver'
 import { User as dbUser } from '@entity/User'
 
 export const elopageWebhook = async (req: any, res: any): Promise<void> => {

backend/tsconfig.json

@@ -47,8 +47,13 @@
     // "moduleResolution": "node",                  /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "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/*"],
-      "@dbTools/*": ["../database/src/*"]
+      "@enum/*": ["./src/graphql/enum/*"],
+      "@model/*": ["./src/graphql/model/*"],
+      "@repository/*": ["./src/typeorm/repository/*"]
     },
     // "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. */