Merge pull request #202 from yuminn-k/fix/screen-share-routing

画面共有機能のルーティングエラー修正
YJU-OKURA · Apr 21, 2024 · f139c17 · f139c17
2 parents 8fb89da + 7a9f01f
commit f139c17
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/controllers/live_class_controller.go b/controllers/live_class_controller.go
@@ -81,7 +81,7 @@ func (c *LiveClassController) CreateRoomHandler() gin.HandlerFunc {
 // @Param userID path string true "ユーザーID"
 // @Success 200 {object} ScreenShareResponse
 // @Failure 400 {object} ErrorResponse
-// @Router /live/start-screen-share/{roomID} [get]
+// @Router /live/start-screen-share/{roomID}/{userID} [get]
 func (c *LiveClassController) StartScreenShareHandler() gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 		authHeader := ctx.GetHeader("Authorization")

diff --git a/docs/docs.go b/docs/docs.go
@@ -2295,7 +2295,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/live/start-screen-share/{roomID}": {
+        "/live/start-screen-share/{roomID}/{userID}": {
             "get": {
                 "description": "画面共有を開始します。",
                 "produces": [

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -2284,7 +2284,7 @@
                 }
             }
         },
-        "/live/start-screen-share/{roomID}": {
+        "/live/start-screen-share/{roomID}/{userID}": {
             "get": {
                 "description": "画面共有を開始します。",
                 "produces": [

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -1737,7 +1737,7 @@ paths:
       summary: ルームを生成します。
       tags:
       - Live Class
-  /live/start-screen-share/{roomID}:
+  /live/start-screen-share/{roomID}/{userID}:
     get:
       description: 画面共有を開始します。
       parameters:

diff --git a/main.go b/main.go
@@ -392,8 +392,8 @@ func setupChatRoutes(router *gin.Engine, chatController *controllers.ChatControl
 		chat.DELETE("room/:scheduleId", chatController.DeleteChatRoom)
 		chat.GET("stream/:scheduleId", chatController.StreamChat)
 		chat.GET("messages/:roomid", chatController.GetChatMessages)
-		chat.POST("dm/{senderId}/{receiverId}", chatController.SendDirectMessage)
-		chat.GET("dm/{userId1}/{userId2}", chatController.GetDirectMessages)
+		chat.POST("dm/:senderId/:receiverId", chatController.SendDirectMessage)
+		chat.GET("dm/:userId1/:userId2", chatController.GetDirectMessages)
 	}
 }
 
@@ -424,9 +424,9 @@ func manageChatRooms(db *gorm.DB, chatManager *services.Manager) {
 func setupLiveClassRoutes(router *gin.Engine, liveClassController *controllers.LiveClassController) {
 	live := router.Group("/api/gin/live")
 	{
-		live.POST("/create-room", liveClassController.CreateRoomHandler())
-		live.GET("/start-screen-share/{roomID}/{userID}", liveClassController.StartScreenShareHandler())
-		live.GET("/stop-screen-share/{roomID}/{userID}", liveClassController.StopScreenShareHandler())
-		live.GET("/view-screen-share/{roomID}", liveClassController.ViewScreenShareHandler())
+		live.POST("create-room", liveClassController.CreateRoomHandler())
+		live.GET("start-screen-share/:roomID/:userID", liveClassController.StartScreenShareHandler())
+		live.GET("stop-screen-share/:roomID/:userID", liveClassController.StopScreenShareHandler())
+		live.GET("view-screen-share/:roomID", liveClassController.ViewScreenShareHandler())
 	}
 }