From 1315c5e1b1f06e60358f9b255e334f606c948184 Mon Sep 17 00:00:00 2001 From: Einhornimmond Date: Fri, 24 Sep 2021 09:45:52 +0200 Subject: [PATCH] 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) } }