Merge pull request #41 from figtive/fix/small-issues

Fixed bookmark

Author: daystram

models/blog.go

@@ -76,7 +76,8 @@ func (o *blogOrm) GetManyByTermAndCourseIDSortByVotes(term time.Time, courseID s
 		Model(&Blog{}).
 		Joins("INNER JOIN courseworks ON blogs.coursework_id = courseworks.id LEFT JOIN votes ON courseworks.id = votes.coursework_id").
 		Where("blogs.created_at >= ? AND blogs.created_at < ? AND courseworks.course_id = ?", utils.TimeToTermTime(term), utils.NextTermTime(term), courseID).
-		Order("Count(votes.id) DESC").
+		Having("COUNT(votes.id) > 1").
+		Order("COUNT(votes.id) DESC").
 		Group("blogs.coursework_id").
 		Preload("Coursework").
 		Find(&blogs)
@@ -99,7 +100,7 @@ func (o *blogOrm) GetManyBookmarkByUserID(userID string) ([]Blog, error) {
 	result := o.db.
 		Model(&Blog{}).
 		Joins("INNER JOIN bookmarks ON blogs.coursework_id = bookmarks.coursework_id").
-		Where("bookmarks.user_id >= ?", userID).
+		Where("bookmarks.user_id = ?", userID).
 		Find(&blogs)
 	return blogs, result.Error
 }

models/project.go

@@ -84,7 +84,8 @@ func (o *projectOrm) GetManyByTermAndCourseIDSortByVotes(term time.Time, courseI
 		Model(&Project{}).
 		Joins("INNER JOIN courseworks ON projects.coursework_id = courseworks.id LEFT JOIN votes ON courseworks.id = votes.coursework_id").
 		Where("projects.created_at >= ? AND projects.created_at < ? AND courseworks.course_id = ?", utils.TimeToTermTime(term), utils.NextTermTime(term), courseID).
-		Order("Count(votes.id) DESC").
+		Having("COUNT(votes.id) > 1").
+		Order("COUNT(votes.id) DESC").
 		Group("projects.coursework_id").
 		Preload("Coursework").
 		Find(&projects)
@@ -107,7 +108,7 @@ func (o *projectOrm) GetManyBookmarkByUserID(userID string) ([]Project, error) {
 	result := o.db.
 		Model(&Project{}).
 		Joins("INNER JOIN bookmarks ON projects.coursework_id = bookmarks.coursework_id").
-		Where("bookmarks.user_id >= ?", userID).
+		Where("bookmarks.user_id = ?", userID).
 		Find(&projects)
 	return projects, result.Error
 }