Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
74626c9
Merge branch 'main' of github.com:go-vela/server
jbrockopp Feb 14, 2023
974c8e6
Merge branch 'main' of github.com:go-vela/server
jbrockopp Mar 3, 2023
2f2c425
Merge branch 'main' of github.com:go-vela/server
jbrockopp Mar 20, 2023
528291a
Merge branch 'main' of github.com:go-vela/server
jbrockopp Apr 8, 2023
b53c687
Merge branch 'main' of github.com:go-vela/server
jbrockopp Apr 8, 2023
4734dcb
Merge branch 'main' of github.com:go-vela/server
jbrockopp Apr 16, 2023
1fb52df
Merge branch 'main' of github.com:go-vela/server
jbrockopp Apr 21, 2023
e996aa6
Merge branch 'main' of github.com:go-vela/server
jbrockopp Apr 27, 2023
c299ee4
Merge branch 'main' of github.com:go-vela/server
jbrockopp May 11, 2023
c8da9e3
Merge branch 'main' of github.com:go-vela/server
jbrockopp May 16, 2023
84d7257
chore: save work
jbrockopp May 16, 2023
17fe6f6
chore: save work
jbrockopp May 17, 2023
9dbf985
feat(database): add build engine
jbrockopp May 22, 2023
353474b
chore(database): remove old service logic
jbrockopp May 22, 2023
bc76bcc
chore: updates for database build engine
jbrockopp May 22, 2023
efada99
Merge branch 'main' of github.com:go-vela/server into refactor/databa…
jbrockopp May 22, 2023
4fdac20
chore: address review feedback
jbrockopp May 23, 2023
8d57ce4
Merge branch 'main' into refactor/database/build
jbrockopp May 23, 2023
4138c0c
Merge branch 'main' into refactor/database/build
ecrupper May 23, 2023
40bd877
Merge branch 'refactor/database/build' of github.com:go-vela/server i…
jbrockopp May 26, 2023
f00e6fe
fix: updates for scheduler
jbrockopp May 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: save work
  • Loading branch information
jbrockopp committed May 17, 2023
commit 17fe6f64a4a39cc5b2be57a49f084d8035820e3f
32 changes: 32 additions & 0 deletions database/build/count_deployment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright (c) 2023 Target Brands, Inc. All rights reserved.
//
// Use of this source code is governed by the LICENSE file in this repository.

package build

import (
"github.com/go-vela/types/constants"
"github.com/go-vela/types/library"
"github.com/sirupsen/logrus"
)

// CountBuildsForDeployment gets the count of builds by deployment from the database.
func (e *engine) CountBuildsForDeployment(r *library.Repo, filters map[string]interface{}) (int64, error) {
e.logger.WithFields(logrus.Fields{
"org": r.GetOrg(),
"repo": r.GetName(),
}).Tracef("getting count of builds for repo %s from the database", r.GetFullName())

// variable to store query results
var b int64

// send query to the database and store result in variable
err := e.client.
Table(constants.TableBuild).
Where("repo_id = ?", r.GetID()).
Where(filters).
Count(&b).
Error

return b, err
}
3 changes: 2 additions & 1 deletion database/build/count_org.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ func (e *engine) CountBuildsForOrg(org string, filters map[string]interface{}) (
// send query to the database and store result in variable
err := e.client.
Table(constants.TableBuild).
Joins("JOIN repos ON builds.repo_id = repos.id and repos.org = ?", org).
Joins("JOIN repos ON builds.repo_id = repos.id").
Where("repos.org = ?", org).
Where(filters).
Count(&b).
Error
Expand Down
13 changes: 7 additions & 6 deletions database/build/count_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,23 @@ import (
"github.com/sirupsen/logrus"
)

// CountBuildsForUser gets the count of builds by user ID from the database.
// CountBuildsForRepo gets the count of builds by repo ID from the database.
func (e *engine) CountBuildsForRepo(r *library.Repo, filters map[string]interface{}) (int64, error) {
e.logger.WithFields(logrus.Fields{
"user": u.GetName(),
}).Tracef("getting count of builds for user %s from the database", u.GetName())
"org": r.GetOrg(),
"repo": r.GetName(),
}).Tracef("getting count of builds for repo %s from the database", r.GetFullName())

// variable to store query results
var b int64

// send query to the database and store result in variable
err := e.client.
Table(constants.TableBuild).
Where("user_id = ?", u.GetID()).
Where("repo_id = ?", r.GetID()).
Where(filters).
Count(&r).
Count(&b).
Error

return r, err
return b, err
}