nodes correctly updated for PIR, sound, air quality and contact sensors

Author: jpbandera

src/mqtt_agent.cpp

@@ -203,7 +203,7 @@ int MqttAgent::sensor_data_to_dsr(json data)
     return 0;
   }
 
-  string sensor_type_ = data["sensorType"];
+  string sensor_name_ = data["sensorName"];
   string parent_node_name_ = data["parentNode"];
 
   // get or create timestamp  
@@ -221,32 +221,33 @@ int MqttAgent::sensor_data_to_dsr(json data)
   // Check if parent node exists (if not, we cannot put the sensor in the world!)
   auto parent_node_ = G_->get_node(parent_node_name_);
   if (!parent_node_.has_value()) {
-    std::cout << "ERROR: Could not find parent node [" << parent_node_name_ << "] for sensor [" << sensor_type_ << "]. "
+    std::cout << "ERROR: Could not find parent node [" << parent_node_name_ << "] for sensor [" << sensor_name_ << "]. "
               << "Sensor node not included in the DSR" << std::endl;
     return 0;
   }
 
   // Then check if sensor node has been created and create it if necessary 
-  auto sensor_node = G_->get_node(sensor_type_);
+  auto sensor_node = G_->get_node(sensor_name_);
+  // if there's no node of that type, create node
   if (!sensor_node.has_value()) {
-    sensor_node.emplace(DSR::Node::create<sensor_node_type>(sensor_type_));
+    sensor_node.emplace(DSR::Node::create<sensor_node_type>(sensor_name_));
     if (auto id = G_->insert_node(sensor_node.value()); id.has_value()) {
-      std::cout << "Inserted sensor node [" << sensor_type_ << "] in the graph."
+      std::cout << "Inserted sensor node [" << sensor_name_ << "] in the graph."
                 << std::endl;
       // Set "IN" edge between room and sensor
       auto edge = DSR::Edge::create<in_edge_type>(sensor_node.value().id(), parent_node_.value().id());
       if (G_->insert_or_assign_edge(edge)) {
-        std::cout << "Inserted edge between [" << sensor_type_ << "] and ["
+        std::cout << "Inserted edge between [" << sensor_name_ << "] and ["
                   << parent_node_name_ << "]" << std::endl;
       }
     }
   }
-  
+ 
   // insert type_of_sensor attribute
-  G_->add_or_modify_attrib_local<type_of_sensor_att>(sensor_node.value(), (std::string)(data["sensorName"]));
+  G_->add_or_modify_attrib_local<type_of_sensor_att>(sensor_node.value(), (std::string)(data["sensorType"]));
 
   // Check type of msg and update the sensor node with the new data
