Skip to content
Snippets Groups Projects
Commit a61977ad authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/2929-MultiInvitation' into 'master'

Обновлен API Invitations с поддержкой многоразовых приглашений

See merge request perxis/perxis-go!410
parents 7432bd15 b80739cc
No related branches found
No related tags found
No related merge requests found
......@@ -6,13 +6,15 @@ const InvitationTTL = 7 * 24 * time.Hour
type Invitation struct {
ID string `bson:"_id"`
Email string `bson:"email"`
Email string `bson:"email,omitempty"`
OrgID string `bson:"orgId"`
SpaceID string `bson:"spaceId"`
OwnerID string `bson:"ownerId"` // Invitation owner
Role string `bson:"role"`
CreatedAt *time.Time `bson:"createdAt"`
ValidUntil *time.Time `bson:"validUntil"`
Uses int `bson:"uses"`
MaxUses int `bson:"max_uses"`
}
func (i Invitation) Clone() *Invitation {
......@@ -25,6 +27,8 @@ func (i Invitation) Clone() *Invitation {
Role: i.Role,
CreatedAt: i.CreatedAt,
ValidUntil: i.ValidUntil,
Uses: i.Uses,
MaxUses: i.MaxUses,
}
}
......
......@@ -38,6 +38,8 @@ func PtrInvitationToProto(invitation *service.Invitation) (*pb.Invitation, error
SpaceId: invitation.SpaceID,
OwnerId: invitation.OwnerID,
Role: invitation.Role,
Uses: uint32(invitation.Uses),
MaxUses: uint32(invitation.MaxUses),
}
if invitation.CreatedAt != nil && !invitation.CreatedAt.IsZero() {
pi.CreatedAt = timestamp.New(*invitation.CreatedAt)
......@@ -59,6 +61,8 @@ func ProtoToPtrInvitation(protoInvitation *pb.Invitation) (*service.Invitation,
SpaceID: protoInvitation.SpaceId,
OwnerID: protoInvitation.OwnerId,
Role: protoInvitation.Role,
Uses: int(protoInvitation.Uses),
MaxUses: int(protoInvitation.MaxUses),
}
if protoInvitation.CreatedAt != nil {
t := protoInvitation.CreatedAt.AsTime()
......
This diff is collapsed.
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.5.1
// - protoc v5.28.3
// - protoc v5.29.2
// source: invitations/invitations.proto
package invitations
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment