Skip to content

Feat: add query for newly registered pupils that already have a screening #1366

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
realmayus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: add query for newly registered pupils that already have a screening #1366

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
49 changes: 32 additions & 17 deletions graphql/statistics/fields.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,21 @@ export class StatisticsResolver {
ORDER BY "year" ASC, "month" ASC;`;
}

@FieldResolver((returns) => [ByMonth])
@Authorized(Role.ADMIN)
async registeredPupilsHavingScreening(@Root() statistics: Statistics) {
return await prisma.$queryRaw`SELECT COUNT(*)::INT AS value,
date_part('year', pupil."createdAt"::date) AS year,
date_part('month', pupil."createdAt"::date) AS month
FROM pupil
LEFT JOIN pupil_screening on pupil_screening."pupilId" = pupil.id
WHERE pupil."createdAt" > ${statistics.from}::timestamp
AND pupil."createdAt" < ${statistics.to}::timestamp
AND (pupil_screening."createdAt" IS NOT NULL)
GROUP BY "year", "month"
ORDER BY "year" ASC, "month" ASC`;
}

@FieldResolver((returns) => [ByMonth])
@Authorized(Role.ADMIN)
async pupilRegistrationsByState(@Root() statistics: Statistics) {
Expand Down Expand Up @@ -1070,7 +1085,7 @@ export class StatisticsResolver {
EXTRACT(YEAR FROM l."start")::int AS year,
EXTRACT(MONTH FROM l."start")::int AS month,
SUM(
l."duration" * CASE
l."duration" * CASE
WHEN l."appointmentType" = 'match' THEN 1
ELSE COALESCE(array_length(l."participantIds", 1), 0)
END
Expand Down Expand Up @@ -1114,7 +1129,7 @@ export class StatisticsResolver {
COUNT(CASE WHEN l_count >= ${minCompletedLectures} THEN m.id END) AS successful_matches
FROM match m
LEFT JOIN (
SELECT
SELECT
l."matchId",
COUNT(*) AS l_count
FROM lecture l
Expand Down Expand Up @@ -1151,7 +1166,7 @@ export class StatisticsResolver {
EXTRACT(MONTH FROM l."start")::int AS month,
COUNT(DISTINCT m."id")::int AS value
FROM match m
JOIN lecture l
JOIN lecture l
ON l."matchId" = m."id"
WHERE l."start" >= ${statistics.from}::timestamp AND l."start" <= ${statistics.to}::timestamp
AND l."isCanceled" = FALSE
Expand All @@ -1168,7 +1183,7 @@ export class StatisticsResolver {
SELECT
COUNT(DISTINCT m."id")::int AS value
FROM match m
JOIN lecture l
JOIN lecture l
ON l."matchId" = m."id"
WHERE l."start" >= ${statistics.from}::timestamp AND l."start" <= ${statistics.to}::timestamp
AND l."isCanceled" = FALSE
Expand All @@ -1186,13 +1201,13 @@ export class StatisticsResolver {
EXTRACT(MONTH FROM l."start")::int AS month,
COUNT(DISTINCT p_id)::int AS value
FROM lecture l
LEFT JOIN subcourse sc
LEFT JOIN subcourse sc
ON sc."id" = l."subcourseId"
LEFT JOIN course c
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."participantIds"
END
Expand Down Expand Up @@ -1226,8 +1241,8 @@ export class StatisticsResolver {
LEFT JOIN subcourse sc ON sc."id" = l."subcourseId"
LEFT JOIN course c ON c."id" = sc."courseId"
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."organizerIds"
END
Expand Down Expand Up @@ -1256,12 +1271,12 @@ export class StatisticsResolver {
SELECT
COUNT(DISTINCT p_id)::int AS value
FROM lecture l
LEFT JOIN subcourse sc
LEFT JOIN subcourse sc
ON sc."id" = l."subcourseId"
LEFT JOIN course c
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN LATERAL UNNEST(
CASE
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."participantIds"
Expand Down Expand Up @@ -1290,13 +1305,13 @@ export class StatisticsResolver {
SELECT
COUNT(DISTINCT s_id)::int AS value
FROM lecture l
LEFT JOIN subcourse sc
LEFT JOIN subcourse sc
ON sc."id" = l."subcourseId"
LEFT JOIN course c
LEFT JOIN course c
ON c."id" = sc."courseId"
CROSS JOIN LATERAL UNNEST(
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
CASE
WHEN c."name" LIKE '%Hausaufgabenhilfe%'
THEN l."joinedBy"
ELSE l."organizerIds"
END
Expand Down