|
|
@ -342,7 +342,7 @@ func (stats *ActivityStats) FillReleases(ctx context.Context, repoID int64, from |
|
|
|
|
|
|
|
|
|
|
|
// Published releases list
|
|
|
|
// Published releases list
|
|
|
|
sess := releasesForActivityStatement(ctx, repoID, fromTime) |
|
|
|
sess := releasesForActivityStatement(ctx, repoID, fromTime) |
|
|
|
sess.OrderBy("release.created_unix DESC") |
|
|
|
sess.OrderBy("`release`.created_unix DESC") |
|
|
|
stats.PublishedReleases = make([]*repo_model.Release, 0) |
|
|
|
stats.PublishedReleases = make([]*repo_model.Release, 0) |
|
|
|
if err = sess.Find(&stats.PublishedReleases); err != nil { |
|
|
|
if err = sess.Find(&stats.PublishedReleases); err != nil { |
|
|
|
return err |
|
|
|
return err |
|
|
@ -350,7 +350,7 @@ func (stats *ActivityStats) FillReleases(ctx context.Context, repoID int64, from |
|
|
|
|
|
|
|
|
|
|
|
// Published releases authors
|
|
|
|
// Published releases authors
|
|
|
|
sess = releasesForActivityStatement(ctx, repoID, fromTime) |
|
|
|
sess = releasesForActivityStatement(ctx, repoID, fromTime) |
|
|
|
if _, err = sess.Select("count(distinct release.publisher_id) as `count`").Table("release").Get(&count); err != nil { |
|
|
|
if _, err = sess.Select("count(distinct `release`.publisher_id) as `count`").Table("release").Get(&count); err != nil { |
|
|
|
return err |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
stats.PublishedReleaseAuthorCount = count |
|
|
|
stats.PublishedReleaseAuthorCount = count |
|
|
@ -359,7 +359,7 @@ func (stats *ActivityStats) FillReleases(ctx context.Context, repoID int64, from |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func releasesForActivityStatement(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session { |
|
|
|
func releasesForActivityStatement(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session { |
|
|
|
return db.GetEngine(ctx).Where("release.repo_id = ?", repoID). |
|
|
|
return db.GetEngine(ctx).Where("`release`.repo_id = ?", repoID). |
|
|
|
And("release.is_draft = ?", false). |
|
|
|
And("`release`.is_draft = ?", false). |
|
|
|
And("release.created_unix >= ?", fromTime.Unix()) |
|
|
|
And("`release`.created_unix >= ?", fromTime.Unix()) |
|
|
|
} |
|
|
|
} |
|
|
|