Get monthly fee + Get 3 months fee (this month + prev 2 months) function (Only supports non-recurring session for now) #118

enhao25 · 2021-03-26T04:48:58Z

Update with the following feature:

Get monthly fee (E.g. fee n/John Doe m/1 y/2021) - Returns monthly fee of a particular student on the specific month and year
Get 3 months fee (this month + prev 2 months) (E.g 3Month_Fee) - Returns past 3 months fee based on current list

Considerations:

Only allows month between 1 to 12
Only allows year between 1970 to 2037

Future Issues / Improvements:

Test cases for command and command parser
Might not need the command for 3Month_Fee if this is automatically in the UI.
~~Only works on the filtered student, find_student will change the value (Could make it for all students instead of filtered students)~~
Take into consideration for recurring session when it is done.

#81 #82

JonahhGohh

Tested it and works well!
I like how you compared the dateTime with the compareTo() method, clean af haha.

Regarding the 3 month command, I was thinking of using it for the Home fee section. So not too sure if we need a command for it.

enhao25 · 2021-03-27T10:27:24Z

Tested it and works well!
I like how you compared the dateTime with the compareTo() method, clean af haha.

Regarding the 3 month command, I was thinking of using it for the Home fee section. So not too sure if we need a command for it.

Haha I agree ah! For the 3 month command thingy, I was also thinking that we might not need the command. So haven't added it to the UG yet. Probably can keep the command for testing purposes, and remove it after the UI that uses the 3 month function is done.

codecov-io · 2021-03-27T11:20:56Z

Codecov Report

Merging #118 (79f0995) into master (91f37b2) will decrease coverage by 3.13%.
The diff coverage is 17.75%.

@@             Coverage Diff              @@
##             master     #118      +/-   ##
============================================
- Coverage     69.54%   66.40%   -3.14%     
- Complexity      495      510      +15     
============================================
  Files            83       88       +5     
  Lines          1658     1765     +107     
  Branches        184      197      +13     
============================================
+ Hits           1153     1172      +19     
- Misses          439      521      +82     
- Partials         66       72       +6

Impacted Files	Coverage Δ	Complexity Δ
...u/address/logic/commands/GetMonthlyFeeCommand.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...ddress/logic/commands/GetPrev3MonthFeeCommand.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
.../seedu/address/logic/parser/AddressBookParser.java	`78.26% <0.00%> (-7.46%)`	`14.00 <0.00> (ø)`
...dress/logic/parser/GetMonthlyFeeCommandParser.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...in/java/seedu/address/logic/parser/ParserUtil.java	`58.22% <0.00%> (-17.19%)`	`17.00 <0.00> (ø)`
src/main/java/seedu/address/model/Model.java	`100.00% <ø> (ø)`	`1.00 <0.00> (ø)`
...rc/main/java/seedu/address/model/ModelManager.java	`76.71% <0.00%> (-15.10%)`	`27.00 <0.00> (ø)`
src/main/java/seedu/address/model/fee/Year.java	`61.53% <61.53%> (ø)`	`7.00 <7.00> (?)`
src/main/java/seedu/address/model/fee/Month.java	`64.28% <64.28%> (ø)`	`8.00 <8.00> (?)`
...ain/java/seedu/address/logic/parser/CliSyntax.java	`93.75% <100.00%> (+0.89%)`	`1.00 <0.00> (ø)`
... and 5 more

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 91f37b2...79f0995. Read the comment docs.

nowknowing

I think it works well! Just maybe could reduce repeat but i can't remember if we're marked on that. If not I think this is good!

nowknowing · 2021-03-27T17:23:35Z

src/main/java/seedu/address/logic/commands/GetPrev3MonthFeeCommand.java