-  if (data["sensorName"] == "ZPHS01B"){
+  if (data["sensorType"] == "calidad_aire"){ 
     // Add location (we use a 'room' attribute for this)
     G_->add_or_modify_attrib_local<room_att>(sensor_node.value(), (std::string)(data["sensorLocation"]));
     // Parse air quality values, update the sensor node and insert it
@@ -265,9 +266,9 @@ int MqttAgent::sensor_data_to_dsr(json data)
       G_->add_or_modify_attrib_local<toinflux_att>(sensor_node.value(), (bool)(data["toInfluxDB"]));
     G_->add_or_modify_attrib_local<measure_timestamp_att>(sensor_node.value(), (uint64_t)(timestamp_));
     G_->update_node(sensor_node.value());
-    std::cout << "Sensor node [" << sensor_type_ << "] has been updated." << std::endl;
+    std::cout << "Sensor node [" << sensor_name_ << "] has been updated." << std::endl;
   }  
-  else if (data["sensorName"] == "datoRadarRespiracion") {
+  else if (data["sensorType"] == "datoRadarRespiracion") {
     // First check data is valid
     if (data["heartrate"] <= 30 || data["breathrate"] <= 10) {
       return 0;
@@ -280,7 +281,7 @@ int MqttAgent::sensor_data_to_dsr(json data)
         auto edge_measure = DSR::Edge::create<measuring_edge_type>(
           sensor_node.value().id(), person_node_.value().id());
         if (G_->insert_or_assign_edge(edge_measure)) {
-          std::cout << "Inserted edge between [" << sensor_type_ << "] and ["
+          std::cout << "Inserted edge between [" << sensor_name_ << "] and ["
                     << person_node_.value().name() << "]" << std::endl;
         }
       }
@@ -292,9 +293,9 @@ int MqttAgent::sensor_data_to_dsr(json data)
       G_->add_or_modify_attrib_local<toinflux_att>(sensor_node.value(), (bool)(data["toInfluxDB"]));
     G_->add_or_modify_attrib_local<measure_timestamp_att>(sensor_node.value(), (uint64_t)(timestamp_));
     G_->update_node(sensor_node.value());
-    std::cout << "Sensor node [" << sensor_type_ << "] has been updated." << std::endl;
+    std::cout << "Sensor node [" << sensor_name_ << "] has been updated." << std::endl;
   }
-  else if (data["sensorName"] == "PIR sensor Adafruit ID 189"){
+  else if (data["sensorType"] == "PIR"){ 
     // Add location (we use a 'room' attribute for this)
     G_->add_or_modify_attrib_local<room_att>(sensor_node.value(), (std::string)(data["sensorLocation"]));
     // Parse presence value, update the sensor node and insert it
@@ -303,9 +304,20 @@ int MqttAgent::sensor_data_to_dsr(json data)
       G_->add_or_modify_attrib_local<toinflux_att>(sensor_node.value(), (bool)(data["toInfluxDB"]));
     G_->add_or_modify_attrib_local<measure_timestamp_att>(sensor_node.value(), (uint64_t)(timestamp_));
     G_->update_node(sensor_node.value());
-    std::cout << "Sensor node [" << sensor_type_ << "] has been updated." << std::endl;
+    std::cout << "Sensor node [" << sensor_name_ << "] has been updated." << std::endl;
   } 
-  else if (data["sensorName"] == "Grove Sound Sensor"){
+  else if (data["sensorType"] == "Contact"){ 
+    // Add location (we use a 'room' attribute for this)
+    G_->add_or_modify_attrib_local<room_att>(sensor_node.value(), (std::string)(data["sensorLocation"]));
+    // Parse open value, update the sensor node and insert it
+    G_->add_or_modify_attrib_local<open_att>(sensor_node.value(), (bool)(data["open"]));
+    if (data.contains("toInfluxDB"))
+      G_->add_or_modify_attrib_local<toinflux_att>(sensor_node.value(), (bool)(data["toInfluxDB"]));
+    G_->add_or_modify_attrib_local<measure_timestamp_att>(sensor_node.value(), (uint64_t)(timestamp_));
+    G_->update_node(sensor_node.value());
+    std::cout << "Sensor node [" << sensor_name_ << "] has been updated." << std::endl;
+  } 
+  else if (data["sensorType"] == "Sound"){ 
     // Add location (we use a 'room' attribute for this)
     G_->add_or_modify_attrib_local<room_att>(sensor_node.value(), (std::string)(data["sensorLocation"]));
     // Parse volume value, update the sensor node and insert it
@@ -314,10 +326,10 @@ int MqttAgent::sensor_data_to_dsr(json data)
       G_->add_or_modify_attrib_local<toinflux_att>(sensor_node.value(), (bool)(data["toInfluxDB"]));
     G_->add_or_modify_attrib_local<measure_timestamp_att>(sensor_node.value(), (uint64_t)(timestamp_));
     G_->update_node(sensor_node.value());
-    std::cout << "Sensor node [" << sensor_type_ << "] has been updated." << std::endl;
+    std::cout << "Sensor node [" << sensor_name_ << "] has been updated." << std::endl;
   } 
   else {
-    std::cout << "sensor_data_to_dsr ERROR: Sensor " << data["sensorName"] << " not supported by mqtt_agent (yet)" << std::endl;
+    std::cout << "sensor_data_to_dsr ERROR: Sensor " << data["sensorType"] << " not supported by mqtt_agent (yet)" << std::endl;
     return 0;
   }