RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints #51

Lin2 · 2022-03-11T00:21:04Z

Overview

We added two PUT endpoints for BUY and SELL, and created onBuy and onSell basic functionality to update totalWealth of a user on the Playpage.

Issues Addressed

We addressed some of the points in #15 . This issue isn't completed yet however, but we wanted to get a PR in for CI/CD.

We addressed these issues:

PlayPage.js updates TotalWealth (located in backend UserCommons.java) in onBuy and onSell based on Market Cow Price.
Get FarmStats.js to display Total Wealth.
UserCommonsController.java has 2 PUT endpoints, for buy and sell
Buy and Sell Endpoints have USER authorization
Mutation testing passes

These are still left for future work

PlayPage.js calls backend to update Average Cow Health in onBuy and onSell using given equations. For selling, Cows are sold for user averageCowHealth * cowPrice
Make FarmStats.js to display average cow health
100% test coverage for frontend

Details

When a user presses the "+"(onBuy) or "-"(onSell) button on the play page on the website, we call the 2 PUT endpoints /buy and /sell. These buy and sell 1 cow respectively each time they're called. Currently, it sells at cowPrice (value of which comes from when an admin creates a new commons), and buys at cowPrice (although this needs to be changed in a future edit to factor in average cowHealth).

User totalWealth comes from startingBalance, which is set by an admin when creating a new commons.

