Merge pull request #3 from Klausdk1999/develop

Develop

documentation/Get_all_readings-1701839548674.txt

@@ -0,0 +1,13 @@
+HTTP/2 500 
+date: Wed, 06 Dec 2023 05:11:59 GMT
+content-type: text/plain; charset=utf-8
+cf-ray: 831207fd8bbff8f9-NVT
+cf-cache-status: DYNAMIC
+vary: Accept-Encoding
+rndr-id: 26e2e19f-af75-49a5
+x-content-type-options: nosniff
+x-render-origin-server: Render
+server: cloudflare
+alt-svc: h3=":443"; ma=86400
+
+Database query error

readings_handler.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/lib/pq"
 	_ "github.com/lib/pq"
 )
 
@@ -24,7 +23,7 @@ func getAllReadings(w http.ResponseWriter, r *http.Request) {
     db := OpenConnection()
     defer db.Close()
 
-    rows, err := db.Query("SELECT id, user_id, timestamp, value, torque_values, asm_times, motion_wastes, set_value FROM readings")
+    rows, err := db.Query("SELECT id, user_id, timestamp, value FROM readings")
     if err != nil {
         http.Error(w, "Database query error", http.StatusInternalServerError)
         return
@@ -34,7 +33,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, pq.Array(&reading.TorqueValues), pq.Array(&reading.AsmTimes), pq.Array(&reading.MotionWastes), &reading.SetValue)
+        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value)
 
         if err != nil {
             http.Error(w, "Error scanning readings", http.StatusInternalServerError)
@@ -65,8 +64,8 @@ func createReading(w http.ResponseWriter, r *http.Request) {
     }
 
     // Assuming timestamp is auto-generated by the database
-    sqlStatement := `INSERT INTO readings (user_id, value, torque_values, asm_times, motion_wastes, set_value) 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)
+    sqlStatement := `INSERT INTO readings (user_id, value) VALUES ($1, $2)`
+    _, err = db.Exec(sqlStatement, reading.UserID, reading.Value)
 
     if err != nil {
         http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -90,7 +89,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, torque_values, asm_times, motion_wastes, set_value FROM readings WHERE user_id = $1", userID)
+    rows, err := db.Query("SELECT id, user_id, timestamp, value FROM readings WHERE user_id = $1", userID)
     if err != nil {
         http.Error(w, "Database query error", http.StatusInternalServerError)
         return
@@ -100,7 +99,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, pq.Array(&reading.TorqueValues), pq.Array(&reading.AsmTimes), pq.Array(&reading.MotionWastes), &reading.SetValue)
+        err := rows.Scan(&reading.ID, &reading.UserID, &reading.Timestamp, &reading.Value)
 
         if err != nil {
             http.Error(w, "Error scanning readings", http.StatusInternalServerError)

user_readings_handler.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
+	"github.com/lib/pq"
 	_ "github.com/lib/pq"
 )
 
@@ -33,17 +34,18 @@ func UserReadingsHandler(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, user_id, timestamp, value, torque_values, asm_times, motion_wastes, set_value FROM readings WHERE user_id = $1", userID)
     if err != nil {
         http.Error(w, "Database query error", http.StatusInternalServerError)
         return
     }
     defer rows.Close()
 
-    var readings []Reading
+ 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)
             return