emails: Add new onboarding email with guide for organization type.

Adds a new welcome email, `onboarding_zulip_guide`, to be sent four
days after a new user registers with a Zulip organization if the
organization has specified a particular organization type that has
a guide in the corporate `/for/.../` pages. If there is no guide,
then no email is scheduled or sent.

The current `for/communities/` page is not very useful for users
who are not organization administrators, so these onboarding guide
emails are further restricted for those organization types to
only go to new users who are invited/registered as admins for the
organzation.

Adds two database queries for new user registrations: one to get
the organization's type and one to create the scheduled email.

Adds two email logs because the email is sent both to a new user
who registers with an existing organization and to the organization
owner when they register a new organization.

Co-authored by: Alya Abbott <alya@zulip.com>
This commit is contained in:
Lauryn Menard
2023-03-15 20:18:09 +01:00
committed by Tim Abbott
parent ab00648e3e
commit f391bfeec6
10 changed files with 423 additions and 60 deletions

View File

@@ -37,6 +37,7 @@ from zerver.lib.url_encoding import (
)
from zerver.models import (
Message,
Realm,
Recipient,
Stream,
UserMessage,
@@ -686,6 +687,7 @@ def get_onboarding_email_schedule(user: UserProfile) -> Dict[str, timedelta]:
# of the user's inbox when the user sits down to deal with their inbox,
# or comes in while they are dealing with their inbox.
"followup_day2": timedelta(days=2, hours=-1),
"onboarding_zulip_guide": timedelta(days=4, hours=-1),
}
user_tz = user.timezone
@@ -693,19 +695,56 @@ def get_onboarding_email_schedule(user: UserProfile) -> Dict[str, timedelta]:
user_tz = "UTC"
signup_day = user.date_joined.astimezone(zoneinfo.ZoneInfo(user_tz)).isoweekday()
# General rules for scheduling welcome emails flow:
# -Do not send emails on Saturday or Sunday
# -Have at least one weekday between each (potential) email
# User signed up on Tuesday
if signup_day == 2:
# Send followup_day2 on Thursday
# Send onboarding_zulip_guide on Monday
onboarding_emails["onboarding_zulip_guide"] = timedelta(days=6, hours=-1)
# User signed up on Wednesday
if signup_day == 3:
# Send followup_day2 on Friday
# Send onboarding_zulip_guide on Tuesday
onboarding_emails["onboarding_zulip_guide"] = timedelta(days=6, hours=-1)
# User signed up on Thursday
if signup_day == 4:
# Send followup_day2 on Friday
onboarding_emails["followup_day2"] = timedelta(days=1, hours=-1)
# Send followup_day2 on Monday
onboarding_emails["followup_day2"] = timedelta(days=4, hours=-1)
# Send onboarding_zulip_guide on Wednesday
onboarding_emails["onboarding_zulip_guide"] = timedelta(days=6, hours=-1)
# User signed up on Friday
if signup_day == 5:
# Send followup_day2 on Monday
onboarding_emails["followup_day2"] = timedelta(days=3, hours=-1)
# Send followup_day2 on Tuesday
onboarding_emails["followup_day2"] = timedelta(days=4, hours=-1)
# Send onboarding_zulip_guide on Thursday
onboarding_emails["onboarding_zulip_guide"] = timedelta(days=6, hours=-1)
return onboarding_emails
def get_org_type_zulip_guide(realm: Realm) -> Tuple[Any, str]:
for realm_type, realm_type_details in Realm.ORG_TYPES.items():
if realm_type_details["id"] == realm.org_type:
organization_type_in_template = realm_type
# There are two education organization types that receive the same email
# content, so we simplify to one shared template context value here.
if organization_type_in_template == "education_nonprofit":
organization_type_in_template = "education"
return (realm_type_details["onboarding_zulip_guide_url"], organization_type_in_template)
# Log problem, and return values that will not send onboarding_zulip_guide email.
logging.error("Unknown organization type '%s'", realm.org_type)
return (None, "")
def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> None:
from zerver.context_processors import common_context
@@ -776,6 +815,38 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> N
delay=onboarding_email_schedule["followup_day2"],
)
# We only send the onboarding_zulip_guide email for a subset of Realm.ORG_TYPES
onboarding_zulip_guide_url, organization_type_reference = get_org_type_zulip_guide(user.realm)
# Only send follow_zulip_guide to "/for/communities/" guide if user is realm admin.
# TODO: Remove this condition and related tests when guide is updated;
# see https://github.com/zulip/zulip/issues/24822.
if (
onboarding_zulip_guide_url == Realm.ORG_TYPES["community"]["onboarding_zulip_guide_url"]
and not user.is_realm_admin
):
onboarding_zulip_guide_url = None
if onboarding_zulip_guide_url is not None:
onboarding_zulip_guide_context = common_context(user)
onboarding_zulip_guide_context.update(
# We use the same unsubscribe link in both followup_day2
# and onboarding_zulip_guide as these links do not expire.
unsubscribe_link=unsubscribe_link,
organization_type=organization_type_reference,
zulip_guide_link=onboarding_zulip_guide_url,
)
send_future_email(
"zerver/emails/onboarding_zulip_guide",
user.realm,
to_user_ids=[user.id],
from_name=from_name,
from_address=from_address,
context=onboarding_zulip_guide_context,
delay=onboarding_email_schedule["onboarding_zulip_guide"],
)
def convert_html_to_markdown(html: str) -> str:
# html2text is GPL licensed, so run it as a subprocess.