Merge pull request #1307 from traPtitech/fix/openapi-editresponse_schema

PATCH /responses/{responseID}のrequest bodyから不要な情報を除く

Author: Eraxyso

controller/response.go

@@ -188,7 +188,13 @@ func (r *Response) EditResponse(ctx echo.Context, responseID openapi.ResponseIDI
 		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to delete response: %w", err))
 	}
 
-	questions, err := r.IQuestion.GetQuestions(ctx.Request().Context(), req.QuestionnaireId)
+	respondentDetail, err := r.IRespondent.GetRespondentDetail(ctx.Request().Context(), responseID)
+	if err != nil {
+		ctx.Logger().Errorf("failed to get respondent detail: %+v", err)
+		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to get respondent detail: %w", err))
+	}
+
+	questions, err := r.IQuestion.GetQuestions(ctx.Request().Context(), respondentDetail.QuestionnaireID)
 	if err != nil {
 		ctx.Logger().Errorf("failed to get questions: %+v", err)
 		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to get questions: %w", err))
@@ -315,12 +321,6 @@ func (r *Response) EditResponse(ctx echo.Context, responseID openapi.ResponseIDI
 		}
 	}
 
-	respondentDetail, err := r.IRespondent.GetRespondentDetail(ctx.Request().Context(), responseID)
-	if err != nil {
-		ctx.Logger().Errorf("failed to get respondent detail: %+v", err)
-		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to get respondent detail: %w", err))
-	}
-
 	err = r.ITransaction.Do(ctx.Request().Context(), nil, func(c context.Context) error {
 		if !respondentDetail.SubmittedAt.Valid {
 			if !req.IsDraft {

controller/response_test.go

@@ -972,9 +972,10 @@ func TestEditResponse(t *testing.T) {
 			require.NoError(t, err)
 		}
 
-		responseEditPost := response
+		var responseEditPost openapi.EditResponseJSONRequestBody
 		responseEditPost.Body = testCase.args.params.Body
 		responseEditPost.IsDraft = testCase.args.params.IsDraft
+		responseEditPost.ResponseId = &responseID
 
 		e = echo.New()
 		body, err = json.Marshal(responseEditPost)

docs/swagger/swagger.yaml

@@ -252,7 +252,7 @@ paths: # TODO 変数の命名を確認する
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/Response"
+              $ref: "#/components/schemas/EditResponse"
       responses:
         "200":
           description: 正常に回答を変更できました
@@ -847,6 +847,14 @@ components:
             - submitted_at
             - modified_at
         - $ref: "#/components/schemas/NewResponse"
+    EditResponse:
+      allOf:
+        - type: object
+          properties:
+            response_id:
+              type: integer
+              example: 1
+        - $ref: "#/components/schemas/NewResponse"
     Responses:
       type: array
       items: