chellow 1714145572.0.0__tar.gz → 1714148308.0.0__tar.gz

{chellow-1714145572.0.0 → chellow-1714148308.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714145572.0.0
+Version: 1714148308.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1714148308.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1714148308.0.0"

{chellow-1714145572.0.0 → chellow-1714148308.0.0}/chellow/reports/report_33.py

@@ -24,9 +24,9 @@ from chellow.models import (
     GeneratorType,
     MeasurementRequirement,
     MtcParticipant,
+    RSession,
     ReadType,
     RegisterRead,
-    Session,
     SiteEra,
     Supply,
     User,
@@ -47,7 +47,7 @@ from chellow.views import chellow_redirect
 
 def content(user_id, date, supply_id, mpan_cores):
     try:
-        with Session() as sess:
+        with RSession() as sess:
             user = User.get_by_id(sess, user_id)
             f = open_file("supplies_snapshot.csv", user, mode="w", newline="")
             _process(sess, f, date, supply_id, mpan_cores)

{chellow-1714145572.0.0 → chellow-1714148308.0.0}/chellow/views.py

@@ -1473,7 +1473,7 @@ def report_run_spreadsheet_get(run_id):
         cw.writerow([csv_make_val(row.data["values"].get(t)) for t in titles])
 
     output = make_response(si.getvalue())
-    output.headers["Content-Disposition"] = f'attachment; filename="{run.title}"'
+    output.headers["Content-Disposition"] = f'attachment; filename="{run.title}.csv"'
     output.headers["Content-type"] = "text/csv"
     return output
 

{chellow-1714145572.0.0 → chellow-1714148308.0.0}/test/reports/test_report_33.py

@@ -34,57 +34,40 @@ from chellow.utils import ct_datetime, to_utc, utc_datetime
 
 
 def test_content(mocker, sess):
-    valid_from = to_utc(ct_datetime(2000, 1, 1))
+    vf = to_utc(ct_datetime(2000, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")
     market_role_Z = MarketRole.insert(sess, "Z", "Non-core")
     participant = Participant.insert(sess, "CALB", "AK Industries")
-    participant.insert_party(sess, market_role_Z, "None core", valid_from, None, None)
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
     bank_holiday_rate_script = {"bank_holidays": []}
     Contract.insert_non_core(
-        sess,
-        "bank_holidays",
-        "",
-        {},
-        utc_datetime(2000, 1, 1),
-        None,
-        bank_holiday_rate_script,
+        sess, "bank_holidays", "", {}, vf, None, bank_holiday_rate_script
     )
     market_role_X = MarketRole.insert(sess, "X", "Supplier")
     market_role_M = MarketRole.insert(sess, "M", "Mop")
     market_role_C = MarketRole.insert(sess, "C", "HH Dc")
     market_role_R = MarketRole.insert(sess, "R", "Distributor")
-    participant.insert_party(sess, market_role_M, "Fusion Mop", valid_from, None, None)
-    participant.insert_party(sess, market_role_X, "Fusion", valid_from, None, None)
-    participant.insert_party(sess, market_role_C, "Fusion DC", valid_from, None, None)
+    participant.insert_party(sess, market_role_M, "Fusion Mop", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
     mop_contract = Contract.insert_mop(
-        sess, "Fusion", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+        sess, "Fusion", participant, "", {}, vf, None, {}
     )
     dc_contract = Contract.insert_dc(
-        sess, "Fusion DC 2000", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
     )
-    pc = Pc.insert(sess, "00", "hh", utc_datetime(2000, 1, 1), None)
+    pc = Pc.insert(sess, "00", "hh", vf, None)
     insert_cops(sess)
     cop = Cop.get_by_code(sess, "5")
     insert_comms(sess)
     comm = Comm.get_by_code(sess, "GSM")
     imp_supplier_contract = Contract.insert_supplier(
-        sess,
-        "Fusion Supplier 2000",
-        participant,
-        "",
-        {},
-        utc_datetime(2000, 1, 1),
-        None,
-        {},
-    )
-    dno = participant.insert_party(
-        sess, market_role_R, "WPD", utc_datetime(2000, 1, 1), None, "22"
-    )
-    meter_type = MeterType.insert(sess, "C5", "COP 1-5", utc_datetime(2000, 1, 1), None)
-    meter_payment_type = MeterPaymentType.insert(
-        sess, "CR", "Credit", utc_datetime(1996, 1, 1), None
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
     )
-    mtc = Mtc.insert(sess, "845", False, True, valid_from, None)
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
     mtc_participant = MtcParticipant.insert(
         sess,
         mtc,
@@ -95,22 +78,15 @@ def test_content(mocker, sess):
         meter_type,
         meter_payment_type,
         0,
-        utc_datetime(1996, 1, 1),
+        vf,
         None,
     )
     insert_voltage_levels(sess)
     voltage_level = VoltageLevel.get_by_code(sess, "HV")
     llfc = dno.insert_llfc(
-        sess,
-        "510",
-        "PC 5-8 & HH HV",
-        voltage_level,
-        False,
-        True,
-        utc_datetime(1996, 1, 1),
-        None,
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
     )
-    MtcLlfc.insert(sess, mtc_participant, llfc, valid_from, None)
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
     insert_sources(sess)
     source = Source.get_by_code(sess, "net")
     insert_energisation_statuses(sess)
@@ -151,12 +127,12 @@ def test_content(mocker, sess):
     editor = UserRole.insert(sess, "editor")
     user = User.insert(sess, "admin@example.com", "xxx", editor, None)
     user_id = user.id
+    supply_id = supply.id
 
     sess.commit()
     f = StringIO()
     mocker.patch("chellow.reports.report_33.open_file", return_value=f)
     date = utc_datetime(2024, 1, 1)
-    supply_id = supply.id
     mpan_cores = None
     content(user_id, date, supply_id, mpan_cores)
 

chellow-1714145572.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1714145572.0.0"