From f20f6876fa755115fc4ce37a3ad376a403b7bddd Mon Sep 17 00:00:00 2001 From: Adam Mahood Date: Wed, 11 Jan 2023 23:25:43 -0500 Subject: [PATCH] ticket/197: fixing field name on semester --- internal/models/semester.go | 2 +- internal/services/events_service_test.go | 8 ++++---- internal/services/membership_service.go | 10 +++++----- internal/services/semester_service.go | 2 +- internal/services/semester_service_test.go | 16 ++++++++-------- internal/services/transaction_service_test.go | 10 +++++----- internal/testhelpers/helpers.go | 2 +- .../20220703231444_initialize_database.sql | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/internal/models/semester.go b/internal/models/semester.go index b1ced66..7051087 100644 --- a/internal/models/semester.go +++ b/internal/models/semester.go @@ -15,7 +15,7 @@ type Semester struct { StartingBudget float64 `json:"startingBudget"` CurrentBudget float64 `json:"currentBudget"` MembershipFee int8 `json:"membershipFee"` - MembershipFeeDiscount int8 `json:"membershipFeeDiscount"` + MembershipDiscountFee int8 `json:"membershipDiscountFee"` RebuyFee int8 `json:"rebuyFee"` } diff --git a/internal/services/events_service_test.go b/internal/services/events_service_test.go index 3ff9c60..752e67f 100644 --- a/internal/services/events_service_test.go +++ b/internal/services/events_service_test.go @@ -55,7 +55,7 @@ func CreateEventTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -119,7 +119,7 @@ func ListEventsTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -206,7 +206,7 @@ func GetEventTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -266,7 +266,7 @@ func EndEventTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) diff --git a/internal/services/membership_service.go b/internal/services/membership_service.go index e60d505..9ed73b9 100644 --- a/internal/services/membership_service.go +++ b/internal/services/membership_service.go @@ -56,7 +56,7 @@ func (ms *membershipService) CreateMembership(req *models.CreateMembershipReques if req.Paid { // If the membership has been discounted, use the discounted rate instead if req.Discounted { - err = ss.UpdateBudget(semesterId, float64(semester.MembershipFeeDiscount)) + err = ss.UpdateBudget(semesterId, float64(semester.MembershipDiscountFee)) if err != nil { tx.Rollback() return nil, err @@ -177,7 +177,7 @@ func (ms *membershipService) UpdateMembership(req *models.UpdateMembershipReques if existingMembership.Paid { // Update semester's budget if existingMembership.Discounted { - err = ss.UpdateBudget(existingMembership.SemesterID, -float64(semester.MembershipFeeDiscount)) + err = ss.UpdateBudget(existingMembership.SemesterID, -float64(semester.MembershipDiscountFee)) if err != nil { tx.Rollback() return nil, err @@ -197,14 +197,14 @@ func (ms *membershipService) UpdateMembership(req *models.UpdateMembershipReques // Next compare the discounted flag if !req.Discounted && existingMembership.Discounted { // Member is marked as discounted and updating them to not discounted - err = ss.UpdateBudget(semester.ID, float64(semester.MembershipFee-semester.MembershipFeeDiscount)) + err = ss.UpdateBudget(semester.ID, float64(semester.MembershipFee-semester.MembershipDiscountFee)) if err != nil { tx.Rollback() return nil, err } } else if req.Discounted && !existingMembership.Discounted { // Member is not marked as discounted and updating them to discounted - err = ss.UpdateBudget(semester.ID, -float64(semester.MembershipFee-semester.MembershipFeeDiscount)) + err = ss.UpdateBudget(semester.ID, -float64(semester.MembershipFee-semester.MembershipDiscountFee)) if err != nil { tx.Rollback() return nil, err @@ -213,7 +213,7 @@ func (ms *membershipService) UpdateMembership(req *models.UpdateMembershipReques } else { // Existing member has not paid, and we are updating them to paid if req.Discounted { - err = ss.UpdateBudget(semester.ID, float64(semester.MembershipFeeDiscount)) + err = ss.UpdateBudget(semester.ID, float64(semester.MembershipDiscountFee)) if err != nil { tx.Rollback() return nil, err diff --git a/internal/services/semester_service.go b/internal/services/semester_service.go index 9868b24..e743c59 100644 --- a/internal/services/semester_service.go +++ b/internal/services/semester_service.go @@ -28,7 +28,7 @@ func (ss *semesterService) CreateSemester(req *models.CreateSemesterRequest) (*m StartingBudget: req.StartingBudget, CurrentBudget: req.StartingBudget, MembershipFee: req.MembershipFee, - MembershipFeeDiscount: req.MembershipDiscountFee, + MembershipDiscountFee: req.MembershipDiscountFee, RebuyFee: req.RebuyFee, } diff --git a/internal/services/semester_service_test.go b/internal/services/semester_service_test.go index 1f59c04..c876b7e 100644 --- a/internal/services/semester_service_test.go +++ b/internal/services/semester_service_test.go @@ -122,7 +122,7 @@ func CreateSemesterTest() func(*testing.T) { return } - if res.MembershipFeeDiscount != 5 { + if res.MembershipDiscountFee != 5 { t.Errorf("SemesterService.CreateSemester().MembershipDiscountFee = %v, wanted = %v", res.Meta, 5) return } @@ -149,7 +149,7 @@ func GetSemesterTest() func(*testing.T) { EndDate: time.Date(2022, 4, 1, 0, 0, 0, 0, time.UTC), StartingBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -187,7 +187,7 @@ func ListSemesterTest() func(*testing.T) { EndDate: time.Date(2022, 4, 1, 0, 0, 0, 0, time.UTC), StartingBudget: 100.54, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -201,7 +201,7 @@ func ListSemesterTest() func(*testing.T) { EndDate: time.Date(2022, 8, 1, 0, 0, 0, 0, time.UTC), StartingBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 7, + MembershipDiscountFee: 7, RebuyFee: 2, } res = db.Create(&semester2) @@ -216,7 +216,7 @@ func ListSemesterTest() func(*testing.T) { EndDate: time.Date(2022, 12, 1, 0, 0, 0, 0, time.UTC), StartingBudget: 140, MembershipFee: 10, - MembershipFeeDiscount: 7, + MembershipDiscountFee: 7, RebuyFee: 1, } res = db.Create(&semester3) @@ -282,7 +282,7 @@ func GetRankingsTest() func(*testing.T) { EndDate: time.Date(2022, 4, 1, 0, 0, 0, 0, time.UTC), StartingBudget: 100.54, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res = db.Create(&semester1) @@ -369,7 +369,7 @@ func UpdateBudget_Positive() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -415,7 +415,7 @@ func UpdateBudget_Negative() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) diff --git a/internal/services/transaction_service_test.go b/internal/services/transaction_service_test.go index eaac87b..1c1d854 100644 --- a/internal/services/transaction_service_test.go +++ b/internal/services/transaction_service_test.go @@ -58,7 +58,7 @@ func CreateTransactionTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -124,7 +124,7 @@ func GetTransactionTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -173,7 +173,7 @@ func ListTransactionTest() func(*testing.T) { StartingBudget: 105.57, CurrentBudget: 105.57, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -233,7 +233,7 @@ func UpdateTransactionTest() func(*testing.T) { StartingBudget: 100.0, CurrentBudget: 110.0, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) @@ -304,7 +304,7 @@ func DeleteTransactionTest() func(*testing.T) { StartingBudget: 100.0, CurrentBudget: 110.0, MembershipFee: 10, - MembershipFeeDiscount: 5, + MembershipDiscountFee: 5, RebuyFee: 2, } res := db.Create(&semester1) diff --git a/internal/testhelpers/helpers.go b/internal/testhelpers/helpers.go index 71eff59..dd28bab 100644 --- a/internal/testhelpers/helpers.go +++ b/internal/testhelpers/helpers.go @@ -18,7 +18,7 @@ func CreateSemester(db *gorm.DB, id uuid.UUID, name string, meta string, startDa StartingBudget: startingBudget, CurrentBudget: currentBudget, MembershipFee: membershipFee, - MembershipFeeDiscount: discountFee, + MembershipDiscountFee: discountFee, RebuyFee: rebuyFee, } diff --git a/migrations/20220703231444_initialize_database.sql b/migrations/20220703231444_initialize_database.sql index 613d0e7..aba086c 100644 --- a/migrations/20220703231444_initialize_database.sql +++ b/migrations/20220703231444_initialize_database.sql @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS semesters ( starting_budget DECIMAL NOT NULL DEFAULT '0'::DECIMAL, current_budget DECIMAL NOT NULL DEFAULT '0'::DECIMAL, membership_fee SMALLINT NOT NULL DEFAULT '0'::SMALLINT, - membership_fee_discount SMALLINT NOT NULL DEFAULT '0'::SMALLINT, + membership_discount_fee SMALLINT NOT NULL DEFAULT '0'::SMALLINT, rebuy_fee SMALLINT NOT NULL DEFAULT '0'::SMALLINT );