wip

action/update_task.go

@@ -8,8 +8,8 @@ import (
 
 type UpdateTaskInput struct {
 	ID        string
-	Name      string    `json:"name" validate:"required"`
-	ExpiresAt time.Time `json:"expires_at" validate:"required"`
+	Name      string `json:"name" validate:"required"`
+	ExpiresAt string `json:"expires_at" validate:"required"`
 }
 
 func UpdateTask(input *UpdateTaskInput) (*model.Task, error) {
@@ -23,9 +23,15 @@ func UpdateTask(input *UpdateTaskInput) (*model.Task, error) {
 		return task, err
 	}
 
-	err := database.ORM().Model(&task).Updates(model.Task{
+	exp, err := time.Parse(time.DateTime, input.ExpiresAt)
+
+	if err != nil {
+		return &model.Task{}, err
+	}
+
+	err = database.ORM().Model(&task).Updates(model.Task{
 		Name:      input.Name,
-		ExpiresAt: input.ExpiresAt,
+		ExpiresAt: exp,
 	}).Error
 
 	if err != nil {

controller/task_controller.go

@@ -66,7 +66,7 @@ func (t *TaskController) Read(c echo.Context) error {
 	var task *model.Task
 
 	err := database.ORM().Where(
-		"users_id = ?",
+		"user_id = ?",
 		authentication.AuthID(c),
 	).First(&task, c.Param("id")).Error
 

model/user.go

@@ -19,7 +19,7 @@ type User struct {
 }
 
 func (u *User) IsEmailUnique(email string) bool {
-	err := database.ORM().First(u, "email = ?", email).Error
+	err := database.ORM().Where("id != ?", u.ID).First(&User{}, "email = ?", email).Error
 
 	return errors.Is(err, gorm.ErrRecordNotFound)
 }

server.go

@@ -29,11 +29,11 @@ func main() {
 			c.JSON(http.StatusNotFound, map[string]interface{}{
 				"message": "not found",
 			})
+
+			return
 		}
 
-		c.JSON(http.StatusInternalServerError, map[string]interface{}{
-			"message": "Internal server error",
-		})
+		e.DefaultHTTPErrorHandler(err, c)
 	}
 
 	e.Use(echojwt.WithConfig(echojwt.Config{
@@ -45,6 +45,7 @@ func main() {
 			return new(authentication.Claims)
 		},
 	}))
+
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())