fix: converters (#1413)

* fix: converters

* fix: converters

* comments

internal/api/grpc/user/converter.go

@@ -23,14 +23,65 @@ func UserToPb(user *model.UserView) *user_pb.User {
 		UserName:           user.UserName,
 		LoginNames:         user.LoginNames,
 		PreferredLoginName: user.PreferredLoginName,
-		Details: object.ToDetailsPb(
+		Type:               UserTypeToPb(user),
+		Details: object.ToViewDetailsPb(
 			user.Sequence,
+			user.CreationDate,
 			user.ChangeDate,
 			user.ResourceOwner,
 		),
 	}
 }
 
+func UserTypeToPb(user *model.UserView) user_pb.UserType {
+	if user.HumanView != nil {
+		return &user_pb.User_Human{
+			Human: HumanToPb(user.HumanView),
+		}
+	}
+	if user.MachineView != nil {
+		return &user_pb.User_Machine{
+			Machine: MachineToPb(user.MachineView),
+		}
+	}
+	return nil
+}
+
+func HumanToPb(view *model.HumanView) *user_pb.Human {
+	return &user_pb.Human{
+		Profile: &user_pb.Profile{
+			FirstName:         view.FirstName,
+			LastName:          view.LastName,
+			NickName:          view.NickName,
+			DisplayName:       view.DisplayName,
+			PreferredLanguage: view.PreferredLanguage,
+			Gender:            GenderToPb(view.Gender),
+		},
+		Email: &user_pb.Email{
+			Email:           view.Email,
+			IsEmailVerified: view.IsEmailVerified,
+		},
+		Phone: &user_pb.Phone{
+			Phone:           view.Phone,
+			IsPhoneVerified: view.IsPhoneVerified,
+		},
+		Address: &user_pb.Address{ //TODO: remove?
+			Country:       view.Country,
+			Locality:      view.Locality,
+			PostalCode:    view.PostalCode,
+			Region:        view.Region,
+			StreetAddress: view.StreetAddress,
+		},
+	}
+}
+
+func MachineToPb(view *model.MachineView) *user_pb.Machine {
+	return &user_pb.Machine{
+		Name:        view.Name,
+		Description: view.Description,
+	}
+}
+
 func ProfileToPb(profile *model.Profile) *user_pb.Profile {
 	return &user_pb.Profile{
 		FirstName:         profile.FirstName,

internal/api/grpc/user/membership.go

@@ -105,8 +105,9 @@ func MembershipToMembershipPb(membership *user_model.UserMembershipView) *user_p
 		Type:        memberTypeToPb(membership),
 		DisplayName: membership.DisplayName,
 		Roles:       membership.Roles,
-		Details: object.ToDetailsPb(
+		Details: object.ToViewDetailsPb(
 			membership.Sequence,
+			membership.CreationDate,
 			membership.ChangeDate,
 			membership.ResourceOwner,
 		),

internal/api/grpc/user/query.go

@@ -100,7 +100,18 @@ func TypeQueryToModel(q *user_pb.TypeQuery) *user_model.UserSearchQuery {
 	return &user_model.UserSearchQuery{
 		Key:    user_model.UserSearchKeyType,
 		Method: domain.SearchMethodEquals,
-		Value:  q.Type,
+		Value:  UserTypeToModel(q.Type),
+	}
+}
+
+func UserTypeToModel(t user_pb.Type) string {
+	switch t {
+	case user_pb.Type_TYPE_HUMAN:
+		return "human"
+	case user_pb.Type_TYPE_MACHINE:
+		return "machine"
+	default:
+		return ""
 	}
 }
 

internal/api/grpc/user/session.go

@@ -24,8 +24,9 @@ func UserSessionToPb(session *user_model.UserSessionView) *user.Session {
 		LoginName:   session.LoginName,
 		DisplayName: session.DisplayName,
 		AuthState:   SessionStateToPb(session.State),
-		Details: object.ToDetailsPb(
+		Details: object.ToViewDetailsPb(
 			session.Sequence,
+			session.CreationDate,
 			session.ChangeDate,
 			session.ResourceOwner,
 		),

internal/api/grpc/user/user_grant.go

@@ -31,8 +31,9 @@ func UserGrantToPb(grant *usr_grant_model.UserGrantView) *user_pb.UserGrant {
 		OrgName:     grant.OrgName,
 		ProjectId:   grant.ProjectID,
 		ProjectName: grant.ProjectName,
-		Details: object.ToDetailsPb(
+		Details: object.ToViewDetailsPb(
 			grant.Sequence,
+			grant.CreationDate,
 			grant.ChangeDate,
 			grant.ResourceOwner,
 		),