better MAU detection

radiantspace · May 19, 2024 · a648e55 · a648e55
1 parent 78dee79
commit a648e55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/backend/app/db/mongo/mongo.go b/backend/app/db/mongo/mongo.go
@@ -242,7 +242,11 @@ func (c *Client) GetUserIdsUsedSince(ctx context.Context, since time.Time, page
 	findOptions := options.Find()
 	findOptions.SetSkip(int64(page * pageSize))
 	findOptions.SetLimit(int64(pageSize))
-	cursor, err := collection.Find(ctx, bson.M{"last_used_at": bson.M{"$gte": since.Format("2006-01-02T15:04:05")}}, findOptions)
+	// last_used_at or subscription_date is gte than since
+	cursor, err := collection.Find(ctx, bson.M{"$or": []bson.M{
+		{"last_used_at": bson.M{"$gte": since.Format("2006-01-02T15:04:05")}},
+		{"subscription_date": bson.M{"$gte": since.Format("2006-01-02")}},
+	}}, findOptions)
 	if err != nil {
 		return nil, fmt.Errorf("GetUserIdsSince: failed to find users: %w", err)
 	}

diff --git a/backend/app/status/system_status.go b/backend/app/status/system_status.go
@@ -116,10 +116,10 @@ func (h *SystemStatusHandler) GetSystemStatus() SystemStatus {
 		basicUsers, _ := h.MongoDB.GetUsersCountForSubscription(context.Background(), "basic")
 		status.Usage.TotalBasicUsers = basicUsers
 
-		weekActiveUsers, _ := h.MongoDB.GetUserIdsUsedSince(context.Background(), time.Now().AddDate(0, 0, -7), 0, 1000000)
+		weekActiveUsers, _ := h.MongoDB.GetUserIdsUsedSince(context.Background(), time.Now().UTC().AddDate(0, 0, -7), 0, 1000000)
 		status.Usage.WeekActiveUsers = int64(len(weekActiveUsers))
 
-		monthActiveUsers, _ := h.MongoDB.GetUserIdsUsedSince(context.Background(), time.Now().AddDate(0, -1, 0), 0, 1000000)
+		monthActiveUsers, _ := h.MongoDB.GetUserIdsUsedSince(context.Background(), time.Now().UTC().AddDate(0, -1, 0), 0, 1000000)
 		status.Usage.MonthActiveUsers = int64(len(monthActiveUsers))
 	}
 	return status