Fix NK measurement data import.

django/report/report_nk.py

@@ -805,19 +805,18 @@
 
 def get_object_name(name):
     ## Map imported data names to object names
+    if name in ("Allgemein Warmwasser u Heizen", "Allgemein"):
+        return "_allgemein"
+    if name == "Hobbyräume und Lager Gesamtstromverbrauch":
+        return "_lager_strom"
     # match = re.search(r"^(\d{3,4}\.?\d?) ", name)
     match = re.search(r"^([0-9a-zA-Z.-]+) ?", name)
     if match:
         # nk.log.append("Match object %s -> %s" % (name, match.group(1)))
         if match.group(1) == "9696":
             return "_lager_strom"
         return match.group(1)
-    elif name in ("Allgemein Warmwasser u Heizen", "Allgemein"):
-        return "_allgemein"
-    elif name == "Hobbyräume und Lager Gesamtstromverbrauch":
-        return "_lager_strom"
-    else:
-        raise RuntimeError("Could not match object: %s" % name)
+    raise RuntimeError("Ungültiger Objektname in den Messdaten: %s" % name)
 
 
 def get_from_api(uri, params=None):
@@ -2661,13 +2660,13 @@
             "ERROR: qrbill API returned: %s %s / %s"
             % (response.status_code, response.reason, response.text)
         )
         return None
     # nk.log.append('Got response: %s' % response.headers)
     if response.headers["Content-Type"] == "application/pdf":
-        return response.getvalue()
+        return response.content
     else:
         nk.log.append("ERROR: qrbill API did not return a application/pdf data.")
         nk.log.append(response.headers)
         return None
 
 

django/report/tests/test_nk_report.py

@@ -4,8 +4,10 @@
 from pprint import pprint
 from unittest.mock import patch
 
+import requests
 from django.conf import settings
 from django.test import Client, tag
+from requests.structures import CaseInsensitiveDict
 
 import report.tests.data as testdata
 from geno.models import Invoice, InvoiceCategory
@@ -24,6 +26,21 @@
     return redirect_request("POST", *args, **kwargs)
 
 
+def convert_to_requests_response(response, url_path):
+    ## Convert response to a requests-like response
+    r = requests.Response()
+    r.status_code = response.status_code
+    if hasattr(response, "content"):
+        r._content = response.content
+    else:
+        r._content = response.getvalue()
+    r.headers = CaseInsensitiveDict(response.headers)
+    r.url = url_path
+    r.encoding = response.charset
+    r.reason = response.reason_phrase
+    return r
+
+
 def redirect_request(method, *args, **kwargs):
     c = Client()
     login_ok = c.login(username="superuser", password="secret")
@@ -60,8 +77,8 @@
             **kwargs,
         )
     else:
         raise ValueError(f"Method {method} not implemented.")
-    return response
+    return convert_to_requests_response(response, url_path)
 
 
 class NKReportTest(ReportTestCase):