IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #891 from gradido/apollo_listGDTTransactions

Browse Source 
Apollo list gdt transactions
This commit is contained in:
einhornimmond 2021-09-24 14:52:34 +02:00 committed by GitHub
commit 62940bd583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/graphql/resolvers/BalanceResolver.ts
View File

@ -5,8 +5,8 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
import CONFIG from '../../config' import CONFIG from '../../config'
import { Balance } from '../models/Balance' import { Balance } from '../models/Balance'
import { apiGet } from '../../apis/HttpRequest' import { apiGet } from '../../apis/HttpRequest'
import { User as tUser } from '../../typeorm/entity/User' import { User as dbUser } from '../../typeorm/entity/User'
import { Balance as tBalance } from '../../typeorm/entity/Balance' import { Balance as dbBalance } from '../../typeorm/entity/Balance'
import calculateDecay from '../../util/decay' import calculateDecay from '../../util/decay'
import { roundFloorFrom4 } from '../../util/round' import { roundFloorFrom4 } from '../../util/round'
@ -20,8 +20,8 @@ export class BalanceResolver {
if (!result.success) throw new Error(result.data) if (!result.success) throw new Error(result.data)
// load user and balance // load user and balance
const userEntity = await tUser.findByPubkeyHex(result.data.user.public_hex) const userEntity = await dbUser.findByPubkeyHex(result.data.user.public_hex)
const balanceEntity = await tBalance.findByUser(userEntity.id) const balanceEntity = await dbBalance.findByUser(userEntity.id)
const now = new Date() const now = new Date()
const balance = new Balance({ const balance = new Balance({
balance: roundFloorFrom4(balanceEntity.amount), balance: roundFloorFrom4(balanceEntity.amount),

16
backend/src/graphql/resolvers/GdtResolver.ts
View File

@ -6,6 +6,7 @@ import CONFIG from '../../config'
import { GdtEntryList } from '../models/GdtEntryList' import { GdtEntryList } from '../models/GdtEntryList'
import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs' import { GdtTransactionSessionIdInput } from '../inputs/GdtInputs'
import { apiGet } from '../../apis/HttpRequest' import { apiGet } from '../../apis/HttpRequest'
import { User as dbUser } from '../../typeorm/entity/User'
@Resolver() @Resolver()
export class GdtResolver { export class GdtResolver {
@ -17,13 +18,20 @@ export class GdtResolver {
{ currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput, { currentPage = 1, pageSize = 5, order = 'DESC' }: GdtTransactionSessionIdInput,
@Ctx() context: any, @Ctx() context: any,
): Promise<GdtEntryList> { ): Promise<GdtEntryList> {
const result = await apiGet( // get public key for current logged in user
`${CONFIG.COMMUNITY_API_URL}listGDTTransactions/${currentPage}/${pageSize}/${order}/${context.sessionId}`, 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 dbUser.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) throw new Error(result.data)
} }
return new GdtEntryList(result.data) return new GdtEntryList(resultGDT.data)
} }
} }