jtom38/newsbot-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up how we return the error

Browse Source
This commit is contained in:
James Tombleson 2022-12-11 09:46:50 -08:00
parent 4b6008f5e2
commit c74a35292b
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
routes/server.go
View File

@ -14,7 +14,6 @@ import (
httpSwagger "github.com/swaggo/http-swagger" httpSwagger "github.com/swaggo/http-swagger"
"github.com/jtom38/newsbot/collector/database" "github.com/jtom38/newsbot/collector/database"
"github.com/jtom38/newsbot/collector/domain/models"
"github.com/jtom38/newsbot/collector/services/config" "github.com/jtom38/newsbot/collector/services/config"
) )
@ -71,11 +70,6 @@ func (s *Server) MountRoutes() {
httpSwagger.URL("doc.json"), //The url pointing to API definition httpSwagger.URL("doc.json"), //The url pointing to API definition
)) ))
/* Root Routes */
//s.Router.Get("/api/helloworld", helloWorld)
//s.Router.Get("/api/hello/{who}", helloWho)
//s.Router.Get("/api/ping", ping)
/* Article Routes */ /* Article Routes */
s.Router.Get("/api/articles", s.listArticles) s.Router.Get("/api/articles", s.listArticles)
s.Router.Route("/api/articles/{ID}", func(r chi.Router) { s.Router.Route("/api/articles/{ID}", func(r chi.Router) {
@ -106,11 +100,21 @@ func (s *Server) MountRoutes() {
s.Router.Mount("/api/subscriptions", s.GetSubscriptionsRouter()) s.Router.Mount("/api/subscriptions", s.GetSubscriptionsRouter())
} }
func (s *Server) WriteError(w http.ResponseWriter, errMessage string, HttpStatusCode int, Payload interface{}) { type ApiStatusModel struct {
e := models.ApiError{ StatusCode int `json:"status"`
Message: errMessage, Message string `json:"message"`
StatusCode: http.StatusInternalServerError, }
Payload: nil,
type ApiError struct {
*ApiStatusModel
}
func (s *Server) WriteError(w http.ResponseWriter, errMessage string, HttpStatusCode int) {
e := ApiError{
ApiStatusModel: &ApiStatusModel{
StatusCode: http.StatusInternalServerError,
Message: errMessage,
},
} }
b, err := json.Marshal(e) b, err := json.Marshal(e)