open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Query bets all at once in updateUserMetrics (#477)

Browse Source
This commit is contained in:
Marshall Polaris 2022-06-10 21:00:19 -07:00 committed by GitHub
parent d8dc91d4b7
commit 00d7e622df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
functions/src/update-user-metrics.ts
View File

@ -1,6 +1,6 @@
import * as functions from 'firebase-functions' import * as functions from 'firebase-functions'
import * as admin from 'firebase-admin' import * as admin from 'firebase-admin'
import { sum, sumBy } from 'lodash' import { groupBy, sum, sumBy } from 'lodash'
import { getValues } from './utils' import { getValues } from './utils'
import { Contract } from '../../common/contract' import { Contract } from '../../common/contract'
@ -14,22 +14,28 @@ const firestore = admin.firestore()
export const updateUserMetrics = functions.pubsub export const updateUserMetrics = functions.pubsub
.schedule('every 15 minutes') .schedule('every 15 minutes')
.onRun(async () => { .onRun(async () => {
const [users, contracts] = await Promise.all([ const [users, contracts, bets] = await Promise.all([
getValues<User>(firestore.collection('users')), getValues<User>(firestore.collection('users')),
getValues<Contract>(firestore.collection('contracts')), getValues<Contract>(firestore.collection('contracts')),
firestore.collectionGroup('bets').get(),
]) ])
const contractsDict = Object.fromEntries( const contractsDict = Object.fromEntries(
contracts.map((contract) => [contract.id, contract]) contracts.map((contract) => [contract.id, contract])
) )
const betsByUser = groupBy(
bets.docs.map((doc) => doc.data() as Bet),
(bet) => bet.userId
)
await batchedWaitAll( await batchedWaitAll(
users.map((user) => async () => { users.map((user) => async () => {
const [investmentValue, creatorVolume] = await Promise.all([ const investmentValue = computeInvestmentValue(
computeInvestmentValue(user, contractsDict), betsByUser[user.id] ?? [],
computeTotalPool(user, contractsDict), contractsDict
]) )
const creatorVolume = computeTotalPool(user, contractsDict)
const totalValue = user.balance + investmentValue const totalValue = user.balance + investmentValue
const totalPnL = totalValue - user.totalDeposits const totalPnL = totalValue - user.totalDeposits
@ -41,13 +47,10 @@ export const updateUserMetrics = functions.pubsub
) )
}) })
const computeInvestmentValue = async ( const computeInvestmentValue = (
user: User, bets: Bet[],
contractsDict: { [k: string]: Contract } contractsDict: { [k: string]: Contract }
) => { ) => {
const query = firestore.collectionGroup('bets').where('userId', '==', user.id)
const bets = await getValues<Bet>(query)
return sumBy(bets, (bet) => { return sumBy(bets, (bet) => {
const contract = contractsDict[bet.contractId] const contract = contractsDict[bet.contractId]
if (!contract || contract.isResolved) return 0 if (!contract || contract.isResolved) return 0
@ -58,7 +61,7 @@ const computeInvestmentValue = async (
}) })
} }
const computeTotalPool = async ( const computeTotalPool = (
user: User, user: User,
contractsDict: { [k: string]: Contract } contractsDict: { [k: string]: Contract }
) => { ) => {