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

Delete JobStatistics model

Browse Source 
Also changed the delete_service_and_all_associated_db_objects function
from the services DAO to remove reference to JobStatistics table.
This commit is contained in:
Katie Smith
2018-03-05 17:25:14 +00:00
parent c843e15f81
commit db6fa457b5
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/services_dao.py
View File

@@ -20,7 +20,6 @@ from app.models import (
InboundNumber, InboundNumber,
InvitedUser, InvitedUser,
Job, Job,
JobStatistics,
Notification, Notification,
NotificationHistory, NotificationHistory,
Permission, Permission,
@@ -220,10 +219,6 @@ def delete_service_and_all_associated_db_objects(service):
query.delete(synchronize_session=False) query.delete(synchronize_session=False)
db.session.commit() db.session.commit()
job_stats = JobStatistics.query.join(Job).filter(Job.service_id == service.id)
list(map(db.session.delete, job_stats))
db.session.commit()
subq = db.session.query(Template.id).filter_by(service=service).subquery() subq = db.session.query(Template.id).filter_by(service=service).subquery()
_delete_commit(TemplateRedacted.query.filter(TemplateRedacted.template_id.in_(subq))) _delete_commit(TemplateRedacted.query.filter(TemplateRedacted.template_id.in_(subq)))

48
app/models.py
View File

@@ -1546,54 +1546,6 @@ class Rate(db.Model):
return the_string return the_string
class JobStatistics(db.Model):
__tablename__ = 'job_statistics'
id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
job_id = db.Column(UUID(as_uuid=True), db.ForeignKey('jobs.id'), index=True, unique=True, nullable=False)
job = db.relationship('Job', backref=db.backref('job_statistics', lazy='dynamic'))
emails_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
emails_delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
emails_failed = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
sms_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
sms_delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
sms_failed = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
letters_sent = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
letters_failed = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=0)
sent = db.Column(db.BigInteger, index=False, unique=False, nullable=True, default=0)
delivered = db.Column(db.BigInteger, index=False, unique=False, nullable=True, default=0)
failed = db.Column(db.BigInteger, index=False, unique=False, nullable=True, default=0)
created_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
default=datetime.datetime.utcnow)
updated_at = db.Column(
db.DateTime,
index=False,
unique=False,
nullable=True,
onupdate=datetime.datetime.utcnow)
def __str__(self):
the_string = ""
the_string += "email sent {} email delivered {} email failed {} ".format(
self.emails_sent, self.emails_delivered, self.emails_failed
)
the_string += "sms sent {} sms delivered {} sms failed {} ".format(
self.sms_sent, self.sms_delivered, self.sms_failed
)
the_string += "letter sent {} letter failed {} ".format(
self.letters_sent, self.letters_failed
)
the_string += "job_id {} ".format(
self.job_id
)
the_string += "created at {}".format(self.created_at)
return the_string
class InboundSms(db.Model): class InboundSms(db.Model):
__tablename__ = 'inbound_sms' __tablename__ = 'inbound_sms'