Skip to content

Commit

Permalink
ticket/197: fixing field name on semester (#150)
Browse files Browse the repository at this point in the history
  • Loading branch information
@asmahood
asmahood authored Jan 12, 2023
1 parent 2ee4a3b commit f121b84
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion internal/models/semester.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
8 changes: 4 additions & 4 deletions internal/services/events_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions internal/services/membership_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/services/semester_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
16 changes: 8 additions & 8 deletions internal/services/semester_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions internal/services/transaction_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion internal/testhelpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
2 changes: 1 addition & 1 deletion migrations/20220703231444_initialize_database.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand Down

0 comments on commit f121b84

Please sign in to comment.