Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions controller/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion controller/response_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 9 additions & 1 deletion docs/swagger/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ paths: # TODO 変数の命名を確認する
content:
application/json:
schema:
$ref: "#/components/schemas/Response"
$ref: "#/components/schemas/EditResponse"
responses:
"200":
description: 正常に回答を変更できました
Expand Down Expand Up @@ -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:
Expand Down
144 changes: 72 additions & 72 deletions openapi/spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion openapi/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading