darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-15 23:38:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2024-06-04 08:20:01 -07:00
parent 22ffc56520 495e15da84
commit db68583cf9
93 changed files with 1262 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/models.py
View File

@@ -1,4 +1,3 @@
import datetime
import itertools
import uuid
@@ -36,6 +35,7 @@ from app.utils import (
DATETIME_FORMAT,
DATETIME_FORMAT_NO_TIMEZONE,
get_dt_string_or_none,
utc_now,
)
from notifications_utils.clients.encryption.encryption_client import EncryptionError
from notifications_utils.recipients import (
@@ -115,14 +115,14 @@ class User(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
_password = db.Column(db.String, index=False, unique=False, nullable=False)
mobile_number = db.Column(db.String, index=False, unique=False, nullable=True)
@@ -131,7 +131,7 @@ class User(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
logged_in_at = db.Column(db.DateTime, nullable=True)
failed_login_count = db.Column(db.Integer, nullable=False, default=0)
@@ -144,7 +144,7 @@ class User(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
preferred_timezone = db.Column(
db.Text,
@@ -368,12 +368,12 @@ class Organization(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
agreement_signed = db.Column(db.Boolean, nullable=True)
agreement_signed_at = db.Column(db.DateTime, nullable=True)
@@ -488,14 +488,14 @@ class Service(db.Model, Versioned):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
active = db.Column(
db.Boolean,
@@ -626,12 +626,12 @@ class AnnualBilling(db.Model):
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
UniqueConstraint(
"financial_year_start",
@@ -698,13 +698,13 @@ class InboundNumber(db.Model):
)
created_at = db.Column(
db.DateTime,
default=datetime.datetime.utcnow,
default=utc_now(),
nullable=False,
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
def serialize(self):
@@ -753,13 +753,13 @@ class ServiceSmsSender(db.Model):
)
created_at = db.Column(
db.DateTime,
default=datetime.datetime.utcnow,
default=utc_now(),
nullable=False,
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
def get_reply_to_text(self):
@@ -798,7 +798,7 @@ class ServicePermission(db.Model):
)
created_at = db.Column(
db.DateTime,
default=datetime.datetime.utcnow,
default=utc_now(),
nullable=False,
)
@@ -826,7 +826,7 @@ class ServiceGuestList(db.Model):
service = db.relationship("Service", backref="guest_list")
recipient_type = enum_column(RecipientType, nullable=False)
recipient = db.Column(db.String(255), nullable=False)
created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow)
created_at = db.Column(db.DateTime, default=utc_now())
@classmethod
def from_string(cls, service_id, recipient_type, recipient):
@@ -867,7 +867,7 @@ class ServiceInboundApi(db.Model, Versioned):
_bearer_token = db.Column("bearer_token", db.String(), nullable=False)
created_at = db.Column(
db.DateTime,
default=datetime.datetime.utcnow,
default=utc_now(),
nullable=False,
)
updated_at = db.Column(db.DateTime, nullable=True)
@@ -914,7 +914,7 @@ class ServiceCallbackApi(db.Model, Versioned):
_bearer_token = db.Column("bearer_token", db.String(), nullable=False)
created_at = db.Column(
db.DateTime,
default=datetime.datetime.utcnow,
default=utc_now(),
nullable=False,
)
updated_at = db.Column(db.DateTime, nullable=True)
@@ -974,14 +974,14 @@ class ApiKey(db.Model, Versioned):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
created_by = db.relationship("User")
created_by_id = db.Column(
@@ -1101,9 +1101,9 @@ class TemplateBase(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(db.DateTime, onupdate=datetime.datetime.utcnow)
updated_at = db.Column(db.DateTime, onupdate=utc_now())
content = db.Column(db.Text, nullable=False)
archived = db.Column(db.Boolean, nullable=False, default=False)
hidden = db.Column(db.Boolean, nullable=False, default=False)
@@ -1249,7 +1249,7 @@ class TemplateRedacted(db.Model):
updated_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_by_id = db.Column(
UUID(as_uuid=True),
@@ -1304,7 +1304,7 @@ class ProviderDetails(db.Model):
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
created_by_id = db.Column(
UUID(as_uuid=True),
@@ -1326,9 +1326,7 @@ class ProviderDetailsHistory(db.Model, HistoryModel):
notification_type = enum_column(NotificationType, nullable=False)
active = db.Column(db.Boolean, nullable=False)
version = db.Column(db.Integer, primary_key=True, nullable=False)
updated_at = db.Column(
db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow
)
updated_at = db.Column(db.DateTime, nullable=True, onupdate=utc_now())
created_by_id = db.Column(
UUID(as_uuid=True), db.ForeignKey("users.id"), index=True, nullable=True
)
@@ -1359,14 +1357,14 @@ class Job(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
notification_count = db.Column(db.Integer, nullable=False)
notifications_sent = db.Column(db.Integer, nullable=False, default=0)
@@ -1410,7 +1408,7 @@ class VerifyCode(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
@property
@@ -1508,7 +1506,7 @@ class Notification(db.Model):
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
status = enum_column(
NotificationStatus,
@@ -1785,7 +1783,7 @@ class NotificationHistory(db.Model, HistoryModel):
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
status = enum_column(
NotificationStatus,
@@ -1854,7 +1852,7 @@ class InvitedUser(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
status = enum_column(
InvitedUserStatus,
@@ -1893,7 +1891,7 @@ class InvitedOrganizationUser(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
status = enum_column(
@@ -1939,7 +1937,7 @@ class Permission(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
__table_args__ = (
@@ -1962,7 +1960,7 @@ class Event(db.Model):
index=False,
unique=False,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
data = db.Column(JSON, nullable=False)
@@ -1986,7 +1984,7 @@ class InboundSms(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
service_id = db.Column(
UUID(as_uuid=True),
@@ -2066,12 +2064,12 @@ class ServiceEmailReplyTo(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
def serialize(self):
@@ -2112,12 +2110,12 @@ class FactBilling(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
@@ -2149,12 +2147,12 @@ class FactNotificationStatus(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
@@ -2167,12 +2165,12 @@ class FactProcessingTime(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
@@ -2195,7 +2193,7 @@ class Complaint(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
def serialize(self):
@@ -2234,12 +2232,12 @@ class ServiceDataRetention(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
__table_args__ = (
@@ -2288,12 +2286,12 @@ class WebauthnCredential(db.Model):
created_at = db.Column(
db.DateTime,
nullable=False,
default=datetime.datetime.utcnow,
default=utc_now(),
)
updated_at = db.Column(
db.DateTime,
nullable=True,
onupdate=datetime.datetime.utcnow,
onupdate=utc_now(),
)
def serialize(self):