|
|
|
@@ -294,13 +294,13 @@ func QueryMetricsForYear() []*UserMetrics { |
|
|
|
} |
|
|
|
|
|
|
|
func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { |
|
|
|
monthMap := make(map[string]UserMetrics) |
|
|
|
monthMap := make(map[string]*UserMetrics) |
|
|
|
if count > 0 { |
|
|
|
for _, userMetrics := range allUserInfo { |
|
|
|
dateTime := time.Unix(userMetrics.CountDate, 0) |
|
|
|
month := fmt.Sprint(dateTime.Year()) + "-" + fmt.Sprint(int(dateTime.Month())) |
|
|
|
if _, ok := monthMap[month]; !ok { |
|
|
|
var monthUserMetrics UserMetrics |
|
|
|
var monthUserMetrics *UserMetrics |
|
|
|
monthUserMetrics.DisplayDate = month |
|
|
|
monthUserMetrics.ActivateRegistUser = userMetrics.ActivateRegistUser |
|
|
|
monthUserMetrics.NotActivateRegistUser = userMetrics.NotActivateRegistUser |
|
|
|
@@ -324,7 +324,7 @@ func makeResultForMonth(allUserInfo []*UserMetrics, count int) []*UserMetrics { |
|
|
|
} |
|
|
|
result := make([]*UserMetrics, 0) |
|
|
|
for _, value := range monthMap { |
|
|
|
result = append(result, &value) |
|
|
|
result = append(result, value) |
|
|
|
} |
|
|
|
sort.Slice(result, func(i, j int) bool { |
|
|
|
return strings.Compare(result[i].DisplayDate, result[j].DisplayDate) > 0 |
|
|
|
|