reformat

app/billing/billing_schemas.py

@@ -8,7 +8,7 @@ create_or_update_free_sms_fragment_limit_schema = {
     "properties": {
         "free_sms_fragment_limit": {"type": "integer", "minimum": 0},
     },
-    "required": ["free_sms_fragment_limit"]
+    "required": ["free_sms_fragment_limit"],
 }
 
 
@@ -25,7 +25,7 @@ def serialize_ft_billing_remove_emails(rows):
             "charged_units": row.charged_units,
         }
         for row in rows
-        if row.notification_type != 'email'
+        if row.notification_type != "email"
     ]
 
 

app/billing/rest.py

@@ -21,44 +21,43 @@ from app.models import Service
 from app.schema_validation import validate
 
 billing_blueprint = Blueprint(
-    'billing',
-    __name__,
-    url_prefix='/service/<uuid:service_id>/billing'
+    "billing", __name__, url_prefix="/service/<uuid:service_id>/billing"
 )
 
 
 register_errors(billing_blueprint)
 
 
-@billing_blueprint.route('/monthly-usage')
+@billing_blueprint.route("/monthly-usage")
 def get_yearly_usage_by_monthly_from_ft_billing(service_id):
     try:
-        year = int(request.args.get('year'))
+        year = int(request.args.get("year"))
     except TypeError:
-        return jsonify(result='error', message='No valid year provided'), 400
+        return jsonify(result="error", message="No valid year provided"), 400
     results = fetch_monthly_billing_for_year(service_id=service_id, year=year)
     data = serialize_ft_billing_remove_emails(results)
     return jsonify(data)
 
 
-@billing_blueprint.route('/yearly-usage-summary')
+@billing_blueprint.route("/yearly-usage-summary")
 def get_yearly_billing_usage_summary_from_ft_billing(service_id):
     try:
-        year = int(request.args.get('year'))
+        year = int(request.args.get("year"))
     except TypeError:
-        return jsonify(result='error', message='No valid year provided'), 400
+        return jsonify(result="error", message="No valid year provided"), 400
 
     billing_data = fetch_billing_totals_for_year(service_id, year)
     data = serialize_ft_billing_yearly_totals(billing_data)
     return jsonify(data)
 
 
-@billing_blueprint.route('/free-sms-fragment-limit', methods=["GET"])
+@billing_blueprint.route("/free-sms-fragment-limit", methods=["GET"])
 def get_free_sms_fragment_limit(service_id):
+    financial_year_start = request.args.get("financial_year_start")
 
-    financial_year_start = request.args.get('financial_year_start')
-
-    annual_billing = dao_get_free_sms_fragment_limit_for_year(service_id, financial_year_start)
+    annual_billing = dao_get_free_sms_fragment_limit_for_year(
+        service_id, financial_year_start
+    )
 
     if annual_billing is None:
         service = Service.query.get(service_id)
@@ -67,40 +66,39 @@ def get_free_sms_fragment_limit(service_id):
 
         annual_billing = set_default_free_allowance_for_service(
             service=service,
-            year_start=int(financial_year_start) if financial_year_start else None
+            year_start=int(financial_year_start) if financial_year_start else None,
         )
 
     return jsonify(annual_billing.serialize_free_sms_items()), 200
 
 
-@billing_blueprint.route('/free-sms-fragment-limit', methods=["POST"])
+@billing_blueprint.route("/free-sms-fragment-limit", methods=["POST"])
 def create_or_update_free_sms_fragment_limit(service_id):
-
     req_args = request.get_json()
 
     form = validate(req_args, create_or_update_free_sms_fragment_limit_schema)
 
-    update_free_sms_fragment_limit_data(service_id,
-                                        free_sms_fragment_limit=form.get('free_sms_fragment_limit'),
-                                        financial_year_start=form.get('financial_year_start'))
+    update_free_sms_fragment_limit_data(
+        service_id,
+        free_sms_fragment_limit=form.get("free_sms_fragment_limit"),
+        financial_year_start=form.get("financial_year_start"),
+    )
     return jsonify(form), 201
 
 
-def update_free_sms_fragment_limit_data(service_id, free_sms_fragment_limit, financial_year_start):
+def update_free_sms_fragment_limit_data(
+    service_id, free_sms_fragment_limit, financial_year_start
+):
     current_year = get_current_calendar_year_start_year()
     if not financial_year_start:
         financial_year_start = current_year
 
     dao_create_or_update_annual_billing_for_year(
-        service_id,
-        free_sms_fragment_limit,
-        financial_year_start
+        service_id, free_sms_fragment_limit, financial_year_start
     )
     # if we're trying to update historical data, don't touch other rows.
     # Otherwise, make sure that future years will get the new updated value.
     if financial_year_start >= current_year:
         dao_update_annual_billing_for_future_years(
-            service_id,
-            free_sms_fragment_limit,
-            financial_year_start
+            service_id, free_sms_fragment_limit, financial_year_start
         )