o-ga09 · o-ga09 · Jun 4, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -10,4 +10,6 @@ close #
 
 ## 動作確認
 
+<deatils><summary>エビデンス</summary></details>
+
 ## テスト結果
diff --git a/.github/workflows/batch-deploy.yml b/.github/workflows/batch-deploy.yml
@@ -2,6 +2,8 @@ name: Batch Deploy
 
 on:
   push:
+    branches:
+      - main
 
 env:
   JOB_NAME: mh-api-batch

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/test.yml → .github/workflows/lint_and_test.yml b/.github/workflows/test.yml → .github/workflows/lint_and_test.yml
@@ -1,18 +1,24 @@
-name: Test
+name: lint and test
 on:
-  push:
+  pull_request:
     branches:
       - "main"
-    paths:
-      - "**.go"
-      - .github/workflows/test.yml
-  pull_request:
-    paths:
-      - "**.go"
-      - .github/workflows/test.yml
-
 jobs:
-  golang-test:
+  lint:
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          golangci_lint_flags: "--timeout=5m --config=./.golangci.yml ./..."
+          fail_on_error: true
+          reporter: "github-pr-review"
+
+  test:
     name: test
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/scenario_test.yml b/.github/workflows/scenario_test.yml
diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-    paths:
-      - ".github/workflows/spec.yml"
-      - "doc/openapi/swagger.yaml"
 
 jobs:
   build:
@@ -22,6 +19,14 @@ jobs:
       - name: Check out
         uses: actions/checkout@v3
 
+      - name: Install swaggo
+        run: |
+          go install github.com/swaggo/swag/cmd/swag@latest
+
+      - name:  Generate OpenAPI Spec
+        run: |
+          swag init -g app/cmd/api/main.go --output doc/openapi/
+
       - name: Build ReDoc HTML
         run: |
           npm install -g redoc-cli

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,6 +5,9 @@ linters-settings:
     min-complexity: 30
   misspell:
     locale: US
+  skip-files:
+    - app/internal/**/*_test.go
+
 
 linters:
   disable-all: true

diff --git a/app/internal/DI/bgm.go b/app/internal/DI/bgm.go
@@ -0,0 +1,19 @@
+package di
+
+import (
+	"context"
+	handler "mh-api/app/internal/controller/music"
+	musicDriver "mh-api/app/internal/driver/music"
+	"mh-api/app/internal/driver/mysql"
+	"mh-api/app/internal/service/music"
+)
+
+func InitBGMHandler() *handler.BGMHandler {
+	db := mysql.New(context.Background())
+	repo := musicDriver.NewMusicRepository(db)
+	qs := musicDriver.NewmusicQueryService(db)
+	service := music.NewMusicService(repo, qs)
+	handler := handler.NewBGMHandler(*service)
+
+	return handler
+}
diff --git a/app/internal/batch/batch.go b/app/internal/batch/batch.go
@@ -99,7 +99,7 @@ func BatchDI() *BatchService {
 	db := mysql.New(context.Background())
 	Monsterrepo := monsterDriver.NewMonsterRepository(db)
 	Fieldrepo := fieldDriver.NewfieldRepository(db)
-	Musicrepo := musicDriver.NewmusicRepository(db)
+	Musicrepo := musicDriver.NewMusicRepository(db)
 	Itemrepo := itemDriver.NewMonsterRepository(db)
 	Partrepo := partDriver.NewMonsterRepository(db)
 	Productrepo := productDriver.NewMonsterRepository(db)

diff --git a/app/internal/controller/monster/handler.go b/app/internal/controller/monster/handler.go
@@ -56,8 +56,8 @@ func (m *MonsterHandler) GetAll(c *gin.Context) {
 		return
 	}
 
-	id, ook := c.Params.Get("id")
-	if ook {
+	id, ok := c.Params.Get("id")
+	if ok {
 		id = ""
 	}
 	ctx := context.WithValue(c.Request.Context(), "param", param)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@ close #

		## 動作確認

		<deatils><summary>エビデンス</summary></details>

		## テスト結果
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ name: Batch Deploy @@
     on:
       push:
+        branches:
+          - main
     env:
       JOB_NAME: mh-api-batch
@@ Expand Down @@