Notify on setting up one on ones

Author: recrsn

snowflake/controllers/notifications.py

@@ -14,6 +14,8 @@ def build_redirect(notification: Notification):
     elif notification.type == TYPE_COMMENT_ON_APPRECIATION_RECEIVED \
             or notification.type == TYPE_COMMENT_ON_APPRECIATION_GIVEN:
         return url_for('index.index') + f"#appreciation-{notification.object.appreciation.id}"
+    elif notification.type == TYPE_ONE_ON_ONE_SETUP or TYPE_ONE_ON_ONE_ACTION_ITEM_ADDED:
+        return url_for('one_on_one.one_on_one', _id=notification.object.id)
 
 
 @login_required

snowflake/controllers/one_on_one.py

@@ -3,6 +3,7 @@
 
 from snowflake.forms import OneOnOneForm, OneOnOneActionItemForm, OneOnOneActionItemStateChange
 from snowflake.models import User, OneOnOne, OneOnOneActionItem
+from snowflake.services import notification
 
 blueprint = Blueprint('one_on_one', __name__)
 
@@ -21,6 +22,9 @@ def one_on_one(_id):
         if user is not None:
             o = OneOnOne(user=user, created_by=current_user)
             OneOnOne.create(o)
+
+            notification.notify_one_on_one_setup(o)
+
             return redirect(url_for("one_on_one.one_on_one"))
         else:
             form.user.errors.append("User not found")
@@ -47,6 +51,8 @@ def one_on_one_action_item():
 
         OneOnOneActionItem.create(action_item)
 
+        notification.notify_one_on_one_action_item_added(action_item)
+
     return redirect(f'/1-on-1s/{form.one_on_one.data}')
 
 

snowflake/models/notification.py

@@ -1,9 +1,12 @@
 from . import Comment
 from .appreciation import Appreciation
+from .one_on_one import OneOnOne
 from .user import User
 from ..db import db
 
 TYPE_APPRECIATION = "appreciation"
+TYPE_ONE_ON_ONE_SETUP = "one_on_one_setup"
+TYPE_ONE_ON_ONE_ACTION_ITEM_ADDED = "one_on_one_action_item_added"
 TYPE_COMMENT_ON_APPRECIATION_RECEIVED = "comment_on_appreciation_received"
 TYPE_COMMENT_ON_APPRECIATION_GIVEN = "comment_on_appreciation_given"
 TYPE_COMMENT_ON_APPRECIATION_COMMENTED = "comment_on_appreciation_commented"
@@ -47,5 +50,7 @@ def object(self):
             return Appreciation.get(int(self.object_id))
         elif self.type == TYPE_COMMENT_ON_APPRECIATION_GIVEN or self.type == TYPE_COMMENT_ON_APPRECIATION_RECEIVED:
             return Comment.get(int(self.object_id))
+        elif self.type == TYPE_ONE_ON_ONE_SETUP or self.type == TYPE_ONE_ON_ONE_ACTION_ITEM_ADDED:
+            return OneOnOne.get(self.object_id)
 
         return None

snowflake/services/notification.py

@@ -4,6 +4,7 @@
 from flask_login import current_user
 
 from ..db import transaction
+from ..models import OneOnOneActionItem
 from ..models.notification import *
 
 
@@ -39,3 +40,23 @@ def notify_comment(c: Comment):
             if user_id != current_user.id:
                 db.session.add(Notification(created_at=now, user_id=user_id, type=notification_type,
                                             object_id=str(c.id)))
+
+
+def notify_one_on_one_setup(o: OneOnOne):
+    with transaction():
+        db.session.add(Notification(created_at=datetime.now(),
+                                    user_id=o.user_id,
+                                    type=TYPE_ONE_ON_ONE_SETUP,
+                                    object_id=str(o.id)))
+
+
+def notify_one_on_one_action_item_added(action_item: OneOnOneActionItem):
+    with transaction():
+        user_id = action_item.one_on_one.user_id \
+            if action_item.one_on_one.created_by_id == current_user.id else \
+            action_item.one_on_one.created_by_id
+
+        db.session.add(Notification(created_at=datetime.now(),
+                                    user_id=user_id,
+                                    type=TYPE_ONE_ON_ONE_ACTION_ITEM_ADDED,
+                                    object_id=str(action_item.one_on_one.id)))

snowflake/templates/notifications.html

@@ -22,6 +22,14 @@ <h2 class="is-size-2 is-bold">Your notifications</h2>
                                     <span>{{ notification.object.user.name }} commented on an appreciation you have given</span>
                                 {% elif notification.type == "comment_on_appreciation_commented" %}
                                     <span>{{ notification.object.user.name }} also commented on an appreciation you commented</span>
+                                {% elif notification.type == "one_on_one_setup" %}
+                                    <span>{{ notification.object.created_by.name }} setup an one on one with you</span>
+                                {% elif notification.type == "one_on_one_action_item_added" %}
+                                    {% if notification.object.created_by_id == current_user.id %}
+                                        <span>{{ notification.object.user.name }} added an action item to your one on one</span>
+                                    {% else %}
+                                        <span>{{ notification.object.created_by.name }} added an action item to your one on one</span>
+                                    {% endif %}
                                 {% endif %}
                                 <span class="help">
                                     <time datetime="{{ notification.created_at | iso_time }}">{{ notification.created_at | humanize_time }}</time>