As per PR comments:

- Remove Organisation.services
- added backref='services' to Services.organisation relationship and removed redundant foreign_keys argument.

app/dao/services_dao.py

@@ -293,7 +293,6 @@ def dao_create_service(
     insert_service_sms_sender(service, current_app.config['FROM_NUMBER'])
 
     if organisation:
-        # service.organisation = organisation
         service.organisation_id = organisation.id
         service.organisation_type = organisation.organisation_type
         if organisation.email_branding:

app/models.py

@@ -349,12 +349,6 @@ class Organisation(db.Model):
     active = db.Column(db.Boolean, nullable=False, default=True)
     created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
     updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)
-
-    services = db.relationship(
-        'Service',
-        uselist=True,
-        backref=db.backref('services'))
-
     agreement_signed = db.Column(db.Boolean, nullable=True)
     agreement_signed_at = db.Column(db.DateTime, nullable=True)
     agreement_signed_by_id = db.Column(
@@ -480,7 +474,7 @@ class Service(db.Model, Versioned):
     go_live_at = db.Column(db.DateTime, nullable=True)
 
     organisation_id = db.Column(UUID(as_uuid=True), db.ForeignKey('organisation.id'), index=True, nullable=True)
-    organisation = db.relationship('Organisation', foreign_keys=[organisation_id])
+    organisation = db.relationship('Organisation', backref='services')
 
     email_branding = db.relationship(
         'EmailBranding',