Change model ScanResult.ScannedCves.AffectedPackages

models/packages.go

@@ -92,15 +92,14 @@ func (ps Packages) FindOne(f func(Package) bool) (string, Package, bool) {
 
 // Package has installed packages.
 type Package struct {
-	Name        string
-	Version     string
-	Release     string
-	NewVersion  string
-	NewRelease  string
-	Arch        string
-	Repository  string
-	Changelog   Changelog
-	NotFixedYet bool // Ubuntu OVAL Only
+	Name       string
+	Version    string
+	Release    string
+	NewVersion string
+	NewRelease string
+	Arch       string
+	Repository string
+	Changelog  Changelog
 }
 
 // FormatVer returns package version-release

models/vulninfos.go

@@ -104,11 +104,28 @@ func (v VulnInfos) FormatCveSummary() string {
 		m["High"], m["Medium"], m["Low"], m["Unknown"])
 }
 
+// PackageStatuses is a list of PackageStatus
+type PackageStatuses []PackageStatus
+
+// Sort by Name
+func (p PackageStatuses) Sort() {
+	sort.Slice(p, func(i, j int) bool {
+		return p[i].Name < p[j].Name
+	})
+	return
+}
+
+// PackageStatus has name and other status abount the package
+type PackageStatus struct {
+	Name        string
+	NotFixedYet bool
+}
+
 // VulnInfo has a vulnerability information and unsecure packages
 type VulnInfo struct {
 	CveID            string
 	Confidence       Confidence
-	PackageNames     []string
+	AffectedPackages PackageStatuses
 	DistroAdvisories []DistroAdvisory // for Aamazon, RHEL, FreeBSD
 	CpeNames         []string
 	CveContents      CveContents
@@ -547,8 +564,8 @@ func (v *VulnInfo) NilToEmpty() *VulnInfo {
 	if v.DistroAdvisories == nil {
 		v.DistroAdvisories = []DistroAdvisory{}
 	}
-	if v.PackageNames == nil {
-		v.PackageNames = []string{}
+	if v.AffectedPackages == nil {
+		v.AffectedPackages = PackageStatuses{}
 	}
 	if v.CveContents == nil {
 		v.CveContents = NewCveContents()

models/vulninfos_test.go

@@ -910,3 +910,27 @@ func TestFormatMaxCvssScore(t *testing.T) {
 		}
 	}
 }
+
+func TestSortPackageStatues(t *testing.T) {
+	var tests = []struct {
+		in  PackageStatuses
+		out PackageStatuses
+	}{
+		{
+			in: PackageStatuses{
+				{Name: "b"},
+				{Name: "a"},
+			},
+			out: PackageStatuses{
+				{Name: "a"},
+				{Name: "b"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		tt.in.Sort()
+		if !reflect.DeepEqual(tt.in, tt.out) {
+			t.Errorf("\nexpected: %v\n  actual: %v\n", tt.out, tt.in)
+		}
+	}
+}