appview/{db,state}: handle index out-of-bound for punchcards

The date compare should be done with years.

Also, previous puchcard didn't work except for December because `idx`
can be negative while iterating the punchcard. Not sure why most
account pages aren't affected

Signed-off-by: Seongmin Lee <[e-mail]>

appview/db/profile.go

···
 
 const TimeframeMonths = 7
 
+func MonthsApart(from, to time.Time) int {
+	fromYear, fromMonth, _ := from.Date()
+	toYear, toMonth, _ := to.Date()
+	return (toYear-fromYear)*12 + int(toMonth-fromMonth)
+}
+
 func MakeProfileTimeline(e Execer, forDid string) (*models.ProfileTimeline, error) {
 	timeline := models.ProfileTimeline{
 		ByMonth: make([]models.ByMonth, TimeframeMonths),
 	}
-	currentMonth := time.Now().Month()
+	now := time.Now()
 	timeframe := fmt.Sprintf("-%d months", TimeframeMonths)
 
 	pulls, err := GetPullsByOwnerDid(e, forDid, timeframe)
···
 
 	// group pulls by month
 	for _, pull := range pulls {
-		pullMonth := pull.Created.Month()
+		idx := MonthsApart(pull.Created, now)
 
-		if currentMonth-pullMonth >= TimeframeMonths {
-			// shouldn't happen; but times are weird
-			continue
+		if 0 <= idx && idx < TimeframeMonths {
+			items := &timeline.ByMonth[idx].PullEvents.Items
+			*items = append(*items, &pull)
 		}
-
-		idx := currentMonth - pullMonth
-		items := &timeline.ByMonth[idx].PullEvents.Items
-
-		*items = append(*items, &pull)
 	}
 
 	issues, err := GetIssues(
···
 	}
 
 	for _, issue := range issues {
-		issueMonth := issue.Created.Month()
+		idx := MonthsApart(issue.Created, now)
 
-		if currentMonth-issueMonth >= TimeframeMonths {
-			// shouldn't happen; but times are weird
-			continue
+		if 0 <= idx && idx < TimeframeMonths {
+			items := &timeline.ByMonth[idx].IssueEvents.Items
+			*items = append(*items, &issue)
 		}
-
-		idx := currentMonth - issueMonth
-		items := &timeline.ByMonth[idx].IssueEvents.Items
-
-		*items = append(*items, &issue)
 	}
 
 	repos, err := GetRepos(e, 0, orm.FilterEq("did", forDid))
···
 			}
 		}
 
-		repoMonth := repo.Created.Month()
+		idx := MonthsApart(repo.Created, now)
 
-		if currentMonth-repoMonth >= TimeframeMonths {
-			// shouldn't happen; but times are weird
-			continue
+		if 0 <= idx && idx < TimeframeMonths {
+			items := &timeline.ByMonth[idx].RepoEvents
+			*items = append(*items, models.RepoEvent{
+				Repo:   &repo,
+				Source: sourceRepo,
+			})
 		}
-
-		idx := currentMonth - repoMonth
-
-		items := &timeline.ByMonth[idx].RepoEvents
-		*items = append(*items, models.RepoEvent{
-			Repo:   &repo,
-			Source: sourceRepo,
-		})
 	}
 
 	return &timeline, nil

appview/state/profile.go

···
 	}
 
 	// populate commit counts in the timeline, using the punchcard
-	currentMonth := time.Now().Month()
+	now := time.Now()
 	for _, p := range profile.Punchcard.Punches {
-		idx := currentMonth - p.Date.Month()
-		if int(idx) < len(timeline.ByMonth) {
+		idx := db.MonthsApart(p.Date, now)
+
+		if 0 <= idx && idx < len(timeline.ByMonth) {
 			timeline.ByMonth[idx].Commits += p.Count
 		}
 	}