handle other fields in create

ragoncsa · Mar 4, 2022 · f714ebb · f714ebb
1 parent e40f9d7
commit f714ebb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -54,7 +54,7 @@ const docTemplate = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/domain.Task"
+                            "$ref": "#/definitions/http.CreateTaskRequest"
                         }
                     }
                 ],
@@ -169,6 +169,17 @@ const docTemplate = `{
                     "type": "string"
                 }
             }
+        },
+        "http.CreateTaskRequest": {
+            "type": "object",
+            "required": [
+                "task"
+            ],
+            "properties": {
+                "task": {
+                    "$ref": "#/definitions/domain.Task"
+                }
+            }
         }
     }
 }`

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -42,7 +42,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/domain.Task"
+                            "$ref": "#/definitions/http.CreateTaskRequest"
                         }
                     }
                 ],
@@ -157,6 +157,17 @@
                     "type": "string"
                 }
             }
+        },
+        "http.CreateTaskRequest": {
+            "type": "object",
+            "required": [
+                "task"
+            ],
+            "properties": {
+                "task": {
+                    "$ref": "#/definitions/domain.Task"
+                }
+            }
         }
     }
 }
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -18,6 +18,13 @@ definitions:
       userId:
         type: string
     type: object
+  http.CreateTaskRequest:
+    properties:
+      task:
+        $ref: '#/definitions/domain.Task'
+    required:
+    - task
+    type: object
 info:
   contact: {}
 paths:
@@ -56,7 +63,7 @@ paths:
         name: task
         required: true
         schema:
-          $ref: '#/definitions/domain.Task'
+          $ref: '#/definitions/http.CreateTaskRequest'
       produces:
       - application/json
       responses:

diff --git a/http/taskservice.go b/http/taskservice.go
@@ -10,7 +10,7 @@ import (
 )
 
 type CreateTaskRequest struct {
-	Name string `json:"name" binding:"required"`
+	Task *domain.Task `json:"task" binding:"required"`
 }
 
 type TaskService struct {
@@ -37,7 +37,7 @@ func (t *TaskService) GetTasks(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, tasks)
 }
 
-// GetTasks godoc
+// GetTask godoc
 // @Summary       Get task
 // @Schemes
 // @Description   Reads a single task and returns it.
@@ -70,7 +70,7 @@ func (t *TaskService) GetTask(c *gin.Context) {
 // @Tags          write
 // @Accept        json
 // @Produce       json
-// @Param         task  body      domain.Task  true  "New task"
+// @Param         task  body      CreateTaskRequest  true  "New task"
 // @Success       200
 // @Router        /tasks/ [post]
 func (t *TaskService) CreateTask(c *gin.Context) {
@@ -79,9 +79,8 @@ func (t *TaskService) CreateTask(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
-	task := &domain.Task{Name: request.Name}
-	t.Service.CreateTask(task)
-	c.IndentedJSON(http.StatusCreated, task)
+	t.Service.CreateTask(request.Task)
+	c.IndentedJSON(http.StatusCreated, request.Task)
 }
 
 // DeleteTasks godoc
@@ -110,7 +109,7 @@ func (t *TaskService) DeleteTask(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, struct{}{})
 }
 
-// GetTasks godoc
+// DeleteTask godoc
 // @Summary       Delete all tasks
 // @Schemes
 // @Description   Deletes all the tasks.