Apply transition functions before and after

hiboo/application/base.py

@@ -51,6 +51,11 @@ class BaseApplication(object):
         """
         return True
 
+    def notify(self, profile):
+        """ Default notifying behavior is doing nothing
+        """
+        return True
+
     def delete(self, profile):
         """ Deleting an account generally requires application
         implementation, so this needs to be overridden

hiboo/profile/__init__.py

@@ -5,6 +5,7 @@ blueprint = flask.Blueprint("profile", __name__, template_folder="templates")
 
 import flask_login
 from hiboo import models, utils, application
+from hiboo.profile import forms
 
 
 def get_profile(service, **redirect_args):
@@ -21,30 +22,47 @@ def get_profile(service, **redirect_args):
         utils.force_redirect(utils.url_for("profile.create_quick", **redirect_args))
 
 
-def transition(profile):
+def transition(profile, current, target, done=False):
     """ Handle profile transitions as single-step workflows
     """
     # These are coded as (current, target), None being a wildcard.
     # All matches apply, including wildcards.
+    # Values are pairs of lists, first actions being applied before,
+    # then actions being applied after the transition.
     TRANSITIONS = {
-        (None, models.Profile.BLOCKED): ["block"],
-        (None, models.Profile.DELETED): ["delete"],
-        (None, models.Profile.ACTIVE): ["activate"],
-        (models.Profile.REQUEST, models.Profile.ACTIVE): ["welcome"],
+        (None, models.Profile.BLOCKED): (
+            ["block"],
+            ["notify"]
+        ),
+        (None, models.Profile.DELETED): (
+            ["delete"],
+            ["notify"]
+        ),
+        (None, models.Profile.ACTIVE): (
+            ["activate"],
+            ["notify"]
+        ),
+        (models.Profile.REQUEST, models.Profile.ACTIVE): (
+            ["welcome"],
+            []
+        ),
     }
     app = application.registry.get(profile.service.application_id)
+    index = 1 if done else 0
+    empty = ([], [])
     functions = (
-        TRANSITIONS.get((profile.status, profile.transition), []) +
-        TRANSITIONS.get((None, profile.transition), []) +
-        TRANSITIONS.get((profile.status, None), [])
+        TRANSITIONS.get((current, target), empty)[index] +
+        TRANSITIONS.get((None, target), empty)[index] +
+        TRANSITIONS.get((current, None), empty)[index]
     )
     valid = any([
         hasattr(app, function) and getattr(app, function)(profile)
         for function in functions
     ])
-    if valid:
+    if valid and not done:
         profile.status = profile.transition
         profile.transition = None
+        transition(profile, current, target, True)
 
 
 from hiboo.profile import login, admin, cli
\ No newline at end of file

hiboo/profile/admin.py

@@ -53,7 +53,7 @@ def set_status(profile_uuid, status):
         actor=flask_login.current_user,
         public=True
     )
-    transition(profile)
+    transition(profile, profile.status, profile.transition)
     models.db.session.commit()
     flask.flash(_("Profile status change was requested"), "success")
     return flask.redirect(flask.url_for(".details", profile_uuid=profile_uuid))
@@ -63,8 +63,9 @@ def set_status(profile_uuid, status):
 @security.admin_required()
 def complete_transition(profile_uuid):
     profile = models.Profile.query.get(profile_uuid) or flask.abort(404)
-    profile.status = profile.transition
-    profile.transition = None
+    current, target = profile.status, profile.transition
+    profile.status, profile.transition = target, None
+    transition(profile, current, target, True)
     models.db.session.commit()
     flask.flash(_("Profile status change was completed"), "success")
     return flask.redirect(flask.url_for(".details", profile_uuid=profile_uuid))

hiboo/profile/login.py

@@ -25,7 +25,7 @@ def create(service_uuid, create_for=False, quick=False):
     service = models.Service.query.get(service_uuid) or flask.abort(404)
     status = models.Profile.ACTIVE
     is_admin = flask_login.current_user.is_admin
-    format = format.ProfileFormat.registry[service.profile_format]
+    formatter = format.ProfileFormat.registry[service.profile_format]
     # If the admin passed a user uuid, use that one, otherwise ignore it
     user = hiboo_user.get_user(intent="profile.create_for", create_for=None) if (create_for and is_admin) else flask_login.current_user
     # Check that profile creation is allowed
@@ -45,11 +45,11 @@ def create(service_uuid, create_for=False, quick=False):
         status = models.Profile.REQUEST
     # Initialize and validate the form before applying overrides
     form = forms.ProfileForm()
-    form.username.validators = format.validators()
+    form.username.validators = formatter.validators()
     submit = form.validate_on_submit()
     # If this is a quick creation or the service prevents custom profile creation, force the username
     if quick or service.single_profile:
-        for username in format.alternatives(format.coalesce(user.username)):
+        for username in formatter.alternatives(formatter.coalesce(user.username)):
             if not service.check_username(username):
                 form.force_username(username)
                 break