Merge pull request #4 from Klausdk1999/develop

Develop
Klausdk1999 · Dec 6, 2023 · fbaf72c · fbaf72c
2 parents 950e755 + 397ec62
commit fbaf72c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/documentation/Get_all_readings-1701839548674.txt b/documentation/Get_all_readings-1701839548674.txt
diff --git a/readings_handler.go b/readings_handler.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/lib/pq"
 	_ "github.com/lib/pq"
 )
 
@@ -23,7 +24,7 @@ func getAllReadings(w http.ResponseWriter, r *http.Request) {
     db := OpenConnection()
     defer db.Close()
 
-    rows, err := db.Query("SELECT id, user_id, timestamp, value FROM readings")
+    rows, err := db.Query("SELECT id, userid, timestamp, value, torquevalues, motionwastes, setvalue FROM readings")
     if err != nil {
         http.Error(w, "Database query error", http.StatusInternalServerError)
         return
@@ -33,7 +34,7 @@ func getAllReadings(w http.ResponseWriter, r *http.Request) {
     var readings []Reading
     for rows.Next() {
         var reading Reading
-        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value)
+        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value, pq.Array(&reading.TorqueValues), pq.Array(&reading.AsmTimes), pq.Array(&reading.MotionWastes), &reading.SetValue)
 
         if err != nil {
             http.Error(w, "Error scanning readings", http.StatusInternalServerError)
@@ -64,8 +65,8 @@ func createReading(w http.ResponseWriter, r *http.Request) {
     }
 
     // Assuming timestamp is auto-generated by the database
-    sqlStatement := `INSERT INTO readings (user_id, value) VALUES ($1, $2)`
-    _, err = db.Exec(sqlStatement, reading.UserID, reading.Value)
+    sqlStatement := `INSERT INTO readings (userid, value, torquevalues, asmtimes, motionwastes, setvalue) VALUES ($1, $2, $3, $4, $5, $6)`
+    _, err = db.Exec(sqlStatement, reading.UserID, reading.Value, pq.Array(reading.TorqueValues), pq.Array(reading.AsmTimes), pq.Array(reading.MotionWastes), reading.SetValue)
 
     if err != nil {
         http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -89,7 +90,7 @@ func getUserReadings(w http.ResponseWriter, r *http.Request) {
     }
 
     // Query database for readings belonging to the user
-    rows, err := db.Query("SELECT id, user_id, timestamp, value FROM readings WHERE user_id = $1", userID)
+    rows, err := db.Query("SELECT id, userid, timestamp, value, torquevalues, asmtimes, motionwastes, setvalue FROM readings WHERE userid = $1", userID)
     if err != nil {
         http.Error(w, "Database query error", http.StatusInternalServerError)
         return
@@ -99,7 +100,7 @@ func getUserReadings(w http.ResponseWriter, r *http.Request) {
     var readings []Reading
     for rows.Next() {
         var reading Reading
-        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value)
+        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value, pq.Array(&reading.TorqueValues), pq.Array(&reading.AsmTimes), pq.Array(&reading.MotionWastes), &reading.SetValue)
 
         if err != nil {
             http.Error(w, "Error scanning readings", http.StatusInternalServerError)