add organisation invite rest and dao

app/celery/scheduled_tasks.py

@@ -22,6 +22,7 @@ from app import performance_platform_client, deskpro_client
 from app.dao.date_util import get_month_start_and_end_date_in_utc
 from app.dao.inbound_sms_dao import delete_inbound_sms_created_more_than_a_week_ago
 from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
+from app.dao.invited_org_user_dao import delete_org_invitations_created_more_than_two_days_ago
 from app.dao.jobs_dao import (
     dao_get_letter_job_ids_by_status,
     dao_set_scheduled_jobs_to_pending,
@@ -184,7 +185,8 @@ def delete_letter_notifications_older_than_seven_days():
 def delete_invitations():
     try:
         start = datetime.utcnow()
-        deleted = delete_invitations_created_more_than_two_days_ago()
+        deleted_invites = delete_invitations_created_more_than_two_days_ago()
+        deleted_invites += delete_org_invitations_created_more_than_two_days_ago()
         current_app.logger.info(
             "Delete job started {} finished {} deleted {} invitations".format(start, datetime.utcnow(), deleted)
         )

app/dao/invited_org_user_dao.py

@@ -0,0 +1,29 @@
+from datetime import datetime, timedelta
+from app import db
+
+from app.models import InvitedOrganisationUser
+
+
+def save_invited_org_user(invited_org_user):
+    db.session.add(invited_org_user)
+    db.session.commit()
+
+
+def get_invited_org_user(organisation_id, invited_org_user_id):
+    return InvitedOrganisationUser.query.filter_by(organisation_id=organisation_id, id=invited_org_user_id).one()
+
+
+def get_invited_org_user_by_id(invited_org_user_id):
+    return InvitedOrganisationUser.query.filter_by(id=invited_org_user_id).one()
+
+
+def get_invited_org_users_for_organisation(organisation_id):
+    return InvitedOrganisationUser.query.filter_by(organisation_id=organisation_id).all()
+
+
+def delete_org_invitations_created_more_than_two_days_ago():
+    deleted = db.session.query(InvitedOrganisationUser).filter(
+        InvitedOrganisationUser.created_at <= datetime.utcnow() - timedelta(days=2)
+    ).delete()
+    db.session.commit()
+    return deleted

app/invite/rest.py

@@ -60,13 +60,6 @@ def get_invited_users_by_service(service_id):
     return jsonify(data=invited_user_schema.dump(invited_users, many=True).data), 200
 
 
-@invite.route('/<invited_user_id>', methods=['GET'])
-def get_invited_user_by_service_and_id(service_id, invited_user_id):
-    invited_user = get_invited_user(service_id=service_id, invited_user_id=invited_user_id)
-
-    return jsonify(data=invited_user_schema.dump(invited_user).data), 200
-
-
 @invite.route('/<invited_user_id>', methods=['POST'])
 def update_invited_user(service_id, invited_user_id):
     fetched = get_invited_user(service_id=service_id, invited_user_id=invited_user_id)

app/models.py

@@ -1451,6 +1451,16 @@ class InvitedOrganisationUser(db.Model):
         default=INVITE_PENDING
     )
 
+    def serialize(self):
+        return {
+            'id': self.id,
+            'email_address': self.email_address,
+            'invited_by': self.invited_by_id,
+            'organisation': self.organisation_id,
+            'created_at': self.created_at.strftime(DATETIME_FORMAT),
+            'status': self.status
+        }
+
 
 # Service Permissions
 MANAGE_USERS = 'manage_users'

app/organisation/invite_rest.py

@@ -0,0 +1,89 @@
+from flask import (
+    Blueprint,
+    request,
+    jsonify,
+    current_app)
+from notifications_utils.url_safe_token import generate_token
+
+from app.config import QueueNames
+from app.dao.invited_org_user_dao import (
+    save_invited_org_user,
+    get_invited_org_user,
+    get_invited_org_users_for_organisation
+)
+from app.dao.templates_dao import dao_get_template_by_id
+from app.models import EMAIL_TYPE, KEY_TYPE_NORMAL, Service, InvitedOrganisationUser
+from app.notifications.process_notifications import persist_notification, send_notification_to_queue
+from app.schemas import invited_org_user_schema
+from app.errors import register_errors
+
+invite = Blueprint('invite', __name__, url_prefix='/organisation/<organisation_id>/invite')
+
+register_errors(invite)
+
+
+@invite.route('', methods=['POST'])
+def create_invited_org_user(organisation_id):
+    request_json = request.get_json()
+
+    invited_org_user = InvitedOrganisationUser(
+        email_address=request_json['email_address'],
+        invited_by_id=request_json['invited_by'],
+        organisation_id=organisation_id
+    )
+    save_invited_org_user(invited_org_user)
+
+    template = dao_get_template_by_id(current_app.config['ORGANISATION_INVITATION_EMAIL_TEMPLATE_ID'])
+
+    saved_notification = persist_notification(
+        template_id=template.id,
+        template_version=template.version,
+        recipient=invited_org_user.email_address,
+        service=template.service,
+        personalisation={
+            'user_name': invited_org_user.invited_by.name,
+            'org_name': invited_org_user.organisation.name,
+            'url': invited_org_user_url(
+                invited_org_user.id,
+                request_json.get('invite_link_host'),
+            ),
+        },
+        notification_type=EMAIL_TYPE,
+        api_key_id=None,
+        key_type=KEY_TYPE_NORMAL,
+        reply_to_text=invited_org_user.from_user.email_address
+    )
+
+    send_notification_to_queue(saved_notification, research_mode=False, queue=QueueNames.NOTIFY)
+
+    return jsonify(data=invited_org_user.serialize()), 201
+
+
+@invite.route('', methods=['GET'])
+def get_invited_org_users_by_organisation(organisation_id):
+    invited_org_users = get_invited_org_users_for_organisation(organisation_id)
+    return jsonify(data=[x.serialize() for x in invited_org_users]), 200
+
+
+@invite.route('/<invited_org_user_id>', methods=['POST'])
+def update_invited_org_user(organisation_id, invited_org_user_id):
+    fetched = get_invited_org_user(organisation_id=organisation_id, invited_org_user_id=invited_org_user_id)
+
+    current_data = dict(fetched.serialize().items())
+    current_data.update(request.get_json())
+    update_dict = invited_org_user_schema.load(current_data).data
+    save_invited_org_user(update_dict)
+    return jsonify(data=fetched.serialize()), 200
+
+
+def invited_org_user_url(invited_org_user_id, invite_link_host=None):
+    token = generate_token(
+        str(invited_org_user_id),
+        current_app.config['SECRET_KEY'],
+        current_app.config['DANGEROUS_SALT']
+    )
+
+    if invite_link_host is None:
+        invite_link_host = current_app.config['ADMIN_BASE_URL']
+
+    return '{0}/organisation-invitation/{1}'.format(invite_link_host, token)

app/schemas.py

@@ -100,7 +100,7 @@ class UserSchema(BaseSchema):
     class Meta:
         model = models.User
         exclude = (
-            "updated_at", "created_at", "user_to_service",
+            "updated_at", "created_at", "user_to_service", "user_to_organisation"
             "_password", "verify_codes")
         strict = True