Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend teams stats API with team members stats API #10236

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions datanode/api/trading_data_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -4634,6 +4634,43 @@ func (t *TradingDataServiceV2) ListTeamsStatistics(ctx context.Context, req *v2.
}, nil
}

func (t *TradingDataServiceV2) ListTeamMembersStatistics(ctx context.Context, req *v2.ListTeamMembersStatisticsRequest) (*v2.ListTeamMembersStatisticsResponse, error) {
defer metrics.StartAPIRequestAndTimeGRPC("ListTeamMembersStatistics")()

pagination, err := entities.CursorPaginationFromProto(req.Pagination)
if err != nil {
return nil, formatE(ErrInvalidPagination, err)
}

filters := sqlstore.ListTeamMembersStatisticsFilters{
AggregationEpochs: 10,
}

if req.PartyId != nil {
filters.PartyID = ptr.From(entities.PartyID(*req.PartyId))
}
if req.AggregationEpochs != nil {
filters.AggregationEpochs = *req.AggregationEpochs
}

stats, pageInfo, err := t.teamsService.ListTeamMembersStatistics(ctx, pagination, filters)
if err != nil {
return nil, formatE(ErrListTeamReferees, err)
}

edges, err := makeEdges[*v2.TeamMemberStatisticsEdge](stats)
if err != nil {
return nil, formatE(err)
}

return &v2.ListTeamMembersStatisticsResponse{
Statistics: &v2.TeamMembersStatisticsConnection{
Edges: edges,
PageInfo: pageInfo.ToProto(),
},
}, nil
}

func (t *TradingDataServiceV2) ListTeamReferees(ctx context.Context, req *v2.ListTeamRefereesRequest) (*v2.ListTeamRefereesResponse, error) {
defer metrics.StartAPIRequestAndTimeGRPC("ListTeamReferees")()
pagination, err := entities.CursorPaginationFromProto(req.Pagination)
Expand Down
2 changes: 1 addition & 1 deletion datanode/entities/entities.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type Entities interface {
ProtocolUpgradeProposal | CoreSnapshotData | EpochRewardSummary | SuccessorMarket | StopOrder |
LiquidityProvider | FundingPeriod | FundingPeriodDataPoint | ReferralSet | ReferralSetRefereeStats |
FlattenReferralSetStats | Team | TeamMember | TeamMemberHistory | FundingPayment | FlattenVolumeDiscountStats |
PaidLiquidityFeesStats | CurrentAndPreviousLiquidityProvisions | TransferDetails | Game | TeamsStatistics
PaidLiquidityFeesStats | CurrentAndPreviousLiquidityProvisions | TransferDetails | Game | TeamsStatistics | TeamMembersStatistics
}

type PagedEntity[T proto.Message] interface {
Expand Down
67 changes: 66 additions & 1 deletion datanode/entities/teams.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func (t TeamsStatistics) ToProto() *v2.TeamStatistics {
TotalQuantumVolume: "",
TotalQuantumRewards: t.TotalQuantumRewards.String(),
QuantumRewards: quantumRewards,
TotalGamePlayed: t.TotalGamesPlayed,
TotalGamesPlayed: t.TotalGamesPlayed,
GamesPlayed: gamesPlayed,
}
}
Expand Down Expand Up @@ -194,6 +194,71 @@ func (c *TeamsStatisticsCursor) Parse(cursorString string) error {
return json.Unmarshal([]byte(cursorString), c)
}

type TeamMembersStatistics struct {
PartyID PartyID
TotalQuantumRewards num.Decimal
QuantumRewards []QuantumRewardsPerEpoch
TotalGamesPlayed uint64
GamesPlayed []GameID
}

func (t TeamMembersStatistics) Cursor() *Cursor {
tc := TeamMemberStatisticsCursor{
ID: t.PartyID,
}
return NewCursor(tc.String())
}

func (t TeamMembersStatistics) ToProto() *v2.TeamMemberStatistics {
gamesPlayed := make([]string, 0, len(t.GamesPlayed))
for _, id := range t.GamesPlayed {
gamesPlayed = append(gamesPlayed, id.String())
}

quantumRewards := make([]*v2.QuantumRewardsPerEpoch, 0, len(t.QuantumRewards))
for _, r := range t.QuantumRewards {
quantumRewards = append(quantumRewards, &v2.QuantumRewardsPerEpoch{
Epoch: r.Epoch,
TotalQuantumRewards: r.Total.String(),
})
}

return &v2.TeamMemberStatistics{
PartyId: string(t.PartyID),
TotalQuantumVolume: "",
TotalQuantumRewards: t.TotalQuantumRewards.String(),
QuantumRewards: quantumRewards,
TotalGamesPlayed: t.TotalGamesPlayed,
GamesPlayed: gamesPlayed,
}
}

func (t TeamMembersStatistics) ToProtoEdge(_ ...any) (*v2.TeamMemberStatisticsEdge, error) {
return &v2.TeamMemberStatisticsEdge{
Node: t.ToProto(),
Cursor: t.Cursor().Encode(),
}, nil
}

type TeamMemberStatisticsCursor struct {
ID PartyID
}

func (c TeamMemberStatisticsCursor) String() string {
bs, err := json.Marshal(c)
if err != nil {
panic(fmt.Errorf("could not marshal team member stats cursor: %v", err))
}
return string(bs)
}

func (c *TeamMemberStatisticsCursor) Parse(cursorString string) error {
if cursorString == "" {
return nil
}
return json.Unmarshal([]byte(cursorString), c)
}

type TeamMember struct {
TeamID TeamID
PartyID PartyID
Expand Down
Loading
Loading