darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-01 20:28:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove crown stuff

Browse Source
This commit is contained in:
stvnrlly
2022-10-17 20:16:39 +00:00
parent 59732ce137
commit 3fff0fdd84
22 changed files with 168 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/dao/broadcast_service_dao.py
View File

@@ -82,7 +82,6 @@ def set_broadcast_service_type(service, service_mode, broadcast_channel, provide
).one()
service.organisation_id = organisation.id
service.organisation_type = organisation.organisation_type
service.crown = organisation.crown
db.session.add(service)

14
app/dao/fact_billing_dao.py
View File

@@ -470,7 +470,6 @@ def _query_for_billing_data(notification_type, start_date, end_date, service):
def _email_query():
return db.session.query(
NotificationAllTimeView.template_id,
literal(service.crown).label('crown'),
literal(service.id).label('service_id'),
literal(notification_type).label('notification_type'),
literal('ses').label('sent_by'),
@@ -497,7 +496,6 @@ def _query_for_billing_data(notification_type, start_date, end_date, service):
international = func.coalesce(NotificationAllTimeView.international, False)
return db.session.query(
NotificationAllTimeView.template_id,
literal(service.crown).label('crown'),
literal(service.id).label('service_id'),
literal(notification_type).label('notification_type'),
sent_by.label('sent_by'),
@@ -526,7 +524,6 @@ def _query_for_billing_data(notification_type, start_date, end_date, service):
postage = func.coalesce(NotificationAllTimeView.postage, 'none')
return db.session.query(
NotificationAllTimeView.template_id,
literal(service.crown).label('crown'),
literal(service.id).label('service_id'),
literal(notification_type).label('notification_type'),
literal('dvla').label('sent_by'),
@@ -579,20 +576,22 @@ def get_service_ids_that_need_billing_populated(start_date, end_date):
def get_rate(
non_letter_rates, letter_rates, notification_type, date, crown=None, letter_page_count=None, post_class='second'
non_letter_rates,
letter_rates,
notification_type,
date,
letter_page_count=None,
post_class='second'
):
start_of_day = get_london_midnight_in_utc(date)
if notification_type == LETTER_TYPE:
if letter_page_count == 0:
return 0
# if crown is not set default to true, this is okay because the rates are the same for both crown and non-crown.
crown = crown or True
return next(
r.rate
for r in letter_rates if (
start_of_day >= r.start_date and
crown == r.crown and
letter_page_count == r.sheet_count and
post_class == r.post_class
)
@@ -615,7 +614,6 @@ def update_fact_billing(data, process_day):
letter_rates,
data.notification_type,
process_day,
data.crown,
data.letter_page_count,
data.postage)
billing_record = create_billing_record(data, rate, process_day)

4
app/dao/organisation_dao.py
View File

@@ -83,9 +83,6 @@ def dao_update_organisation(organisation_id, **kwargs):
if 'organisation_type' in kwargs:
_update_organisation_services(organisation, 'organisation_type', only_where_none=False)
if 'crown' in kwargs:
_update_organisation_services(organisation, 'crown', only_where_none=False)
if 'email_branding_id' in kwargs:
_update_organisation_services(organisation, 'email_branding')
@@ -114,7 +111,6 @@ def dao_add_service_to_organisation(service, organisation_id):
service.organisation_id = organisation_id
service.organisation_type = organisation.organisation_type
service.crown = organisation.crown
db.session.add(service)

2
app/dao/services_dao.py
View File

@@ -321,8 +321,6 @@ def dao_create_service(
if organisation.letter_branding:
service.letter_branding = organisation.letter_branding
if organisation:
service.crown = organisation.crown
service.count_as_live = not user.platform_admin
db.session.add(service)