Merge pull request #5 from jeoooo/refactor-1

Refactor 1

Author: jeoooo

PocketbaseArduino.cpp

@@ -5,7 +5,6 @@
 // #include <ESP8266WiFi.h>
 // #include <ESP8266HTTPClient.h>
 // #include <BearSSLHelpers.h>
-#include <ArduinoJson.h>
 
 #if defined(ESP8266)
 #include <ESP8266HTTPClient.h>
@@ -32,6 +31,12 @@ PocketbaseArduino::PocketbaseArduino(const char *baseUrl)
     fields_param = "";
 }
 
+PocketbaseArduino &PocketbaseArduino::collection(const char *collection)
+{
+    current_endpoint = "collections/" + String(collection) + "/";
+    return *this;
+}
+
 String performGETRequest(const char *endpoint)
 {
 
@@ -218,7 +223,7 @@ String performDELETERequest(const char *endpoint)
 #endif
 }
 
-String performPOSTRequest(const char *endpoint, const std::unordered_map<String, String> &params)
+String performPOSTRequest(const char *endpoint, const String &requestBody)
 {
 #if defined(ESP32)
     // ESP32 implementation
@@ -235,18 +240,6 @@ String performPOSTRequest(const char *endpoint, const std::unordered_map<String,
     {
         Serial.print("[HTTPS] POST...\n");
 
-        // Create a JSON object to hold the parameters
-        DynamicJsonDocument jsonBody(1024); // Adjust the capacity based on your needs
-
-        for (const auto &param : params)
-        {
-            jsonBody[param.first] = param.second;
-        }
-
-        // Serialize the JSON object to a string
-        String requestBody;
-        serializeJson(jsonBody, requestBody);
-
         int httpCode = http.POST(requestBody);
         if (httpCode > 0)
         {
@@ -276,12 +269,6 @@ String performPOSTRequest(const char *endpoint, const std::unordered_map<String,
 #endif
 }
 
-PocketbaseArduino &PocketbaseArduino::collection(const char *collection)
-{
-    current_endpoint = "collections/" + String(collection) + "/";
-    return *this;
-}
-
 String PocketbaseArduino::getOne(const char *recordId, const char *expand /* = nullptr */, const char *fields /* = nullptr */)
 {
     String fullEndpoint = base_url + String(current_endpoint) + "records/" + recordId;
@@ -379,11 +366,11 @@ String PocketbaseArduino::deleteRecord(const char *recordId)
     return performDELETERequest(fullEndpoint.c_str());
 }
 
-String PocketbaseArduino::create(const std::unordered_map<String, String> &params)
+String PocketbaseArduino::create(const String &requestBody)
 {
     // Construct the endpoint based on the current_endpoint
     String fullEndpoint = current_endpoint + "records/";
 
     // Call performPOSTRequest with the constructed endpoint and provided parameters
-    return performPOSTRequest(fullEndpoint.c_str(), params);
+    return performPOSTRequest(fullEndpoint.c_str(), requestBody);
 }

PocketbaseArduino.h

@@ -4,10 +4,11 @@
 #define PocketbaseArduino_h
 
 #include "Arduino.h"
-#include <ESP8266HTTPClient.h>
 
+#include <ESP8266HTTPClient.h>
 #include <ESP8266WiFi.h>
 #include <ESP8266HTTPClient.h>
+
 #include <BearSSLHelpers.h>
 
 class PocketbaseArduino
@@ -90,7 +91,7 @@ class PocketbaseArduino
         const char *expand /* = nullptr */,
         const char *fields /* = nullptr */);
 
-    String create(const std::unordered_map<String, String> &params);
+    String create(const String &requestBody);
 
 private:
     String base_url;

README.md

@@ -99,7 +99,7 @@ void loop()
 
 ## Contributing
 
-1.[Fork](https://github.com/jeoooo/PocketbaseArduino/fork) this Github repository.
+1. [Fork](https://github.com/jeoooo/PocketbaseArduino/fork) this Github repository
 2. Create your feature branch (`git checkout -b my-new-feature`).
 3. Commit your changes (`git commit -am 'Add some feature`)
 4. Push to the branch (`git push origin my-new-feature`)