チーム登録時にplayerも登録できるように

FlowingSPDG · Aug 12, 2023 · fe70881 · fe70881
1 parent 5b28c05
commit fe70881
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 89 deletions.
diff --git a/backend/gqlgen.yml b/backend/gqlgen.yml
@@ -88,4 +88,7 @@ models:
 
   DateTime:
     model:
-      - github.com/99designs/gqlgen/graphql.Time
+      - github.com/99designs/gqlgen/graphql.Time
+  SteamID:
+    model:
+      - github.com/99designs/gqlgen/graphql.Uint64
diff --git a/backend/graph/converter.go b/backend/graph/converter.go
@@ -1,8 +1,6 @@
 package graph
 
 import (
-	"strconv"
-
 	"github.com/FlowingSPDG/get5loader/backend/entity"
 	"github.com/FlowingSPDG/get5loader/backend/graph/model"
 )
@@ -53,7 +51,7 @@ func convertPlayer(player *entity.Player) *model.Player {
 	return &model.Player{
 		ID:      string(player.ID),
 		TeamID:  string(player.TeamID),
-		SteamID: strconv.Itoa(int(player.SteamID)),
+		SteamID: uint64(player.SteamID),
 		Name:    player.Name,
 	}
 }
@@ -123,7 +121,7 @@ func convertPlayerstat(playerstat *entity.PlayerStat) *model.PlayerStats {
 		ID:               string(playerstat.ID),
 		MatchID:          string(playerstat.MatchID),
 		MapstatsID:       string(playerstat.MapID),
-		SteamID:          strconv.Itoa(int(playerstat.SteamID)),
+		SteamID:          uint64(playerstat.SteamID),
 		Name:             playerstat.Name,
 		Kills:            int(playerstat.Kills),
 		Assists:          int(playerstat.Assists),
@@ -163,7 +161,7 @@ func convertPlayerstats(playerstats []*entity.PlayerStat) []*model.PlayerStats {
 func convertUser(user *entity.User) *model.User {
 	return &model.User{
 		ID:          string(user.ID),
-		SteamID:     strconv.Itoa(int(user.SteamID)),
+		SteamID:     uint64(user.SteamID),
 		Name:        user.Name,
 		Admin:       false,
 		Gameservers: convertGameServers(user.Servers),

diff --git a/backend/graph/generated.go b/backend/graph/generated.go
diff --git a/backend/graph/model/models_gen.go b/backend/graph/model/models_gen.go
diff --git a/backend/graph/qls/schema.graphqls b/backend/graph/qls/schema.graphqls
@@ -1,9 +1,10 @@
 scalar DateTime
+scalar SteamID
 
 # User Operations
 type User {
 	id: ID!
-	steamId: String!
+	steamId: SteamID!
 	name: String!
 	admin: Boolean!
 	gameservers: [GameServer!]!
@@ -12,14 +13,14 @@ type User {
 }
 
 input NewUser {
-	steamId: String!
+	steamId: SteamID!
 	name: String!
 	password: String!
 	admin: Boolean!
 }
 
 input UserLoginSteamID {
-	steamId: String!
+	steamId: SteamID!
 	password: String!
 }
 
@@ -57,18 +58,18 @@ input NewTeam {
 type Player {
     id: ID!
     teamId: ID!
-    steamId: String!
+    steamId: SteamID!
     name: String!
 }
 
 input NewPlayer {
-    steamId: String!
+    steamId: SteamID!
     name: String!
     teamid: ID!
 }
 
 input NewPlayerForTeam {
-    steamId: String!
+    steamId: SteamID!
     name: String!
 }
 
@@ -164,7 +165,7 @@ type PlayerStats {
     id: ID!
     matchId: ID!
     mapstatsId: ID!
-    steamId: String!
+    steamId: SteamID!
     name: String!
 
     kills: Int!

diff --git a/backend/graph/schema.resolvers.go b/backend/graph/schema.resolvers.go