Fix uneeded assume + assume after invite accept

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-01-08 19:11:17 +01:00
committed by Bryan Frimin
parent c6094ff572
commit cfcbda4519
15 changed files with 681 additions and 222 deletions

View File

@@ -198,17 +198,17 @@ func (s *AccountService) AcceptInvitation(
ctx context.Context,
identityID gid.GID,
invitationID gid.GID,
) (*coredata.Membership, error) {
) (*coredata.Invitation, *coredata.Membership, error) {
var (
now = time.Now()
membership = &coredata.Membership{}
invitation = &coredata.Invitation{}
)
err := s.pg.WithTx(
ctx,
func(tx pg.Conn) error {
identity := coredata.Identity{}
invitation := coredata.Invitation{}
err := identity.LoadByID(ctx, tx, identityID)
if err != nil {
@@ -306,10 +306,10 @@ func (s *AccountService) AcceptInvitation(
)
if err != nil {
return nil, err
return nil, nil, err
}
return membership, nil
return invitation, membership, nil
}
func (s *AccountService) ListPendingInvitations(