動けるようにする

.github/workflows/main.yml

@@ -19,10 +19,13 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
-      - uses: actions/[email protected]
+          cache: false
+      - uses: actions/[email protected]
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-gomod-
       - run: go mod download
   build:
     name: Build
@@ -35,21 +38,22 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
-      - uses: actions/[email protected]
+          cache: false
+      - uses: actions/[email protected]
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-gomod-
-      - uses: actions/cache@v3.3.2
+      - uses: actions/cache@v4.2.0
         with:
           path: /tmp/go/cache
           key: ${{ runner.os }}-go-build-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-go-build-${{ github.ref }}-
             ${{ runner.os }}-go-build-
       - run: go build -o anke-to
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: anke-to
           path: anke-to
@@ -70,26 +74,27 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version-file: 'go.mod'
-      - uses: actions/[email protected]
+          cache: false
+      - uses: actions/[email protected]
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-gomod-
       - run: go install github.com/golang/mock/[email protected]
       - run: go generate ./...
-      - run: go test ./model ./router -v -coverprofile=coverage.txt -race -vet=off
+      - run: go test ./model -v -coverprofile=coverage.txt -race -vet=off # for temporary use as controller test is not ready
+      # - run: go test ./controller ./model -v -coverprofile=coverage.txt -race -vet=off
         env:
           MARIADB_USERNAME: root
           MARIADB_PASSWORD: password
           MARIADB_HOSTNAME: 127.0.0.1
           MARIADB_DATABASE: anke-to
       - name: Upload coverage data
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v5.1.2
         with:
-          file: ./coverage.txt
-          yml: ./codecov.yml
-      - uses: actions/upload-artifact@v3
+          files: ./coverage.txt
+      - uses: actions/upload-artifact@v4
         with:
           name: coverage.txt
           path: coverage.txt

.spectral.yaml

@@ -0,0 +1 @@
+extends: ["spectral:oas"]

controller/adapter.go

