nvm that esitmated via part

database/EstimatedVehicleJourney.go

@@ -1,42 +1,11 @@
 package database
 
 import (
-	"context"
-	"crypto/md5"
 	"database/sql"
-	"encoding/hex"
 	"fmt"
-	"ti1/valki"
-
-	"github.com/valkey-io/valkey-go"
 )
 
-func InsertOrUpdateEstimatedVehicleJourney(ctx context.Context, db *sql.DB, values []interface{}, valkeyClient valkey.Client) (int, string, error) {
+func InsertOrUpdateEstimatedVehicleJourney(db *sql.DB, values []interface{}) (int, string, error) {
-	// Generate a key using lineref, directionref, datasource, and datedvehiclejourneyref
-	lineref := values[2]
-	directionref := values[3]
-	datasource := values[4]
-	datedvehiclejourneyref := values[5]
-	key := fmt.Sprintf("%v.%v.%v.%v", lineref, directionref, datasource, datedvehiclejourneyref)
-
-	// Convert values to a single string and hash it using MD5
-	var valuesString string
-	for _, v := range values {
-		if v != nil {
-			valuesString += fmt.Sprintf("%v", v)
-		}
-	}
-	hash := md5.Sum([]byte(valuesString))
-	hashString := hex.EncodeToString(hash[:])
-
-	// Get the MD5 hash from Valkey
-	retrievedHash, err := valki.GetValkeyValue(ctx, valkeyClient, key)
-	if err != nil {
-		return 0, "", fmt.Errorf("failed to get value from Valkey: %v", err)
-	}
-
-	// Check if the retrieved value matches the original MD5 hash
-	if retrievedHash != hashString {
 	query := `
 	INSERT INTO estimatedvehiclejourney (servicedelivery, recordedattime, lineref, directionref, datasource, datedvehiclejourneyref, vehiclemode, dataframeref, originref, destinationref, operatorref, vehicleref, cancellation, other, firstservicedelivery)
 	VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $1)
@@ -61,19 +30,12 @@ func InsertOrUpdateEstimatedVehicleJourney(ctx context.Context, db *sql.DB, valu
 	}
 	defer stmt.Close()
 
-		err = valki.SetValkeyValue(ctx, valkeyClient, key, hashString)
-		if err != nil {
-			return 0, "", fmt.Errorf("failed to set value in Valkey: %v", err)
-		}
-
 	var action string
 	var id int
 	err = stmt.QueryRow(values...).Scan(&action, &id)
 	if err != nil {
 		return 0, "", fmt.Errorf("error executing statement: %v", err)
 	}
+
 	return id, action, nil
-	} else {
-		return 0, "none", nil
-	}
 }

export/database.go

@@ -38,7 +38,7 @@ func DBData(data *data.Data) {
 	fmt.Println("SID:", sid)
 
 	// counters
-	var insertCount, updateCount, noneCount, totalCount, estimatedCallInsertCount, estimatedCallUpdateCount, estimatedCallNoneCount, recordedCallInsertCount, recordedCallUpdateCount, recordedCallNoneCount int
+	var insertCount, updateCount, totalCount, estimatedCallInsertCount, estimatedCallUpdateCount, estimatedCallNoneCount, recordedCallInsertCount, recordedCallUpdateCount, recordedCallNoneCount int
 
 	for _, journey := range data.ServiceDelivery.EstimatedTimetableDelivery[0].EstimatedJourneyVersionFrame.EstimatedVehicleJourney {
 		var values []interface{}
@@ -151,7 +151,7 @@ func DBData(data *data.Data) {
 		values = append(values, otherJson)
 
 		// Insert or update the record
-		id, action, err := database.InsertOrUpdateEstimatedVehicleJourney(ctx, db, values, valkeyClient)
+		id, action, err := database.InsertOrUpdateEstimatedVehicleJourney(db, values)
 		if err != nil {
 			fmt.Printf("Error inserting/updating estimated vehicle journey: %v\n", err)
 		} else {
@@ -163,10 +163,8 @@ func DBData(data *data.Data) {
 				insertCount++
 			} else if action == "update" {
 				updateCount++
-			} else if action == "none" {
-				noneCount++
 			}
-			totalCount = insertCount + updateCount + noneCount
+			totalCount = insertCount + updateCount
 
 			//fmt.Printf("Inserts: %d, Updates: %d, Total: %d\n", insertCount, updateCount, totalCount)
 			if totalCount%1000 == 0 {