preload GiftResponse when getting GiftRequests

GenerateNU · Oct 9, 2023 · 23a8372 · 23a8372
1 parent a046d20
commit 23a8372
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/api/src/model/transactions.go b/api/src/model/transactions.go
@@ -33,7 +33,7 @@ func GetAllExampleGiftsFromDB(db *gorm.DB) ([]ExampleGift, error) {
 
 func GetIncompleteGiftRequestsFromDB(db *gorm.DB) ([]GiftRequest, error) {
 	var requests []GiftRequest
-	if err := db.Where("gift_response_id IS NULL").Find(&requests).Error; err != nil {
+	if err := db.Where("gift_response_id IS NULL").Preload("GiftResponse").Find(&requests).Error; err != nil {
 		return nil, err
 	}
 	return requests, nil

diff --git a/api/tests/api_test.go b/api/tests/api_test.go
@@ -6,12 +6,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"sort"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/lib/pq"
 
 	"os"
@@ -277,6 +278,11 @@ func TestGetCompleteGiftRequests(t *testing.T) {
 	assert.Equal(t, request.BudgetMax, requestsRetrieved[0].BudgetMax)
 	assert.Equal(t, request.BudgetMin, requestsRetrieved[0].BudgetMin)
 	assert.Equal(t, request.GiftResponseID, requestsRetrieved[0].GiftResponseID)
+	assert.Equal(t, request.GiftResponse.ID, giftResponse.ID)
+	assert.NotNil(t, request.GiftResponse) // make sure preloading works
+	assert.Equal(t, request.GiftResponse.GiftCollectionID, giftResponse.GiftCollectionID)
+	assert.Equal(t, request.GiftResponse.GiftCollection, giftResponse.GiftCollection)
+	assert.Equal(t, request.GiftResponse.CustomMessage, giftResponse.CustomMessage)
 	assert.Equal(t, request.DateNeeded.In(time.UTC).Round(time.Millisecond),
 		requestsRetrieved[0].DateNeeded.In(time.UTC).Round(time.Millisecond))
 }