Skip to content

fix: data since caculates the min year across yearly data tables for a school #198

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

fix: data since caculates the min year across yearly data tables for a school #198

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
23 changes: 20 additions & 3 deletions src/app/api/schools/[name]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,28 @@ export async function GET(
and(eq(projects.schoolId, school.id), eq(projects.year, year)),
);

// First year would be minimum year found in a school's projects
const firstYearData = await db
// First year would be minimum of first time there are projects, school info, or teachers
const firstYearProjects = await db
.select({ year: sql<number>`min(${projects.year})` })
.from(projects)
.where(eq(projects.schoolId, school.id));
const firstYearTeachers = await db
.select({
year: sql<number>`min(${yearlyTeacherParticipation.year})`,
})
.from(yearlyTeacherParticipation)
.where(eq(yearlyTeacherParticipation.schoolId, school.id));
const firstYearSchools = await db
.select({
year: sql<number>`min(${yearlySchoolParticipation.year})`,
})
.from(yearlySchoolParticipation)
.where(eq(yearlySchoolParticipation.schoolId, school.id));
const firstYearData = Math.min(
firstYearProjects[0].year,
firstYearTeachers[0].year,
firstYearSchools[0].year,
);

const yearlyData = await db.query.yearlySchoolParticipation.findFirst({
where: and(
Expand All @@ -315,7 +332,7 @@ export async function GET(
: 0,
teacherCount: teacherCount[0]?.count ?? 0,
projectCount: projectCount[0]?.count ?? 0,
firstYear: firstYearData[0]?.year ?? null,
firstYear: firstYearData ?? null,
projects: projectRows,
division: yearlyData?.division ?? [],
implementationModel: yearlyData?.implementationModel ?? "",
Expand Down