Skip to content

Refactor unpaid function for clarity and date fix #5

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −3
Open

Refactor unpaid function for clarity and date fix #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions server/lib/calcEarnings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ async function total(year, month, user, report) {
* @param {number} [month] month to exclude
* @returns {Promise<UnpaidEarnings>}
*/

async function unpaid(user, year, month) {
let earnings = 0;
const ids = [];
Expand All @@ -122,11 +123,20 @@ async function unpaid(user, year, month) {
[UserEarnings.PAYMENT_ID, null],
];

// Exclude current or future months if year/month is passed
if (year && month) {
where.push([UserEarnings.MONTH, month, '<'], [UserEarnings.YEAR, year], 'OR', [UserEarnings.YEAR, year, '<']);
where.push(
[UserEarnings.MONTH, month, '<'],
[UserEarnings.YEAR, year],
'OR',
[UserEarnings.YEAR, year, '<']
);
}

const unpaidEarnings = await UserEarnings.get([UserEarnings.AMOUNT, UserEarnings.ID, UserEarnings.MONTH, UserEarnings.YEAR], where);
const unpaidEarnings = await UserEarnings.get(
[UserEarnings.AMOUNT, UserEarnings.ID, UserEarnings.MONTH, UserEarnings.YEAR],
where
);

let fromMonth = 31;
let fromYear = 9999;
Expand All @@ -151,11 +161,24 @@ async function unpaid(user, year, month) {
}

earnings = Number.parseFloat(Math.round(earnings * 100) / 100);

// ✅ Fix: Adjust 'to' date so it doesn’t go beyond current date
const now = moment();
let toMoment = moment({ year: toYear, month: toMonth });

if (toMoment.isSame(now, 'month') && toMoment.isSame(now, 'year')) {
// If unpaid includes the current month, cap it at today
toMoment = now.endOf('day');
} else {
// Otherwise use the full month end
toMoment = toMoment.endOf('month');
}

return {
ids,
earnings,
from: moment({ year: fromYear, month: fromMonth }).startOf('month'),
to: moment({ year: toYear, month: toMonth }).endOf('month'),
to: toMoment,
};
}

Expand Down