Ensure reviews for test is in a well defined order

Author: davidsvantesson

models/fixtures/review.yml

@@ -44,38 +44,38 @@
   reviewer_id: 2
   issue_id: 3
   content: "New review 3"
-  updated_unix: 946684810
-  created_unix: 946684810
+  updated_unix: 946684811
+  created_unix: 946684811
 -
   id: 7
   type: 3
   reviewer_id: 3
   issue_id: 3
   content: "New review 4"
-  updated_unix: 946684810
-  created_unix: 946684810
+  updated_unix: 946684812
+  created_unix: 946684812
 -
   id: 8
   type: 1
   reviewer_id: 4
   issue_id: 3
   content: "New review 5"
-  updated_unix: 946684810
-  created_unix: 946684810
+  updated_unix: 946684813
+  created_unix: 946684813
 -
   id: 9
   type: 3
   reviewer_id: 2
   issue_id: 3
   content: "New review 3 rejected"
-  updated_unix: 946684810
-  created_unix: 946684810
+  updated_unix: 946684814
+  created_unix: 946684814
 
 -
   id: 10
   type: 3
   reviewer_id: 100
   issue_id: 3
   content: "a deleted user's review"
-  updated_unix: 946684810
-  created_unix: 946684810
+  updated_unix: 946684815
+  created_unix: 946684815

models/review.go

@@ -341,6 +341,7 @@ func GetReviewersByIssueID(issueID int64) (reviews []*Review, err error) {
 		return nil, err
 	}
 
+	// Get latest review of each reviwer, sorted in order they were made
 	if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id = ? AND type in (?, ?) GROUP BY issue_id, reviewer_id) ORDER BY review.updated_unix ASC",
 		issueID, ReviewTypeApprove, ReviewTypeReject).
 		Find(&reviewsUnfiltered); err != nil {

models/review_test.go

@@ -107,20 +107,21 @@ func TestGetReviewersByIssueID(t *testing.T) {
 	user4 := AssertExistsAndLoadBean(t, &User{ID: 4}).(*User)
 
 	expectedReviews := []*Review{}
-	expectedReviews = append(expectedReviews, &Review{
-		Reviewer:    user2,
-		Type:        ReviewTypeReject,
-		UpdatedUnix: 946684810,
-	},
+	expectedReviews = append(expectedReviews,
 		&Review{
 			Reviewer:    user3,
 			Type:        ReviewTypeReject,
-			UpdatedUnix: 946684810,
+			UpdatedUnix: 946684812,
 		},
 		&Review{
 			Reviewer:    user4,
 			Type:        ReviewTypeApprove,
-			UpdatedUnix: 946684810,
+			UpdatedUnix: 946684813,
+		},
+		&Review{
+			Reviewer:    user2,
+			Type:        ReviewTypeReject,
+			UpdatedUnix: 946684814,
 		})
 
 	allReviews, err := GetReviewersByIssueID(issue.ID)