active users in last30

Author: prkhrkat

client/telemetry/TelemetryEventClient.go

@@ -339,6 +339,7 @@ func (impl *TelemetryEventClientImpl) SendSummaryEvent(eventType string) error {
 	payload.PolicyCount = impl.getPolicyCount()
 	payload.AppliedPolicyRowCount = impl.getAppliedPolicyRowCount()
 	payload.PhysicalClusterCount, payload.IsolatedClusterCount = impl.getClusterCounts()
+	payload.ActiveUsersLast30Days = impl.getActiveUsersLast30Days()
 
 	payload.ClusterProvider, err = impl.GetCloudProvider()
 	if err != nil {

client/telemetry/TelemetryEventClientExtended.go

@@ -347,6 +347,7 @@ func (impl *TelemetryEventClientImplExtended) SendSummaryEvent(eventType string)
 	payload.PolicyCount = impl.getPolicyCount()
 	payload.AppliedPolicyRowCount = impl.getAppliedPolicyRowCount()
 	payload.PhysicalClusterCount, payload.IsolatedClusterCount = impl.getClusterCounts()
+	payload.ActiveUsersLast30Days = impl.getActiveUsersLast30Days()
 
 	payload.ClusterProvider, err = impl.GetCloudProvider()
 	if err != nil {

client/telemetry/bean.go

@@ -87,6 +87,7 @@ type TelemetryEventEA struct {
 	AppliedPolicyRowCount       int `json:"appliedPolicyRowCount,omitempty"`
 	PhysicalClusterCount        int `json:"physicalClusterCount,omitempty"`
 	IsolatedClusterCount        int `json:"isolatedClusterCount,omitempty"`
+	ActiveUsersLast30Days       int `json:"activeUsersLast30Days,omitempty"`
 }
 
 const AppsCount int = 50
@@ -160,4 +161,5 @@ type TelemetryEventDto struct {
 	AppliedPolicyRowCount       int `json:"appliedPolicyRowCount,omitempty"`
 	PhysicalClusterCount        int `json:"physicalClusterCount,omitempty"`
 	IsolatedClusterCount        int `json:"isolatedClusterCount,omitempty"`
+	ActiveUsersLast30Days       int `json:"activeUsersLast30Days,omitempty"`
 }

client/telemetry/telemetryQueries.go

@@ -156,3 +156,19 @@ func (impl *TelemetryEventClientImpl) getJobPipelineSucceededLast24h() int {
 func (impl *TelemetryEventClientImpl) getAppliedPolicyRowCount() int {
 	return 0
 }
+
+func (impl *TelemetryEventClientImpl) getActiveUsersLast30Days() int {
+	if impl.userAuditService == nil {
+		impl.logger.Warnw("userAuditService not available for active users count")
+		return -1
+	}
+
+	count, err := impl.userAuditService.GetActiveUsersCountInLast30Days()
+	if err != nil {
+		impl.logger.Errorw("error getting active users count in last 30 days", "err", err)
+		return -1
+	}
+
+	impl.logger.Debugw("counted active users in last 30 days", "count", count)
+	return count
+}

pkg/auth/user/UserAuditService.go

@@ -36,6 +36,7 @@ type UserAuditService interface {
 	GetLatestByUserId(userId int32) (*UserAudit, error)
 	GetLatestUser() (*UserAudit, error)
 	Update(userAudit *UserAudit) error
+	GetActiveUsersCountInLast30Days() (int, error)
 }
 
 type UserAuditServiceImpl struct {
@@ -123,3 +124,13 @@ func (impl UserAuditServiceImpl) GetLatestUser() (*UserAudit, error) {
 		UpdatedOn: userAuditDb.UpdatedOn,
 	}, nil
 }
+
+func (impl UserAuditServiceImpl) GetActiveUsersCountInLast30Days() (int, error) {
+	impl.logger.Info("Getting active users count in last 30 days")
+	count, err := impl.userAuditRepository.GetActiveUsersCountInLast30Days()
+	if err != nil {
+		impl.logger.Errorw("error while getting active users count in last 30 days", "err", err)
+		return 0, err
+	}
+	return count, nil
+}

pkg/auth/user/repository/UserAuditRepository.go

@@ -39,6 +39,7 @@ type UserAuditRepository interface {
 	GetLatestByUserId(userId int32) (*UserAudit, error)
 	GetLatestUser() (*UserAudit, error)
 	Update(userAudit *UserAudit) error
+	GetActiveUsersCountInLast30Days() (int, error)
 }
 
 type UserAuditRepositoryImpl struct {
@@ -86,3 +87,16 @@ func (impl UserAuditRepositoryImpl) GetLatestUser() (*UserAudit, error) {
 		Select()
 	return userAudit, err
 }
+
+func (impl UserAuditRepositoryImpl) GetActiveUsersCountInLast30Days() (int, error) {
+	var count int
+	// Calculate the date 30 days ago from now
+	thirtyDaysAgo := time.Now().AddDate(0, 0, -30)
+
+	// Count distinct users who have been active (have updated_on) in the last 30 days
+	_, err := impl.dbConnection.Query(&count,
+		"SELECT COUNT(DISTINCT user_id) FROM user_audit WHERE updated_on >= ?",
+		thirtyDaysAgo)
+
+	return count, err
+}