diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index 5f326b372..68f0ea781 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -23,7 +23,6 @@ from app.models import ( Notification, NotificationHistory, Permission, - ProviderStatistics, Service, ServicePermission, ServiceSmsSender, @@ -223,7 +222,6 @@ def delete_service_and_all_associated_db_objects(service): _delete_commit(TemplateRedacted.query.filter(TemplateRedacted.template_id.in_(subq))) _delete_commit(ServiceSmsSender.query.filter_by(service=service)) - _delete_commit(ProviderStatistics.query.filter_by(service=service)) _delete_commit(InvitedUser.query.filter_by(service=service)) _delete_commit(Permission.query.filter_by(service=service)) _delete_commit(NotificationHistory.query.filter_by(service=service)) diff --git a/app/models.py b/app/models.py index 2984edeab..d55fff3ca 100644 --- a/app/models.py +++ b/app/models.py @@ -864,20 +864,6 @@ NOTIFICATION_TYPE = [EMAIL_TYPE, SMS_TYPE, LETTER_TYPE] notification_types = db.Enum(*NOTIFICATION_TYPE, name='notification_type') -class ProviderStatistics(db.Model): - __tablename__ = 'provider_statistics' - - id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4) - day = db.Column(db.Date, nullable=False) - provider_id = db.Column(UUID(as_uuid=True), db.ForeignKey('provider_details.id'), index=True, nullable=False) - provider = db.relationship( - 'ProviderDetails', backref=db.backref('provider_stats', lazy='dynamic') - ) - service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, nullable=False) - service = db.relationship('Service', backref=db.backref('service_provider_stats', lazy='dynamic')) - unit_count = db.Column(db.BigInteger, nullable=False) - - class ProviderRates(db.Model): __tablename__ = 'provider_rates' diff --git a/tests/app/conftest.py b/tests/app/conftest.py index 9dad50c18..ed6d432c8 100644 --- a/tests/app/conftest.py +++ b/tests/app/conftest.py @@ -1,4 +1,4 @@ -from datetime import (datetime, date, timedelta) +from datetime import datetime, timedelta import json import uuid @@ -22,7 +22,6 @@ from app.models import ( NotificationHistory, InvitedUser, Permission, - ProviderStatistics, ProviderDetails, ProviderDetailsHistory, ProviderRates, @@ -839,28 +838,6 @@ def mmg_provider(): return ProviderDetails.query.filter_by(identifier='mmg').one() -@pytest.fixture(scope='function') -def sample_provider_statistics(notify_db, - notify_db_session, - sample_service, - provider=None, - day=None, - unit_count=1): - - if provider is None: - provider = ProviderDetails.query.filter_by(identifier='mmg').first() - if day is None: - day = date.today() - stats = ProviderStatistics( - service=sample_service, - provider_id=provider.id, - day=day, - unit_count=unit_count) - notify_db.session.add(stats) - notify_db.session.commit() - return stats - - @pytest.fixture(scope='function') def mock_firetext_client(mocker, statsd_client=None): client = FiretextClient() diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index b0c5a0ccb..997920fd5 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -37,7 +37,6 @@ from app.dao.services_dao import ( from app.dao.service_permissions_dao import dao_add_service_permission, dao_remove_service_permission from app.dao.users_dao import save_model_user from app.models import ( - ProviderStatistics, VerifyCode, ApiKey, Template, @@ -460,14 +459,12 @@ def test_delete_service_and_associated_objects(notify_db, sample_job, sample_notification, sample_invited_user, - sample_permission, - sample_provider_statistics): + sample_permission): assert ServicePermission.query.count() == len(( SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE )) delete_service_and_all_associated_db_objects(sample_service) - assert ProviderStatistics.query.count() == 0 assert VerifyCode.query.count() == 0 assert ApiKey.query.count() == 0 assert ApiKey.get_history_model().query.count() == 0