From be70d7674b974cf5c167dfd3ca0c86a94ad3a43c Mon Sep 17 00:00:00 2001 From: ice-myles <96409608+ice-myles@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:52:06 +0300 Subject: [PATCH] Use total users instead of active in user growth time series. --- cmd/eskimo-hut/eskimo.go | 7 ++++++- go.mod | 6 +++--- go.sum | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmd/eskimo-hut/eskimo.go b/cmd/eskimo-hut/eskimo.go index 69eede80..2f6c37ec 100644 --- a/cmd/eskimo-hut/eskimo.go +++ b/cmd/eskimo-hut/eskimo.go @@ -224,7 +224,7 @@ func (s *service) GetTopCountries( //nolint:gocritic // False negative. // @Failure 500 {object} server.ErrorResponse // @Failure 504 {object} server.ErrorResponse "if request times out" // @Router /v1r/user-statistics/user-growth [GET]. -func (s *service) GetUserGrowth( //nolint:gocritic // False negative. +func (s *service) GetUserGrowth( //nolint:gocritic,funlen // False negative. ctx context.Context, req *server.Request[GetUserGrowthArg, users.UserGrowthStatistics], ) (*server.Response[users.UserGrowthStatistics], *server.Response[server.ErrorResponse]) { @@ -251,6 +251,11 @@ func (s *service) GetUserGrowth( //nolint:gocritic // False negative. if err != nil { return nil, server.Unexpected(errors.Wrapf(err, "failed to get user growth stats for: %#v", req.Data)) } + if true { + for i := range result.TimeSeries { + result.TimeSeries[i].Active = result.TimeSeries[i].Total + } + } return server.OK(result), nil } diff --git a/go.mod b/go.mod index af3a621c..38f9fe08 100644 --- a/go.mod +++ b/go.mod @@ -31,8 +31,8 @@ require ( cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/firestore v1.15.0 // indirect - cloud.google.com/go/iam v1.1.8 // indirect - cloud.google.com/go/longrunning v0.5.7 // indirect + cloud.google.com/go/iam v1.1.9 // indirect + cloud.google.com/go/longrunning v0.5.8 // indirect cloud.google.com/go/storage v1.42.0 // indirect firebase.google.com/go/v4 v4.14.1 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect @@ -57,7 +57,7 @@ require ( github.com/dennwc/varint v1.0.0 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v27.0.1+incompatible // indirect + github.com/docker/docker v27.0.2+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect diff --git a/go.sum b/go.sum index 2e630f39..b482e573 100644 --- a/go.sum +++ b/go.sum @@ -9,10 +9,10 @@ cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2Qx cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/firestore v1.15.0 h1:/k8ppuWOtNuDHt2tsRV42yI21uaGnKDEQnRFeBpbFF8= cloud.google.com/go/firestore v1.15.0/go.mod h1:GWOxFXcv8GZUtYpWHw/w6IuYNux/BtmeVTMmjrm4yhk= -cloud.google.com/go/iam v1.1.8 h1:r7umDwhj+BQyz0ScZMp4QrGXjSTI3ZINnpgU2nlB/K0= -cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE= -cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU= -cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng= +cloud.google.com/go/iam v1.1.9 h1:oSkYLVtVme29uGYrOcKcvJRht7cHJpYD09GM9JaR0TE= +cloud.google.com/go/iam v1.1.9/go.mod h1:Nt1eDWNYH9nGQg3d/mY7U1hvfGmsaG9o/kLGoLoLXjQ= +cloud.google.com/go/longrunning v0.5.8 h1:QThI5BFSlYlS7K0wnABCdmKsXbG/htLc3nTPzrfOgeU= +cloud.google.com/go/longrunning v0.5.8/go.mod h1:oJDErR/mm5h44gzsfjQlxd6jyjFvuBPOxR1TLy2+cQk= cloud.google.com/go/storage v1.42.0 h1:4QtGpplCVt1wz6g5o1ifXd656P5z+yNgzdw1tVfp0cU= cloud.google.com/go/storage v1.42.0/go.mod h1:HjMXRFq65pGKFn6hxj6x3HCyR41uSB72Z0SO/Vn6JFQ= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=