minor fixes

This commit is contained in:
SowinskiBraeden committed 2022-06-13 14:12:45 -07:00
1 parent 61d97ea429
commit e2d085a534
2 files changed
+12 -6

No files matched your search

+2 -2
View File
@@ -1081,7 +1081,7 @@ func DeleteContact(c *fiber.Ctx) error {
} }
// Check required fields are included // Check required fields are included
if data["id"] == "" { if data["_id"] == "" {
cancel() cancel()
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
"success": false, "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 { if err != nil {
cancel() cancel()
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{ return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+10 -4
View File
@@ -1735,7 +1735,7 @@ func UpdateContactName(c *fiber.Ctx) error {
} }
// Check required fields are included // Check required fields are included
if data["_id"] == "" || data["firstname"] == "" || data["middlename"] == "" || data["lastname"] == "" { if data["_id"] == "" || data["firstname"] == "" || data["lastname"] == "" {
cancel() cancel()
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
"success": false, "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_time, _ := time.Parse(time.RFC3339, time.Now().Format(time.RFC3339))
update := bson.M{ update := bson.M{
"$set": bson.M{ "$set": bson.M{
"firstname": data["firstname"], "firstname": data["firstname"],
"middlename": data["middlename"], "middlename": middlename,
"lastname": data["lastname"], "lastname": data["lastname"],
"updated_at": update_time, "updated_at": update_time,
}, },
@@ -2018,7 +2024,7 @@ func UpdateContactEmail(c *fiber.Ctx) error {
} }
func UpdateContactPriority(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) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
if err := c.BodyParser(&data); err != nil { 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 // Check id of contact and new priority number is included
if data["_id"] == "" || data["priority"] == "" { if data["_id"] == nil || data["priority"] == nil {
cancel() cancel()
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{ return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
"success": false, "success": false,