From d15b256fed30a445fd1d557675ebe213e4831e55 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 3 Oct 2021 11:13:02 +0200 Subject: [PATCH 1/7] model in singular folder --- backend/src/graphql/{models => model}/Balance.ts | 0 backend/src/graphql/{models => model}/CheckEmailResponse.ts | 0 backend/src/graphql/{models => model}/CheckUsernameResponse.ts | 0 backend/src/graphql/{models => model}/Decay.ts | 0 backend/src/graphql/{models => model}/GdtEntry.ts | 0 backend/src/graphql/{models => model}/GdtEntryList.ts | 0 backend/src/graphql/{models => model}/GdtSumPerEmail.ts | 0 backend/src/graphql/{models => model}/KlickTipp.ts | 0 backend/src/graphql/{models => model}/LoginViaVerificationCode.ts | 0 .../graphql/{models => model}/SendPasswordResetEmailResponse.ts | 0 backend/src/graphql/{models => model}/Transaction.ts | 0 backend/src/graphql/{models => model}/TransactionList.ts | 0 backend/src/graphql/{models => model}/UpdateUserInfosResponse.ts | 0 backend/src/graphql/{models => model}/User.ts | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename backend/src/graphql/{models => model}/Balance.ts (100%) rename backend/src/graphql/{models => model}/CheckEmailResponse.ts (100%) rename backend/src/graphql/{models => model}/CheckUsernameResponse.ts (100%) rename backend/src/graphql/{models => model}/Decay.ts (100%) rename backend/src/graphql/{models => model}/GdtEntry.ts (100%) rename backend/src/graphql/{models => model}/GdtEntryList.ts (100%) rename backend/src/graphql/{models => model}/GdtSumPerEmail.ts (100%) rename backend/src/graphql/{models => model}/KlickTipp.ts (100%) rename backend/src/graphql/{models => model}/LoginViaVerificationCode.ts (100%) rename backend/src/graphql/{models => model}/SendPasswordResetEmailResponse.ts (100%) rename backend/src/graphql/{models => model}/Transaction.ts (100%) rename backend/src/graphql/{models => model}/TransactionList.ts (100%) rename backend/src/graphql/{models => model}/UpdateUserInfosResponse.ts (100%) rename backend/src/graphql/{models => model}/User.ts (100%) diff --git a/backend/src/graphql/models/Balance.ts b/backend/src/graphql/model/Balance.ts similarity index 100% rename from backend/src/graphql/models/Balance.ts rename to backend/src/graphql/model/Balance.ts diff --git a/backend/src/graphql/models/CheckEmailResponse.ts b/backend/src/graphql/model/CheckEmailResponse.ts similarity index 100% rename from backend/src/graphql/models/CheckEmailResponse.ts rename to backend/src/graphql/model/CheckEmailResponse.ts diff --git a/backend/src/graphql/models/CheckUsernameResponse.ts b/backend/src/graphql/model/CheckUsernameResponse.ts similarity index 100% rename from backend/src/graphql/models/CheckUsernameResponse.ts rename to backend/src/graphql/model/CheckUsernameResponse.ts diff --git a/backend/src/graphql/models/Decay.ts b/backend/src/graphql/model/Decay.ts similarity index 100% rename from backend/src/graphql/models/Decay.ts rename to backend/src/graphql/model/Decay.ts diff --git a/backend/src/graphql/models/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts similarity index 100% rename from backend/src/graphql/models/GdtEntry.ts rename to backend/src/graphql/model/GdtEntry.ts diff --git a/backend/src/graphql/models/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts similarity index 100% rename from backend/src/graphql/models/GdtEntryList.ts rename to backend/src/graphql/model/GdtEntryList.ts diff --git a/backend/src/graphql/models/GdtSumPerEmail.ts b/backend/src/graphql/model/GdtSumPerEmail.ts similarity index 100% rename from backend/src/graphql/models/GdtSumPerEmail.ts rename to backend/src/graphql/model/GdtSumPerEmail.ts diff --git a/backend/src/graphql/models/KlickTipp.ts b/backend/src/graphql/model/KlickTipp.ts similarity index 100% rename from backend/src/graphql/models/KlickTipp.ts rename to backend/src/graphql/model/KlickTipp.ts diff --git a/backend/src/graphql/models/LoginViaVerificationCode.ts b/backend/src/graphql/model/LoginViaVerificationCode.ts similarity index 100% rename from backend/src/graphql/models/LoginViaVerificationCode.ts rename to backend/src/graphql/model/LoginViaVerificationCode.ts diff --git a/backend/src/graphql/models/SendPasswordResetEmailResponse.ts b/backend/src/graphql/model/SendPasswordResetEmailResponse.ts similarity index 100% rename from backend/src/graphql/models/SendPasswordResetEmailResponse.ts rename to backend/src/graphql/model/SendPasswordResetEmailResponse.ts diff --git a/backend/src/graphql/models/Transaction.ts b/backend/src/graphql/model/Transaction.ts similarity index 100% rename from backend/src/graphql/models/Transaction.ts rename to backend/src/graphql/model/Transaction.ts diff --git a/backend/src/graphql/models/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts similarity index 100% rename from backend/src/graphql/models/TransactionList.ts rename to backend/src/graphql/model/TransactionList.ts diff --git a/backend/src/graphql/models/UpdateUserInfosResponse.ts b/backend/src/graphql/model/UpdateUserInfosResponse.ts similarity index 100% rename from backend/src/graphql/models/UpdateUserInfosResponse.ts rename to backend/src/graphql/model/UpdateUserInfosResponse.ts diff --git a/backend/src/graphql/models/User.ts b/backend/src/graphql/model/User.ts similarity index 100% rename from backend/src/graphql/models/User.ts rename to backend/src/graphql/model/User.ts From 084561e5fb184502fc9073752a252e2e798a070c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 3 Oct 2021 11:13:21 +0200 Subject: [PATCH 2/7] resolver in singulat folder --- .../{resolvers => resolver}/BalanceResolver.ts | 2 +- .../graphql/{resolvers => resolver}/GdtResolver.ts | 2 +- .../{resolvers => resolver}/KlicktippResolver.ts | 0 .../{resolvers => resolver}/TransactionResolver.ts | 4 ++-- .../{resolvers => resolver}/UserResolver.ts | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) rename backend/src/graphql/{resolvers => resolver}/BalanceResolver.ts (96%) rename backend/src/graphql/{resolvers => resolver}/GdtResolver.ts (95%) rename backend/src/graphql/{resolvers => resolver}/KlicktippResolver.ts (100%) rename backend/src/graphql/{resolvers => resolver}/TransactionResolver.ts (98%) rename backend/src/graphql/{resolvers => resolver}/UserResolver.ts (93%) diff --git a/backend/src/graphql/resolvers/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts similarity index 96% rename from backend/src/graphql/resolvers/BalanceResolver.ts rename to backend/src/graphql/resolver/BalanceResolver.ts index 642f32975..e067b4d68 100644 --- a/backend/src/graphql/resolvers/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -3,7 +3,7 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql' import { getCustomRepository } from 'typeorm' -import { Balance } from '../models/Balance' +import { Balance } from '../model/Balance' import { BalanceRepository } from '../../typeorm/repository/Balance' import { UserRepository } from '../../typeorm/repository/User' import { calculateDecay } from '../../util/decay' diff --git a/backend/src/graphql/resolvers/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts similarity index 95% rename from backend/src/graphql/resolvers/GdtResolver.ts rename to backend/src/graphql/resolver/GdtResolver.ts index 39781f563..db0a02bf8 100644 --- a/backend/src/graphql/resolvers/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -4,7 +4,7 @@ import { Resolver, Query, Args, Ctx, Authorized } from 'type-graphql' import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' -import { GdtEntryList } from '../models/GdtEntryList' +import { GdtEntryList } from '../model/GdtEntryList' import Paginated from '../args/Paginated' import { apiGet } from '../../apis/HttpRequest' import { UserRepository } from '../../typeorm/repository/User' diff --git a/backend/src/graphql/resolvers/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts similarity index 100% rename from backend/src/graphql/resolvers/KlicktippResolver.ts rename to backend/src/graphql/resolver/KlicktippResolver.ts diff --git a/backend/src/graphql/resolvers/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts similarity index 98% rename from backend/src/graphql/resolvers/TransactionResolver.ts rename to backend/src/graphql/resolver/TransactionResolver.ts index f90eafff3..1fe0c4ff0 100644 --- a/backend/src/graphql/resolvers/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -6,8 +6,8 @@ import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' -import { Transaction } from '../models/Transaction' -import { TransactionList } from '../models/TransactionList' +import { Transaction } from '../model/Transaction' +import { TransactionList } from '../model/TransactionList' import TransactionSendArgs from '../args/TransactionSendArgs' import Paginated from '../args/Paginated' diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts similarity index 93% rename from backend/src/graphql/resolvers/UserResolver.ts rename to backend/src/graphql/resolver/UserResolver.ts index 36d2d5bed..79dfca496 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -3,11 +3,11 @@ import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' import CONFIG from '../../config' -import { CheckUsernameResponse } from '../models/CheckUsernameResponse' -import { LoginViaVerificationCode } from '../models/LoginViaVerificationCode' -import { SendPasswordResetEmailResponse } from '../models/SendPasswordResetEmailResponse' -import { UpdateUserInfosResponse } from '../models/UpdateUserInfosResponse' -import { User } from '../models/User' +import { CheckUsernameResponse } from '../model/CheckUsernameResponse' +import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode' +import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailResponse' +import { UpdateUserInfosResponse } from '../model/UpdateUserInfosResponse' +import { User } from '../model/User' import encode from '../../jwt/encode' import ChangePasswordArgs from '../args/ChangePasswordArgs' import CheckUsernameArgs from '../args/CheckUsernameArgs' @@ -19,10 +19,10 @@ import { klicktippRegistrationMiddleware, klicktippNewsletterStateMiddleware, } from '../../middleware/klicktippMiddleware' -import { CheckEmailResponse } from '../models/CheckEmailResponse' +import { CheckEmailResponse } from '../model/CheckEmailResponse' import { getCustomRepository } from 'typeorm' import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' -import { Setting } from '../../graphql/enum/Setting' +import { Setting } from '../enum/Setting' import { UserRepository } from '../../typeorm/repository/User' @Resolver() From d1f3e4e2156bc88366135044a382ea206c0fccd9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 3 Oct 2021 11:14:24 +0200 Subject: [PATCH 3/7] moved isAuthorized in directive folder removed resolver index.ts and load it via glob pattern --- .../directive/isAuthorized.ts} | 17 +++++++++++------ backend/src/graphql/resolvers/index.ts | 19 ------------------- backend/src/graphql/schema.ts | 6 +++--- 3 files changed, 14 insertions(+), 28 deletions(-) rename backend/src/{auth/auth.ts => graphql/directive/isAuthorized.ts} (66%) delete mode 100644 backend/src/graphql/resolvers/index.ts diff --git a/backend/src/auth/auth.ts b/backend/src/graphql/directive/isAuthorized.ts similarity index 66% rename from backend/src/auth/auth.ts rename to backend/src/graphql/directive/isAuthorized.ts index 7be67764b..77fe56ba1 100644 --- a/backend/src/auth/auth.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -1,13 +1,16 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { AuthChecker } from 'type-graphql' -import decode from '../jwt/decode' -import { apiGet } from '../apis/HttpRequest' -import CONFIG from '../config' -import encode from '../jwt/encode' -/* eslint-disable-next-line @typescript-eslint/no-unused-vars */ -export const isAuthorized: AuthChecker = async ({ root, args, context, info }, roles) => { +import CONFIG from '../../config' +import { apiGet } from '../../apis/HttpRequest' + +import decode from '../../jwt/decode' +import encode from '../../jwt/encode' + +const isAuthorized: AuthChecker = async ( + { /* root, args, */ context /*, info */ } /*, roles */, +) => { if (context.token) { const decoded = decode(context.token) if (decoded.sessionId && decoded.sessionId !== 0) { @@ -22,3 +25,5 @@ export const isAuthorized: AuthChecker = async ({ root, args, context, info } throw new Error('401 Unauthorized') } + +export default isAuthorized diff --git a/backend/src/graphql/resolvers/index.ts b/backend/src/graphql/resolvers/index.ts deleted file mode 100644 index f42829645..000000000 --- a/backend/src/graphql/resolvers/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { UserResolver } from './UserResolver' -import { BalanceResolver } from './BalanceResolver' -import { GdtResolver } from './GdtResolver' -import { TransactionResolver } from './TransactionResolver' -import { KlicktippResolver } from './KlicktippResolver' -import { NonEmptyArray } from 'type-graphql' - -export { UserResolver, BalanceResolver, GdtResolver, TransactionResolver, KlicktippResolver } - -// eslint-disable-next-line @typescript-eslint/ban-types -const resolvers = (): NonEmptyArray => [ - UserResolver, - BalanceResolver, - GdtResolver, - TransactionResolver, - KlicktippResolver, -] - -export default resolvers diff --git a/backend/src/graphql/schema.ts b/backend/src/graphql/schema.ts index f18a3bea6..0a570ae82 100644 --- a/backend/src/graphql/schema.ts +++ b/backend/src/graphql/schema.ts @@ -1,12 +1,12 @@ import { GraphQLSchema } from 'graphql' import { buildSchema } from 'type-graphql' +import path from 'path' -import resolvers from './resolvers' -import { isAuthorized } from '../auth/auth' +import isAuthorized from './directive/isAuthorized' const schema = async (): Promise => { return buildSchema({ - resolvers: resolvers(), + resolvers: [path.join(__dirname, 'resolver', `*.{js,ts}`)], authChecker: isAuthorized, }) } From fa5860ee47ef0187369838e65e60dc81eebe6978 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 3 Oct 2021 11:14:39 +0200 Subject: [PATCH 4/7] missing model ajustment --- backend/src/middleware/klicktippMiddleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts index a391038cb..ab3a9bd4c 100644 --- a/backend/src/middleware/klicktippMiddleware.ts +++ b/backend/src/middleware/klicktippMiddleware.ts @@ -1,6 +1,6 @@ import { MiddlewareFn } from 'type-graphql' import { signIn, getKlickTippUser } from '../apis/KlicktippController' -import { KlickTipp } from '../graphql/models/KlickTipp' +import { KlickTipp } from '../graphql/model/KlickTipp' import CONFIG from '../config/index' export const klicktippRegistrationMiddleware: MiddlewareFn = async ( From a673a5f11eb3e881f85bdc346ac991b128cbcb51 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 3 Oct 2021 13:41:20 +0200 Subject: [PATCH 5/7] missing change --- backend/src/util/decay.test.ts | 24 +++++++++++++++++++++++- backend/src/util/decay.ts | 8 ++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/backend/src/util/decay.test.ts b/backend/src/util/decay.test.ts index 645cdf6f0..1dbd37595 100644 --- a/backend/src/util/decay.test.ts +++ b/backend/src/util/decay.test.ts @@ -1,6 +1,28 @@ -import { calculateDecay } from './decay' +import { decayFormula, calculateDecay } from './decay' describe('utils/decay', () => { + describe('decayFormula', () => { + it('has base 0.99999997802044727', async () => { + const amount = 1.0 + const seconds = 1 + expect(await decayFormula(amount, seconds)).toBe(0.99999997802044727) + }) + it.skip('has negative decay?', async () => { + const amount = -1.0 + const seconds = 1 + expect(await decayFormula(amount, seconds)).toBe(-0.99999997802044727) + }) + it.skip('has correct backward calculation', async () => { + const amount = 1.0 + const seconds = -1 + expect(await decayFormula(amount, seconds)).toBe(1.0000000219795533) + }) + it.skip('has correct forward calculation', async () => { + const amount = 1.000000219795533 + const seconds = 1 + expect(await decayFormula(amount, seconds)).toBe(1.0) + }) + }) it.skip('has base 0.99999997802044727', async () => { const now = new Date() now.setSeconds(1) diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts index 7b064b0b1..7ea97ada9 100644 --- a/backend/src/util/decay.ts +++ b/backend/src/util/decay.ts @@ -1,9 +1,9 @@ import { getCustomRepository } from 'typeorm' -import { Decay } from '../graphql/models/Decay' +import { Decay } from '../graphql/model/Decay' import { TransactionRepository } from '../typeorm/repository/Transaction' -function decayFormula(amount: number, durationInSeconds: number): number { - return amount * Math.pow(0.99999997802044727, durationInSeconds) +function decayFormula(amount: number, seconds: number): number { + return amount * Math.pow(0.99999997802044727, seconds) // This number represents 50% decay a year } async function calculateDecay(amount: number, from: Date, to: Date): Promise { @@ -56,4 +56,4 @@ async function calculateDecayWithInterval( return result } -export { calculateDecay, calculateDecayWithInterval } +export { decayFormula, calculateDecay, calculateDecayWithInterval } From 3487a2e23286e6a5cd9ef53a805613c706c2edf7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 4 Oct 2021 10:04:58 +0200 Subject: [PATCH 6/7] renamed args folder to singular arg --- .../src/graphql/{args => arg}/ChangePasswordArgs.ts | 0 backend/src/graphql/{args => arg}/CheckUsernameArgs.ts | 0 backend/src/graphql/{args => arg}/CreateUserArgs.ts | 0 backend/src/graphql/{args => arg}/Paginated.ts | 0 .../graphql/{args => arg}/SubscribeNewsletterArgs.ts | 0 .../src/graphql/{args => arg}/TransactionSendArgs.ts | 0 backend/src/graphql/{args => arg}/UnsecureLoginArgs.ts | 0 .../src/graphql/{args => arg}/UpdateUserInfosArgs.ts | 0 backend/src/graphql/resolver/GdtResolver.ts | 2 +- backend/src/graphql/resolver/KlicktippResolver.ts | 2 +- backend/src/graphql/resolver/TransactionResolver.ts | 4 ++-- backend/src/graphql/resolver/UserResolver.ts | 10 +++++----- 12 files changed, 9 insertions(+), 9 deletions(-) rename backend/src/graphql/{args => arg}/ChangePasswordArgs.ts (100%) rename backend/src/graphql/{args => arg}/CheckUsernameArgs.ts (100%) rename backend/src/graphql/{args => arg}/CreateUserArgs.ts (100%) rename backend/src/graphql/{args => arg}/Paginated.ts (100%) rename backend/src/graphql/{args => arg}/SubscribeNewsletterArgs.ts (100%) rename backend/src/graphql/{args => arg}/TransactionSendArgs.ts (100%) rename backend/src/graphql/{args => arg}/UnsecureLoginArgs.ts (100%) rename backend/src/graphql/{args => arg}/UpdateUserInfosArgs.ts (100%) diff --git a/backend/src/graphql/args/ChangePasswordArgs.ts b/backend/src/graphql/arg/ChangePasswordArgs.ts similarity index 100% rename from backend/src/graphql/args/ChangePasswordArgs.ts rename to backend/src/graphql/arg/ChangePasswordArgs.ts diff --git a/backend/src/graphql/args/CheckUsernameArgs.ts b/backend/src/graphql/arg/CheckUsernameArgs.ts similarity index 100% rename from backend/src/graphql/args/CheckUsernameArgs.ts rename to backend/src/graphql/arg/CheckUsernameArgs.ts diff --git a/backend/src/graphql/args/CreateUserArgs.ts b/backend/src/graphql/arg/CreateUserArgs.ts similarity index 100% rename from backend/src/graphql/args/CreateUserArgs.ts rename to backend/src/graphql/arg/CreateUserArgs.ts diff --git a/backend/src/graphql/args/Paginated.ts b/backend/src/graphql/arg/Paginated.ts similarity index 100% rename from backend/src/graphql/args/Paginated.ts rename to backend/src/graphql/arg/Paginated.ts diff --git a/backend/src/graphql/args/SubscribeNewsletterArgs.ts b/backend/src/graphql/arg/SubscribeNewsletterArgs.ts similarity index 100% rename from backend/src/graphql/args/SubscribeNewsletterArgs.ts rename to backend/src/graphql/arg/SubscribeNewsletterArgs.ts diff --git a/backend/src/graphql/args/TransactionSendArgs.ts b/backend/src/graphql/arg/TransactionSendArgs.ts similarity index 100% rename from backend/src/graphql/args/TransactionSendArgs.ts rename to backend/src/graphql/arg/TransactionSendArgs.ts diff --git a/backend/src/graphql/args/UnsecureLoginArgs.ts b/backend/src/graphql/arg/UnsecureLoginArgs.ts similarity index 100% rename from backend/src/graphql/args/UnsecureLoginArgs.ts rename to backend/src/graphql/arg/UnsecureLoginArgs.ts diff --git a/backend/src/graphql/args/UpdateUserInfosArgs.ts b/backend/src/graphql/arg/UpdateUserInfosArgs.ts similarity index 100% rename from backend/src/graphql/args/UpdateUserInfosArgs.ts rename to backend/src/graphql/arg/UpdateUserInfosArgs.ts diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index db0a02bf8..9ca9421f6 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -5,7 +5,7 @@ import { Resolver, Query, Args, Ctx, Authorized } from 'type-graphql' import { getCustomRepository } from 'typeorm' import CONFIG from '../../config' import { GdtEntryList } from '../model/GdtEntryList' -import Paginated from '../args/Paginated' +import Paginated from '../arg/Paginated' import { apiGet } from '../../apis/HttpRequest' import { UserRepository } from '../../typeorm/repository/User' import { Order } from '../enum/Order' diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index a76e9f6bb..e90d43a1f 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -8,7 +8,7 @@ import { unsubscribe, signIn, } from '../../apis/KlicktippController' -import SubscribeNewsletterArgs from '../args/SubscribeNewsletterArgs' +import SubscribeNewsletterArgs from '../arg/SubscribeNewsletterArgs' @Resolver() export class KlicktippResolver { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 1fe0c4ff0..f0ba6efb2 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -9,8 +9,8 @@ import CONFIG from '../../config' import { Transaction } from '../model/Transaction' import { TransactionList } from '../model/TransactionList' -import TransactionSendArgs from '../args/TransactionSendArgs' -import Paginated from '../args/Paginated' +import TransactionSendArgs from '../arg/TransactionSendArgs' +import Paginated from '../arg/Paginated' import { Order } from '../enum/Order' diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 79dfca496..5a2a049de 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -9,11 +9,11 @@ import { SendPasswordResetEmailResponse } from '../model/SendPasswordResetEmailR import { UpdateUserInfosResponse } from '../model/UpdateUserInfosResponse' import { User } from '../model/User' import encode from '../../jwt/encode' -import ChangePasswordArgs from '../args/ChangePasswordArgs' -import CheckUsernameArgs from '../args/CheckUsernameArgs' -import CreateUserArgs from '../args/CreateUserArgs' -import UnsecureLoginArgs from '../args/UnsecureLoginArgs' -import UpdateUserInfosArgs from '../args/UpdateUserInfosArgs' +import ChangePasswordArgs from '../arg/ChangePasswordArgs' +import CheckUsernameArgs from '../arg/CheckUsernameArgs' +import CreateUserArgs from '../arg/CreateUserArgs' +import UnsecureLoginArgs from '../arg/UnsecureLoginArgs' +import UpdateUserInfosArgs from '../arg/UpdateUserInfosArgs' import { apiPost, apiGet } from '../../apis/HttpRequest' import { klicktippRegistrationMiddleware, From 338a2e8f6cfeaa81bd1a4cbfd216adb7e7d1c5de Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 4 Oct 2021 10:28:04 +0200 Subject: [PATCH 7/7] Update backend/src/util/decay.test.ts Co-authored-by: Hannes Heine --- backend/src/util/decay.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/util/decay.test.ts b/backend/src/util/decay.test.ts index 1dbd37595..3a1c33716 100644 --- a/backend/src/util/decay.test.ts +++ b/backend/src/util/decay.test.ts @@ -7,6 +7,7 @@ describe('utils/decay', () => { const seconds = 1 expect(await decayFormula(amount, seconds)).toBe(0.99999997802044727) }) + // Not sure if the following skiped tests make sence!? it.skip('has negative decay?', async () => { const amount = -1.0 const seconds = 1