We created 4 tests for the buy and sell endpoint (2 of which are for checking when the usercommons doesn't exist).

We deleted a line of code from a backend test created by w22-6pm-4 (see commit message regarding it).

Testing Plan

Create a commons
Join the commons
The Total Wealth under Your Farm Stats should be the Starting Wealth entered when you created the commons
When "+" is clicked under Manage Cows, Total Wealth decreases by the Cow Price entered when you created the commons
When "-" is clicked under Manage Cows, Total Wealth decreases by the Cow Price entered when you created the commons

codecov · 2022-03-11T00:22:09Z

Codecov Report

Merging #51 (92d88b5) into main (b4f5ce2) will increase coverage by 0.18%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main      #51      +/-   ##
============================================
+ Coverage     81.09%   81.27%   +0.18%     
- Complexity       75       78       +3     
============================================
  Files            52       49       -3     
  Lines           439      438       -1     
  Branches         12       11       -1     
============================================
  Hits            356      356              
+ Misses           83       82       -1

Impacted Files	Coverage Δ
frontend/src/main/components/Nav/AppNavbar.js	`100.00% <ø> (ø)`
frontend/src/main/components/OurTable.js	`100.00% <ø> (ø)`
frontend/src/main/pages/AdminCreateCommonsPage.js	`100.00% <ø> (ø)`
...d/src/main/components/Commons/CreateCommonsForm.js	`100.00% <100.00%> (ø)`
frontend/src/main/components/Commons/ManageCows.js	`100.00% <100.00%> (ø)`
frontend/src/main/pages/PlayPage.js	`100.00% <100.00%> (ø)`
...156/happiercows/controllers/CommonsController.java	`100.00% <100.00%> (ø)`
...happiercows/controllers/UserCommonsController.java	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b4f5ce2...92d88b5. Read the comment docs.

pconrad

Where are the controller tests for the new methods?

Lin2 · 2022-03-11T08:02:48Z

Where are the controller tests for the new methods?

I realized we were missing this right after we made the request -- working on it now!

…e sense to save a usercommons to a nonexistent commons

…l as 2 for non-existing sell and buy

Lin2 · 2022-03-11T13:08:17Z

The PR has been completed with controller tests for UserCommonsController.

eambriz27

Looks like you have some merge conflicts to resolve, but everything else LGTM!

pconrad

Couple of "TODOs left in the code"...

pconrad · 2022-03-12T22:38:16Z

src/test/java/edu/ucsb/cs156/happiercows/controllers/UserCommonsControllerTests.java

+    when(commonsRepository.findById(eq(1L))).thenReturn(Optional.of(randomCommons));
+
+    // act
+    MvcResult response = mockMvc.perform(put("/api/usercommons/buy?id=1") //oof, accidentally made PUT endpoints id variable instead of commonsId. TODO: Fix later.


Fix now maybe?

pconrad · 2022-03-12T22:38:41Z

src/test/java/edu/ucsb/cs156/happiercows/controllers/UserCommonsControllerTests.java

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


As long as we are fixing things, maybe this white space too...

pconrad · 2022-03-12T22:38:56Z

src/test/java/edu/ucsb/cs156/happiercows/controllers/UserCommonsControllerTests.java

+    when(commonsRepository.findById(eq(1L))).thenReturn(Optional.of(randomCommons));
+
+    // act
+    MvcResult response = mockMvc.perform(put("/api/usercommons/buy?id=234") //oof, accidentally made PUT endpoints id variable instead of commonsId. TODO: Fix later.


oof indeed :-)

…ing for when only commons doesn't exist

eambriz27

LGTM

Lin2 · 2022-03-15T06:14:31Z

Bad PR

sophiajmoore and others added 6 commits March 10, 2022 15:53

sm-rl- working on buy button

90cf58e

sm-rl- fix buy button

06cc090

sm-rl- buy button

d735014

rl-sm- finish buy button, sell button has issues

5ade574

sm- update buy and sell buttons

e54408d

rl-sm-sell button now works, but equation doesnt factor in health yet

a2cba71

Lin2 requested review from bzamora020, ryanmosalem, gama-A, johnsonlin2001 and eambriz27 March 11, 2022 00:21

Merge branch 'main' into rl-sm-hookup-farm-component-to-backend

d12f354

pconrad added the w22-6pm-3 label Mar 11, 2022

pconrad requested changes Mar 11, 2022

View reviewed changes

pconrad added Attn-respond-to-CR Please address changes requested in code review Attn-CI/CD-failures At least one of the CI/CD scripts is failing labels Mar 11, 2022

Lin2 changed the title ~~RL-SM: Add Fuctionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints~~ RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints Mar 11, 2022

Lin2 added 2 commits March 11, 2022 02:50

rl-sm-deleted save line from commonscontrollertest as it does not mak…

59406ee

…e sense to save a usercommons to a nonexistent commons

rl-sm-mw-added user commons controller tests for sell and buy, as wel…

3517126

…l as 2 for non-existing sell and buy

Lin2 temporarily deployed to team04-w22-6pm-3 March 11, 2022 20:00 Inactive

eambriz27 temporarily deployed to team04-w22-6pm-3 March 11, 2022 20:06 Inactive

sophiajmoore requested a review from pconrad March 12, 2022 01:01

Merge branch 'main' into rl-sm-hookup-farm-component-to-backend

209ac4f

eambriz27 previously approved these changes Mar 12, 2022

View reviewed changes

rl-sm-added one if statement in buy endpoint

d6ba662

Lin2 dismissed eambriz27’s stale review via d6ba662 March 12, 2022 06:03

sm- pull from main

5b67f6e

sophiajmoore added 3 commits March 11, 2022 23:41

sm- undoing me pulling main...

fdcb521

sm-rl- revert to original changes which passed all tests

f76e341

sm-rl- update controller tests

6bbb27d

sophiajmoore force-pushed the rl-sm-hookup-farm-component-to-backend branch from 57897ea to 6bbb27d Compare March 12, 2022 21:04

pconrad requested changes Mar 12, 2022

View reviewed changes

pconrad added Attn-Merge Conflicts and removed Attn-CI/CD-failures At least one of the CI/CD scripts is failing labels Mar 12, 2022

sophiajmoore added 2 commits March 12, 2022 15:23

sm-rl- revert changes to 3517126

a3aa37a

rl-sm- made requested changes from code review

75b7c14

sophiajmoore force-pushed the rl-sm-hookup-farm-component-to-backend branch from 7a14585 to 75b7c14 Compare March 12, 2022 23:49

rl-sm-fixed mistakes in previous commit

6a9f1b9

Lin2 requested a review from eambriz27 March 13, 2022 00:25

sophiajmoore temporarily deployed to team04-w22-6pm-3-qa March 13, 2022 00:27 Inactive

sophiajmoore temporarily deployed to team04-w22-6pm-3-qa March 13, 2022 00:39 Inactive

sophiajmoore temporarily deployed to team04-w22-6pm-3 March 13, 2022 00:43 Inactive

rl- changed exception logic for backend, and make backend tests cover…

ee26650

…ing for when only commons doesn't exist

sophiajmoore force-pushed the rl-sm-hookup-farm-component-to-backend branch from ad8cc6d to ee26650 Compare March 13, 2022 01:30

sophiajmoore requested a review from pconrad March 13, 2022 01:46

eambriz27 previously approved these changes Mar 13, 2022

View reviewed changes

sophiajmoore temporarily deployed to team04-w22-6pm-3 March 13, 2022 02:51 Inactive

sm-rl- fixed toast for buy and sell, added tests for buy and sell

1c4cb86

sophiajmoore dismissed eambriz27’s stale review via 1c4cb86 March 13, 2022 03:29

sophiajmoore force-pushed the rl-sm-hookup-farm-component-to-backend branch from 79e7054 to 1c4cb86 Compare March 13, 2022 03:29

Merge branch 'main' into rl-sm-hookup-farm-component-to-backend

92d88b5

eambriz27 marked this pull request as draft March 15, 2022 03:04

Lin2 closed this Mar 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints #51

RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints #51

Lin2 commented Mar 11, 2022 •

edited by sophiajmoore

codecov bot commented Mar 11, 2022 •

edited

pconrad left a comment

Lin2 commented Mar 11, 2022

Lin2 commented Mar 11, 2022 •

edited

eambriz27 left a comment •

edited

pconrad left a comment

pconrad Mar 12, 2022

pconrad Mar 12, 2022

pconrad Mar 12, 2022

eambriz27 left a comment

Lin2 commented Mar 15, 2022

RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints #51

RL-SM: Add Functionality for onBuy, onSell Buttons, updating totalWealth using 2 PUT endpoints #51

Conversation

Lin2 commented Mar 11, 2022 • edited by sophiajmoore

Overview

Issues Addressed

Details

Testing Plan

codecov bot commented Mar 11, 2022 • edited

Codecov Report

pconrad left a comment

Choose a reason for hiding this comment

Lin2 commented Mar 11, 2022

Lin2 commented Mar 11, 2022 • edited

eambriz27 left a comment • edited

Choose a reason for hiding this comment

pconrad left a comment

Choose a reason for hiding this comment

pconrad Mar 12, 2022

Choose a reason for hiding this comment

pconrad Mar 12, 2022

Choose a reason for hiding this comment

pconrad Mar 12, 2022

Choose a reason for hiding this comment

eambriz27 left a comment

Choose a reason for hiding this comment

Lin2 commented Mar 15, 2022

Lin2 commented Mar 11, 2022 •

edited by sophiajmoore

codecov bot commented Mar 11, 2022 •

edited

Lin2 commented Mar 11, 2022 •

edited

eambriz27 left a comment •

edited