diff --git a/go.mod b/go.mod index 51a7e74..cff55df 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 toolchain go1.23.5 require ( - github.com/PretendoNetwork/grpc/go v0.0.0-20250123103241-5fb484bf544d + github.com/PretendoNetwork/grpc/go v0.0.0-20260801122926-a632ab44588d github.com/PretendoNetwork/nex-go/v2 v2.1.2 github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.2.2 github.com/PretendoNetwork/nex-protocols-go/v2 v2.2.1 diff --git a/go.sum b/go.sum index dde920c..01eb7ae 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/PretendoNetwork/grpc/go v0.0.0-20250123103241-5fb484bf544d h1:i/XyhbTm/j8UfCSnA0Cwrvc0mWOPIftOVrfSYqbh8Xo= github.com/PretendoNetwork/grpc/go v0.0.0-20250123103241-5fb484bf544d/go.mod h1:L6We4KkcQeiQVPrF7iu8Zax0B1Bm0v4nssR1JOAiRFQ= +github.com/PretendoNetwork/grpc/go v0.0.0-20260801122926-a632ab44588d h1:9tMOif1DXaDNZ3auC+DkTd8+PpX7j3xvH1w2jzdR7w0= +github.com/PretendoNetwork/grpc/go v0.0.0-20260801122926-a632ab44588d/go.mod h1:L6We4KkcQeiQVPrF7iu8Zax0B1Bm0v4nssR1JOAiRFQ= github.com/PretendoNetwork/nex-go/v2 v2.1.2 h1:OJFAS6U6VNzZ4YzteKqUEZ5aJMwWIHODeRrLwNbN7nw= github.com/PretendoNetwork/nex-go/v2 v2.1.2/go.mod h1:3LyJzsv3AataJW8D0binp15Q8ZH22MWTYly1VNtXi64= github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.2.2 h1:rBJNZDJ92pa9fU3Og0sanyizJTWnELPoGR0Tjz8zlws= diff --git a/grpc/delete_course.go b/grpc/delete_course.go index 556a303..86d051a 100644 --- a/grpc/delete_course.go +++ b/grpc/delete_course.go @@ -6,20 +6,22 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - pb "github.com/PretendoNetwork/grpc/go/smm" + pb "github.com/PretendoNetwork/grpc/go/smm/v1" + "github.com/PretendoNetwork/nex-go/v2/types" datastore_db "github.com/PretendoNetwork/super-mario-maker/database/datastore" "github.com/PretendoNetwork/super-mario-maker/globals" ) func (s *gRPCSMMServer) DeleteCourse(ctx context.Context, in *pb.DeleteCourseRequest) (*pb.DeleteCourseResponse, error) { - err := datastore_db.IsObjectAvailable(in.DataID) + dataID := types.NewUInt64(in.DataId) + err := datastore_db.IsObjectAvailable(dataID) if err != nil { return &pb.DeleteCourseResponse{ Success: false, }, status.Errorf(codes.NotFound, "Course not found") } - metaInfo, err := datastore_db.GetObjectInfoByDataID(in.DataID) + metaInfo, err := datastore_db.GetObjectInfoByDataID(dataID) if err != nil { globals.Logger.Critical(err.Error()) return &pb.DeleteCourseResponse{ @@ -27,7 +29,7 @@ func (s *gRPCSMMServer) DeleteCourse(ctx context.Context, in *pb.DeleteCourseReq }, status.Errorf(codes.Internal, "internal server error") } - err = datastore_db.DeleteObjectByDataID(in.DataID) + err = datastore_db.DeleteObjectByDataID(dataID) if err != nil { globals.Logger.Critical(err.Error()) return &pb.DeleteCourseResponse{ @@ -35,8 +37,8 @@ func (s *gRPCSMMServer) DeleteCourse(ctx context.Context, in *pb.DeleteCourseReq }, status.Errorf(codes.Internal, "internal server error") } - return &pb.SendUserFriendRequestResponse{ - CourseName: metaInfo.Name, + return &pb.DeleteCourseResponse{ + CourseName: string(metaInfo.Name), Success: true, }, nil } diff --git a/grpc/grpc_server.go b/grpc/grpc_server.go index c4a8ec4..3ff55a7 100644 --- a/grpc/grpc_server.go +++ b/grpc/grpc_server.go @@ -5,13 +5,13 @@ import ( "log" "net" - pb "github.com/PretendoNetwork/grpc/go/smm" + pb "github.com/PretendoNetwork/grpc/go/smm/v1" "github.com/PretendoNetwork/super-mario-maker/globals" "google.golang.org/grpc" ) type gRPCSMMServer struct { - pb.UnimplementedSMMServer + pb.UnimplementedSMMServiceServer } func StartGRPCServer() { @@ -24,7 +24,7 @@ func StartGRPCServer() { grpc.UnaryInterceptor(apiKeyInterceptor), ) - pb.RegisterSMMServer(server, &gRPCSMMServer{}) + pb.RegisterSMMServiceServer(server, &gRPCSMMServer{}) log.Printf("server listening at %v", listener.Addr())