✨ handlerでzipファイル関係のエラーハンドリング

traPtitech · Oct 27, 2024 · 5a75e28 · 5a75e28
1 parent 83d57d4
commit 5a75e28
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 178 deletions.
diff --git a/docs/openapi/v2.yaml b/docs/openapi/v2.yaml
@@ -6,7 +6,7 @@ servers:
   - url: /api/v2 #oapi-codegenでproxy後にもmatchできるようにするため必要
 info:
   description: 'traP Collection v2'
-  version: '2.3.0'
+  version: '2.4.0'
   title: 'traP Collection v2'
   contact:
     name: traP
@@ -857,6 +857,7 @@ paths:
                 $ref: '#/components/schemas/Error'
           description: |
             リクエストが不正である場合に返されます。
+            エントリーポイントが存在しない、zipファイルでないなどです。
         "401":
           $ref: '#/components/responses/TraPUnauthorized'
         "404":

diff --git a/src/handler/v2/game_file.go b/src/handler/v2/game_file.go
@@ -105,7 +105,13 @@ func (gameFile GameFile) PostGameFile(c echo.Context, gameID openapi.GameIDInPat
 		var err error
 		savedFile, err = gameFile.gameFileService.SaveGameFile(c.Request().Context(), r, values.NewGameIDFromUUID(gameID), fileType, entryPoint)
 		if errors.Is(err, service.ErrInvalidGameID) {
-			return echo.NewHTTPError(http.StatusNotFound, "invalid gameID")
+			return echo.NewHTTPError(http.StatusNotFound, "gameID not found")
+		}
+		if errors.Is(err, service.ErrNotZipFile) {
+			return echo.NewHTTPError(http.StatusBadRequest, "only zip file is allowed")
+		}
+		if errors.Is(err, service.ErrInvalidEntryPoint) {
+			return echo.NewHTTPError(http.StatusBadRequest, "invalid entry point")
 		}
 		if err != nil {
 			log.Printf("error: failed to save game file: %v\n", err)

diff --git a/src/handler/v2/game_file_test.go b/src/handler/v2/game_file_test.go
@@ -395,6 +395,26 @@ func TestPostGameFile(t *testing.T) {
 			isErr:               true,
 			statusCode:          http.StatusNotFound,
 		},
+		{
+			description:         "SaveGameFileがErrNotZipFileなので404",
+			fileType:            openapi.Jar,
+			gameID:              uuid.UUID(values.NewGameID()),
+			reader:              bytes.NewReader([]byte("test")),
+			executeSaveGameFile: true,
+			saveGameFileErr:     service.ErrNotZipFile,
+			isErr:               true,
+			statusCode:          http.StatusBadRequest,
+		},
+		{
+			description:         "SaveGameFileがErrInvalidEntryPointなので404",
+			fileType:            openapi.Jar,
+			gameID:              uuid.UUID(values.NewGameID()),
+			reader:              bytes.NewReader([]byte("test")),
+			executeSaveGameFile: true,
+			saveGameFileErr:     service.ErrInvalidEntryPoint,
+			isErr:               true,
+			statusCode:          http.StatusBadRequest,
+		},
 		{
 			description:         "SaveGameFileがエラーなので500",
 			fileType:            openapi.Jar,