Skip to content

Refactor SQL query for improved date range logic #68

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

Merged
anatolyshipitz merged 3 commits into from
Jul 3, 2025
Merged

Refactor SQL query for improved date range logic #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
773ebca
Refactor SQL query in TARGET_UNITS_QUERY for improved date handling
anatolyshipitz Jul 2, 2025
76cfefa
Refactor date handling in composeWeeklyReportTitle method
anatolyshipitz Jul 2, 2025
205dc24
Merge branch 'main' into issue/fix-date-range
killev Jul 3, 2025
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
11 changes: 9 additions & 2 deletions workers/main/src/services/TargetUnit/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ export const TARGET_UNITS_QUERY = `SELECT
JOIN users AS u ON u.id = te.user_id
WHERE g.type = 'Group'
AND cv.customized_type = 'Principal' and cv.value = ?
AND te.spent_on BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 7 DAY)
AND DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY)
AND te.spent_on BETWEEN
DATE_FORMAT(
DATE_SUB(
DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY),
INTERVAL (MONTH(DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY))-1)%3 MONTH
),
'%Y-%m-01'
)
AND DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) + 1 DAY)
) t
GROUP BY
group_id,
Expand Down
7 changes: 2 additions & 5 deletions workers/main/src/services/WeeklyFinancialReport/WeeklyFinancialReportRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,8 @@ export class WeeklyFinancialReportRepository
}

private composeWeeklyReportTitle(currentDate: Date): string {
const periodStart = new Date(
currentDate.getFullYear(),
currentDate.getMonth(),
currentDate.getDate() - ((currentDate.getDay() + 6) % 7) - 7,
)
const quarter = Math.floor(currentDate.getMonth() / 3);
const periodStart = new Date(currentDate.getFullYear(), quarter * 3, 1)
.toISOString()
.slice(0, 10);
Comment thread
anatolyshipitz marked this conversation as resolved.
const periodEnd = new Date(
Expand Down