fix: county prices

Author: Angular2Guy

backend/pkd/fileimport/postcodeimport.go

@@ -189,7 +189,7 @@ func updateCountyStatePrices(plzs []string) {
 		gasStationStids = append(gasStationStids, myGasStation.ID)
 		plzGasStation[myGasStation.PostCode] = append(plzGasStation[myGasStation.PostCode], myGasStation)
 	}
-	myGasPrices := gasstation.FindPricesByStids(&gasStationStids, 5, gasstation.Month)
+	myGasPrices := gasstation.FindPricesByStids(&gasStationStids, 5, gasstation.Month, false)
 	gasStationIdGasPrices := make(map[string][]gsmodel.GasPrice)
 	for _, myGasPrice := range myGasPrices {
 		gasStationIdGasPrices[myGasPrice.GasStationID] = append(gasStationIdGasPrices[myGasPrice.GasStationID], myGasPrice)

backend/pkd/gasstation/gsbaserepo.go

@@ -121,7 +121,7 @@ func findGasPricesByTimeframe(postCodeGasStationsMap *map[string][]gsmodel.GasSt
 		}
 	}
 	//log.Printf("gasStationIds: %v", len(gasStationIds))
-	gasPrices := FindPricesByStids(&gasStationIds, 0, timeframe)
+	gasPrices := FindPricesByStids(&gasStationIds, 0, timeframe, false)
 	return gasPrices
 }
 
@@ -135,7 +135,7 @@ func createPostCodeGasStationsMap() map[string][]gsmodel.GasStation {
 	return postCodeGasStationsMap
 }
 
-func findPricesByStids(stids *[]string, resultLimit int, timeframe TimeFrame) []gsmodel.GasPrice {
+func findPricesByStids(stids *[]string, resultLimit int, timeframe TimeFrame, onlyLastUpdate bool) []gsmodel.GasPrice {
 	var myGasPrices []gsmodel.GasPrice
 	var myTimeFrame time.Time
 	if timeframe == Day {
@@ -156,7 +156,10 @@ func findPricesByStids(stids *[]string, resultLimit int, timeframe TimeFrame) []
 			}
 			myQuery.Find(&values)
 			//log.Printf("%v", values)
-			var lastUpdates = returnLastUpdatesGasStation(&values)
+			var lastUpdates = values
+			if onlyLastUpdate {
+				lastUpdates = returnLastUpdatesGasStation(&values)
+			}
 			//log.Printf("%v", lastUpdates)
 			myGasPrices = append(myGasPrices, lastUpdates...)
 		}

backend/pkd/gasstation/gsrepo.go

@@ -95,7 +95,7 @@ func UpdatePrice(gasStationPrices *[]GasStationPrices) {
 		stationPricesKeys = append(stationPricesKeys, value.GasStationID)
 	}
 	gasPriceUpdateMap := make(map[string]gsmodel.GasPrice)
-	stationPricesDb := FindPricesByStids(&stationPricesKeys, 0, Month)
+	stationPricesDb := FindPricesByStids(&stationPricesKeys, 0, Month, true)
 	log.Printf("StationPricesKeys: %v StationPricesDb: %v", len(stationPricesKeys), len(stationPricesDb))
 	for _, value := range stationPricesDb {
 		if _, found := gasPriceUpdateMap[value.GasStationID]; !found {
@@ -383,8 +383,8 @@ func FindById(id string) gsmodel.GasStation {
 	return myGasStation
 }
 
-func FindPricesByStids(stids *[]string, resultLimit int, timeframe TimeFrame) []gsmodel.GasPrice {
-	myGasPrice := findPricesByStids(stids, resultLimit, timeframe)
+func FindPricesByStids(stids *[]string, resultLimit int, timeframe TimeFrame, onlyLastUpdate bool) []gsmodel.GasPrice {
+	myGasPrice := findPricesByStids(stids, resultLimit, timeframe, onlyLastUpdate)
 	return myGasPrice
 }