diff --git a/cmd/main.go b/cmd/main.go index a886200..d2f2a4d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -51,6 +51,7 @@ func initArticlesRoutes(r *gin.Engine) { articlesRouter.GET("/", internal.GetAllArticlesHandler) articlesRouter.GET("/:id", internal.GetArticleHandler) articlesRouter.POST("/:id", internal.AddArticleHandler) + articlesRouter.PATCH("/:id", internal.EditArticleHandler) articlesRouter.DELETE("/:id", internal.DeleteArticleHandler) } diff --git a/internal/articlesBusiness.go b/internal/articlesBusiness.go index 54c22db..4366153 100644 --- a/internal/articlesBusiness.go +++ b/internal/articlesBusiness.go @@ -1,17 +1,14 @@ package internal import ( + "github.com/gin-gonic/gin" "go.mongodb.org/mongo-driver/bson" ) type Article struct { - IdName string `json:"id_name" bson:"id_name"` - Date int64 `json:"date" bson:"date"` - Content interface{} `json:"content" bson:"content"` -} - -type DelArticle struct { - IdName string `json:"id_name" bson:"id_name"` + IdName string `json:"id_name" bson:"id_name"` + Date int64 `json:"date" bson:"date"` + Content gin.H `json:"content" bson:"content"` } var articlesLocation = Location{Database: "gohcms", Collection: "articles"} diff --git a/internal/articlesHandlers.go b/internal/articlesHandlers.go index c870aff..dff2757 100644 --- a/internal/articlesHandlers.go +++ b/internal/articlesHandlers.go @@ -9,7 +9,7 @@ import ( ) func GetAllArticlesHandler(c *gin.Context) { - documents, err := getDocuments(articlesLocation, bson.D{}) + documents, err := getDocuments(articlesLocation, gin.H{}) if err != nil { SendBadRequest(c, err.Error()) return @@ -20,7 +20,7 @@ func GetAllArticlesHandler(c *gin.Context) { func GetArticleHandler(c *gin.Context) { articleID := c.Params.ByName("id") article, err := getUniqueDocument(articlesLocation, - bson.D{{Key: "id_name", Value: articleID}}) + gin.H{"id_name": articleID}) if err != nil { SendBadRequest(c, "The ID provided doesn't match any article.") return @@ -60,24 +60,37 @@ func AddArticleHandler(c *gin.Context) { } func DeleteArticleHandler(c *gin.Context) { - var delArticle DelArticle - delArticle.IdName = c.Params.ByName("id") - if c.BindJSON(&delArticle) != nil { - SendBadRequest(c, "Could not correctly parse the article ID.") - return - } + id := c.Params.ByName("id") - document, err := bson.Marshal(delArticle) + deleteCount, err := deleteDocument(articlesLocation, gin.H{"id_name": id}) if err != nil { - SendBadRequest(c, "Could not correctly marshal the article ID.") + SendBadRequest(c, "Could not delete document into DB.") return } - deleteCount, err := deleteDocument(articlesLocation, document) + if deleteCount != 0 { + SendOk(c, fmt.Sprintf("%d articles were successfully deleted!", deleteCount)) + } else { + SendOk(c, "No articles were deleted.") + } +} + +func EditArticleHandler(c *gin.Context) { + id := c.Params.ByName("id") + + var articleUpdate DocumentUpdate + articleUpdate.Filter = gin.H{"id_name": id} + c.BindJSON(&articleUpdate.Update) + + editCount, err := editDocument(articlesLocation, articleUpdate) if err != nil { - SendBadRequest(c, "Could not insert document into DB.") + SendBadRequest(c, err.Error()) return + } + + if editCount != 0 { + SendOk(c, fmt.Sprintf("%d articles were successfully edited!", editCount)) + } else { + SendOk(c, "No articles were edited.") } - - SendOk(c, fmt.Sprintf("%d articles were successfully deleted!", deleteCount)) } diff --git a/internal/database.go b/internal/database.go index da6e592..b190406 100644 --- a/internal/database.go +++ b/internal/database.go @@ -4,6 +4,7 @@ import ( "context" "errors" + "github.com/gin-gonic/gin" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) @@ -13,6 +14,11 @@ type Location struct { Collection string } +type DocumentUpdate struct { + Filter gin.H `json:"filter"` + Update gin.H `json:"update"` +} + func getNewClient() *mongo.Client { client, err := mongo.Connect( context.TODO(), @@ -44,7 +50,7 @@ func getDocuments(location Location, filter interface{}) ([][]byte, error) { cursor, err := collection.Find(context.TODO(), filter) if err != nil { - return results, errors.New("something is wrong with filter to find the document") + return results, errors.New("something is wrong with filter to find the document.") } for cursor.TryNext(context.TODO()) { results = append(results, cursor.Current) @@ -71,8 +77,24 @@ func deleteDocument(location Location, filter interface{}) (int64, error) { result, err := collection.DeleteOne(context.TODO(), filter) if err != nil { - return 0, errors.New("something is wrong with filter to delete the document") + return 0, errors.New("something is wrong with filter to delete the document.") } return result.DeletedCount, nil } + +func editDocument(location Location, jsons DocumentUpdate) (int64, error) { + client := getNewClient() + collection := client.Database(location.Database).Collection(location.Collection) + defer client.Disconnect(context.TODO()) + + result, err := collection.UpdateOne(context.TODO(), jsons.Filter, gin.H{"$set": jsons.Update}) + if err != nil { + return 0, err + } + if result.MatchedCount == 0 { + return 0, errors.New("cannot find document matching filter.") + } + + return result.ModifiedCount, nil +}