From f66df2c931e1488902e517d2b1785779959241bd Mon Sep 17 00:00:00 2001 From: Neil Martinsen-Burrell Date: Mon, 3 Apr 2023 15:04:53 -0500 Subject: [PATCH] Review feedback: name changes --- src/registrar/models/domain_invitation.py | 8 ++++---- src/registrar/models/user.py | 2 +- ...on.subject.txt => submission_confirmation_subject.txt} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename src/registrar/templates/emails/{submission_confirmation.subject.txt => submission_confirmation_subject.txt} (100%) diff --git a/src/registrar/models/domain_invitation.py b/src/registrar/models/domain_invitation.py index ba9b6ac03..1ad150e4a 100644 --- a/src/registrar/models/domain_invitation.py +++ b/src/registrar/models/domain_invitation.py @@ -10,7 +10,7 @@ from .user_domain_role import UserDomainRole class DomainInvitation(TimeStampedModel): - SENT = "sent" + INVITED = "invited" RETRIEVED = "retrieved" email = models.EmailField( @@ -27,17 +27,17 @@ class DomainInvitation(TimeStampedModel): status = FSMField( choices=[ - (SENT, SENT), + (INVITED, INVITED), (RETRIEVED, RETRIEVED), ], - default=SENT, + default=INVITED, protected=True, # can't alter state except through transition methods! ) def __str__(self): return f"Invitation for {self.email} on {self.domain} is {self.status}" - @transition(field="status", source=SENT, target=RETRIEVED) + @transition(field="status", source=INVITED, target=RETRIEVED) def retrieve(self): """When an invitation is retrieved, create the corresponding permission.""" diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py index 963771ec3..fb51af30c 100644 --- a/src/registrar/models/user.py +++ b/src/registrar/models/user.py @@ -41,7 +41,7 @@ class User(AbstractUser): invitations that match their email address. """ for invitation in DomainInvitation.objects.filter( - email=self.email, status=DomainInvitation.SENT + email=self.email, status=DomainInvitation.INVITED ): invitation.retrieve() invitation.save() diff --git a/src/registrar/templates/emails/submission_confirmation.subject.txt b/src/registrar/templates/emails/submission_confirmation_subject.txt similarity index 100% rename from src/registrar/templates/emails/submission_confirmation.subject.txt rename to src/registrar/templates/emails/submission_confirmation_subject.txt