Skip to content

Feat: Include HaH in statistics #1321

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
JeangelLF merged 2 commits into from
Dec 1, 2025
Merged

Feat: Include HaH in statistics #1321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
441d33f
feat: Include Hausaufgabenhilfe in statistics
JeangelLF Dec 1, 2025
ca55b4a
fix: formatting
JeangelLF Dec 1, 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
60 changes: 40 additions & 20 deletions graphql/statistics/fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,13 @@ export class StatisticsResolver {
ON sc."id" = l."subcourseId"
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN UNNEST(l."participantIds") AS t(p_id)
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."participantIds"
END
) AS t(p_id)
WHERE l."isCanceled" = FALSE
AND l."start" >= ${statistics.from}::timestamp
AND l."start" <= ${statistics.to}::timestamp
Expand All @@ -1198,7 +1204,6 @@ export class StatisticsResolver {
OR (
c."courseState" = 'allowed'
AND sc."cancelled" = FALSE
AND c."name" NOT LIKE '%Hausaufgabenhilfe%'
)
)
GROUP BY year, month
Expand All @@ -1217,20 +1222,25 @@ export class StatisticsResolver {
FROM lecture l
LEFT JOIN subcourse sc ON sc."id" = l."subcourseId"
LEFT JOIN course c ON c."id" = sc."courseId"
CROSS JOIN UNNEST(l."organizerIds") AS t(s_id)
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."organizerIds"
END
) AS t(s_id)
WHERE l."isCanceled" = FALSE
AND l."start" >= ${statistics.from}::timestamp
AND l."start" <= ${statistics.to}::timestamp
AND l."appointmentType" IN ('group', 'match')
AND s_id LIKE 'student/%'
AND (
c."id" IS NULL
OR (
c."courseState" = 'allowed'
AND sc."cancelled" = FALSE
AND c."name" NOT LIKE '%Hausaufgabenhilfe%'
AND l."start" >= ${statistics.from}::timestamp
AND l."start" <= ${statistics.to}::timestamp
AND l."appointmentType" IN ('group', 'match')
AND s_id LIKE 'student/%'
AND (
c."id" IS NULL
OR (
c."courseState" = 'allowed'
AND sc."cancelled" = FALSE
)
)
)
GROUP BY year, month
ORDER BY year, month;
`;
Expand All @@ -1247,7 +1257,13 @@ export class StatisticsResolver {
ON sc."id" = l."subcourseId"
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN UNNEST(l."participantIds") AS t(p_id)
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."participantIds"
END
) AS t(p_id)
WHERE l."isCanceled" = FALSE
AND l."start" >= ${statistics.from}::timestamp
AND l."start" <= ${statistics.to}::timestamp
Expand All @@ -1258,9 +1274,8 @@ export class StatisticsResolver {
OR (
c."courseState" = 'allowed'
AND sc."cancelled" = FALSE
AND c."name" NOT LIKE '%Hausaufgabenhilfe%'
)
)
);
`;
return result[0]?.value ?? 0;
}
Expand All @@ -1276,7 +1291,13 @@ export class StatisticsResolver {
ON sc."id" = l."subcourseId"
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN UNNEST(l."organizerIds") AS t(s_id)
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."organizerIds"
END
) AS t(s_id)
WHERE l."isCanceled" = FALSE
AND l."start" >= ${statistics.from}::timestamp
AND l."start" <= ${statistics.to}::timestamp
Expand All @@ -1287,9 +1308,8 @@ export class StatisticsResolver {
OR (
c."courseState" = 'allowed'
AND sc."cancelled" = FALSE
AND c."name" NOT LIKE '%Hausaufgabenhilfe%'
)
)
);
`;
return result[0]?.value ?? 0;
}
Expand Down