addressed comments

rudderlabs · Jul 22, 2024 · e6f08dc · e6f08dc
1 parent 4aed384
commit e6f08dc
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/enterprise/trackedusers/users_reporter.go b/enterprise/trackedusers/users_reporter.go
@@ -141,7 +141,7 @@ func (u *UniqueUsersReporter) GenerateReportsFromJobs(jobs []*jobsdb.JobT, sourc
  workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID] = u.recordIdentifier(workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID], anonymousID, idTypeAnonymousID)
  }
 
- if userID != "" && anonymousID != "" {
+ if userID != "" && anonymousID != "" && eventType != eventTypeAlias {
  combinedUserIDAnonymousID := combineUserIDAnonymousID(userID, anonymousID)
  workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID] = u.recordIdentifier(workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID], combinedUserIDAnonymousID, idTypeIdentifiedAnonymousID)
  }
@@ -154,12 +154,20 @@ func (u *UniqueUsersReporter) GenerateReportsFromJobs(jobs []*jobsdb.JobT, sourc
  // {type:track, userID: user2}
  // {type:identify, userID: user1, anonymousID: anon1}
  // {type:alias, previousId: user2, userID: user1}
- // userHLL: {user1, user2}, anonHLL: {anon1}, identifiedAnonHLL: {user1-anon1, user2}
- // cardinality: len(userHLL)+len(anonHLL)-len(identifiedAnonHLL): 2+1-2 = 1
+ // {type:alias, previousId: user2, userID: user3}
+ // then we will have
+ // userHLL: {user1, user2, user3}, anonHLL: {anon1}, identifiedAnonHLL: {user1-anon1, user2-user1, user2-user3}
+ // cardinality: len(userHLL)+len(anonHLL)-len(identifiedAnonHLL): 3+1-3 = 1
  if eventType == eventTypeAlias {
  previousID := gjson.GetBytes(job.EventPayload, "batch.0.previousId").String()
  if previousID != "" && previousID != userID && previousID != anonymousID {
- workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID] = u.recordIdentifier(workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID], previousID, idTypeIdentifiedAnonymousID)
+ combinedID := previousID
+ if userID != "" {
+ combinedID = combineUserIDAnonymousID(previousID, userID)
+ } else {
+ combinedID = combineUserIDAnonymousID(previousID, anonymousID)
+ }
+ workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID] = u.recordIdentifier(workspaceSourceUserIdTypeMap[job.WorkspaceId][sourceID], combinedID, idTypeIdentifiedAnonymousID)
  }
  }
  }