RHINENG-2281: remove system_package table from /packages/version

base/database/utils.go

@@ -34,13 +34,6 @@ func PackageSystemDataShort(tx *gorm.DB, accountID int) *gorm.DB {
 		Where("pd.rh_account_id = ?", accountID)
 }
 
-func SystemPackages(tx *gorm.DB, accountID int, groups map[string]string) *gorm.DB {
-	return Systems(tx, accountID, groups).
-		Joins("JOIN system_package spkg on spkg.system_id = sp.id AND spkg.rh_account_id = ?", accountID).
-		Joins("JOIN package p on p.id = spkg.package_id").
-		Joins("JOIN package_name pn on pn.id = spkg.name_id")
-}
-
 func SystemPackageData(tx *gorm.DB, accountID int, groups map[string]string) *gorm.DB {
 	return Systems(tx, accountID, groups).
 		Joins(`JOIN (SELECT system_id,

base/models/models.go

@@ -122,10 +122,6 @@ type SystemPackage struct {
 	NameID     int64
 }
 
-func (SystemPackage) TableName() string {
-	return "system_package"
-}
-
 type PackageUpdate struct {
 	EVRA     string `json:"evra"`
 	Advisory string `json:"-"` // don't show it in API, we can probably remove it completely later

manager/controllers/package_versions.go

@@ -46,10 +46,10 @@ func packagesNameID(db *gorm.DB, pkgName string) *gorm.DB {
 }
 
 func packageVersionsQuery(db *gorm.DB, acc int, groups map[string]string, packageNameIDs []int) *gorm.DB {
-	query := database.SystemPackages(db, acc, groups).
+	query := database.SystemPackageData(db, acc, groups).
 		Distinct(PackageVersionSelect).
 		Where("sp.stale = false").
-		Where("spkg.name_id in (?)", packageNameIDs)
+		Where("p.name_id in (?)", packageNameIDs)
 	return query
 }