From fd70e45ea1eb3b6c18704417c266c2084349e097 Mon Sep 17 00:00:00 2001 From: Peder Vatn Austad Date: Thu, 26 Dec 2024 15:14:48 +0100 Subject: [PATCH] id print change --- data/data.go | 2 +- database/EstimatedVehicleJourney.go | 10 ++++------ export/database.go | 4 +++- main.go | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/data.go b/data/data.go index 0a18bdd..1d162d6 100644 --- a/data/data.go +++ b/data/data.go @@ -169,7 +169,7 @@ func FetchData() (*Data, error) { }, } - resp, err := client.Get("https://api.entur.io/realtime/v1/rest/et?useOriginalId=true&maxSize=100000") + resp, err := client.Get("https://api.entur.io/realtime/v1/rest/et?useOriginalId=true&maxSize=10") if err != nil { return nil, err } diff --git a/database/EstimatedVehicleJourney.go b/database/EstimatedVehicleJourney.go index a78374a..57692fe 100644 --- a/database/EstimatedVehicleJourney.go +++ b/database/EstimatedVehicleJourney.go @@ -5,7 +5,7 @@ import ( "fmt" ) -func InsertOrUpdateEstimatedVehicleJourney(db *sql.DB, values []interface{}) error { +func InsertOrUpdateEstimatedVehicleJourney(db *sql.DB, values []interface{}) (int, string, error) { query := ` INSERT INTO estimatedvehiclejourney (servicedelivery, recordedattime, lineref, directionref, datasource, datedvehiclejourneyref, vehiclemode, dataframeref, originref, destinationref, operatorref, vehicleref, cancellation, other) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) @@ -26,7 +26,7 @@ func InsertOrUpdateEstimatedVehicleJourney(db *sql.DB, values []interface{}) err stmt, err := db.Prepare(query) if err != nil { - return fmt.Errorf("error preparing statement: %v", err) + return 0, "", fmt.Errorf("error preparing statement: %v", err) } defer stmt.Close() @@ -34,10 +34,8 @@ func InsertOrUpdateEstimatedVehicleJourney(db *sql.DB, values []interface{}) err var id int err = stmt.QueryRow(values...).Scan(&action, &id) if err != nil { - return fmt.Errorf("error executing statement: %v", err) + return 0, "", fmt.Errorf("error executing statement: %v", err) } - fmt.Printf("Action: %s, ID: %d\n", action, id) - - return nil + return id, action, nil } diff --git a/export/database.go b/export/database.go index 860683b..b7d60ac 100644 --- a/export/database.go +++ b/export/database.go @@ -136,9 +136,11 @@ func DBData(data *data.Data) { values = append(values, otherJson) // Insert or update the record - err = database.InsertOrUpdateEstimatedVehicleJourney(db, values) + id, action, err := database.InsertOrUpdateEstimatedVehicleJourney(db, values) if err != nil { fmt.Printf("Error inserting/updating estimated vehicle journey: %v\n", err) + } else { + fmt.Printf("Action: %s, ID: %d\n", action, id) } } } diff --git a/main.go b/main.go index 715dccf..2d26cc1 100644 --- a/main.go +++ b/main.go @@ -17,6 +17,7 @@ func main() { //export.ExportToCSV(data) export.DBData(data) + //export.PrintData(data) //log.Printf("Data fetched successfully: %+v", data)