Merge pull request #1695 from alphagov/org-user-endpoints

Organisation user endpoints

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/dao/organisation_dao.py

@@ -1,6 +1,10 @@
 from app import db
 from app.dao.dao_utils import transactional
-from app.models import Organisation
+from app.models import (
+    Organisation,
+    InvitedOrganisationUser,
+    User
+)
 
 
 def dao_get_organisations():
@@ -42,3 +46,23 @@ def dao_add_service_to_organisation(service, organisation_id):
     ).one()
 
     organisation.services.append(service)
+
+
+def dao_get_invited_organisation_user(user_id):
+    return InvitedOrganisationUser.query.filter_by(id=user_id).one()
+
+
+def dao_get_users_for_organisation(organisation_id):
+    return User.query.filter(
+        User.organisations.any(id=organisation_id),
+        User.state == 'active'
+    ).order_by(User.created_at).all()
+
+
+@transactional
+def dao_add_user_to_organisation(organisation_id, user_id):
+    organisation = dao_get_organisation_by_id(organisation_id)
+    user = User.query.filter_by(id=user_id).one()
+    user.organisations.append(organisation)
+    db.session.add(organisation)
+    return user