RHINENG-19880: update tests for system delete event

systems are marked as stale and culled instead of being removed from database

Author: MichaelMraka

listener/common_test.go

@@ -37,6 +37,7 @@ func deleteData(t *testing.T) {
 		Delete(&models.Repo{}).Error)
 	assert.Nil(t, database.DB.Unscoped().Where("inventory_id = ?::uuid", id).Delete(&models.SystemPlatform{}).Error)
 	assert.Nil(t, database.DB.Unscoped().Where("name = ?", id).Delete(&models.RhAccount{}).Error)
+	assert.Nil(t, database.DB.Unscoped().Where("inventory_id = ?", id).Delete(&models.DeletedSystem{}).Error)
 }
 
 // nolint: unparam
@@ -68,7 +69,17 @@ func assertSystemNotInDB(t *testing.T) {
 	assert.Nil(t, database.DB.Model(models.SystemPlatform{}).
 		Where("inventory_id = ?::uuid", id).Count(&systemCount).Error)
 
-	assert.Equal(t, int(systemCount), 0)
+	assert.Equal(t, 0, int(systemCount))
+}
+
+func assertSystemStaleAndCulled(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("inventory_id = ?::uuid", id).Count(&systemCount).Error)
+
+	assert.Equal(t, 1, int(systemCount))
 }
 
 func getOrCreateTestAccount(t *testing.T) int {

listener/events_test.go

@@ -49,8 +49,9 @@ func TestDeleteSystem(t *testing.T) {
 
 	deleteEvent := createTestDeleteEvent(id)
 	err := HandleDelete(deleteEvent)
-	assertSystemNotInDB(t)
 	assert.NoError(t, err)
+	assertSystemStaleAndCulled(t)
+	deleteData(t)
 }
 
 func TestDeleteSystemWarn1(t *testing.T) {
@@ -103,11 +104,51 @@ func TestUploadAfterDelete(t *testing.T) {
 	utils.SkipWithoutDB(t)
 	core.SetupTestEnvironment()
 	configure()
+	deleteData(t)
+
+	// system is not in database and the first event is delete
+	deleteEvent := createTestDeleteEvent(id)
+	err := HandleDelete(deleteEvent)
+	assert.NoError(t, err)
 
+	// upload will be skipped and system won't be created
 	uploadEvent := createTestUploadEvent("1", id, "puptoo", true, false)
-	err := HandleUpload(uploadEvent)
+	err = HandleUpload(uploadEvent)
 	assert.NoError(t, err)
 	assertSystemNotInDB(t)
+
+	deleteData(t)
+}
+
+func TestCreateDeleteUpload(t *testing.T) {
+	utils.SkipWithoutDB(t)
+	core.SetupTestEnvironment()
+	configure()
+	deleteData(t)
+
+	uploadEvent := createTestUploadEvent("1", id, "puptoo", true, false)
+	originalName := "UPLOADED"
+	uploadEvent.Host.DisplayName = &originalName
+	err := HandleUpload(uploadEvent)
+	assert.NoError(t, err)
+
+	// delete marks the system but not physically delete it
+	deleteEvent := createTestDeleteEvent(id)
+	err = HandleDelete(deleteEvent)
+	assert.NoError(t, err)
+	assertSystemStaleAndCulled(t)
+
+	// second upload of now deleted system should not change anything
+	changedName := "UPDATED"
+	uploadEvent.Host.DisplayName = &changedName
+	err = HandleUpload(uploadEvent)
+	assert.NoError(t, err)
+
+	var system models.SystemPlatform
+	assert.NoError(t, database.DB.Order("ID DESC").Find(&system, "inventory_id = ?::uuid", id).Error)
+	assert.Equal(t, originalName, system.DisplayName)
+
+	deleteData(t)
 }
 
 func TestDeleteCleanup(t *testing.T) {

tasks/system_culling/system_culling_test.go

@@ -172,3 +172,41 @@ func TestCullSystems(t *testing.T) {
 		assert.Equal(t, cnt-int64(nToDelete), cntAfter)
 	})
 }
+
+func TestPruneDeletedSystems(t *testing.T) {
+	utils.SkipWithoutDB(t)
+	core.SetupTestEnvironment()
+
+	nToDelete := 4
+	for i := 0; i < nToDelete; i++ {
+		invID := fmt.Sprintf("00000000-0000-0000-0000-000000000de%d", i+1)
+		assert.NoError(t, database.DB.Create(&models.DeletedSystem{
+			InventoryID: invID,
+			WhenDeleted: staleDate,
+		}).Error)
+	}
+	assert.NoError(t, database.DB.Create(&models.DeletedSystem{
+		InventoryID: "00000000-0000-0000-0000-000000000deff",
+		WhenDeleted: time.Now(),
+	}).Error)
+
+	var cnt int64
+	var cntAfter int64
+	assert.NoError(t, database.DB.Model(&models.DeletedSystem{}).Count(&cnt).Error)
+	assert.Equal(t, int64(nToDelete+1), cnt)
+
+	nDeleted, err := pruneDeletedSystems(database.DB, 3)
+	assert.Nil(t, err)
+	assert.Equal(t, int64(3), nDeleted)
+
+	// remove rest except last system (below threshold)
+	nDeleted, err = pruneDeletedSystems(database.DB, 3)
+	assert.Nil(t, err)
+	assert.Equal(t, int64(1), nDeleted)
+
+	assert.NoError(t, database.DB.Model(&models.DeletedSystem{}).Count(&cntAfter).Error)
+	assert.Equal(t, int64(1), cntAfter)
+
+	// clean data from table
+	assert.NoError(t, database.DB.Delete(&models.DeletedSystem{}, "1=1").Error)
+}