Merge pull request #2583 from alphagov/add-org-id-to-services

Add org id to services

app/dao/organisation_dao.py

@@ -100,6 +100,7 @@ def dao_add_service_to_organisation(service, organisation_id):
     ).one()
 
     organisation.services.append(service)
+    service.organisation_id = organisation_id
     service.organisation_type = organisation.organisation_type
     service.crown = organisation.crown
 

app/dao/services_dao.py

@@ -284,13 +284,6 @@ def dao_create_service(
     service.id = service_id or uuid.uuid4()  # must be set now so version history model can use same id
     service.active = True
     service.research_mode = False
-    if organisation:
-        service.crown = organisation.crown
-    elif service.organisation_type in CROWN_ORGANISATION_TYPES:
-        service.crown = True
-    elif service.organisation_type in NON_CROWN_ORGANISATION_TYPES:
-        service.crown = False
-    service.count_as_live = not user.platform_admin
 
     for permission in service_permissions:
         service_permission = ServicePermission(service_id=service.id, permission=permission)
@@ -300,9 +293,9 @@ 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:
             service.email_branding = organisation.email_branding
 
@@ -310,9 +303,15 @@ def dao_create_service(
             service.letter_branding = organisation.letter_branding
 
     elif service.organisation_type in ['nhs_central', 'nhs_local'] or email_address_is_nhs(user.email_address):
-
         service.email_branding = dao_get_email_branding_by_name('NHS')
         service.letter_branding = dao_get_letter_branding_by_name('NHS')
+    if organisation:
+        service.crown = organisation.crown
+    elif service.organisation_type in CROWN_ORGANISATION_TYPES:
+        service.crown = True
+    elif service.organisation_type in NON_CROWN_ORGANISATION_TYPES:
+        service.crown = False
+    service.count_as_live = not user.platform_admin
 
     db.session.add(service)
 

app/models.py

@@ -479,6 +479,7 @@ class Service(db.Model, Versioned):
     go_live_user = db.relationship('User', foreign_keys=[go_live_user_id])
     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',
         secondary=organisation_to_service,