RHINENG-25740: mark deleted systems only as culled

and let delete_system() running from the job deal with stale/unstale trigger

Author: MichaelMraka

listener/common_test.go

@@ -72,11 +72,11 @@ func assertSystemNotInDB(t *testing.T) {
 	assert.Equal(t, 0, int(systemCount))
 }
 
-func assertSystemStaleAndCulled(t *testing.T) {
+func assertSystemCulled(t *testing.T) {
 	var systemCount int64
 	now := time.Now()
 	assert.Nil(t, database.DB.Model(models.SystemPlatform{}).
-		Where("stale = true AND stale_timestamp < ? AND culled_timestamp < ?", now, now).
+		Where("culled_timestamp < ?", now).
 		Where("inventory_id = ?::uuid", id).Count(&systemCount).Error)
 
 	assert.Equal(t, 1, int(systemCount))

listener/events.go

@@ -81,8 +81,6 @@ func HandleDelete(event mqueue.PlatformEvent) error {
 	// mark system as stale and let system_culling job remove it later
 	query := database.DB.Model(&models.SystemInventory{}).Where("inventory_id = ?::uuid", event.ID).
 		Updates(map[string]interface{}{
-			"stale":            true,
-			"stale_timestamp":  gorm.Expr("NOW()"),
 			"culled_timestamp": gorm.Expr("NOW()"),
 		})
 	err = query.Error

listener/events_test.go

@@ -50,7 +50,7 @@ func TestDeleteSystem(t *testing.T) {
 	deleteEvent := createTestDeleteEvent(id)
 	err := HandleDelete(deleteEvent)
 	assert.NoError(t, err)
-	assertSystemStaleAndCulled(t)
+	assertSystemCulled(t)
 	deleteData(t)
 }
 
@@ -136,7 +136,7 @@ func TestCreateDeleteUpload(t *testing.T) {
 	deleteEvent := createTestDeleteEvent(id)
 	err = HandleDelete(deleteEvent)
 	assert.NoError(t, err)
-	assertSystemStaleAndCulled(t)
+	assertSystemCulled(t)
 
 	// second upload of now deleted system should not change anything
 	changedName := "UPDATED"