From e2d085a534495167eba08637e9747903b1ee227f Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Mon, 13 Jun 2022 14:12:45 -0700 Subject: [PATCH] minor fixes --- controllers/authController.go | 4 ++-- controllers/updateController.go | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/controllers/authController.go b/controllers/authController.go index 542e71b..dd6171a 100644 --- a/controllers/authController.go +++ b/controllers/authController.go @@ -1081,7 +1081,7 @@ func DeleteContact(c *fiber.Ctx) error { } // Check required fields are included - if data["id"] == "" { + if data["_id"] == "" { cancel() return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ "success": false, @@ -1089,7 +1089,7 @@ func DeleteContact(c *fiber.Ctx) error { }) } - _, err := contactCollection.DeleteOne(ctx, bson.M{"_id": data["id"]}) + _, err := contactCollection.DeleteOne(ctx, bson.M{"_id": data["_id"]}) if err != nil { cancel() return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ diff --git a/controllers/updateController.go b/controllers/updateController.go index d744688..9ac469d 100644 --- a/controllers/updateController.go +++ b/controllers/updateController.go @@ -1735,7 +1735,7 @@ func UpdateContactName(c *fiber.Ctx) error { } // Check required fields are included - if data["_id"] == "" || data["firstname"] == "" || data["middlename"] == "" || data["lastname"] == "" { + if data["_id"] == "" || data["firstname"] == "" || data["lastname"] == "" { cancel() return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ "success": false, @@ -1743,11 +1743,17 @@ func UpdateContactName(c *fiber.Ctx) error { }) } + var middlename string = "" + + if data["middlename"] != "" { + middlename = data["middlename"] + } + update_time, _ := time.Parse(time.RFC3339, time.Now().Format(time.RFC3339)) update := bson.M{ "$set": bson.M{ "firstname": data["firstname"], - "middlename": data["middlename"], + "middlename": middlename, "lastname": data["lastname"], "updated_at": update_time, }, @@ -2018,7 +2024,7 @@ func UpdateContactEmail(c *fiber.Ctx) error { } func UpdateContactPriority(c *fiber.Ctx) error { - var data map[string]string + var data map[string]interface{} ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) if err := c.BodyParser(&data); err != nil { @@ -2040,7 +2046,7 @@ func UpdateContactPriority(c *fiber.Ctx) error { } // Check id of contact and new priority number is included - if data["_id"] == "" || data["priority"] == "" { + if data["_id"] == nil || data["priority"] == nil { cancel() return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ "success": false,