fix: fixed gs not adding SN data when present.

stefa168 · Nov 26, 2023 · 8e874ec · 8e874ec
1 parent a102576
commit 8e874ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ timescale-data
 .idea/dataSources.xml
 .idea/git_toolbox_prj.xml
 .idea/remote-targets.xml
+playground.sql
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider

diff --git a/.idea/growatt_server.iml b/.idea/growatt_server.iml
diff --git a/...652e5edba434d94d2a7738e5c166668c779c.json → ...1e3fe5f0e0ae03ef7e019f05b430ef004d98.json b/...652e5edba434d94d2a7738e5c166668c779c.json → ...1e3fe5f0e0ae03ef7e019f05b430ef004d98.json
diff --git a/src/main.rs b/src/main.rs
@@ -241,8 +241,9 @@ impl ConnectionHandler {
 
         debug!("Message type: {:?}", &datamessage.data_type);
 
-        let r = sqlx::query!("INSERT INTO inverter_messages (raw, type, header, time) VALUES ($1, $2, $3, $4) returning id",
-            datamessage.raw, serde_json::to_string(&datamessage.data_type).unwrap(), datamessage.header, datamessage.time)
+        // First save the complete message
+        let r = sqlx::query!("INSERT INTO inverter_messages (raw, type, header, time, inverter_sn) VALUES ($1, $2, $3, $4, $5) returning id",
+            datamessage.raw, serde_json::to_string(&datamessage.data_type).unwrap(), datamessage.header, datamessage.time, datamessage.serial_number)
             .fetch_one(&self.db_pool)
             // todo handle unlikely scenarios
             .await;
@@ -254,6 +255,7 @@ impl ConnectionHandler {
 
         let id = r.unwrap().id;
 
+        // Then all the additional deserialized parts of the message (if present)
         for (key, value) in datamessage.data {
             sqlx::query!(
                 "INSERT INTO message_data (message_id, key, value) VALUES ($1, $2, $3)",