From 1315c5e1b1f06e60358f9b255e334f606c948184 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Fri, 24 Sep 2021 09:45:52 +0200 Subject: [PATCH 1/3] use gdt call direct --- backend/src/graphql/resolvers/GdtResolver.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolvers/GdtResolver.ts b/backend/src/graphql/resolvers/GdtResolver.ts index 18365e9f9..212d2b42f 100644 --- a/backend/src/graphql/resolvers/GdtResolver.ts +++ b/backend/src/graphql/resolvers/GdtResolver.ts @@ -6,6 +6,7 @@ import CONFIG from '../../config' import { GdtEntryList } from '../models/GdtEntryList' import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs' import { apiGet } from '../../apis/HttpRequest' +import { User as tUser } from '../../typeorm/entity/User' @Resolver() export class GdtResolver { @@ -17,13 +18,20 @@ export class GdtResolver { { currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput, @Ctx() context: any, ): Promise { - const result = await apiGet( - `${CONFIG.COMMUNITY_API_URL}listGDTTransactions/${currentPage}/${pageSize}/${order}/${context.sessionId}`, + // get public key for current logged in user + const result = await apiGet(CONFIG.LOGIN_API_URL + 'login?session_id=' + context.sessionId) + if (!result.success) throw new Error(result.data) + + // load user + const userEntity = await tUser.findByPubkeyHex(result.data.user.public_hex) + + const resultGDT = await apiGet( + `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`, ) - if (!result.success) { + if (!resultGDT.success) { throw new Error(result.data) } - return new GdtEntryList(result.data) + return new GdtEntryList(resultGDT.data) } } From 1f99be5eec6971410acd88917a6631bfcc2ca845 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Fri, 24 Sep 2021 12:29:41 +0200 Subject: [PATCH 2/3] exchange t for typeorm with db for db model.. it's more clear --- backend/src/graphql/resolvers/BalanceResolver.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolvers/BalanceResolver.ts b/backend/src/graphql/resolvers/BalanceResolver.ts index c42d3d101..34aedac37 100644 --- a/backend/src/graphql/resolvers/BalanceResolver.ts +++ b/backend/src/graphql/resolvers/BalanceResolver.ts @@ -5,8 +5,8 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql' import CONFIG from '../../config' import { Balance } from '../models/Balance' import { apiGet } from '../../apis/HttpRequest' -import { User as tUser } from '../../typeorm/entity/User' -import { Balance as tBalance } from '../../typeorm/entity/Balance' +import { User as dbUser } from '../../typeorm/entity/User' +import { Balance as dbBalance } from '../../typeorm/entity/Balance' import calculateDecay from '../../util/decay' import { roundFloorFrom4 } from '../../util/round' @@ -20,8 +20,8 @@ export class BalanceResolver { if (!result.success) throw new Error(result.data) // load user and balance - const userEntity = await tUser.findByPubkeyHex(result.data.user.public_hex) - const balanceEntity = await tBalance.findByUser(userEntity.id) + const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex) + const balanceEntity = await dbBalance.findByUser(userEntity.id) const now = new Date() const balance = new Balance({ balance: roundFloorFrom4(balanceEntity.amount), From 2d1a0d8c4eb56b2fd13c0dda6cf991190587fde3 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Fri, 24 Sep 2021 13:08:01 +0200 Subject: [PATCH 3/3] now in the correct file --- backend/src/graphql/resolvers/GdtResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolvers/GdtResolver.ts b/backend/src/graphql/resolvers/GdtResolver.ts index 212d2b42f..4396c5ac9 100644 --- a/backend/src/graphql/resolvers/GdtResolver.ts +++ b/backend/src/graphql/resolvers/GdtResolver.ts @@ -6,7 +6,7 @@ import CONFIG from '../../config' import { GdtEntryList } from '../models/GdtEntryList' import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs' import { apiGet } from '../../apis/HttpRequest' -import { User as tUser } from '../../typeorm/entity/User' +import { User as dbUser } from '../../typeorm/entity/User' @Resolver() export class GdtResolver { @@ -23,7 +23,7 @@ export class GdtResolver { if (!result.success) throw new Error(result.data) // load user - const userEntity = await tUser.findByPubkeyHex(result.data.user.public_hex) + const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex) const resultGDT = await apiGet( `${CONFIG.GDT_API_URL}/GdtEntries/listPerEmailApi/${userEntity.email}/${currentPage}/${pageSize}/${order}`,