peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added extra error type for unknown dependency type

Browse Source
This commit is contained in:
kolaente 2018-04-10 15:52:07 +02:00
parent 7b26e2c92e
commit 3820fc4354
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
models/error.go
View File

@ -1275,3 +1275,18 @@ func IsErrDependenciesLeft(err error) bool {
func (err ErrDependenciesLeft) Error() string {
return fmt.Sprintf("cannot close this issue as it still has open dependencies [issue id: %d]", err.IssueID)
}
// ErrUnknownDependencyType represents an error where an unknown dependency type was passed
type ErrUnknownDependencyType struct {
Type DependencyType
}
// IsErrUnknownDependencyType checks if an error is ErrUnknownDependencyType
func IsErrUnknownDependencyType(err error) bool {
_, ok := err.(ErrUnknownDependencyType)
return ok
}
func (err ErrUnknownDependencyType) Error() string {
return fmt.Sprintf("unknown dependency type [type: %d]", err.Type)
}

5
models/issue_dependency.go
View File

@ -8,6 +8,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"fmt"
)
// IssueDependency represents an issue dependency
@ -83,7 +84,7 @@ func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType Depende
case DependencyTypeBlocking:
err = issueDepExists(sess, dep.ID, issue.ID)
default:
return
return ErrUnknownDependencyType{depType}
}
if err != nil {
if IsErrDependencyExists(err) {
@ -104,7 +105,7 @@ func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType Depende
case DependencyTypeBlocking:
issueDepToDelete = IssueDependency{IssueID: dep.ID, DependencyID: issue.ID}
default:
return
return ErrUnknownDependencyType{depType}
}
if _, err := sess.Delete(&issueDepToDelete); err != nil {