ITQ/Datarush
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/competition

Browse Source
This commit is contained in:
Timur Kh.
2025-12-17 09:26:09 +03:00
parent 69d99e08ea 843c50a103
commit 9f585a3a90
7 changed files with 129 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/competition/competition.pb.go
+31 -76
View File
@@ -21,6 +21,7 @@ import (
"google.golang.org/protobuf/proto"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
emptypb "google.golang.org/protobuf/types/known/emptypb"
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
"reflect"
"sync"
@@ -401,50 +402,6 @@ func (x *DeleteCompetitionRequest) GetCompetitionId() string {
return ""
}
type DeleteCompetitionResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *DeleteCompetitionResponse) Reset() {
*x = DeleteCompetitionResponse{}
mi := &file_api_proto_competition_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *DeleteCompetitionResponse) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DeleteCompetitionResponse) ProtoMessage() {}
func (x *DeleteCompetitionResponse) ProtoReflect() protoreflect.Message {
mi := &file_api_proto_competition_proto_msgTypes[3]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DeleteCompetitionResponse.ProtoReflect.Descriptor instead.
func (*DeleteCompetitionResponse) Descriptor() ([]byte, []int) {
return file_api_proto_competition_proto_rawDescGZIP(), []int{3}
}
func (x *DeleteCompetitionResponse) GetSuccess() bool {
if x != nil {
return x.Success
}
return false
}
type ListCompetitionsRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
PageSize int32 `protobuf:"varint,1,opt,name=page_size,json=pageSize,proto3" json:"page_size,omitempty"`
@@ -458,7 +415,7 @@ type ListCompetitionsRequest struct {
func (x *ListCompetitionsRequest) Reset() {
*x = ListCompetitionsRequest{}
mi := &file_api_proto_competition_proto_msgTypes[4]
mi := &file_api_proto_competition_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -470,7 +427,7 @@ func (x *ListCompetitionsRequest) String() string {
func (*ListCompetitionsRequest) ProtoMessage() {}
func (x *ListCompetitionsRequest) ProtoReflect() protoreflect.Message {
mi := &file_api_proto_competition_proto_msgTypes[4]
mi := &file_api_proto_competition_proto_msgTypes[3]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -483,7 +440,7 @@ func (x *ListCompetitionsRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListCompetitionsRequest.ProtoReflect.Descriptor instead.
func (*ListCompetitionsRequest) Descriptor() ([]byte, []int) {
return file_api_proto_competition_proto_rawDescGZIP(), []int{4}
return file_api_proto_competition_proto_rawDescGZIP(), []int{3}
}
func (x *ListCompetitionsRequest) GetPageSize() int32 {
@@ -532,7 +489,7 @@ type ListCompetitionsResponse struct {
func (x *ListCompetitionsResponse) Reset() {
*x = ListCompetitionsResponse{}
mi := &file_api_proto_competition_proto_msgTypes[5]
mi := &file_api_proto_competition_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -544,7 +501,7 @@ func (x *ListCompetitionsResponse) String() string {
func (*ListCompetitionsResponse) ProtoMessage() {}
func (x *ListCompetitionsResponse) ProtoReflect() protoreflect.Message {
mi := &file_api_proto_competition_proto_msgTypes[5]
mi := &file_api_proto_competition_proto_msgTypes[4]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -557,7 +514,7 @@ func (x *ListCompetitionsResponse) ProtoReflect() protoreflect.Message {
// Deprecated: Use ListCompetitionsResponse.ProtoReflect.Descriptor instead.
func (*ListCompetitionsResponse) Descriptor() ([]byte, []int) {
return file_api_proto_competition_proto_rawDescGZIP(), []int{5}
return file_api_proto_competition_proto_rawDescGZIP(), []int{4}
}
func (x *ListCompetitionsResponse) GetTotalCount() int32 {
@@ -591,7 +548,7 @@ type ChangeCompetitionStateRequest struct {
func (x *ChangeCompetitionStateRequest) Reset() {
*x = ChangeCompetitionStateRequest{}
mi := &file_api_proto_competition_proto_msgTypes[6]
mi := &file_api_proto_competition_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -603,7 +560,7 @@ func (x *ChangeCompetitionStateRequest) String() string {
func (*ChangeCompetitionStateRequest) ProtoMessage() {}
func (x *ChangeCompetitionStateRequest) ProtoReflect() protoreflect.Message {
mi := &file_api_proto_competition_proto_msgTypes[6]
mi := &file_api_proto_competition_proto_msgTypes[5]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -616,7 +573,7 @@ func (x *ChangeCompetitionStateRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ChangeCompetitionStateRequest.ProtoReflect.Descriptor instead.
func (*ChangeCompetitionStateRequest) Descriptor() ([]byte, []int) {
return file_api_proto_competition_proto_rawDescGZIP(), []int{6}
return file_api_proto_competition_proto_rawDescGZIP(), []int{5}
}
func (x *ChangeCompetitionStateRequest) GetCompetitionId() string {
@@ -637,7 +594,7 @@ var File_api_proto_competition_proto protoreflect.FileDescriptor
const file_api_proto_competition_proto_rawDesc = "" +
"\n" +
"\x1bapi/proto/competition.proto\x12\vcompetition\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa3\x04\n" +
"\x1bapi/proto/competition.proto\x12\vcompetition\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xa3\x04\n" +
"\vCompetition\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x123\n" +
"\x05state\x18\x02 \x01(\x0e2\x1d.competition.CompetitionStateR\x05state\x12\x14\n" +
@@ -659,9 +616,7 @@ const file_api_proto_competition_proto_rawDesc = "" +
"\x15GetCompetitionRequest\x12%\n" +
"\x0ecompetition_id\x18\x01 \x01(\tR\rcompetitionId\"A\n" +
"\x18DeleteCompetitionRequest\x12%\n" +
"\x0ecompetition_id\x18\x01 \x01(\tR\rcompetitionId\"5\n" +
"\x19DeleteCompetitionResponse\x12\x18\n" +
"\asuccess\x18\x01 \x01(\bR\asuccess\"\x97\x02\n" +
"\x0ecompetition_id\x18\x01 \x01(\tR\rcompetitionId\"\x97\x02\n" +
"\x17ListCompetitionsRequest\x12\x1b\n" +
"\tpage_size\x18\x01 \x01(\x05R\bpageSize\x12\x1d\n" +
"\n" +
@@ -694,12 +649,12 @@ const file_api_proto_competition_proto_rawDesc = "" +
"\x0fCompetitionType\x12 \n" +
"\x1cCOMPETITION_TYPE_UNSPECIFIED\x10\x00\x12\x1e\n" +
"\x1aCOMPETITION_TYPE_EDUCATIVE\x10\x01\x12 \n" +
"\x1cCOMPETITION_TYPE_COMPETETIVE\x10\x022\x99\x04\n" +
"\x1cCOMPETITION_TYPE_COMPETETIVE\x10\x022\x89\x04\n" +
"\x12CompetitionService\x12G\n" +
"\x11CreateCompetition\x12\x18.competition.Competition\x1a\x18.competition.Competition\x12N\n" +
"\x0eGetCompetition\x12\".competition.GetCompetitionRequest\x1a\x18.competition.Competition\x12E\n" +
"\x0fEditCompetition\x12\x18.competition.Competition\x1a\x18.competition.Competition\x12b\n" +
"\x11DeleteCompetition\x12%.competition.DeleteCompetitionRequest\x1a&.competition.DeleteCompetitionResponse\x12_\n" +
"\x0fEditCompetition\x12\x18.competition.Competition\x1a\x18.competition.Competition\x12R\n" +
"\x11DeleteCompetition\x12%.competition.DeleteCompetitionRequest\x1a\x16.google.protobuf.Empty\x12_\n" +
"\x10ListCompetitions\x12$.competition.ListCompetitionsRequest\x1a%.competition.ListCompetitionsResponse\x12^\n" +
"\x16ChangeCompetitionState\x12*.competition.ChangeCompetitionStateRequest\x1a\x18.competition.CompetitionB\x15Z\x13pkg/api/competitionb\x06proto3"
@@ -716,7 +671,7 @@ func file_api_proto_competition_proto_rawDescGZIP() []byte {
}
var file_api_proto_competition_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
var file_api_proto_competition_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_api_proto_competition_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_api_proto_competition_proto_goTypes = []any{
(CompetitionState)(0), // 0: competition.CompetitionState
(ParticipationType)(0), // 1: competition.ParticipationType
@@ -724,20 +679,20 @@ var file_api_proto_competition_proto_goTypes = []any{
(*Competition)(nil), // 3: competition.Competition
(*GetCompetitionRequest)(nil), // 4: competition.GetCompetitionRequest
(*DeleteCompetitionRequest)(nil), // 5: competition.DeleteCompetitionRequest
(*DeleteCompetitionResponse)(nil), // 6: competition.DeleteCompetitionResponse
(*ListCompetitionsRequest)(nil), // 7: competition.ListCompetitionsRequest
(*ListCompetitionsResponse)(nil), // 8: competition.ListCompetitionsResponse
(*ChangeCompetitionStateRequest)(nil), // 9: competition.ChangeCompetitionStateRequest
(*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp
(*ListCompetitionsRequest)(nil), // 6: competition.ListCompetitionsRequest
(*ListCompetitionsResponse)(nil), // 7: competition.ListCompetitionsResponse
(*ChangeCompetitionStateRequest)(nil), // 8: competition.ChangeCompetitionStateRequest
(*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp
(*emptypb.Empty)(nil), // 10: google.protobuf.Empty
}
var file_api_proto_competition_proto_depIdxs = []int32{
0, // 0: competition.Competition.state:type_name -> competition.CompetitionState
10, // 1: competition.Competition.start_time:type_name -> google.protobuf.Timestamp
10, // 2: competition.Competition.end_time:type_name -> google.protobuf.Timestamp
9, // 1: competition.Competition.start_time:type_name -> google.protobuf.Timestamp
9, // 2: competition.Competition.end_time:type_name -> google.protobuf.Timestamp
2, // 3: competition.Competition.type:type_name -> competition.CompetitionType
1, // 4: competition.Competition.participation_type:type_name -> competition.ParticipationType
10, // 5: competition.Competition.created_at:type_name -> google.protobuf.Timestamp
10, // 6: competition.Competition.updated_at:type_name -> google.protobuf.Timestamp
9, // 5: competition.Competition.created_at:type_name -> google.protobuf.Timestamp
9, // 6: competition.Competition.updated_at:type_name -> google.protobuf.Timestamp
0, // 7: competition.ListCompetitionsRequest.state:type_name -> competition.CompetitionState
3, // 8: competition.ListCompetitionsResponse.competitions:type_name -> competition.Competition
0, // 9: competition.ChangeCompetitionStateRequest.state:type_name -> competition.CompetitionState
@@ -745,13 +700,13 @@ var file_api_proto_competition_proto_depIdxs = []int32{
4, // 11: competition.CompetitionService.GetCompetition:input_type -> competition.GetCompetitionRequest
3, // 12: competition.CompetitionService.EditCompetition:input_type -> competition.Competition
5, // 13: competition.CompetitionService.DeleteCompetition:input_type -> competition.DeleteCompetitionRequest
7, // 14: competition.CompetitionService.ListCompetitions:input_type -> competition.ListCompetitionsRequest
9, // 15: competition.CompetitionService.ChangeCompetitionState:input_type -> competition.ChangeCompetitionStateRequest
6, // 14: competition.CompetitionService.ListCompetitions:input_type -> competition.ListCompetitionsRequest
8, // 15: competition.CompetitionService.ChangeCompetitionState:input_type -> competition.ChangeCompetitionStateRequest
3, // 16: competition.CompetitionService.CreateCompetition:output_type -> competition.Competition
3, // 17: competition.CompetitionService.GetCompetition:output_type -> competition.Competition
3, // 18: competition.CompetitionService.EditCompetition:output_type -> competition.Competition
6, // 19: competition.CompetitionService.DeleteCompetition:output_type -> competition.DeleteCompetitionResponse
8, // 20: competition.CompetitionService.ListCompetitions:output_type -> competition.ListCompetitionsResponse
10, // 19: competition.CompetitionService.DeleteCompetition:output_type -> google.protobuf.Empty
7, // 20: competition.CompetitionService.ListCompetitions:output_type -> competition.ListCompetitionsResponse
3, // 21: competition.CompetitionService.ChangeCompetitionState:output_type -> competition.Competition
16, // [16:22] is the sub-list for method output_type
10, // [10:16] is the sub-list for method input_type
@@ -766,14 +721,14 @@ func file_api_proto_competition_proto_init() {
return
}
file_api_proto_competition_proto_msgTypes[0].OneofWrappers = []any{}
file_api_proto_competition_proto_msgTypes[4].OneofWrappers = []any{}
file_api_proto_competition_proto_msgTypes[3].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_proto_competition_proto_rawDesc), len(file_api_proto_competition_proto_rawDesc)),
NumEnums: 3,
NumMessages: 7,
NumMessages: 6,
NumExtensions: 0,
NumServices: 1,
},
pkg/api/competition/competition_grpc.pb.go
+6 -5
View File
@@ -11,6 +11,7 @@ import (
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
emptypb "google.golang.org/protobuf/types/known/emptypb"
)
// This is a compile-time assertion to ensure that this generated file
@@ -34,7 +35,7 @@ type CompetitionServiceClient interface {
CreateCompetition(ctx context.Context, in *Competition, opts ...grpc.CallOption) (*Competition, error)
GetCompetition(ctx context.Context, in *GetCompetitionRequest, opts ...grpc.CallOption) (*Competition, error)
EditCompetition(ctx context.Context, in *Competition, opts ...grpc.CallOption) (*Competition, error)
DeleteCompetition(ctx context.Context, in *DeleteCompetitionRequest, opts ...grpc.CallOption) (*DeleteCompetitionResponse, error)
DeleteCompetition(ctx context.Context, in *DeleteCompetitionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
ListCompetitions(ctx context.Context, in *ListCompetitionsRequest, opts ...grpc.CallOption) (*ListCompetitionsResponse, error)
ChangeCompetitionState(ctx context.Context, in *ChangeCompetitionStateRequest, opts ...grpc.CallOption) (*Competition, error)
}
@@ -77,9 +78,9 @@ func (c *competitionServiceClient) EditCompetition(ctx context.Context, in *Comp
return out, nil
}
func (c *competitionServiceClient) DeleteCompetition(ctx context.Context, in *DeleteCompetitionRequest, opts ...grpc.CallOption) (*DeleteCompetitionResponse, error) {
func (c *competitionServiceClient) DeleteCompetition(ctx context.Context, in *DeleteCompetitionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(DeleteCompetitionResponse)
out := new(emptypb.Empty)
err := c.cc.Invoke(ctx, CompetitionService_DeleteCompetition_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
@@ -114,7 +115,7 @@ type CompetitionServiceServer interface {
CreateCompetition(context.Context, *Competition) (*Competition, error)
GetCompetition(context.Context, *GetCompetitionRequest) (*Competition, error)
EditCompetition(context.Context, *Competition) (*Competition, error)
DeleteCompetition(context.Context, *DeleteCompetitionRequest) (*DeleteCompetitionResponse, error)
DeleteCompetition(context.Context, *DeleteCompetitionRequest) (*emptypb.Empty, error)
ListCompetitions(context.Context, *ListCompetitionsRequest) (*ListCompetitionsResponse, error)
ChangeCompetitionState(context.Context, *ChangeCompetitionStateRequest) (*Competition, error)
mustEmbedUnimplementedCompetitionServiceServer()
@@ -136,7 +137,7 @@ func (UnimplementedCompetitionServiceServer) GetCompetition(context.Context, *Ge
func (UnimplementedCompetitionServiceServer) EditCompetition(context.Context, *Competition) (*Competition, error) {
return nil, status.Error(codes.Unimplemented, "method EditCompetition not implemented")
}
func (UnimplementedCompetitionServiceServer) DeleteCompetition(context.Context, *DeleteCompetitionRequest) (*DeleteCompetitionResponse, error) {
func (UnimplementedCompetitionServiceServer) DeleteCompetition(context.Context, *DeleteCompetitionRequest) (*emptypb.Empty, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteCompetition not implemented")
}
func (UnimplementedCompetitionServiceServer) ListCompetitions(context.Context, *ListCompetitionsRequest) (*ListCompetitionsResponse, error) {