zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-03 08:22:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

invitation logic pt 2

Browse source
This commit is contained in:
zandercymatics 2024-08-19 10:28:13 -06:00
parent 78a5774af2
commit 28a7d7bee2
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/registrar/models/portfolio_invitation.py
View file

@ -6,6 +6,7 @@ from django.contrib.auth import get_user_model
from django.db import models
from django_fsm import FSMField, transition
from waffle import flag_is_active
from registrar.models.user_portfolio_permission import UserPortfolioPermission
from .utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices # type: ignore
@ -95,3 +96,12 @@ class PortfolioInvitation(TimeStampedModel):
if self.portfolio_additional_permissions and len(self.portfolio_additional_permissions) > 0:
user_portfolio_permission.portfolio_additional_permissions = self.portfolio_additional_permissions
user_portfolio_permission.save()
# The multiple_portfolios flag ensures that many portfolios can exist per user.
# This is (or will be) exposed as a multiselect, which they can choose from.
# Without it, we should just add the user on invitation as they'd have no way to select it.
# For now, the caller should ensure that this only occurs when no portfolio is selected.
# NOTE: Model enforcement of this occurs elsewhere.
if not flag_is_active(None, "multiple_portfolios"):
user.last_selected_portfolio = user_portfolio_permission.portfolio
user.save()

4
src/registrar/models/user.py
View file

@ -14,7 +14,6 @@ from .transition_domain import TransitionDomain
from .verified_by_staff import VerifiedByStaff
from .domain import Domain
from .domain_request import DomainRequest
from django.contrib.postgres.fields import ArrayField
from waffle.decorators import flag_is_active
from phonenumber_field.modelfields import PhoneNumberField # type: ignore
@ -378,7 +377,8 @@ class User(AbstractUser):
for invitation in PortfolioInvitation.objects.filter(
email__iexact=self.email, status=PortfolioInvitation.PortfolioInvitationStatus.INVITED
):
if self.last_selected_portfolio is None:
only_single_portfolio = not flag_is_active(None, "multiple_portfolios") and self.last_selected_portfolio is None
if only_single_portfolio or flag_is_active(None, "multiple_portfolios"):
try:
invitation.retrieve()
invitation.save()