Merge pull request 'patch' (#22) from develop into master

Reviewed-on: #22

include/Program.h

@@ -22,7 +22,6 @@ public:
     void checkNfc();
     void checkServo();
     void checkWifi();
-    void moveStepper();
 private:
     DolibarrClient *client;
     ServoMotorComponent *servo;

lib/DolibarrClient/src/DolibarrClient.cpp

@@ -4,8 +4,6 @@
 #include <iostream>
 #include "M5LCD.h"
 
-HTTPClient *client = new HTTPClient();
-
 DolibarrClient::DolibarrClient(struct DolibarrConfig dolibarr_config) : dolibarr(dolibarr_config) {
     #if defined(DEBUG)
         Serial.println(" --- Dolibarr configuration --- ");
@@ -16,6 +14,7 @@ DolibarrClient::DolibarrClient(struct DolibarrConfig dolibarr_config) : dolibarr
 }
 
 HTTPClient *DolibarrClient::build_url(const String& url) const {
+    auto *client = new HTTPClient();
     String clientUrl = this->dolibarr.url + url;
     client->begin(clientUrl);
     client->addHeader("Content-Type", "application/json");
@@ -26,12 +25,40 @@ HTTPClient *DolibarrClient::build_url(const String& url) const {
     return client;
 }
 
+
+int DolibarrClient::login() const {
+    HTTPClient *client = this->build_url(API_LOGIN_URL);
+    int httpResponseCode = client->GET();
+    if (httpResponseCode > 0) {
+        DynamicJsonDocument doc(384);
+        DeserializationError error = deserializeJson(doc, client->getString().c_str());
+        if (error) {
+            Serial.println("ERROR: ");
+            Serial.println(error.c_str());
+            delete client;
+            return -1;
+        }
+        delete client;
+        return 0;
+    }
+    delete client;
+    return -1;
+}
+
 String replace_id(const char *str, const char *id) {
     String url(str);
     url.replace("{id}", id);
     return url;
 }
 
+std::vector<models::Product> *DolibarrClient::list_products() const {
+    HTTPClient *client = this->build_url(API_LIST_PRODUCT_URL);
+    if (client->GET() == HTTP_CODE_OK) {
+
+    }
+    return nullptr;
+}
+
 models::Product DolibarrClient::get_product_by_factory_id(const char* factory_id) const {
     HTTPClient *client = this->build_url(replace_id("/products?sortorder=ASC&limit=1&sqlfilters=(t.accountancy_code_sell:like:'{id}')", factory_id).c_str());
     if (client->GET() == HTTP_CODE_OK) {
@@ -40,6 +67,7 @@ models::Product DolibarrClient::get_product_by_factory_id(const char* factory_id
         if (error) {
             Serial.println("ERROR: ");
             Serial.println(error.c_str());
+            delete client;
             return {};
         }
         for (auto obj : doc.as<JsonArray>()) {
@@ -52,10 +80,13 @@ models::Product DolibarrClient::get_product_by_factory_id(const char* factory_id
             product.accountancy_code_sell = obj["accountancy_code_sell"].as<std::string>();
             product.accountancy_code_sell_export = obj["accountancy_code_sell_export"].as<std::string>();
             product.fk_default_warehouse = obj["fk_default_warehouse"].as<std::string>();
+            delete client;
             return product;
         }
+        delete client;
         return {};
     }
+    delete client;
     return {};
 }
 
@@ -65,6 +96,7 @@ models::Product *DolibarrClient::get_product_by_id(const char* id_product) const
         DynamicJsonDocument doc(6144);
         DeserializationError error = deserializeJson(doc, client->getString().c_str());
         if (error) {
+            delete client;
             return nullptr;
         }
         auto *product = new models::Product();
@@ -75,8 +107,10 @@ models::Product *DolibarrClient::get_product_by_id(const char* id_product) const
         product->label = doc["label"].as<std::string>();
         product->accountancy_code_sell = doc["accountancy_code_sell"].as<std::string>();
         product->accountancy_code_sell_export = doc["accountancy_code_sell_export"].as<std::string>();
+        delete client;
         return product;
     }
+    delete client;
     return nullptr;
 }
 
@@ -88,6 +122,7 @@ std::vector<models::Warehouse> *DolibarrClient::list_warehouse() const {
         if (error) {
             Serial.println("ERROR: ");
             Serial.println(error.c_str());
+            delete client;
             return nullptr;
         }
         auto *warehouses = new std::vector<models::Warehouse>();
@@ -97,8 +132,10 @@ std::vector<models::Warehouse> *DolibarrClient::list_warehouse() const {
             warehouse.label = obj["label"].as<std::string>();
             warehouses->push_back(warehouse);
         }
+        delete client;
         return warehouses;
     }
+    delete client;
     return nullptr;
 }
 
@@ -114,6 +151,7 @@ int DolibarrClient::create_movement(models::CreateProductStock stock) const {
     serializeJson(doc, result);
     Serial.println(result.c_str());
     if (client->POST(result.c_str()) == HTTP_CODE_OK) {
+        delete client;
         return 0;
     }
     return -1;

lib/DolibarrClient/src/DolibarrClient.h

@@ -20,7 +20,9 @@ class DolibarrClient {
 public:
     DolibarrClient(DolibarrConfig dolibarr_config);
     ~DolibarrClient() = default;
+    int login() const;
     std::vector<models::Warehouse> *list_warehouse() const;
+    std::vector<models::Product> *list_products() const;
     models::Product *get_product_by_id(const char* id_product) const;
     models::Product get_product_by_factory_id(const char* uuid) const;
     int create_movement(models::CreateProductStock stock) const;

lib/GRBL/src/GRBL.cpp

@@ -36,7 +36,7 @@ void GRBL::mouveForward(int mm){
 bool GRBL::isIddle(){
     bool sortie = false;
 
-    if(this->grbl->readStatus().indexOf("IDLE") != -1) {
+    if(this->grbl->readStatus().indexOf("IDLE") != -1){
         sortie = true;
     }
 

lib/M5LCD/src/M5LCD.cpp

@@ -4,7 +4,7 @@
  * M5LCD classe
  */
 
-M5LCD::M5LCD() : _current_page(0), _logs() , _debug_loc_y(0), _components_status({COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_OK}) {
+M5LCD::M5LCD() : _current_page(0), _logs() , _debug_loc_y(0), _components_status({COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_KO}) {
     this->_product_id = std::string("");
     this->_product_label = std::string("");
     this->_last_nfc = std::string("");