From 7dc9168a3f645a7778113e9fb15526bd64c6e0f8 Mon Sep 17 00:00:00 2001
From: Jeff Ortel <jortel@redhat.com>
Date: Tue, 16 Jul 2024 08:46:06 -0700
Subject: [PATCH] Fix migrationWaves test.

Signed-off-by: Jeff Ortel <jortel@redhat.com>
---
 api/migrationwave.go               | 19 ++++++++++++++++++-
 test/api/migrationwave/api_test.go |  6 ++++++
 test/api/review/api_test.go        |  2 +-
 test/api/ticket/api_test.go        |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/api/migrationwave.go b/api/migrationwave.go
index 8651a369e..9bc36c58c 100644
--- a/api/migrationwave.go
+++ b/api/migrationwave.go
@@ -98,11 +98,28 @@ func (h MigrationWaveHandler) Create(ctx *gin.Context) {
 	}
 	m := r.Model()
 	m.CreateUser = h.CurrentUser(ctx)
-	result := h.DB(ctx).Create(m)
+	db := h.DB(ctx).Omit(clause.Associations)
+	result := db.Create(m)
 	if result.Error != nil {
 		_ = ctx.Error(result.Error)
 		return
 	}
+	err = h.DB(ctx).Model(m).Association("Applications").Replace("Applications", m.Applications)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
+	}
+	err = h.DB(ctx).Model(m).Association("Stakeholders").Replace("Stakeholders", m.Stakeholders)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
+	}
+	err = h.DB(ctx).Model(m).Association("StakeholderGroups").Replace("StakeholderGroups", m.StakeholderGroups)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
+	}
+
 	r.With(m)
 
 	h.Respond(ctx, http.StatusCreated, r)
diff --git a/test/api/migrationwave/api_test.go b/test/api/migrationwave/api_test.go
index afa2ac846..7c2622a84 100644
--- a/test/api/migrationwave/api_test.go
+++ b/test/api/migrationwave/api_test.go
@@ -18,6 +18,7 @@ func TestMigrationWaveCRUD(t *testing.T) {
 			}
 			assert.Must(t, Application.Create(&expectedApp))
 			createdApps = append(createdApps, expectedApp)
+			r.Applications[0].ID = expectedApp.ID
 		}
 
 		createdStakeholders := []api.Stakeholder{}
@@ -28,6 +29,7 @@ func TestMigrationWaveCRUD(t *testing.T) {
 			}
 			assert.Must(t, Stakeholder.Create(&expectedStakeholder))
 			createdStakeholders = append(createdStakeholders, expectedStakeholder)
+			r.Stakeholders[0].ID = expectedStakeholder.ID
 		}
 
 		createdStakeholderGroups := []api.StakeholderGroup{}
@@ -38,6 +40,7 @@ func TestMigrationWaveCRUD(t *testing.T) {
 			}
 			assert.Must(t, StakeholderGroup.Create(&expectedStakeholderGroup))
 			createdStakeholderGroups = append(createdStakeholderGroups, expectedStakeholderGroup)
+			r.StakeholderGroups[0].ID = expectedStakeholderGroup.ID
 		}
 
 		assert.Must(t, MigrationWave.Create(&r))
@@ -102,6 +105,7 @@ func TestMigrationWaveList(t *testing.T) {
 			}
 			assert.Must(t, Application.Create(&expectedApp))
 			createdApps = append(createdApps, expectedApp)
+			r.Applications[0].ID = expectedApp.ID
 		}
 
 		for _, stakeholder := range r.Stakeholders {
@@ -111,6 +115,7 @@ func TestMigrationWaveList(t *testing.T) {
 			}
 			assert.Must(t, Stakeholder.Create(&expectedStakeholder))
 			createdStakeholders = append(createdStakeholders, expectedStakeholder)
+			r.Stakeholders[0].ID = expectedStakeholder.ID
 		}
 
 		for _, stakeholderGroup := range r.StakeholderGroups {
@@ -120,6 +125,7 @@ func TestMigrationWaveList(t *testing.T) {
 			}
 			assert.Must(t, StakeholderGroup.Create(&expectedStakeholderGroup))
 			createdStakeholderGroups = append(createdStakeholderGroups, expectedStakeholderGroup)
+			r.StakeholderGroups[0].ID = expectedStakeholderGroup.ID
 		}
 		assert.Must(t, MigrationWave.Create(&r))
 		createdMigrationWaves = append(createdMigrationWaves, r)
diff --git a/test/api/review/api_test.go b/test/api/review/api_test.go
index 013f84842..d32555859 100644
--- a/test/api/review/api_test.go
+++ b/test/api/review/api_test.go
@@ -143,7 +143,7 @@ func TestReviewList(t *testing.T) {
 
 	// Delete related reviews and applications.
 	for _, review := range createdReviews {
-		assert.Must(t, Application.Delete(review.ID))
+		assert.Must(t, Application.Delete(review.Application.ID))
 		assert.Must(t, Review.Delete(review.ID))
 	}
 }
diff --git a/test/api/ticket/api_test.go b/test/api/ticket/api_test.go
index 830b8c47a..71ea3d178 100644
--- a/test/api/ticket/api_test.go
+++ b/test/api/ticket/api_test.go
@@ -121,7 +121,7 @@ func TestTicketList(t *testing.T) {
 		// Delete tickets and related resources.
 		for _, ticket := range createdTickets {
 			assert.Must(t, Ticket.Delete(ticket.ID))
-			assert.Must(t, Application.Delete(ticket.ID))
+			assert.Must(t, Application.Delete(ticket.Application.ID))
 		}
 		for _, tracker := range createdTrackers {
 			assert.Must(t, Tracker.Delete(tracker.ID))