RHINENG-21786: refactor advisory notification

so we can get rid of special handling of AdvisoryTypes

Author: MichaelMraka

base/database/setup.go

@@ -1,7 +1,6 @@
 package database
 
 import (
-	"app/base/models"
 	"app/base/utils"
 	"fmt"
 	"time"
@@ -23,7 +22,6 @@ var (
 	DB                 *gorm.DB
 	DBReadReplica      *gorm.DB
 	OtherAdvisoryTypes []string
-	AdvisoryTypes      map[int]string
 	globalPgConfig     map[DBMode]PostgreSQLConfig = make(map[DBMode]PostgreSQLConfig)
 )
 
@@ -172,20 +170,4 @@ func loadAdditionalParamsFromDB() {
 	if err != nil {
 		panic(err)
 	}
-
-	// Load AdvisoryTypes
-	var types []models.AdvisoryType
-
-	err = DB.Table("advisory_type").
-		Select("id, name").
-		Scan(&types).Error
-	utils.LogDebug("advisory_types", types, "Advisory types loaded from DB")
-	if err != nil {
-		panic(err)
-	}
-
-	AdvisoryTypes = make(map[int]string)
-	for _, at := range types {
-		AdvisoryTypes[at.ID] = at.Name
-	}
 }

base/database/setup_test.go

@@ -2,8 +2,9 @@ package database
 
 import (
 	"app/base/utils"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDBCheck(t *testing.T) {
@@ -15,5 +16,5 @@ func TestAdditionalParams(t *testing.T) {
 	utils.SkipWithoutDB(t)
 	Configure()
 
-	assert.True(t, len(AdvisoryTypes) == 5)
+	assert.True(t, len(OtherAdvisoryTypes) == 2)
 }

evaluator/notifications.go

@@ -2,7 +2,6 @@ package evaluator
 
 import (
 	"app/base"
-	"app/base/database"
 	"app/base/models"
 	"app/base/mqueue"
 	ntf "app/base/notification"
@@ -32,35 +31,18 @@ func getUnnotifiedAdvisories(tx *gorm.DB, accountID int, newAdvs SystemAdvisoryM
 		advIDs = append(advIDs, a.AdvisoryID)
 	}
 
-	var advNames []string
 	err := tx.Table("advisory_account_data as acd").
-		Select("am.name").
+		Select("am.id as advisory_id, am.name as advisory_name, at.name as advisory_type, am.synopsis").
 		Joins("inner join advisory_metadata am on am.id = acd.advisory_id").
+		Joins("inner join advisory_type at on at.id = am.advisory_type_id").
 		Where("acd.rh_account_id = ? AND acd.advisory_id IN (?)"+
 			"AND acd.notified IS NULL AND acd.systems_installable > 0", accountID, advIDs).
 		Order("am.name ASC").
-		Scan(&advNames).Error
+		Scan(&unAdvs).Error
 	if err != nil {
 		return nil, errors.Wrap(err, "querying unnotified advisories from DB failed")
 	}
 
-	if len(advNames) == 0 {
-		return nil, nil
-	}
-
-	for _, n := range advNames {
-		if a, ok := newAdvs[n]; ok {
-			unAdvs = append(
-				unAdvs,
-				ntf.Advisory{
-					AdvisoryID:   a.AdvisoryID,
-					AdvisoryName: a.Advisory.Name,
-					AdvisoryType: database.AdvisoryTypes[a.Advisory.AdvisoryTypeID],
-					Synopsis:     a.Advisory.Synopsis,
-				})
-		}
-	}
-
 	return unAdvs, nil
 }