diff --git a/app/player/api/internal/logic/player/createServiceLogic.go b/app/player/api/internal/logic/player/createServiceLogic.go index 3589d4c..1980d3b 100644 --- a/app/player/api/internal/logic/player/createServiceLogic.go +++ b/app/player/api/internal/logic/player/createServiceLogic.go @@ -52,7 +52,7 @@ func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *t return nil, errors.New("player not initialized") } - _, err = l.svcCtx.PlayerRpc.AddPlayerServices(l.ctx, &playerservice.AddPlayerServicesReq{ + serviceResp, err := l.svcCtx.PlayerRpc.AddPlayerServices(l.ctx, &playerservice.AddPlayerServicesReq{ PlayerId: player.Id, GameId: req.GameId, Title: req.Title, @@ -66,5 +66,21 @@ func (l *CreateServiceLogic) CreateService(req *types.CreateServiceReq) (resp *t logx.Errorf("failed to create player service: %v", err) return nil, errors.New("failed to create player service") } - return + + service := serviceResp.GetPlayerServices() + if service == nil { + return nil, errors.New("failed to create player service") + } + + return &types.PlayerService{ + Id: service.Id, + PlayerId: service.PlayerId, + GameId: service.GameId, + Title: service.Title, + Description: service.Description, + Price: service.Price, + Unit: service.Unit, + RankRange: service.RankRange, + Availability: service.Availability, + }, nil } diff --git a/app/player/api/internal/types/types.go b/app/player/api/internal/types/types.go index 29967a9..4ec92ed 100644 --- a/app/player/api/internal/types/types.go +++ b/app/player/api/internal/types/types.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// goctl 1.9.2 +// goctl 1.10.1 package types @@ -71,7 +71,7 @@ type PlayerProfile struct { } type PlayerService struct { - Id int64 `json:"id"` + Id int64 `json:"id,optional"` PlayerId int64 `json:"playerId"` GameId int64 `json:"gameId"` GameName string `json:"gameName"` diff --git a/app/player/rpc/internal/logic/addPlayerServicesLogic.go b/app/player/rpc/internal/logic/addPlayerServicesLogic.go index 4334b05..72a8472 100644 --- a/app/player/rpc/internal/logic/addPlayerServicesLogic.go +++ b/app/player/rpc/internal/logic/addPlayerServicesLogic.go @@ -3,6 +3,7 @@ package logic import ( "context" "errors" + "juwan-backend/app/player/rpc/internal/models/playerservices" "juwan-backend/app/player/rpc/internal/svc" "juwan-backend/app/player/rpc/pb" "juwan-backend/app/snowflake/rpc/snowflake" @@ -50,5 +51,31 @@ func (l *AddPlayerServicesLogic) AddPlayerServices(in *pb.AddPlayerServicesReq) return nil, errors.New("add player service failed") } - return &pb.AddPlayerServicesResp{}, nil + playerService, err := l.svcCtx.PlayerModelRO.PlayerServices.Query().Where(playerservices.IDEQ(idResp.Id)).First(l.ctx) + if err != nil { + logx.Errorf("getPlayerServicesById err:%v", err) + return nil, errors.New("get player service failed") + } + + pbPlayerService := pb.PlayerServices{ + Id: playerService.ID, + PlayerId: playerService.PlayerID, + GameId: playerService.GameID, + Title: playerService.Title, + Price: playerService.Price.InexactFloat64(), + Unit: playerService.Unit, + Availability: playerService.Availability, + Rating: playerService.Rating.InexactFloat64(), + IsActive: playerService.IsActive, + CreatedAt: playerService.CreatedAt.Unix(), + UpdatedAt: playerService.UpdatedAt.Unix(), + } + if playerService.Description != nil { + pbPlayerService.Description = *playerService.Description + } + if playerService.RankRange != nil { + pbPlayerService.RankRange = *playerService.RankRange + } + + return &pb.AddPlayerServicesResp{PlayerServices: &pbPlayerService}, nil } diff --git a/app/player/rpc/pb/player.pb.go b/app/player/rpc/pb/player.pb.go index da0df26..fb6162a 100644 --- a/app/player/rpc/pb/player.pb.go +++ b/app/player/rpc/pb/player.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.36.11 // protoc v7.34.1 -// source: player.proto +// source: desc/rpc/player.proto package pb @@ -43,7 +43,7 @@ type PlayerServices struct { func (x *PlayerServices) Reset() { *x = PlayerServices{} - mi := &file_player_proto_msgTypes[0] + mi := &file_desc_rpc_player_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -55,7 +55,7 @@ func (x *PlayerServices) String() string { func (*PlayerServices) ProtoMessage() {} func (x *PlayerServices) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[0] + mi := &file_desc_rpc_player_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -68,7 +68,7 @@ func (x *PlayerServices) ProtoReflect() protoreflect.Message { // Deprecated: Use PlayerServices.ProtoReflect.Descriptor instead. func (*PlayerServices) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{0} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{0} } func (x *PlayerServices) GetId() int64 { @@ -182,7 +182,7 @@ type AddPlayerServicesReq struct { func (x *AddPlayerServicesReq) Reset() { *x = AddPlayerServicesReq{} - mi := &file_player_proto_msgTypes[1] + mi := &file_desc_rpc_player_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -194,7 +194,7 @@ func (x *AddPlayerServicesReq) String() string { func (*AddPlayerServicesReq) ProtoMessage() {} func (x *AddPlayerServicesReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[1] + mi := &file_desc_rpc_player_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -207,7 +207,7 @@ func (x *AddPlayerServicesReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AddPlayerServicesReq.ProtoReflect.Descriptor instead. func (*AddPlayerServicesReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{1} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{1} } func (x *AddPlayerServicesReq) GetPlayerId() int64 { @@ -295,14 +295,15 @@ func (x *AddPlayerServicesReq) GetUpdatedAt() int64 { } type AddPlayerServicesResp struct { - state protoimpl.MessageState `protogen:"open.v1"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + PlayerServices *PlayerServices `protobuf:"bytes,1,opt,name=playerServices,proto3" json:"playerServices,omitempty"` //playerServices + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AddPlayerServicesResp) Reset() { *x = AddPlayerServicesResp{} - mi := &file_player_proto_msgTypes[2] + mi := &file_desc_rpc_player_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -314,7 +315,7 @@ func (x *AddPlayerServicesResp) String() string { func (*AddPlayerServicesResp) ProtoMessage() {} func (x *AddPlayerServicesResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[2] + mi := &file_desc_rpc_player_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -327,7 +328,14 @@ func (x *AddPlayerServicesResp) ProtoReflect() protoreflect.Message { // Deprecated: Use AddPlayerServicesResp.ProtoReflect.Descriptor instead. func (*AddPlayerServicesResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{2} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{2} +} + +func (x *AddPlayerServicesResp) GetPlayerServices() *PlayerServices { + if x != nil { + return x.PlayerServices + } + return nil } type UpdatePlayerServicesReq struct { @@ -351,7 +359,7 @@ type UpdatePlayerServicesReq struct { func (x *UpdatePlayerServicesReq) Reset() { *x = UpdatePlayerServicesReq{} - mi := &file_player_proto_msgTypes[3] + mi := &file_desc_rpc_player_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -363,7 +371,7 @@ func (x *UpdatePlayerServicesReq) String() string { func (*UpdatePlayerServicesReq) ProtoMessage() {} func (x *UpdatePlayerServicesReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[3] + mi := &file_desc_rpc_player_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -376,7 +384,7 @@ func (x *UpdatePlayerServicesReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdatePlayerServicesReq.ProtoReflect.Descriptor instead. func (*UpdatePlayerServicesReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{3} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{3} } func (x *UpdatePlayerServicesReq) GetId() int64 { @@ -478,7 +486,7 @@ type UpdatePlayerServicesResp struct { func (x *UpdatePlayerServicesResp) Reset() { *x = UpdatePlayerServicesResp{} - mi := &file_player_proto_msgTypes[4] + mi := &file_desc_rpc_player_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -490,7 +498,7 @@ func (x *UpdatePlayerServicesResp) String() string { func (*UpdatePlayerServicesResp) ProtoMessage() {} func (x *UpdatePlayerServicesResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[4] + mi := &file_desc_rpc_player_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -503,7 +511,7 @@ func (x *UpdatePlayerServicesResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdatePlayerServicesResp.ProtoReflect.Descriptor instead. func (*UpdatePlayerServicesResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{4} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{4} } type DelPlayerServicesReq struct { @@ -515,7 +523,7 @@ type DelPlayerServicesReq struct { func (x *DelPlayerServicesReq) Reset() { *x = DelPlayerServicesReq{} - mi := &file_player_proto_msgTypes[5] + mi := &file_desc_rpc_player_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -527,7 +535,7 @@ func (x *DelPlayerServicesReq) String() string { func (*DelPlayerServicesReq) ProtoMessage() {} func (x *DelPlayerServicesReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[5] + mi := &file_desc_rpc_player_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -540,7 +548,7 @@ func (x *DelPlayerServicesReq) ProtoReflect() protoreflect.Message { // Deprecated: Use DelPlayerServicesReq.ProtoReflect.Descriptor instead. func (*DelPlayerServicesReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{5} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{5} } func (x *DelPlayerServicesReq) GetId() int64 { @@ -558,7 +566,7 @@ type DelPlayerServicesResp struct { func (x *DelPlayerServicesResp) Reset() { *x = DelPlayerServicesResp{} - mi := &file_player_proto_msgTypes[6] + mi := &file_desc_rpc_player_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -570,7 +578,7 @@ func (x *DelPlayerServicesResp) String() string { func (*DelPlayerServicesResp) ProtoMessage() {} func (x *DelPlayerServicesResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[6] + mi := &file_desc_rpc_player_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -583,7 +591,7 @@ func (x *DelPlayerServicesResp) ProtoReflect() protoreflect.Message { // Deprecated: Use DelPlayerServicesResp.ProtoReflect.Descriptor instead. func (*DelPlayerServicesResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{6} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{6} } type GetPlayerServicesByIdReq struct { @@ -595,7 +603,7 @@ type GetPlayerServicesByIdReq struct { func (x *GetPlayerServicesByIdReq) Reset() { *x = GetPlayerServicesByIdReq{} - mi := &file_player_proto_msgTypes[7] + mi := &file_desc_rpc_player_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -607,7 +615,7 @@ func (x *GetPlayerServicesByIdReq) String() string { func (*GetPlayerServicesByIdReq) ProtoMessage() {} func (x *GetPlayerServicesByIdReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[7] + mi := &file_desc_rpc_player_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -620,7 +628,7 @@ func (x *GetPlayerServicesByIdReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPlayerServicesByIdReq.ProtoReflect.Descriptor instead. func (*GetPlayerServicesByIdReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{7} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{7} } func (x *GetPlayerServicesByIdReq) GetId() int64 { @@ -639,7 +647,7 @@ type GetPlayerServicesByIdResp struct { func (x *GetPlayerServicesByIdResp) Reset() { *x = GetPlayerServicesByIdResp{} - mi := &file_player_proto_msgTypes[8] + mi := &file_desc_rpc_player_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -651,7 +659,7 @@ func (x *GetPlayerServicesByIdResp) String() string { func (*GetPlayerServicesByIdResp) ProtoMessage() {} func (x *GetPlayerServicesByIdResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[8] + mi := &file_desc_rpc_player_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -664,7 +672,7 @@ func (x *GetPlayerServicesByIdResp) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPlayerServicesByIdResp.ProtoReflect.Descriptor instead. func (*GetPlayerServicesByIdResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{8} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{8} } func (x *GetPlayerServicesByIdResp) GetPlayerServices() *PlayerServices { @@ -697,7 +705,7 @@ type SearchPlayerServicesReq struct { func (x *SearchPlayerServicesReq) Reset() { *x = SearchPlayerServicesReq{} - mi := &file_player_proto_msgTypes[9] + mi := &file_desc_rpc_player_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -709,7 +717,7 @@ func (x *SearchPlayerServicesReq) String() string { func (*SearchPlayerServicesReq) ProtoMessage() {} func (x *SearchPlayerServicesReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[9] + mi := &file_desc_rpc_player_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -722,7 +730,7 @@ func (x *SearchPlayerServicesReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SearchPlayerServicesReq.ProtoReflect.Descriptor instead. func (*SearchPlayerServicesReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{9} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{9} } func (x *SearchPlayerServicesReq) GetPage() int64 { @@ -839,7 +847,7 @@ type SearchPlayerServicesResp struct { func (x *SearchPlayerServicesResp) Reset() { *x = SearchPlayerServicesResp{} - mi := &file_player_proto_msgTypes[10] + mi := &file_desc_rpc_player_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -851,7 +859,7 @@ func (x *SearchPlayerServicesResp) String() string { func (*SearchPlayerServicesResp) ProtoMessage() {} func (x *SearchPlayerServicesResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[10] + mi := &file_desc_rpc_player_proto_msgTypes[10] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -864,7 +872,7 @@ func (x *SearchPlayerServicesResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SearchPlayerServicesResp.ProtoReflect.Descriptor instead. func (*SearchPlayerServicesResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{10} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{10} } func (x *SearchPlayerServicesResp) GetPlayerServices() []*PlayerServices { @@ -895,7 +903,7 @@ type Players struct { func (x *Players) Reset() { *x = Players{} - mi := &file_player_proto_msgTypes[11] + mi := &file_desc_rpc_player_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -907,7 +915,7 @@ func (x *Players) String() string { func (*Players) ProtoMessage() {} func (x *Players) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[11] + mi := &file_desc_rpc_player_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -920,7 +928,7 @@ func (x *Players) ProtoReflect() protoreflect.Message { // Deprecated: Use Players.ProtoReflect.Descriptor instead. func (*Players) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{11} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{11} } func (x *Players) GetId() int64 { @@ -1026,7 +1034,7 @@ type AddPlayersReq struct { func (x *AddPlayersReq) Reset() { *x = AddPlayersReq{} - mi := &file_player_proto_msgTypes[12] + mi := &file_desc_rpc_player_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1038,7 +1046,7 @@ func (x *AddPlayersReq) String() string { func (*AddPlayersReq) ProtoMessage() {} func (x *AddPlayersReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[12] + mi := &file_desc_rpc_player_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1051,7 +1059,7 @@ func (x *AddPlayersReq) ProtoReflect() protoreflect.Message { // Deprecated: Use AddPlayersReq.ProtoReflect.Descriptor instead. func (*AddPlayersReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{12} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{12} } func (x *AddPlayersReq) GetUserId() int64 { @@ -1139,7 +1147,7 @@ type AddPlayersResp struct { func (x *AddPlayersResp) Reset() { *x = AddPlayersResp{} - mi := &file_player_proto_msgTypes[13] + mi := &file_desc_rpc_player_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1151,7 +1159,7 @@ func (x *AddPlayersResp) String() string { func (*AddPlayersResp) ProtoMessage() {} func (x *AddPlayersResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[13] + mi := &file_desc_rpc_player_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1164,7 +1172,7 @@ func (x *AddPlayersResp) ProtoReflect() protoreflect.Message { // Deprecated: Use AddPlayersResp.ProtoReflect.Descriptor instead. func (*AddPlayersResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{13} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{13} } type UpdatePlayersReq struct { @@ -1187,7 +1195,7 @@ type UpdatePlayersReq struct { func (x *UpdatePlayersReq) Reset() { *x = UpdatePlayersReq{} - mi := &file_player_proto_msgTypes[14] + mi := &file_desc_rpc_player_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1199,7 +1207,7 @@ func (x *UpdatePlayersReq) String() string { func (*UpdatePlayersReq) ProtoMessage() {} func (x *UpdatePlayersReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[14] + mi := &file_desc_rpc_player_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1212,7 +1220,7 @@ func (x *UpdatePlayersReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdatePlayersReq.ProtoReflect.Descriptor instead. func (*UpdatePlayersReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{14} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{14} } func (x *UpdatePlayersReq) GetId() int64 { @@ -1307,7 +1315,7 @@ type UpdatePlayersResp struct { func (x *UpdatePlayersResp) Reset() { *x = UpdatePlayersResp{} - mi := &file_player_proto_msgTypes[15] + mi := &file_desc_rpc_player_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1319,7 +1327,7 @@ func (x *UpdatePlayersResp) String() string { func (*UpdatePlayersResp) ProtoMessage() {} func (x *UpdatePlayersResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[15] + mi := &file_desc_rpc_player_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1332,7 +1340,7 @@ func (x *UpdatePlayersResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdatePlayersResp.ProtoReflect.Descriptor instead. func (*UpdatePlayersResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{15} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{15} } type DelPlayersReq struct { @@ -1344,7 +1352,7 @@ type DelPlayersReq struct { func (x *DelPlayersReq) Reset() { *x = DelPlayersReq{} - mi := &file_player_proto_msgTypes[16] + mi := &file_desc_rpc_player_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1356,7 +1364,7 @@ func (x *DelPlayersReq) String() string { func (*DelPlayersReq) ProtoMessage() {} func (x *DelPlayersReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[16] + mi := &file_desc_rpc_player_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1369,7 +1377,7 @@ func (x *DelPlayersReq) ProtoReflect() protoreflect.Message { // Deprecated: Use DelPlayersReq.ProtoReflect.Descriptor instead. func (*DelPlayersReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{16} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{16} } func (x *DelPlayersReq) GetId() int64 { @@ -1387,7 +1395,7 @@ type DelPlayersResp struct { func (x *DelPlayersResp) Reset() { *x = DelPlayersResp{} - mi := &file_player_proto_msgTypes[17] + mi := &file_desc_rpc_player_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1399,7 +1407,7 @@ func (x *DelPlayersResp) String() string { func (*DelPlayersResp) ProtoMessage() {} func (x *DelPlayersResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[17] + mi := &file_desc_rpc_player_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1412,7 +1420,7 @@ func (x *DelPlayersResp) ProtoReflect() protoreflect.Message { // Deprecated: Use DelPlayersResp.ProtoReflect.Descriptor instead. func (*DelPlayersResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{17} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{17} } type GetPlayersByIdReq struct { @@ -1424,7 +1432,7 @@ type GetPlayersByIdReq struct { func (x *GetPlayersByIdReq) Reset() { *x = GetPlayersByIdReq{} - mi := &file_player_proto_msgTypes[18] + mi := &file_desc_rpc_player_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1436,7 +1444,7 @@ func (x *GetPlayersByIdReq) String() string { func (*GetPlayersByIdReq) ProtoMessage() {} func (x *GetPlayersByIdReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[18] + mi := &file_desc_rpc_player_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1449,7 +1457,7 @@ func (x *GetPlayersByIdReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPlayersByIdReq.ProtoReflect.Descriptor instead. func (*GetPlayersByIdReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{18} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{18} } func (x *GetPlayersByIdReq) GetId() int64 { @@ -1468,7 +1476,7 @@ type GetPlayersByIdResp struct { func (x *GetPlayersByIdResp) Reset() { *x = GetPlayersByIdResp{} - mi := &file_player_proto_msgTypes[19] + mi := &file_desc_rpc_player_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1480,7 +1488,7 @@ func (x *GetPlayersByIdResp) String() string { func (*GetPlayersByIdResp) ProtoMessage() {} func (x *GetPlayersByIdResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[19] + mi := &file_desc_rpc_player_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1493,7 +1501,7 @@ func (x *GetPlayersByIdResp) ProtoReflect() protoreflect.Message { // Deprecated: Use GetPlayersByIdResp.ProtoReflect.Descriptor instead. func (*GetPlayersByIdResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{19} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{19} } func (x *GetPlayersByIdResp) GetPlayers() *Players { @@ -1525,7 +1533,7 @@ type SearchPlayersReq struct { func (x *SearchPlayersReq) Reset() { *x = SearchPlayersReq{} - mi := &file_player_proto_msgTypes[20] + mi := &file_desc_rpc_player_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1537,7 +1545,7 @@ func (x *SearchPlayersReq) String() string { func (*SearchPlayersReq) ProtoMessage() {} func (x *SearchPlayersReq) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[20] + mi := &file_desc_rpc_player_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1550,7 +1558,7 @@ func (x *SearchPlayersReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SearchPlayersReq.ProtoReflect.Descriptor instead. func (*SearchPlayersReq) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{20} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{20} } func (x *SearchPlayersReq) GetPage() int64 { @@ -1660,7 +1668,7 @@ type SearchPlayersResp struct { func (x *SearchPlayersResp) Reset() { *x = SearchPlayersResp{} - mi := &file_player_proto_msgTypes[21] + mi := &file_desc_rpc_player_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1672,7 +1680,7 @@ func (x *SearchPlayersResp) String() string { func (*SearchPlayersResp) ProtoMessage() {} func (x *SearchPlayersResp) ProtoReflect() protoreflect.Message { - mi := &file_player_proto_msgTypes[21] + mi := &file_desc_rpc_player_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1685,7 +1693,7 @@ func (x *SearchPlayersResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SearchPlayersResp.ProtoReflect.Descriptor instead. func (*SearchPlayersResp) Descriptor() ([]byte, []int) { - return file_player_proto_rawDescGZIP(), []int{21} + return file_desc_rpc_player_proto_rawDescGZIP(), []int{21} } func (x *SearchPlayersResp) GetPlayers() []*Players { @@ -1695,11 +1703,11 @@ func (x *SearchPlayersResp) GetPlayers() []*Players { return nil } -var File_player_proto protoreflect.FileDescriptor +var File_desc_rpc_player_proto protoreflect.FileDescriptor -const file_player_proto_rawDesc = "" + +const file_desc_rpc_player_proto_rawDesc = "" + "\n" + - "\fplayer.proto\x12\x02pb\"\xe8\x02\n" + + "\x15desc/rpc/player.proto\x12\x02pb\"\xe8\x02\n" + "\x0ePlayerServices\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\bplayerId\x18\x02 \x01(\x03R\bplayerId\x12\x16\n" + @@ -1728,8 +1736,9 @@ const file_player_proto_rawDesc = "" + "\bisActive\x18\n" + " \x01(\bR\bisActive\x12\x1c\n" + "\tcreatedAt\x18\v \x01(\x03R\tcreatedAt\x12\x1c\n" + - "\tupdatedAt\x18\f \x01(\x03R\tupdatedAt\"\x17\n" + - "\x15AddPlayerServicesResp\"\xaf\x04\n" + + "\tupdatedAt\x18\f \x01(\x03R\tupdatedAt\"S\n" + + "\x15AddPlayerServicesResp\x12:\n" + + "\x0eplayerServices\x18\x01 \x01(\v2\x12.pb.PlayerServicesR\x0eplayerServices\"\xaf\x04\n" + "\x17UpdatePlayerServicesReq\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1f\n" + "\bplayerId\x18\x02 \x01(\x03H\x00R\bplayerId\x88\x01\x01\x12\x1b\n" + @@ -1897,19 +1906,19 @@ const file_player_proto_rawDesc = "" + "\rSearchPlayers\x12\x14.pb.SearchPlayersReq\x1a\x15.pb.SearchPlayersRespB\x06Z\x04./pbb\x06proto3" var ( - file_player_proto_rawDescOnce sync.Once - file_player_proto_rawDescData []byte + file_desc_rpc_player_proto_rawDescOnce sync.Once + file_desc_rpc_player_proto_rawDescData []byte ) -func file_player_proto_rawDescGZIP() []byte { - file_player_proto_rawDescOnce.Do(func() { - file_player_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_player_proto_rawDesc), len(file_player_proto_rawDesc))) +func file_desc_rpc_player_proto_rawDescGZIP() []byte { + file_desc_rpc_player_proto_rawDescOnce.Do(func() { + file_desc_rpc_player_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_desc_rpc_player_proto_rawDesc), len(file_desc_rpc_player_proto_rawDesc))) }) - return file_player_proto_rawDescData + return file_desc_rpc_player_proto_rawDescData } -var file_player_proto_msgTypes = make([]protoimpl.MessageInfo, 22) -var file_player_proto_goTypes = []any{ +var file_desc_rpc_player_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_desc_rpc_player_proto_goTypes = []any{ (*PlayerServices)(nil), // 0: pb.PlayerServices (*AddPlayerServicesReq)(nil), // 1: pb.AddPlayerServicesReq (*AddPlayerServicesResp)(nil), // 2: pb.AddPlayerServicesResp @@ -1933,63 +1942,64 @@ var file_player_proto_goTypes = []any{ (*SearchPlayersReq)(nil), // 20: pb.SearchPlayersReq (*SearchPlayersResp)(nil), // 21: pb.SearchPlayersResp } -var file_player_proto_depIdxs = []int32{ - 0, // 0: pb.GetPlayerServicesByIdResp.playerServices:type_name -> pb.PlayerServices - 0, // 1: pb.SearchPlayerServicesResp.playerServices:type_name -> pb.PlayerServices - 11, // 2: pb.GetPlayersByIdResp.players:type_name -> pb.Players - 11, // 3: pb.SearchPlayersResp.players:type_name -> pb.Players - 1, // 4: pb.playerService.AddPlayerServices:input_type -> pb.AddPlayerServicesReq - 3, // 5: pb.playerService.UpdatePlayerServices:input_type -> pb.UpdatePlayerServicesReq - 5, // 6: pb.playerService.DelPlayerServices:input_type -> pb.DelPlayerServicesReq - 7, // 7: pb.playerService.GetPlayerServicesById:input_type -> pb.GetPlayerServicesByIdReq - 9, // 8: pb.playerService.SearchPlayerServices:input_type -> pb.SearchPlayerServicesReq - 12, // 9: pb.playerService.AddPlayers:input_type -> pb.AddPlayersReq - 14, // 10: pb.playerService.UpdatePlayers:input_type -> pb.UpdatePlayersReq - 16, // 11: pb.playerService.DelPlayers:input_type -> pb.DelPlayersReq - 18, // 12: pb.playerService.GetPlayersById:input_type -> pb.GetPlayersByIdReq - 20, // 13: pb.playerService.GetPlayerByUserId:input_type -> pb.SearchPlayersReq - 20, // 14: pb.playerService.SearchPlayers:input_type -> pb.SearchPlayersReq - 2, // 15: pb.playerService.AddPlayerServices:output_type -> pb.AddPlayerServicesResp - 4, // 16: pb.playerService.UpdatePlayerServices:output_type -> pb.UpdatePlayerServicesResp - 6, // 17: pb.playerService.DelPlayerServices:output_type -> pb.DelPlayerServicesResp - 8, // 18: pb.playerService.GetPlayerServicesById:output_type -> pb.GetPlayerServicesByIdResp - 10, // 19: pb.playerService.SearchPlayerServices:output_type -> pb.SearchPlayerServicesResp - 13, // 20: pb.playerService.AddPlayers:output_type -> pb.AddPlayersResp - 15, // 21: pb.playerService.UpdatePlayers:output_type -> pb.UpdatePlayersResp - 17, // 22: pb.playerService.DelPlayers:output_type -> pb.DelPlayersResp - 19, // 23: pb.playerService.GetPlayersById:output_type -> pb.GetPlayersByIdResp - 19, // 24: pb.playerService.GetPlayerByUserId:output_type -> pb.GetPlayersByIdResp - 21, // 25: pb.playerService.SearchPlayers:output_type -> pb.SearchPlayersResp - 15, // [15:26] is the sub-list for method output_type - 4, // [4:15] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name +var file_desc_rpc_player_proto_depIdxs = []int32{ + 0, // 0: pb.AddPlayerServicesResp.playerServices:type_name -> pb.PlayerServices + 0, // 1: pb.GetPlayerServicesByIdResp.playerServices:type_name -> pb.PlayerServices + 0, // 2: pb.SearchPlayerServicesResp.playerServices:type_name -> pb.PlayerServices + 11, // 3: pb.GetPlayersByIdResp.players:type_name -> pb.Players + 11, // 4: pb.SearchPlayersResp.players:type_name -> pb.Players + 1, // 5: pb.playerService.AddPlayerServices:input_type -> pb.AddPlayerServicesReq + 3, // 6: pb.playerService.UpdatePlayerServices:input_type -> pb.UpdatePlayerServicesReq + 5, // 7: pb.playerService.DelPlayerServices:input_type -> pb.DelPlayerServicesReq + 7, // 8: pb.playerService.GetPlayerServicesById:input_type -> pb.GetPlayerServicesByIdReq + 9, // 9: pb.playerService.SearchPlayerServices:input_type -> pb.SearchPlayerServicesReq + 12, // 10: pb.playerService.AddPlayers:input_type -> pb.AddPlayersReq + 14, // 11: pb.playerService.UpdatePlayers:input_type -> pb.UpdatePlayersReq + 16, // 12: pb.playerService.DelPlayers:input_type -> pb.DelPlayersReq + 18, // 13: pb.playerService.GetPlayersById:input_type -> pb.GetPlayersByIdReq + 20, // 14: pb.playerService.GetPlayerByUserId:input_type -> pb.SearchPlayersReq + 20, // 15: pb.playerService.SearchPlayers:input_type -> pb.SearchPlayersReq + 2, // 16: pb.playerService.AddPlayerServices:output_type -> pb.AddPlayerServicesResp + 4, // 17: pb.playerService.UpdatePlayerServices:output_type -> pb.UpdatePlayerServicesResp + 6, // 18: pb.playerService.DelPlayerServices:output_type -> pb.DelPlayerServicesResp + 8, // 19: pb.playerService.GetPlayerServicesById:output_type -> pb.GetPlayerServicesByIdResp + 10, // 20: pb.playerService.SearchPlayerServices:output_type -> pb.SearchPlayerServicesResp + 13, // 21: pb.playerService.AddPlayers:output_type -> pb.AddPlayersResp + 15, // 22: pb.playerService.UpdatePlayers:output_type -> pb.UpdatePlayersResp + 17, // 23: pb.playerService.DelPlayers:output_type -> pb.DelPlayersResp + 19, // 24: pb.playerService.GetPlayersById:output_type -> pb.GetPlayersByIdResp + 19, // 25: pb.playerService.GetPlayerByUserId:output_type -> pb.GetPlayersByIdResp + 21, // 26: pb.playerService.SearchPlayers:output_type -> pb.SearchPlayersResp + 16, // [16:27] is the sub-list for method output_type + 5, // [5:16] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } -func init() { file_player_proto_init() } -func file_player_proto_init() { - if File_player_proto != nil { +func init() { file_desc_rpc_player_proto_init() } +func file_desc_rpc_player_proto_init() { + if File_desc_rpc_player_proto != nil { return } - file_player_proto_msgTypes[3].OneofWrappers = []any{} - file_player_proto_msgTypes[14].OneofWrappers = []any{} - file_player_proto_msgTypes[20].OneofWrappers = []any{} + file_desc_rpc_player_proto_msgTypes[3].OneofWrappers = []any{} + file_desc_rpc_player_proto_msgTypes[14].OneofWrappers = []any{} + file_desc_rpc_player_proto_msgTypes[20].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_player_proto_rawDesc), len(file_player_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_desc_rpc_player_proto_rawDesc), len(file_desc_rpc_player_proto_rawDesc)), NumEnums: 0, NumMessages: 22, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_player_proto_goTypes, - DependencyIndexes: file_player_proto_depIdxs, - MessageInfos: file_player_proto_msgTypes, + GoTypes: file_desc_rpc_player_proto_goTypes, + DependencyIndexes: file_desc_rpc_player_proto_depIdxs, + MessageInfos: file_desc_rpc_player_proto_msgTypes, }.Build() - File_player_proto = out.File - file_player_proto_goTypes = nil - file_player_proto_depIdxs = nil + File_desc_rpc_player_proto = out.File + file_desc_rpc_player_proto_goTypes = nil + file_desc_rpc_player_proto_depIdxs = nil } diff --git a/app/player/rpc/pb/player_grpc.pb.go b/app/player/rpc/pb/player_grpc.pb.go index 3472ebf..c7d0ace 100644 --- a/app/player/rpc/pb/player_grpc.pb.go +++ b/app/player/rpc/pb/player_grpc.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.1 -// - protoc v5.29.6 -// source: player.proto +// - protoc v7.34.1 +// source: desc/rpc/player.proto package pb @@ -501,5 +501,5 @@ var PlayerService_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "player.proto", + Metadata: "desc/rpc/player.proto", } diff --git a/desc/api/player.api b/desc/api/player.api index b394f07..9b89e75 100644 --- a/desc/api/player.api +++ b/desc/api/player.api @@ -11,7 +11,7 @@ import "common.api" type ( PlayerService { - Id int64 `json:"id"` + Id int64 `json:"id,optional"` PlayerId int64 `json:"playerId"` GameId int64 `json:"gameId"` GameName string `json:"gameName"` diff --git a/desc/rpc/player.proto b/desc/rpc/player.proto index 6b9262e..5ed0949 100644 --- a/desc/rpc/player.proto +++ b/desc/rpc/player.proto @@ -41,6 +41,7 @@ message AddPlayerServicesReq { } message AddPlayerServicesResp { + PlayerServices playerServices = 1; //playerServices } message UpdatePlayerServicesReq {