mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
resolve relative paths in resolvers
This commit is contained in:
parent
e44bc316bf
commit
0136a22f0c
@ -10,25 +10,25 @@ import {
|
|||||||
getConnection,
|
getConnection,
|
||||||
In,
|
In,
|
||||||
} from '@dbTools/typeorm'
|
} 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 { 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 { AdminPendingCreation } from '@entity/AdminPendingCreation'
|
||||||
import { hasElopageBuys } from '../../util/hasElopageBuys'
|
import { hasElopageBuys } from '@/util/hasElopageBuys'
|
||||||
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
|
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
|
||||||
import { User } from '@entity/User'
|
import { User } from '@entity/User'
|
||||||
import { TransactionTypeId } from '../enum/TransactionTypeId'
|
import { TransactionTypeId } from '@enum/TransactionTypeId'
|
||||||
import Decimal from 'decimal.js-light'
|
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_IN_REGISTER = 1
|
||||||
// const EMAIL_OPT_UNKNOWN = 3 // elopage?
|
// const EMAIL_OPT_UNKNOWN = 3 // elopage?
|
||||||
|
|||||||
@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
|
import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
|
||||||
import { getCustomRepository } from '@dbTools/typeorm'
|
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 { Transaction } from '@entity/Transaction'
|
||||||
import Decimal from 'decimal.js-light'
|
import Decimal from 'decimal.js-light'
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
||||||
|
|
||||||
import { createTestClient } from 'apollo-server-testing'
|
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')
|
||||||
|
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
||||||
|
|
||||||
import { Resolver, Query, Authorized } from 'type-graphql'
|
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()
|
@Resolver()
|
||||||
export class CommunityResolver {
|
export class CommunityResolver {
|
||||||
|
|||||||
@ -3,13 +3,13 @@
|
|||||||
|
|
||||||
import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql'
|
import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql'
|
||||||
import { getCustomRepository } from '@dbTools/typeorm'
|
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()
|
@Resolver()
|
||||||
export class GdtResolver {
|
export class GdtResolver {
|
||||||
|
|||||||
@ -7,9 +7,9 @@ import {
|
|||||||
getKlicktippTagMap,
|
getKlicktippTagMap,
|
||||||
unsubscribe,
|
unsubscribe,
|
||||||
klicktippSignIn,
|
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()
|
@Resolver()
|
||||||
export class KlicktippResolver {
|
export class KlicktippResolver {
|
||||||
|
|||||||
@ -6,32 +6,32 @@
|
|||||||
import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
|
import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
|
||||||
import { getCustomRepository, getConnection } from '@dbTools/typeorm'
|
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 { User as dbUser } from '@entity/User'
|
||||||
import { Transaction as dbTransaction } from '@entity/Transaction'
|
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 Decimal from 'decimal.js-light'
|
||||||
import { calculateDecay } from '../../util/decay'
|
import { calculateDecay } from '@/util/decay'
|
||||||
|
|
||||||
@Resolver()
|
@Resolver()
|
||||||
export class TransactionResolver {
|
export class TransactionResolver {
|
||||||
|
|||||||
@ -4,12 +4,12 @@
|
|||||||
import { createTestClient } from 'apollo-server-testing'
|
import { createTestClient } from 'apollo-server-testing'
|
||||||
import gql from 'graphql-tag'
|
import gql from 'graphql-tag'
|
||||||
import { GraphQLError } from 'graphql'
|
import { GraphQLError } from 'graphql'
|
||||||
import createServer from '../../server/createServer'
|
import createServer from '@/server/createServer'
|
||||||
import { resetDB, initialize } from '@dbTools/helpers'
|
import { resetDB, initialize } from '@dbTools/helpers'
|
||||||
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
|
import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
|
||||||
import { User } from '@entity/User'
|
import { User } from '@entity/User'
|
||||||
import CONFIG from '../../config'
|
import CONFIG from '@/config'
|
||||||
import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
|
import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
|
||||||
// import { klicktippSignIn } from '../../apis/KlicktippController'
|
// import { klicktippSignIn } from '../../apis/KlicktippController'
|
||||||
|
|
||||||
jest.setTimeout(10000)
|
jest.setTimeout(10000)
|
||||||
|
|||||||
@ -4,24 +4,24 @@
|
|||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
|
import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
|
||||||
import { getConnection, getCustomRepository, QueryRunner } from '@dbTools/typeorm'
|
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 { 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 { 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'
|
import { ServerUser } from '@entity/ServerUser'
|
||||||
|
|
||||||
const EMAIL_OPT_IN_RESET_PASSWORD = 2
|
const EMAIL_OPT_IN_RESET_PASSWORD = 2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user