Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Yuki - Added total cows sold to play page and leaderboard table #31

Closed
wants to merge 10 commits into from
Closed

Yuki - Added total cows sold to play page and leaderboard table #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a9fd7e5
jw-Update backend to be able to handle buying and selling multiple cows
JacobWoodward2000 May 25, 2023
65a94f8
jw-add buttons to buy and sell multiple cows
JacobWoodward2000 May 26, 2023
105ac5d
jw-add coverage for jacoco and pitest
JacobWoodward2000 May 27, 2023
c036a0f
jw-change getByTestId() to findByTestId()
JacobWoodward2000 May 27, 2023
40e62ce
yk - added total cows bought to play page and leaderboard table
ykeung May 27, 2023
df0bc84
yk - added leaderboard tests to include total cows bought
ykeung May 27, 2023
b2cdea3
yk - merged with JacobW-BuySellMultipleCows
ykeung May 28, 2023
ecf78f7
yk - added backend logic for total cows sold
ykeung May 29, 2023
6ee9810
yk - added frontend display logic to play page and leaderboard table …
ykeung May 29, 2023
918ad08
yk - added tests in FarmStats and LeaderboardTable
ykeung May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 57 additions & 19 deletions frontend/src/fixtures/leaderboardFixtures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ const leaderboardFixtures = {
"username": "one",
"commonsId": 1,
"totalWealth" : 1000,
"numOfCows": 5
"numOfCows": 5,
"totalCowsBought": 5,
"totalCowsSold": 1
}
],
threeUserCommonsLB:
Expand All @@ -18,23 +20,29 @@ const leaderboardFixtures = {
"username": "one",
"commonsId": 1,
"totalWealth" : 1000,
"numOfCows": 8
"numOfCows": 8,
"totalCowsBought": 8,
"totalCowsSold": 11
},
{
"id":2,
"userId": 2,
"username": "two",
"commonsId": 1,
"totalWealth" : 1000,
"numOfCows": 5
"numOfCows": 5,
"totalCowsBought": 5,
"totalCowsSold": 0
},
{
"id":3,
"userId": 3,
"username": "three",
"commonsId": 1,
"totalWealth" : 100000,
"numOfCows": 1000
"numOfCows": 1000,
"totalCowsBought": 1000,
"totalCowsSold": 70
}
],
fiveUserCommonsLB:
Expand All @@ -46,7 +54,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 1000,
"cowHealth": 93.0,
"numOfCows": 8
"numOfCows": 8,
"totalCowsBought": 8,
"totalCowsSold": 1000
},
{
"id":2,
Expand All @@ -55,7 +65,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 1000,
"cowHealth": 98.0,
"numOfCows": 5
"numOfCows": 5,
"totalCowsBought": 5,
"totalCowsSold": 1
},
{
"id":3,
Expand All @@ -64,7 +76,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 100000,
"cowHealth": 2.0,
"numOfCows": 1000
"numOfCows": 1000,
"totalCowsBought": 1000,
"totalCowsSold": 500
},
{
"id":4,
Expand All @@ -73,15 +87,19 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 50,
"cowHealth": 84.0,
"numOfCows": 100
"numOfCows": 100,
"totalCowsBought": 100,
"totalCowsSold": 15
},
{
"id":5,
"userId": 5,
"username": "five",
"commonsId": 1,
"totalWealth" : 800,
"numOfCows": 60
"numOfCows": 60,
"totalCowsBought": 60,
"totalCowsSold": 19
}
],
tenUserCommonsLB:
Expand All @@ -93,7 +111,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 1000,
"cowHealth": 93.0,
"numOfCows": 8
"numOfCows": 8,
"totalCowsBought": 8,
"totalCowsSold": 6
},
{
"id":2,
Expand All @@ -102,7 +122,9 @@ const leaderboardFixtures = {
"username": "two",
"totalWealth" : 1000,
"cowHealth": 98.0,
"numOfCows": 5
"numOfCows": 5,
"totalCowsBought": 5,
"totalCowsSold": 12
},
{
"id":3,
Expand All @@ -111,7 +133,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 100000,
"cowHealth": 2.0,
"numOfCows": 1000
"numOfCows": 1000,
"totalCowsBought": 1000,
"totalCowsSold": 45
},
{
"id":4,
Expand All @@ -120,7 +144,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 50,
"cowHealth": 84.0,
"numOfCows": 100
"numOfCows": 100,
"totalCowsBought": 100,
"totalCowsSold": 0
},
{
"id":5,
Expand All @@ -129,7 +155,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 800,
"cowHealth": 72.0,
"numOfCows": 60
"numOfCows": 60,
"totalCowsBought": 60,
"totalCowsSold": 11
},
{
"id":6,
Expand All @@ -138,7 +166,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 1000,
"cowHealth": 93.0,
"numOfCows": 8
"numOfCows": 8,
"totalCowsBought": 8,
"totalCowsSold": 88
},
{
"id":7,
Expand All @@ -147,7 +177,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 1000,
"cowHealth": 98.0,
"numOfCows": 5
"numOfCows": 5,
"totalCowsBought": 5,
"totalCowsSold": 1111
},
{
"id":8,
Expand All @@ -156,7 +188,9 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 100000,
"cowHealth": 2.0,
"numOfCows": 1000
"numOfCows": 1000,
"totalCowsBought": 1000,
"totalCowsSold": 1
},
{
"id":9,
Expand All @@ -165,15 +199,19 @@ const leaderboardFixtures = {
"commonsId": 1,
"totalWealth" : 50,
"cowHealth": 84.0,
"numOfCows": 100
"numOfCows": 100,
"totalCowsBought": 100,
"totalCowsSold": 0
},
{
"id":10,
"userId": 10,
"username": "ten",
"commonsId": 1,
"totalWealth" : 800,
"numOfCows": 60
"numOfCows": 60,
"totalCowsBought": 60,
"totalCowsSold": 60
}
]
}
Expand Down
Loading