update responses and add query search endpoint
This commit is contained in:
4 files changed
+59
-19
No files matched your search
+5
-1
@@ -7,6 +7,7 @@ import (
|
||||
|
||||
"github.com/SowinskiBraeden/SulliCartShare/api"
|
||||
"github.com/SowinskiBraeden/SulliCartShare/models"
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/gorilla/mux"
|
||||
"go.uber.org/zap"
|
||||
|
||||
@@ -14,6 +15,8 @@ import (
|
||||
"github.com/SowinskiBraeden/SulliCartShare/databases"
|
||||
)
|
||||
|
||||
var validate = validator.New()
|
||||
|
||||
// App stores the router and db connection so it can be reused
|
||||
type App struct {
|
||||
Router *mux.Router
|
||||
@@ -33,7 +36,8 @@ func (a *App) New() *mux.Router {
|
||||
apiCreate := r.PathPrefix("/api/v1").Subrouter()
|
||||
|
||||
apiCreate.Handle("/cow/{cow_id}", api.Middleware(http.HandlerFunc(cow.CowByIDHandler))).Methods("GET") // By Object ID not CowCode
|
||||
apiCreate.Handle("/cows", api.Middleware(http.HandlerFunc(cow.CowHandler))).Methods("GET")
|
||||
apiCreate.Handle("/cows", api.Middleware(http.HandlerFunc(cow.CowHandler))).Methods("GET") // Returns all cows
|
||||
apiCreate.Handle("/cows", api.Middleware(http.HandlerFunc(cow.CowHandlerQuery))).Methods("POST") // Returns list of cows based of query
|
||||
apiCreate.Handle("/cows/new", api.Middleware(http.HandlerFunc(cow.NewCowHandler))).Methods("POST")
|
||||
apiCreate.Handle("/cows/update/{cow_id}", api.Middleware(http.HandlerFunc(cow.UpdateCowHandler))).Methods("POST") // By Object ID not CowCode
|
||||
|
||||
|
||||
+35
-6
@@ -10,22 +10,16 @@ import (
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
|
||||
"github.com/go-playground/validator/v10"
|
||||
|
||||
"github.com/SowinskiBraeden/SulliCartShare/config"
|
||||
"github.com/SowinskiBraeden/SulliCartShare/databases"
|
||||
"github.com/SowinskiBraeden/SulliCartShare/models"
|
||||
)
|
||||
|
||||
var validate = validator.New()
|
||||
|
||||
// Cow exported for testing purposes
|
||||
type Cow struct {
|
||||
DB databases.CowDatabase
|
||||
}
|
||||
|
||||
// TODO: update api return messages
|
||||
|
||||
// CowHandler returns all cows
|
||||
func (c Cow) CowHandler(w http.ResponseWriter, r *http.Request) {
|
||||
dbResp, err := c.DB.Find(context.TODO(), bson.M{})
|
||||
@@ -47,6 +41,41 @@ func (c Cow) CowHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write(b)
|
||||
}
|
||||
|
||||
// CowHandlerQuery is the same as CowHanlder, but queries a specific list of objects by Name
|
||||
func (c Cow) CowHandlerQuery(w http.ResponseWriter, r *http.Request) {
|
||||
var query models.Query // Json data will represent the query model
|
||||
|
||||
// validate the request body
|
||||
if err := json.NewDecoder(r.Body).Decode(&query); err != nil {
|
||||
config.ErrorStatus("failed to unpack request body", http.StatusInternalServerError, w, err)
|
||||
return
|
||||
}
|
||||
|
||||
// use the validator library to validate required fields
|
||||
if validationErr := validate.Struct(&query); validationErr != nil {
|
||||
config.ErrorStatus("invalid request body", http.StatusBadRequest, w, validationErr)
|
||||
return
|
||||
}
|
||||
|
||||
dbResp, err := c.DB.Find(context.TODO(), bson.M{"Detials.Name": query.Name}) // Search by cow name
|
||||
if err != nil {
|
||||
config.ErrorStatus("failed to get cows", http.StatusNotFound, w, err)
|
||||
return
|
||||
}
|
||||
|
||||
// If len == 0 then we will just return an empty data object
|
||||
if len(dbResp) == 0 {
|
||||
dbResp = []models.Cow{}
|
||||
}
|
||||
b, err := json.Marshal(dbResp)
|
||||
if err != nil {
|
||||
config.ErrorStatus("failed to marshal response", http.StatusInternalServerError, w, err)
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(b)
|
||||
}
|
||||
|
||||
// CowByIDHandler returns a cow by ID
|
||||
func (c Cow) CowByIDHandler(w http.ResponseWriter, r *http.Request) {
|
||||
cowID := mux.Vars(r)["cow_id"]
|
||||
|
||||
Reference in new issue
Block a user