fix: memory

Author: Angular2Guy

backend/pkd/gasstation/gsbaserepo.go

@@ -82,8 +82,8 @@ func createPostCodeMaps() (map[int]pcmodel.PostCodeLocation, map[int]pcmodel.Sta
 	return postCodePostCodeLocationMap, idStateDataMap, idCountyDataMap
 }
 
-func createGasStationIdGasPriceMap(postCodeGasStationsMap *map[string][]gsmodel.GasStation, timeframe TimeFrame) map[string][]gsmodel.GasPrice {
-	gasPrices := findGasPricesByTimeframe(postCodeGasStationsMap, timeframe)
+func createGasStationIdGasPriceMap(gasStations *[]gsmodel.GasStation, timeframe TimeFrame) map[string][]gsmodel.GasPrice {
+	gasPrices := findGasPricesByTimeframe(gasStations, timeframe)
 	//log.Printf("gasPrices: %v", len(gasPrices))
 	gasStationIdGasPriceMap := make(map[string][]gsmodel.GasPrice)
 	for _, myGasPrice := range gasPrices {
@@ -98,8 +98,8 @@ func createGasStationIdGasPriceMap(postCodeGasStationsMap *map[string][]gsmodel.
 	return gasStationIdGasPriceMap
 }
 
-func createGasStationIdGasPriceArrayMap(postCodeGasStationsMap *map[string][]gsmodel.GasStation, timeframe TimeFrame) map[string][]gsmodel.GasPrice {
-	gasPrices := findGasPricesByTimeframe(postCodeGasStationsMap, timeframe)
+func createGasStationIdGasPriceArrayMap(gasStations *[]gsmodel.GasStation, timeframe TimeFrame) map[string][]gsmodel.GasPrice {
+	gasPrices := findGasPricesByTimeframe(gasStations, timeframe)
 	//log.Printf("gasPrices: %v", len(gasPrices))
 	gasStationIdGasPriceMap := make(map[string][]gsmodel.GasPrice)
 	for _, myGasPrice := range gasPrices {
@@ -113,12 +113,10 @@ func createGasStationIdGasPriceArrayMap(postCodeGasStationsMap *map[string][]gsm
 	return gasStationIdGasPriceMap
 }
 
-func findGasPricesByTimeframe(postCodeGasStationsMap *map[string][]gsmodel.GasStation, timeframe TimeFrame) []gsmodel.GasPrice {
+func findGasPricesByTimeframe(gasStations *[]gsmodel.GasStation, timeframe TimeFrame) []gsmodel.GasPrice {
 	var gasStationIds []string
-	for _, myGasStations := range *postCodeGasStationsMap {
-		for _, myGasStation := range myGasStations {
-			gasStationIds = append(gasStationIds, myGasStation.ID)
-		}
+	for _, myGasStation := range *gasStations {
+		gasStationIds = append(gasStationIds, myGasStation.ID)
 	}
 	//log.Printf("gasStationIds: %v", len(gasStationIds))
 	gasPrices := FindPricesByStids(&gasStationIds, 0, timeframe, false)

backend/pkd/gasstation/gsrepo.go

@@ -162,14 +162,15 @@ func ReCalcCountyStatePrices() {
 	log.Printf("recalcCountyStatePrices started.")
 	myStart := time.Now()
 	postCodePostCodeLocationMap, idStateDataMap, idCountyDataMap, postCodeGasStationsMap := createPostCodeGasStationMaps()
-	gasStationIdGasPriceMap := createGasStationIdGasPriceMap(&postCodeGasStationsMap, Month)
-	log.Printf("gasStationIdGasPriceMap: %v", len(gasStationIdGasPriceMap))
+	//gasStationIdGasPriceMap := createGasStationIdGasPriceMap(&postCodeGasStationsMap, Month)
 	resetDataMaps(&idStateDataMap, &idCountyDataMap)
 	//sum up prices and count stations
 	for _, myPostCodeLocation := range postCodePostCodeLocationMap {
 		myPostCode := postcode.FormatPostCode(myPostCodeLocation.PostCode)
-		for _, myGasStation := range postCodeGasStationsMap[myPostCode] {
-			for _, myGasPrice := range gasStationIdGasPriceMap[myGasStation.ID] {
+		gasStations := postCodeGasStationsMap[myPostCode]
+		//log.Printf("gasStationIdGasPriceMap: %v", len(gasStations))
+		for _, myGasStationPrices := range createGasStationIdGasPriceMap(&gasStations, Month) {
+			for _, myGasPrice := range myGasStationPrices {
 				if myGasPrice.E5 < 10 && myGasPrice.E10 < 10 && myGasPrice.Diesel < 10 {
 					continue
 				}
@@ -234,10 +235,12 @@ func ReCalcCountyStatePrices() {
 }
 
 func createCodeTimeSliceBuckets(postCodePostCodeLocationMap map[int]pcmodel.PostCodeLocation, postCodeGasStationsMap map[string][]gsmodel.GasStation) map[string]map[time.Time][]gsmodel.GasPrice {
-	gasStationIdGasPriceMap := createGasStationIdGasPriceArrayMap(&postCodeGasStationsMap, Day)
+	//gasStationIdGasPriceMap := createGasStationIdGasPriceArrayMap(&postCodeGasStationsMap, Day)
 	postCodeTimeSliceBuckets := make(map[string]map[time.Time][]gsmodel.GasPrice)
 	for _, myPostCodeLocation := range postCodePostCodeLocationMap {
 		myPostCode := postcode.FormatPostCode(myPostCodeLocation.PostCode)
+		gasStations := postCodeGasStationsMap[myPostCode]
+		gasStationIdGasPriceMap := createGasStationIdGasPriceArrayMap(&gasStations, Day)
 		for _, myGasStation := range postCodeGasStationsMap[myPostCode] {
 			yesterday := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, -1).Round(time.Hour)
 			//yesterday := time.Now().AddDate(0, 0, -1).Round(time.Hour)
@@ -350,6 +353,7 @@ func CalcCountyTimeSlots() {
 	log.Printf("calcCountyTimeSlots started.")
 	myStart := time.Now()
 	postCodePostCodeLocationMap, _, idCountyDataMap, postCodeGasStationsMap := createPostCodeGasStationMaps()
+
 	postCodeTimeSliceBuckets := createCodeTimeSliceBuckets(postCodePostCodeLocationMap, postCodeGasStationsMap)
 	//log.Printf("postCodeTimeSliceBuckets: %v\n", len(postCodeGasStationsMap))
 	database.DB.Transaction(func(tx *gorm.DB) error {