use measurements endpoint for bulk upload

Author: tcsullivan

noisemeter-device/api.cpp

@@ -34,14 +34,17 @@ API::Request::Request(const char endpoint[])
 
 API::Request& API::Request::addParam(const char param[], String value)
 {
-    params.concat('&');
+    if (!params.isEmpty())
+        params.concat('&');
+
     params.concat(param);
     params.concat('=');
     params.concat(urlEncode(value));
     return *this;
 }
 
-std::optional<JsonDocument> API::sendAuthorizedRequest(const API::Request& req)
+std::optional<JsonDocument> API::sendAuthorizedRequest(
+    const API::Request& req, String ctype)
 {
     WiFiClientSecure client;
     client.setCACert(rootCertificate());
@@ -53,10 +56,10 @@ std::optional<JsonDocument> API::sendAuthorizedRequest(const API::Request& req)
 
     HTTPClient https;
     if (https.begin(client, req.url)) {
-        https.addHeader("Content-Type", "application/x-www-form-urlencoded");
+        https.addHeader("Content-Type", ctype);
         https.addHeader("Authorization", String("Token ") + token);
         https.addHeader("X-Tracket-Device", id);
-        return sendHttpPOST(https, req.params.substring(1));
+        return sendHttpPOST(https, req.params);
 #ifdef API_VERBOSE
     } else {
         SERIAL.println("[api] Failed to https.begin()");
@@ -80,7 +83,7 @@ std::optional<JsonDocument> API::sendNonauthorizedRequest(const API::Request& re
     if (https.begin(client, req.url)) {
         https.addHeader("Content-Type", "application/x-www-form-urlencoded");
         https.addHeader("X-Tracket-Device", id);
-        return sendHttpPOST(https, req.params.substring(1));
+        return sendHttpPOST(https, req.params);
 #ifdef API_VERBOSE
     } else {
         SERIAL.println("[api] Failed to https.begin()");
@@ -165,6 +168,34 @@ std::optional<JsonDocument> API::responseToJson(const String& response)
 API::API(UUID id_, String token_):
     id(id_), token(token_) {}
 
+bool API::sendMeasurements(const std::list<DataPacket>& pkts)
+{
+    String send;
+    JsonDocument doc;
+    auto data = doc["data"].to<JsonArray>();
+
+    for (const auto& packet : pkts) {
+        auto entry = data.add<JsonObject>();
+        entry["timestamp"] = String(packet.timestamp);
+        entry["min"]       = std::lround(packet.minimum);
+        entry["max"]       = std::lround(packet.maximum);
+        entry["mean"]      = std::lround(packet.average);
+    }
+
+    const auto size = serializeJson(data, send);
+
+    if (size == 0) {
+        SERIAL.println("sendMeasurements: serializeJson: failed!");
+        return false;
+    } else {
+        auto request = Request("measurements");
+        request.params = send;
+
+        const auto resp = sendAuthorizedRequest(request, "application/json");
+        return resp && (*resp)["result"] == "ok";
+    }
+}
+
 bool API::sendMeasurement(const DataPacket& packet)
 {
     const auto request = Request("measurement")
@@ -210,7 +241,7 @@ std::optional<API::LatestSoftware> API::getLatestSoftware()
     WiFiClientSecure client;
     client.setCACert(rootCertificate());
 
-    String endpoint = request.url + '?' + request.params.substring(1);
+    String endpoint = request.url + '?' + request.params;
 
 #ifdef API_VERBOSE
     SERIAL.print("[api] Non-authorized request: ");

noisemeter-device/api.h

@@ -25,6 +25,7 @@
 #include <ArduinoJson.h>
 #include <WString.h>
 
+#include <list>
 #include <optional>
 
 class HTTPClient;
@@ -47,7 +48,6 @@ class API
 
         /**
          * Adds a parameter to the given request.
-         * Resulting URL e.g. "https://host/endpoint?parm1=123&parm2=456&"
          * @param param Name of parameter to add.
          * @param value Value of the added parameter.
          * @return *this
@@ -83,6 +83,8 @@ class API
      */
     bool sendMeasurement(const DataPacket& packet);
 
+    bool sendMeasurements(const std::list<DataPacket>& pkts);
+
     /**
      * Sends diagnostic/analytic data to the server along with a DataPacket.
      * This request requires authentication.
@@ -120,7 +122,8 @@ class API
     /** Converts response string into JSON. */
     std::optional<JsonDocument> responseToJson(const String& response);
     /** Attempts the given request and returns the JSON response on success. */
-    std::optional<JsonDocument> sendAuthorizedRequest(const Request& req);
+    std::optional<JsonDocument> sendAuthorizedRequest(
+        const Request& req, String ctype = "application/x-www-form-urlencoded");
     /** Attempts the given request and returns the JSON response on success. */
     std::optional<JsonDocument> sendNonauthorizedRequest(const Request& req);
 

noisemeter-device/board.h

@@ -69,6 +69,8 @@ extern HWCDC USBSerial;
 
 #define SERIAL      Serial
 
+#elif defined(BOARD_TESTING)
+
 #else
 #error "Please select a board from the list in board.h!"
 #endif

noisemeter-device/noisemeter-device.ino

@@ -192,20 +192,22 @@ void loop() {
       API api (buildDeviceId(), Creds.get(Storage::Entry::Token));
 
       if (firstSend) {
-        if (api.sendMeasurementWithDiagnostics(packets.back(), NOISEMETER_VERSION, lastUpload)) {
-            packets.pop_back();
+        const bool success = api.sendMeasurementWithDiagnostics(
+          packets.front(), NOISEMETER_VERSION, lastUpload);
+
+        if (success) {
+            packets.pop_front();
             firstSend = false;
         }
-      } else {
-        std::optional<Blinker> bl;
+      }
 
-        // Only blink if there's multiple packets to send
-        if (++packets.cbegin() != packets.cend())
-          bl.emplace(200);
+      if (!packets.empty()) {
+        const bool success = (++packets.cbegin() != packets.cend())
+          ? api.sendMeasurements(packets)
+          : api.sendMeasurement(packets.front());
 
-        packets.remove_if([&api](const auto& pkt) {
-          return pkt.count <= 0 || api.sendMeasurement(pkt);
-        });
+        if (success)
+          packets.clear();
       }
 
 #if defined(BOARD_ESP32_PCB)