diff --git a/src/nfc.cpp b/src/nfc.cpp index f8be623..0855d11 100644 --- a/src/nfc.cpp +++ b/src/nfc.cpp @@ -1900,19 +1900,27 @@ String optimizeJsonForFastPath(const char* payload) { JsonDocument optimizedDoc; // Always add sm_id first (even if it's "0" for brand filaments) - if (inputDoc["sm_id"].is()) { + // Also convert spool_id to sm_id if present (backend may send either) + if (inputDoc["sm_id"].is() && inputDoc["sm_id"].as() != "0" && inputDoc["sm_id"].as() != "") { optimizedDoc["sm_id"] = inputDoc["sm_id"].as(); Serial.print("Optimizing JSON: sm_id found = "); Serial.println(inputDoc["sm_id"].as()); + } else if (inputDoc["spool_id"].is() && inputDoc["spool_id"].as() > 0) { + optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as()); + Serial.print("Optimizing JSON: Converted spool_id to sm_id = "); + Serial.println(inputDoc["spool_id"].as()); + } else if (inputDoc["spool_id"].is() && inputDoc["spool_id"].as() != "0" && inputDoc["spool_id"].as() != "") { + optimizedDoc["sm_id"] = inputDoc["spool_id"].as(); + Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = "); + Serial.println(inputDoc["spool_id"].as()); } else { optimizedDoc["sm_id"] = "0"; // Default for brand filaments - Serial.println("Optimizing JSON: No sm_id found, setting to '0'"); + Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'"); } - // Add all other keys in original order for (JsonPair kv : inputDoc.as()) { String key = kv.key().c_str(); - if (key != "sm_id") { // Skip sm_id as it's already added first + if (key != "sm_id" && key != "spool_id") { optimizedDoc[key] = kv.value(); } } diff --git a/src/website.cpp b/src/website.cpp index dd85533..1f508f0 100644 --- a/src/website.cpp +++ b/src/website.cpp @@ -227,11 +227,14 @@ void setupWebserver(AsyncWebServer &server) { String payloadString; serializeJson(doc, payloadString); + bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull(); int spoolId = doc["spool_id"] | 0; + if (spoolId == 0 && doc["sm_id"].is()) { + spoolId = doc["sm_id"].as().toInt(); + } int locationId = doc["location_id"] | 0; - // Start write task (fire and forget) - startWriteJsonToTag(!doc["spool_id"].isNull(), payloadString.c_str(), spoolId, locationId); + startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId); // Respond immediately request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");