From aca7485b3c9ec9e1af94df895aab009589591d39 Mon Sep 17 00:00:00 2001
From: Michael Mraka <michael.mraka@redhat.com>
Date: Wed, 25 Oct 2023 13:48:58 +0200
Subject: [PATCH] fixup! RHINENG-2284: updated evaluation to store data in
 {system_package,package_system}_data tables

---
 evaluator/evaluate_packages.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/evaluator/evaluate_packages.go b/evaluator/evaluate_packages.go
index dcee9af6d..89a7156cd 100644
--- a/evaluator/evaluate_packages.go
+++ b/evaluator/evaluate_packages.go
@@ -151,7 +151,7 @@ func loadSystemNEVRAsFromDB(tx *gorm.DB, system *models.SystemPlatform,
 			updatable++
 		}
 		pkgMeta, ok := memoryPackageCache.GetByNevra(nevra)
-		pkgUpdateData := packageUpdateData(availableUpdates)
+		pkgUpdateData := packageUpdateData(pkgMeta.Evra, availableUpdates)
 		// before we used nevra.EVRAString() function which shows only non zero epoch, keep it consistent
 		// maybe we need here something like: evra := strings.TrimPrefix(upData.GetEVRA(), "0:")
 		if ok {
@@ -214,15 +214,16 @@ func loadSystemNEVRAsFromDB(tx *gorm.DB, system *models.SystemPlatform,
 	return packages, installed, updatable, err
 }
 
-func packageUpdateData(availableUpdates []vmaas.UpdatesV3ResponseAvailableUpdates) models.PackageUpdateData {
-	data := models.PackageUpdateData{}
+func packageUpdateData(installedEvra string,
+	availableUpdates []vmaas.UpdatesV3ResponseAvailableUpdates) models.PackageUpdateData {
+	data := models.PackageUpdateData{Installed: installedEvra}
 	for _, p := range availableUpdates {
 		if p.Package != nil {
 			switch p.StatusID {
 			case APPLICABLE:
-				data.Applicable = *p.Package
+				data.Applicable = *p.EVRA
 			case INSTALLABLE:
-				data.Installable = *p.Package
+				data.Installable = *p.EVRA
 			}
 		}
 	}