Merge pull request #45 from GenerateNU/36-cc-15-update-gift-type-and-…

…testing cc 15 update gift type and testing
GenerateNU · Nov 7, 2023 · e20f0e4 · e20f0e4
2 parents 5fab4ac + 1643b9d
commit e20f0e4
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 49 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/api/main b/api/main
diff --git a/api/src/model/transactions.go b/api/src/model/transactions.go
@@ -124,6 +124,12 @@ func UpdateGiftToDb(db *gorm.DB, id int64, inputGift Gift) (Gift, error) {
 	if inputGift.Description != "" {
 		updates["Description"] = inputGift.Description
 	}
+	if inputGift.Occasion != "" {
+		updates["Occasion"] = inputGift.Occasion
+	}
+	if len(inputGift.Category) != 0 {
+		updates["Category"] = inputGift.Category
+	}
 	if inputGift.Demographic != "" {
 		updates["Demographic"] = inputGift.Demographic
 	}
@@ -193,7 +199,6 @@ func GetGiftFromDB(db *gorm.DB, id int64) (Gift, error) {
 	return gift, nil
 }
 
-// GetAllGiftsFromDB fetches all ExampleGift
 // GetAllGiftsFromDB fetches all Gift
 func GetAllGiftsFromDB(db *gorm.DB) ([]Gift, error) {
 	var gifts []Gift
@@ -203,7 +208,6 @@ func GetAllGiftsFromDB(db *gorm.DB) ([]Gift, error) {
 	return gifts, nil
 }
 
-// GetAllResponsesFromDB fetches all GiftResponse
 // WriteGiftToDb saves the Gift and returns it
 func WriteGiftToDb(db *gorm.DB, inputGift Gift) (Gift, error) {
 	if err := db.Create(&inputGift).Error; err != nil {

diff --git a/api/src/model/types.go b/api/src/model/types.go
@@ -1,9 +1,10 @@
 package model
 
 import (
+	"time"
+
 	"github.com/lib/pq"
 	"gorm.io/gorm"
-	"time"
 )
 
 type Gift struct {
@@ -13,6 +14,8 @@ type Gift struct {
 	Link            string
 	Description     string
 	Demographic     string
+	Category        pq.StringArray `gorm:"type:text[]"`
+	Occasion        string
 	GiftCollections []*GiftCollection `gorm:"many2many:gift_request_gifts;"`
 }
 

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"
@@ -242,6 +243,8 @@ func TestAddRequest(t *testing.T) {
 	request := model.GiftRequest{
 		CustomerID:    retrievedCustomer.ID,
 		RecipientName: "Friend",
+		Occasion:           pq.StringArray{"Birthday", "Anniversary"},
+		RecipientInterests: pq.StringArray{"Reading", "Gaming"},
 	}
 
 	// Create the GiftRequest and call the endpoint
@@ -261,6 +264,8 @@ func TestAddRequest(t *testing.T) {
 	var retrievedRequest model.GiftRequest
 	err = tx.First(&retrievedRequest).Error
 	assert.Equal(t, addedRequest.RecipientName, retrievedRequest.RecipientName)
+	assert.Equal(t, addedRequest.Occasion, retrievedRequest.Occasion)
+	assert.Equal(t, addedRequest.RecipientInterests, retrievedRequest.RecipientInterests)
 
 }
 
@@ -976,6 +981,7 @@ func TestAddGiftToCollection(t *testing.T) {
 	// Add Gift to Gift Collection
 	gift := model.Gift{
 		Name: "Gift1",
+		Category: pq.StringArray{"Best selling", "Gadgets"},
 	}
 	giftJSON, err := json.Marshal(gift)
 	if err != nil {
@@ -995,6 +1001,7 @@ func TestAddGiftToCollection(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, giftAddedRetrievedCollection.CollectionName, giftAddedCollection.CollectionName)
 	assert.Equal(t, giftAddedRetrievedCollection.Gifts[0].Name, giftAddedCollection.Gifts[0].Name)
+	assert.Equal(t, giftAddedRetrievedCollection.Gifts[0].Category, giftAddedCollection.Gifts[0].Category)
 }
 
 func TestGiftDeleteFromCollection(t *testing.T) {

diff --git a/api/tests/db_test.go b/api/tests/db_test.go
@@ -2,11 +2,13 @@ package tests
 
 import (
 	"CaitsCurates/backend/src/model"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
+	"github.com/lib/pq"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 )
@@ -52,7 +54,7 @@ func TestGiftModel(t *testing.T) {
 	defer tx.Rollback()
 
 	// Create Gift
-	gift := model.Gift{Name: "Super cool new toy", Price: 500000.00, Link: "https://www.youtube.com/watch?v=dQw4w9WgXcQ", Description: "Really great content. Highly recommend", Demographic: "Unknown..."}
+	gift := model.Gift{Name: "Super cool new toy", Price: 500000.00, Link: "https://www.youtube.com/watch?v=dQw4w9WgXcQ", Description: "Really great content. Highly recommend", Demographic: "Unknown...", Category: pq.StringArray{"Best selling"}}
 
 	err = tx.Create(&gift).Error
 	assert.NoError(t, err)
@@ -68,6 +70,7 @@ func TestGiftModel(t *testing.T) {
 	assert.Equal(t, gift.Description, fetchedGift.Description)
 	assert.Equal(t, gift.Demographic, fetchedGift.Demographic)
 	assert.Equal(t, gift.Link, fetchedGift.Link)
+	assert.Equal(t, gift.Category, fetchedGift.Category)
 	assert.Equal(t, gift.CreatedAt.In(time.UTC).Round(time.Millisecond),
 		fetchedGift.CreatedAt.In(time.UTC).Round(time.Millisecond))
 
@@ -117,7 +120,7 @@ func TestGiftRequestModel(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Create GiftRequest
-	giftRequest := model.GiftRequest{GiftResponse: &giftResponse}
+	giftRequest := model.GiftRequest{GiftResponse: &giftResponse, Occasion: pq.StringArray{"Birthday"}, RecipientInterests: pq.StringArray{"Soccer"}}
 	user := model.User{Email: "[email protected]", FirstName: "person1", LastName: "lastname1", Password: "dgeeg32"}
 	customer := model.Customer{GiftRequests: []*model.GiftRequest{&giftRequest}, User: user}
 	err = tx.Create(&customer).Error
@@ -146,6 +149,8 @@ func TestGiftRequestModel(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, giftRequest.ID, fetchedGiftRequest.ID)
 	assert.Equal(t, giftRequest.GiftResponseID, fetchedGiftRequest.GiftResponseID)
+	assert.Equal(t, giftRequest.Occasion, fetchedGiftRequest.Occasion)
+	assert.Equal(t, giftRequest.RecipientInterests, fetchedGiftRequest.RecipientInterests)
 	assert.Equal(t, giftRequest.CreatedAt.In(time.UTC).Round(time.Millisecond),
 		fetchedGiftRequest.CreatedAt.In(time.UTC).Round(time.Millisecond))
 
@@ -257,6 +262,7 @@ func TestGiftResponseModel(t *testing.T) {
 		Link:            "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
 		Description:     "Really great content. Highly recommend",
 		Demographic:     "Unknown...",
+		Category: 		 pq.StringArray{"Best selling"},
 		GiftCollections: nil,
 	}
 
@@ -266,6 +272,7 @@ func TestGiftResponseModel(t *testing.T) {
 		Link:            "https://www.youtube.com/Penguinz0",
 		Description:     "Really great content. Highly recommend",
 		Demographic:     "Unknown...",
+		Category: 		 pq.StringArray{"Best selling"},
 		GiftCollections: nil,
 	}
 

diff --git a/client/src/components/GiftForm.tsx b/client/src/components/GiftForm.tsx
@@ -4,7 +4,7 @@ import {Gift} from "../types.tsx";
 
 
 const defaultGift: Gift = {
-    Demographic: "", Description: "", GiftCollections: [], ID: 0, Link: "", Name: "", Price: 0
+    Demographic: "", Description: "", Occasion: "", Category: [], GiftCollections: [], ID: 0, Link: "", Name: "", Price: 0
 }
 type Props = {
     initialGift?: Gift;
@@ -80,7 +80,19 @@ const GiftForm: React.FC<Props> = ({ initialGift = defaultGift, mode, onGiftChan
                     className="mt-1 p-2 w-full border-2 border-gray-300 rounded-md"
                 />
             </div>
-
+            <div className="mb-4">
+                <label htmlFor="occasion" className="block text-sm font-medium text-gray-700">
+                    Description:
+                </label>
+                <input
+                    type="text"
+                    id="occasion"
+                    name="Occasion"
+                    value={gift.Occasion}
+                    onChange={handleInputChange}
+                    className="mt-1 p-2 w-full border-2 border-gray-300 rounded-md"
+                />
+            </div>
             <div className="mb-4">
                 <label htmlFor="price" className="block text-sm font-medium text-gray-700">
                     Price:

diff --git a/client/src/components/GiftItem.tsx b/client/src/components/GiftItem.tsx
@@ -22,7 +22,9 @@ const GiftItem = (props: GiftProps) => {
                     >Link</a>
                 </div>
                 <p>Demographic: {props.gift.Demographic}</p>
+                <p>Categories: {props.gift.Category}</p>
                 <p>Description: {props.gift.Description}</p>
+                <p>Description: {props.gift.Occasion}</p>
             </div>
 
                 <div className='w-1/12 flex flex-row space-x-2'>

diff --git a/client/src/types.tsx b/client/src/types.tsx
@@ -1,56 +1,58 @@
 export interface Gift {
-    ID : number
-    Name: string;
-    Price: number;
-    Link: string;
-    Description: string;
-    Demographic: string;
-    GiftCollections: GiftCollection[];
+  ID: number;
+  Name: string;
+  Price: number;
+  Link: string;
+  Occasion: string;
+  Description: string;
+  Demographic: string;
+  GiftCollections: GiftCollection[];
+  Category: string[];
 }
 
 export interface GiftRequest {
-    ID : number
-    CustomerId: number;
-    GiftResponseId: number | null;
-    RecipientName: string;
-    RecipientAge: number;
-    Occasion: string[];
-    RecipientInterests: string[];
-    BudgetMax: number;
-    BudgetMin: number;
-    GiftResponse: GiftResponse | null;
-    DateNeeded: string;
+  ID: number;
+  CustomerId: number;
+  GiftResponseId: number | null;
+  RecipientName: string;
+  RecipientAge: number;
+  Occasion: string[];
+  RecipientInterests: string[];
+  BudgetMax: number;
+  BudgetMin: number;
+  GiftResponse: GiftResponse | null;
+  DateNeeded: string;
 }
 
 export interface GiftCollection {
-    ID : number
-    CustomerId: number | null;
-    Customer: Customer;
-    CollectionName: string;
-    Gifts: Gift[];
+  ID: number;
+  CustomerId: number | null;
+  Customer: Customer;
+  CollectionName: string;
+  Gifts: Gift[];
 }
 
 export interface GiftResponse {
-    ID : number
-    GiftCollection: GiftCollection;
-    GiftCollectionId: number;
-    CustomMessage: string;
+  ID: number;
+  GiftCollection: GiftCollection;
+  GiftCollectionId: number;
+  CustomMessage: string;
 }
 
 export interface User {
-    ID : number
-    Email: string;
-    FirstName: string;
-    LastName: string;
-    Password: string;
+  ID: number;
+  Email: string;
+  FirstName: string;
+  LastName: string;
+  Password: string;
 }
 
 export interface Customer {
-    ID : number
-    UserId: number;
+  ID: number;
+  UserId: number;
 }
 
 export interface Admin {
-    ID : number
-    UserId: number;
-}
+  ID: number;
+  UserId: number;
+}