Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion api/api_gomux.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"time"

"github.com/gorilla/websocket"
"github.com/swaggo/http-swagger"
httpSwagger "github.com/swaggo/http-swagger"
"go.mongodb.org/mongo-driver/bson/primitive"

"github.com/square/etre"
Expand Down Expand Up @@ -1263,6 +1263,16 @@ func (api *API) WriteResult(rc *req, w http.ResponseWriter, ids interface{}, err
dupeErr.EntityId = v.EntityId
dupeErr.Message += " (db err: " + v.Err.Error() + ")"
wr.Error = &dupeErr
case "db-insert":
insertErr := ErrDBInsertFailed
insertErr.EntityId = v.EntityId
insertErr.Message += " (db err: " + v.Err.Error() + ")"
wr.Error = &insertErr
case "db-update":
updateErr := ErrDBUpdateFailed
updateErr.EntityId = v.EntityId
updateErr.Message += " (db err: " + v.Err.Error() + ")"
wr.Error = &updateErr
default:
wr.Error = &etre.Error{
Message: v.Err.Error(),
Expand Down
12 changes: 12 additions & 0 deletions api/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ var ErrDuplicateEntity = etre.Error{
Message: "cannot insert or update entity because identifying labels conflict with another entity",
}

var ErrDBInsertFailed = etre.Error{
Type: "db-insert-failed",
HTTPStatus: http.StatusBadRequest,
Message: "failed to insert entity",
}

var ErrDBUpdateFailed = etre.Error{
Type: "db-update-failed",
HTTPStatus: http.StatusBadRequest,
Message: "failed to update entity",
}

var ErrNotFound = etre.Error{
Type: "entity-not-found",
HTTPStatus: http.StatusNotFound,
Expand Down