darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-30 11:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into stvnrlly-remove-broadcasts

Browse Source
This commit is contained in:
stvnrlly
2022-10-20 19:44:20 -04:00
parent e58d0eb552 821efca6f1
commit d4e156e8ae
56 changed files with 1011 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models.py
View File

@@ -348,13 +348,9 @@ class Domain(db.Model):
ORGANISATION_TYPES = [
"central", "local", "nhs_central", "nhs_local", "nhs_gp", "emergency_service", "school_or_college", "other",
"federal", "state", "other"
]
CROWN_ORGANISATION_TYPES = ["nhs_central"]
NON_CROWN_ORGANISATION_TYPES = ["local", "nhs_local", "nhs_gp", "emergency_service", "school_or_college"]
NHS_ORGANISATION_TYPES = ["nhs_central", "nhs_local", "nhs_gp"]
class OrganisationTypes(db.Model):
__tablename__ = 'organisation_types'
@@ -1488,6 +1484,8 @@ class Notification(db.Model):
document_download_count = db.Column(db.Integer, nullable=True)
postage = db.Column(db.String, nullable=True)
provider_response = db.Column(db.Text, nullable=True)
# queue_name = db.Column(db.Text, nullable=True)
__table_args__ = (
db.ForeignKeyConstraint(
@@ -1690,6 +1688,7 @@ class Notification(db.Model):
"postcode": None,
"type": self.notification_type,
"status": self.get_letter_status() if self.notification_type == LETTER_TYPE else self.status,
"provider_response": self.provider_response,
"template": template_dict,
"body": self.content,
"subject": self.subject,