+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {


Im understanding that getPrev3 month is getMonth applied to every student, and for 3 months. I guess it'd be considered less "repeated code" if this method was built on getMonth. possibly using getMonth's methods from within getPrev3?

Ok good suggestion, the only common place for both code base is on model. Hence, I have abstracted out the get fees code over to model. Do have a look, the output should still be the same. Thank you!

super neat, hadn't thought of putting it at model!

…ith get fee

nowknowing

LGTM!!

nowknowing · 2021-03-28T01:59:25Z

src/main/java/seedu/address/logic/commands/GetPrev3MonthFeeCommand.java

+ * Gets current month and previous 2 months expected monthly fee based on the current list of sessions
+ */
+public class GetPrev3MonthFeeCommand extends Command {
+    public static final String COMMAND_WORD = "3Month_Fee";


Might be consistent with the other commands if not capitalised. eg "past_fees" / "3_fees" / "3_month_fees"

Ahhh right! I have changed it to 3_month_fees instead.

nowknowing · 2021-03-28T02:07:42Z

src/main/java/seedu/address/logic/commands/GetPrev3MonthFeeCommand.java

+    public static final String COMMAND_WORD = "3Month_Fee";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Shows the total expected monthly fee"
+        + "for this month + previous 2 months";


"Shows the totalled fees per month, for the past 3 months." Or something of the sort could be somewhat more accurate.

Alright! Change from that to "Shows the totalled fees per month, for this month + previous 2 months" instead.

…mment

enhao25 · 2021-03-28T02:31:29Z

closes #81

enhao25 added 10 commits March 22, 2021 20:27

Add functionality to get monthly fee

67ddcfb

Create a command to get previous 3 month pay

1797722

Resolve conflict

95c8a51

Resolve checkstyle error

dc0bad9

Merge branch 'master' into branch-monthly-fee

e3e9a18

Added month test

8c5376c

Add test for year

937314c

Resolve merge conflict

8efbc33

Resolve checkstyle

38f6216

Resolve naming bugs

bf15f45

enhao25 added the type.Story A user story label Mar 26, 2021

enhao25 added this to the v1.3 milestone Mar 26, 2021

enhao25 requested review from JonahhGohh and nowknowing March 26, 2021 04:48

enhao25 self-assigned this Mar 26, 2021

JonahhGohh approved these changes Mar 27, 2021

View reviewed changes

Add s to some of the words

2ff619f

JonahhGohh mentioned this pull request Mar 27, 2021

Add UI #119

Merged

nowknowing reviewed Mar 27, 2021

View reviewed changes

enhao25 added 3 commits March 28, 2021 08:09

Use DRY principle to abstract out get fee method to model

4a8e5be

Solve checkstyle error

8c97575

Make use of the full list instead of the filtered list when working w…

acbc23f

…ith get fee

nowknowing approved these changes Mar 28, 2021

View reviewed changes

nowknowing reviewed Mar 28, 2021

View reviewed changes

Change naming conversion on getprev3monthfeecommand based on shion co…

79f0995

…mment

enhao25 merged commit e9b7356 into AY2021S2-CS2103T-T11-1:master Mar 28, 2021

enhao25 mentioned this pull request Mar 28, 2021

Calculate Monthly Fees for 1 student #81

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get monthly fee + Get 3 months fee (this month + prev 2 months) function (Only supports non-recurring session for now) #118

Get monthly fee + Get 3 months fee (this month + prev 2 months) function (Only supports non-recurring session for now) #118

enhao25 commented Mar 26, 2021 •

edited

JonahhGohh left a comment

enhao25 commented Mar 27, 2021

codecov-io commented Mar 27, 2021 •

edited

nowknowing left a comment

nowknowing Mar 27, 2021

enhao25 Mar 28, 2021

nowknowing Mar 28, 2021

nowknowing left a comment •

edited

nowknowing Mar 28, 2021 •

edited

enhao25 Mar 28, 2021

nowknowing Mar 28, 2021 •

edited

enhao25 Mar 28, 2021

enhao25 commented Mar 28, 2021

Get monthly fee + Get 3 months fee (this month + prev 2 months) function (Only supports non-recurring session for now) #118

Get monthly fee + Get 3 months fee (this month + prev 2 months) function (Only supports non-recurring session for now) #118

Conversation

enhao25 commented Mar 26, 2021 • edited

JonahhGohh left a comment

Choose a reason for hiding this comment

enhao25 commented Mar 27, 2021

codecov-io commented Mar 27, 2021 • edited

Codecov Report

nowknowing left a comment

Choose a reason for hiding this comment

nowknowing Mar 27, 2021

Choose a reason for hiding this comment

enhao25 Mar 28, 2021

Choose a reason for hiding this comment

nowknowing Mar 28, 2021

Choose a reason for hiding this comment

nowknowing left a comment • edited

Choose a reason for hiding this comment

nowknowing Mar 28, 2021 • edited

Choose a reason for hiding this comment

enhao25 Mar 28, 2021

Choose a reason for hiding this comment

nowknowing Mar 28, 2021 • edited

Choose a reason for hiding this comment

enhao25 Mar 28, 2021

Choose a reason for hiding this comment

enhao25 commented Mar 28, 2021

enhao25 commented Mar 26, 2021 •

edited

codecov-io commented Mar 27, 2021 •

edited

nowknowing left a comment •

edited

nowknowing Mar 28, 2021 •

edited

nowknowing Mar 28, 2021 •

edited