@@ -18,12 +18,12 @@ func questionnaireInfo2questionnaireSummary(questionnaireInfo model.Questionnair
 		HasMyDraft:               hasMyDraft,
 		HasMyResponse:            hasMyResponse,
 		IsDuplicateAnswerAllowed: questionnaireInfo.IsDuplicateAnswerAllowed,
-		// IsAnonymous:                 questionnaireInfo.IsAnonymous,
-		IsPublished:     questionnaireInfo.IsPublished,
-		IsTargetingMe:   questionnaireInfo.IsTargeted,
-		ModifiedAt:      questionnaireInfo.ModifiedAt,
-		QuestionnaireId: questionnaireInfo.ID,
-		Title:           questionnaireInfo.Title,
+		IsAnonymous:              questionnaireInfo.IsAnonymous,
+		IsPublished:              questionnaireInfo.IsPublished,
+		IsTargetingMe:            questionnaireInfo.IsTargeted,
+		ModifiedAt:               questionnaireInfo.ModifiedAt,
+		QuestionnaireId:          questionnaireInfo.ID,
+		Title:                    questionnaireInfo.Title,
 	}
 	if respondedDateTimeByMe.Valid {
 		res.RespondedDateTimeByMe = &respondedDateTimeByMe.Time
@@ -68,7 +68,7 @@ func convertResSharedTo(resSharedTo string) openapi.ResShareType {
 func createUsersAndGroups(users []string, groups uuid.UUIDs) openapi.UsersAndGroups {
 	res := openapi.UsersAndGroups{
 		Users:  users,
-		Groups: groups.Strings(),
+		Groups: groups,
 	}
 	return res
 }
@@ -81,52 +81,66 @@ func convertOptions(options []model.Options) openapi.QuestionSettingsSingleChoic
 	return res
 }
 
-func convertQuestions(questions []model.Questions) []openapi.Question {
+func convertQuestions(questions []model.Questions) ([]openapi.Question, error) {
 	res := []openapi.Question{}
 	for _, question := range questions {
 		q := openapi.Question{
-			CreatedAt: question.CreatedAt,
-			// Description:     question.Description,
+			CreatedAt:       question.CreatedAt,
+			Body:            question.Body,
 			IsRequired:      question.IsRequired,
-			QuestionId:      question.ID,
+			QuestionId:      &question.ID,
 			QuestionnaireId: question.QuestionnaireID,
-			Title:           question.Body,
 		}
 		switch question.Type {
 		case "Text":
-			q.FromQuestionSettingsText(
+			err := q.FromQuestionSettingsText(
 				openapi.QuestionSettingsText{
 					QuestionType: "Text",
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		case "TextArea":
-			q.FromQuestionSettingsText(
+			err := q.FromQuestionSettingsText(
 				openapi.QuestionSettingsText{
 					QuestionType: "TextLong",
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		case "Number":
-			q.FromQuestionSettingsNumber(
+			err := q.FromQuestionSettingsNumber(
 				openapi.QuestionSettingsNumber{
 					QuestionType: "Number",
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		case "Radio":
-			q.FromQuestionSettingsSingleChoice(
+			err := q.FromQuestionSettingsSingleChoice(
 				openapi.QuestionSettingsSingleChoice{
 					QuestionType: "Radio",
 					Options:      convertOptions(question.Options).Options,
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		case "MultipleChoice":
-			q.FromQuestionSettingsMultipleChoice(
+			err := q.FromQuestionSettingsMultipleChoice(
 				openapi.QuestionSettingsMultipleChoice{
 					QuestionType: "MultipleChoice",
 					Options:      convertOptions(question.Options).Options,
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		case "LinearScale":
-			q.FromQuestionSettingsScale(
+			err := q.FromQuestionSettingsScale(
 				openapi.QuestionSettingsScale{
 					QuestionType: "LinearScale",
 					MinLabel:     &question.ScaleLabels[0].ScaleLabelLeft,
@@ -135,37 +149,38 @@ func convertQuestions(questions []model.Questions) []openapi.Question {
 					MaxValue:     question.ScaleLabels[0].ScaleMax,
 				},
 			)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}
-	return res
+	return res, nil
 }
 
-func convertRespondents(respondents []model.Respondents) []string {
-	res := []string{}
-	for _, respondent := range respondents {
-		res = append(res, respondent.UserTraqid)
+func questionnaire2QuestionnaireDetail(questionnaires model.Questionnaires, admins []string, adminUsers []string, adminGroups []uuid.UUID, targets []string, targetUsers []string, targetGroups []uuid.UUID, respondents []string) (openapi.QuestionnaireDetail, error) {
+	questions, err := convertQuestions(questionnaires.Questions)
+	if err != nil {
+		return openapi.QuestionnaireDetail{}, err
 	}
-	return res
-}
-
-func questionnaire2QuestionnaireDetail(questionnaires model.Questionnaires, adminUsers []string, adminGroups []uuid.UUID, targetUsers []string, targetGroups []uuid.UUID, respondents []string) openapi.QuestionnaireDetail {
 	res := openapi.QuestionnaireDetail{
-		Admins:                   createUsersAndGroups(adminUsers, adminGroups),
+		Admin:                    createUsersAndGroups(adminUsers, adminGroups),
+		Admins:                   admins,
 		CreatedAt:                questionnaires.CreatedAt,
 		Description:              questionnaires.Description,
 		IsDuplicateAnswerAllowed: questionnaires.IsDuplicateAnswerAllowed,
 		IsAnonymous:              questionnaires.IsAnonymous,
 		IsPublished:              questionnaires.IsPublished,
 		ModifiedAt:               questionnaires.ModifiedAt,
 		QuestionnaireId:          questionnaires.ID,
-		Questions:                convertQuestions(questionnaires.Questions),
+		Questions:                questions,
 		Respondents:              respondents,
 		ResponseDueDateTime:      &questionnaires.ResTimeLimit.Time,
 		ResponseViewableBy:       convertResSharedTo(questionnaires.ResSharedTo),
-		Targets:                  createUsersAndGroups(targetUsers, targetGroups),
+		Target:                   createUsersAndGroups(targetUsers, targetGroups),
+		Targets:                  targets,
 		Title:                    questionnaires.Title,
 	}
-	return res
+	return res, nil
 }
 
 func respondentDetail2Response(ctx echo.Context, respondentDetail model.RespondentDetail) (openapi.Response, error) {
@@ -175,21 +190,27 @@ func respondentDetail2Response(ctx echo.Context, respondentDetail model.Responde
 		switch r.QuestionType {
 		case "Text":
 			if r.Body.Valid {
-				oResponseBody.FromResponseBodyText(
+				err := oResponseBody.FromResponseBodyText(
 					openapi.ResponseBodyText{
 						Answer:       r.Body.String,
 						QuestionType: "Text",
 					},
 				)
+				if err != nil {
+					return openapi.Response{}, err
+				}
 			}
 		case "TextArea":
 			if r.Body.Valid {
-				oResponseBody.FromResponseBodyText(
+				err := oResponseBody.FromResponseBodyText(
 					openapi.ResponseBodyText{
 						Answer:       r.Body.String,
 						QuestionType: "TextLong",
 					},
 				)
+				if err != nil {
+					return openapi.Response{}, err
+				}
 			}
 		case "Number":
 			if r.Body.Valid {
@@ -198,17 +219,20 @@ func respondentDetail2Response(ctx echo.Context, respondentDetail model.Responde
 					ctx.Logger().Errorf("failed to convert string to float: %+v", err)
 					return openapi.Response{}, err
 				}
-				oResponseBody.FromResponseBodyNumber(
+				err = oResponseBody.FromResponseBodyNumber(
 					openapi.ResponseBodyNumber{
 						Answer:       float32(answer),
 						QuestionType: "Number",
 					},
 				)
+				if err != nil {
+					return openapi.Response{}, err
+				}
 			}
 		case "MultipleChoice":
 			if r.Body.Valid {
 				answer := []int{}
-				questionnaire, _, _, _, _, _, err := model.NewQuestionnaire().GetQuestionnaireInfo(ctx.Request().Context(), r.QuestionID)
+				questionnaire, _, _, _, _, _, _, _, err := model.NewQuestionnaire().GetQuestionnaireInfo(ctx.Request().Context(), r.QuestionID)
 				if err != nil {
 					ctx.Logger().Errorf("failed to get questionnaire info: %+v", err)
 					return openapi.Response{}, err
@@ -220,29 +244,35 @@ func respondentDetail2Response(ctx echo.Context, respondentDetail model.Responde
 						}
 					}
 				}
-				oResponseBody.FromResponseBodyMultipleChoice(
+				err = oResponseBody.FromResponseBodyMultipleChoice(
 					openapi.ResponseBodyMultipleChoice{
 						Answer:       answer,
 						QuestionType: "MultipleChoice",
 					},
 				)
+				if err != nil {
+					return openapi.Response{}, err
+				}
 			}
 		case "Checkbox":
 			if r.Body.Valid {
-				questionnaire, _, _, _, _, _, err := model.NewQuestionnaire().GetQuestionnaireInfo(ctx.Request().Context(), r.QuestionID)
+				questionnaire, _, _, _, _, _, _, _, err := model.NewQuestionnaire().GetQuestionnaireInfo(ctx.Request().Context(), r.QuestionID)
 				if err != nil {
 					ctx.Logger().Errorf("failed to get questionnaire info: %+v", err)
 					return openapi.Response{}, err
 				}
 				for _, a := range r.OptionResponse {
 					for i, o := range questionnaire.Questions[j].Options {
 						if a == o.Body {
-							oResponseBody.FromResponseBodySingleChoice(
+							err := oResponseBody.FromResponseBodySingleChoice(
 								openapi.ResponseBodySingleChoice{
 									Answer:       i,
 									QuestionType: "SingleChoice",
 								},
 							)
+							if err != nil {
+								return openapi.Response{}, err
+							}
 						}
 					}
 				}
@@ -254,12 +284,15 @@ func respondentDetail2Response(ctx echo.Context, respondentDetail model.Responde
 					ctx.Logger().Errorf("failed to convert string to int: %+v", err)
 					return openapi.Response{}, err
 				}
-				oResponseBody.FromResponseBodyScale(
+				err = oResponseBody.FromResponseBodyScale(
 					openapi.ResponseBodyScale{
 						Answer:       answer,
 						QuestionType: "LinearScale",
 					},
 				)
+				if err != nil {
+					return openapi.Response{}, err
+				}
 			}
 		}
 		oResponseBodies = append(oResponseBodies, oResponseBody)