[refactoring] #48

homenoc · Mar 17, 2021 · fb64131 · fb64131
1 parent 1f8e8aa
commit fb64131
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 12 deletions.
diff --git a/pkg/api/core/support/ticket/v0/admin.go b/pkg/api/core/support/ticket/v0/admin.go
@@ -228,17 +228,25 @@ func GetAdminWebSocket(c *gin.Context) {
 	}
 
 	// WebSocket送信
-	support.Clients[&support.WebSocket{TicketID: uint(id), UserID: resultAdmin.AdminID,
-		GroupID: ticketResult.Ticket[0].GroupID, Socket: conn}] = true
+	support.Clients[&support.WebSocket{
+		TicketID: uint(id),
+		UserID:   resultAdmin.AdminID,
+		GroupID:  ticketResult.Ticket[0].GroupID,
+		Socket:   conn,
+	}] = true
 
 	//WebSocket受信
 	for {
 		var msg support.WebSocketResult
 		err = conn.ReadJSON(&msg)
 		if err != nil {
 			log.Printf("error: %v", err)
-			delete(support.Clients, &support.WebSocket{TicketID: uint(id), UserID: resultAdmin.AdminID,
-				GroupID: ticketResult.Ticket[0].GroupID, Socket: conn})
+			delete(support.Clients, &support.WebSocket{
+				TicketID: uint(id),
+				UserID:   resultAdmin.AdminID,
+				GroupID:  ticketResult.Ticket[0].GroupID,
+				Socket:   conn,
+			})
 			break
 		}
 
@@ -272,7 +280,10 @@ func GetAdminWebSocket(c *gin.Context) {
 				log.Println(resultTicket.Err)
 			}
 			if len(resultTicket.Ticket) != 0 {
-				resultUser := dbUser.Get(user.GIDAndLevel, &core.User{GroupID: resultTicket.Ticket[0].GroupID, Level: 1})
+				resultUser := dbUser.Get(user.GIDAndLevel, &core.User{
+					GroupID: resultTicket.Ticket[0].GroupID,
+					Level:   1,
+				})
 				if resultUser.Err != nil {
 					log.Println(resultUser.Err)
 				}

diff --git a/pkg/api/core/support/ticket/v0/ticket.go b/pkg/api/core/support/ticket/v0/ticket.go
@@ -187,21 +187,34 @@ func GetWebSocket(c *gin.Context) {
 	}
 
 	// WebSocket送信
-	support.Clients[&support.WebSocket{TicketID: uint(id), Admin: false,
-		UserID: result.User.ID, GroupID: result.Group.ID, Socket: conn}] = true
+	support.Clients[&support.WebSocket{
+		TicketID: uint(id),
+		Admin:    false,
+		UserID:   result.User.ID,
+		GroupID:  result.Group.ID,
+		Socket:   conn,
+	}] = true
 
 	//WebSocket受信
 	for {
 		var msg support.WebSocketResult
 		err = conn.ReadJSON(&msg)
 		if err != nil {
 			log.Printf("error: %v", err)
-			delete(support.Clients, &support.WebSocket{TicketID: uint(id), Admin: false, UserID: result.User.ID,
-				GroupID: result.Group.ID, Socket: conn})
+			delete(support.Clients, &support.WebSocket{
+				TicketID: uint(id),
+				Admin:    false,
+				UserID:   result.User.ID,
+				GroupID:  result.Group.ID,
+				Socket:   conn,
+			})
 			break
 		}
 		// 入力されたデータをTokenにて認証
-		resultGroup := auth.GroupAuthentication(0, core.Token{UserToken: msg.UserToken, AccessToken: msg.AccessToken})
+		resultGroup := auth.GroupAuthentication(0, core.Token{
+			UserToken:   msg.UserToken,
+			AccessToken: msg.AccessToken,
+		})
 		if resultGroup.Err != nil {
 			log.Println(resultGroup.Err)
 			return
@@ -225,8 +238,13 @@ func GetWebSocket(c *gin.Context) {
 			msg.UserToken = ""
 
 			//ユーザ側に送信
-			controller.SendChatUser(controllerInterface.Chat{CreatedAt: msg.CreatedAt,
-				UserID: result.User.ID, GroupID: resultGroup.Group.ID, Admin: msg.Admin, Message: msg.Message})
+			controller.SendChatUser(controllerInterface.Chat{
+				CreatedAt: msg.CreatedAt,
+				UserID:    result.User.ID,
+				GroupID:   resultGroup.Group.ID,
+				Admin:     msg.Admin,
+				Message:   msg.Message,
+			})
 
 			userName := "不明"