Merge branch 'fix/openapi' into fix/openapi-reminder

controller/adapter.go

@@ -269,7 +269,7 @@ func respondentDetail2Response(ctx echo.Context, respondentDetail model.Responde
 		IsDraft:         respondentDetail.SubmittedAt.Valid,
 		ModifiedAt:      respondentDetail.ModifiedAt,
 		QuestionnaireId: respondentDetail.QuestionnaireID,
-		Respondent:      respondentDetail.TraqID,
+		Respondent:      &respondentDetail.TraqID,
 		ResponseId:      respondentDetail.ResponseID,
 		SubmittedAt:     respondentDetail.SubmittedAt.Time,
 	}

controller/questionnaire.go

@@ -718,7 +718,7 @@ func (q Questionnaire) PostQuestionnaireResponse(c echo.Context, questionnaireID
 	res = openapi.Response{
 		QuestionnaireId: questionnaireID,
 		ResponseId:      resopnseID,
-		Respondent:      userID,
+		Respondent:      &userID,
 		SubmittedAt:     submittedAt,
 		ModifiedAt:      modifiedAt,
 		IsDraft:         params.IsDraft,

controller/response.go

@@ -76,7 +76,7 @@ func (r Response) GetMyResponses(ctx echo.Context, params openapi.GetMyResponses
 			ModifiedAt:        response.ModifiedAt,
 			QuestionnaireId:   response.QuestionnaireId,
 			QuestionnaireInfo: &questionnaireInfo,
-			Respondent:        userID,
+			Respondent:        &userID,
 			ResponseId:        response.ResponseId,
 			SubmittedAt:       response.SubmittedAt,
 		}

docs/swagger/swagger.yaml

@@ -667,6 +667,9 @@ components:
         - $ref: "#/components/schemas/QuestionBase"
         - $ref: "#/components/schemas/QuestionSettingsByType"
         - properties:
+            questionnaire_id:
+              type: integer
+              example: 1
             question_id:
               type: integer
               example: 1
@@ -675,14 +678,12 @@ components:
               format: date-time
               example: 2020-01-01T00:00:00+09:00
           required:
+            - questionnaire_id
             - question_id
             - created_at
     QuestionBase:
       type: object
       properties:
-        questionnaire_id:
-          type: integer
-          example: 1
         title:
           type: string
         description:
@@ -692,7 +693,6 @@ components:
           description: |
             回答必須かどうか
       required:
-        - questionnaire_id
         - title
         - description
         - is_required

handler/questionnaire.go

@@ -194,25 +194,3 @@ func (h Handler) PostQuestionnaireResponse(ctx echo.Context, questionnaireID ope
 
 	return ctx.JSON(201, res)
 }
-
-// (GET /questionnaires/{questionnaireID}/result)
-func (h Handler) GetQuestionnaireResult(ctx echo.Context, questionnaireID openapi.QuestionnaireIDInPath) error {
-	res := openapi.Result{}
-	userID, err := getUserID(ctx)
-	if err != nil {
-		ctx.Logger().Errorf("failed to get userID: %+v", err)
-		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to get userID: %w", err))
-	}
-
-	q := controller.NewQuestionnaire()
-	res, err = q.GetQuestionnaireResult(ctx, questionnaireID, userID)
-	if err != nil {
-		if errors.Is(err, echo.ErrNotFound) {
-			return echo.NewHTTPError(http.StatusNotFound, fmt.Errorf("questionnaire result not found: %w", err))
-		}
-		ctx.Logger().Errorf("failed to get questionnaire result: %+v", err)
-		return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("failed to get questionnaire result: %w", err))
-	}
-
-	return ctx.JSON(200, res)
-}