Add e2e test
diff --git a/core/kg/rpc/interfaces.go b/core/kg/rpc/interfaces.go
new file mode 100644
index 0000000..0cd072a
--- /dev/null
+++ b/core/kg/rpc/interfaces.go
@@ -0,0 +1,7 @@
+package rpc
+
+import "github.com/giolekva/pcloud/core/kg/model"
+
+type appIface interface {
+ GetUser(userID string) (*model.User, error)
+}
diff --git a/core/kg/rpc/user_service.go b/core/kg/rpc/user_service.go
index b5ac194..c0ddd21 100644
--- a/core/kg/rpc/user_service.go
+++ b/core/kg/rpc/user_service.go
@@ -3,17 +3,18 @@
import (
"context"
- "github.com/giolekva/pcloud/core/kg/app"
"github.com/giolekva/pcloud/core/kg/model/proto"
+ "github.com/pkg/errors"
+ "google.golang.org/protobuf/types/known/timestamppb"
)
type userService struct {
proto.UnimplementedUserServiceServer
- app *app.App
+ app appIface
}
// NewService returns new user service
-func NewService(app *app.App) proto.UserServiceServer {
+func NewService(app appIface) proto.UserServiceServer {
s := &userService{
app: app,
}
@@ -21,13 +22,26 @@
return s
}
-func (us *userService) GetUser(context.Context, *proto.GetUserRequest) (*proto.User, error) {
- // us.app.getUser...
- return nil, nil
+func (us *userService) GetUser(c context.Context, r *proto.GetUserRequest) (*proto.GetUserResponse, error) {
+ user, err := us.app.GetUser(r.GetId())
+ if err != nil {
+ return nil, errors.Wrap(err, "can't get user from application")
+ }
+ return &proto.GetUserResponse{
+ User: &proto.User{
+ Id: &user.ID,
+ CreateAt: ×tamppb.Timestamp{Seconds: user.CreateAt},
+ UpdateAt: ×tamppb.Timestamp{Seconds: user.UpdateAt},
+ DeleteAt: ×tamppb.Timestamp{Seconds: user.DeleteAt},
+ Username: user.Username,
+ Password: user.Password,
+ LastPasswordUpdate: ×tamppb.Timestamp{Seconds: user.LastPasswordUpdate},
+ },
+ }, nil
}
func (us *userService) ListUsers(context.Context, *proto.ListUserRequest) (*proto.ListUserResponse, error) {
return nil, nil
}
-func (us *userService) CreateUser(context.Context, *proto.CreateUserRequest) (*proto.User, error) {
+func (us *userService) CreateUser(context.Context, *proto.CreateUserRequest) (*proto.CreateUserResponse, error) {
return nil, nil
}
diff --git a/core/kg/rpc/user_service_test.go b/core/kg/rpc/user_service_test.go
new file mode 100644
index 0000000..ec53f89
--- /dev/null
+++ b/core/kg/rpc/user_service_test.go
@@ -0,0 +1,32 @@
+package rpc_test
+
+import (
+ "context"
+ "fmt"
+ "testing"
+
+ "github.com/giolekva/pcloud/core/kg/model/proto"
+ "github.com/giolekva/pcloud/core/kg/server"
+ "github.com/stretchr/testify/assert"
+ "google.golang.org/grpc"
+)
+
+func TestUserService(t *testing.T) {
+ ts := server.Setup(t)
+ defer ts.ShutdownServers()
+ _, err := ts.App.GetUser("id")
+ assert.NotNil(t, err)
+
+ ctx := context.Background()
+ address := fmt.Sprintf("localhost:%d", ts.Config.GRPC.Port)
+ conn, err := grpc.Dial(address, grpc.WithInsecure())
+ if err != nil {
+ t.Fatalf("did not connect: %v", err)
+ }
+ defer conn.Close()
+
+ client := proto.NewUserServiceClient(conn)
+ request := &proto.GetUserRequest{Id: "id"}
+ _, err = client.GetUser(ctx, request)
+ assert.NotNil(t, err)
+}