Skip to content

Bugfix/hackathons pagination #3434

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 4 commits into
base: master
Choose a base branch
from
Open

Bugfix/hackathons pagination #3434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66be203
feat(fix filters): filter by status at get data from db
Nov 28, 2025
0bcbb7b
bugfix(hackathons): import error
Nov 28, 2025
6cc3cf4
feat(hackathons): remove unused filters
Nov 28, 2025
a08e1e2
bugfix(pagination): fix error at get total pages
Nov 29, 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
6 changes: 3 additions & 3 deletions components/hackathons/Hackathons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ export default function Hackathons({
const isHackathonCreator = session?.user?.custom_attributes.includes("hackathonCreator") || session?.user?.custom_attributes.includes("team1-admin");

const router = useRouter();
const pageSize = 4;

const [pastHackathons, setPastHackathons] = useState<HackathonHeader[]>(
initialPastHackathons
Expand All @@ -90,6 +89,7 @@ export default function Hackathons({

const [filters, setFilters] = useState<HackathonsFilters>(initialFilters);
const [searchQuery, setSearchQuery] = useState<string>("");
const [pageSize, setPageSize] = useState<number>(filters.recordsByPage ?? 4);
const [totalPages, setTotalPages] = useState<number>(
Math.ceil(totalPastHackathons / pageSize)
);
Expand Down Expand Up @@ -346,7 +346,7 @@ export default function Hackathons({
length: totalPages > 7 ? 7 : totalPages,
},
(_, i) =>
currentPage +
1 +
i -
(currentPage > 3
? totalPages - currentPage > 3
Expand Down Expand Up @@ -386,7 +386,7 @@ export default function Hackathons({
onValueChange={(value: string) =>
handleFilterChange("recordsByPage", value)
}
value={String(filters.recordsByPage ?? 4)}
value={String(pageSize) ?? 4}
>
<SelectTrigger className="border border-zinc-300 dark:border-zinc-800">
<SelectValue placeholder="Select track" />
Expand Down
169 changes: 72 additions & 97 deletions server/services/hackathons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,29 +67,31 @@ export class ValidationError extends Error {
}
}

export async function getHackathonLite(hackathon: any): Promise<HackathonHeader> {
export async function getHackathonLite(
hackathon: any
): Promise<HackathonHeader> {
// Get user information if created_by exists
if (hackathon.created_by) {
try {
const user = await getUserById(hackathon.created_by);
hackathon.created_by_name = user?.name || user?.email || 'Unknown User';
hackathon.created_by_name = user?.name || user?.email || "Unknown User";
} catch (error) {
console.error('Error fetching user info:', error);
hackathon.created_by_name = 'Unknown User';
console.error("Error fetching user info:", error);
hackathon.created_by_name = "Unknown User";
}
}

// Get user information if updated_by exists
if (hackathon.updated_by) {
try {
const user = await getUserById(hackathon.updated_by);
hackathon.updated_by_name = user?.name || user?.email || 'Unknown User';
hackathon.updated_by_name = user?.name || user?.email || "Unknown User";
} catch (error) {
console.error('Error fetching updated_by user info:', error);
hackathon.updated_by_name = 'Unknown User';
console.error("Error fetching updated_by user info:", error);
hackathon.updated_by_name = "Unknown User";
}
}

return hackathon;
}

Expand Down Expand Up @@ -141,43 +143,40 @@ export async function getFilteredHackathons(options: GetHackathonsOptions) {
const offset = (page - 1) * pageSize;

let filters: any = {};

// Build all conditions
const conditions: any[] = [];

if (options.location) {
if (options.location == "InPerson") {
conditions.push({ NOT: { location: "Online" } });
} else {
conditions.push({ location: options.location });
}
}

if (options.created_by) {
// Show hackathons where user is either creator OR updater
conditions.push({
OR: [
{ created_by: options.created_by },
{ updated_by: options.created_by }
]
{ updated_by: options.created_by },
],
});
}

if (options.date) {
conditions.push({ date: options.date });
}

// Filter by visibility: only show public hackathons unless include_private is true
// Treat null/undefined as public for backwards compatibility
if (!options.include_private) {
conditions.push({
OR: [
{ is_public: true },
{ is_public: null },
]
OR: [{ is_public: true }, { is_public: null }],
});
}

if (options.search) {
const searchWords = options.search.split(/\s+/);
let searchFilters: any[] = [];
Expand Down Expand Up @@ -215,15 +214,33 @@ export async function getFilteredHackathons(options: GetHackathonsOptions) {

conditions.push({ OR: searchFilters });
}


if (options.status) {
switch (options.status) {
case "ENDED":
conditions.push({ end_date: { lt: new Date() } });
break;
case "ONGOING":
conditions.push({
start_date: { lte: new Date() },
end_date: { gte: new Date() },
});
break;
case "UPCOMING":
conditions.push({ start_date: { gt: new Date() } });
break;
}
}

// Combine all conditions with AND
if (conditions.length === 1) {
filters = conditions[0];
} else if (conditions.length > 1) {
filters = { AND: conditions };
}

console.log("Filters: ", filters);
const hackathonCount = await prisma.hackathon.count({ where: filters });

const hackathonList = await prisma.hackathon.findMany({
where: filters,
Expand All @@ -237,64 +254,6 @@ export async function getFilteredHackathons(options: GetHackathonsOptions) {
const hackathons = await Promise.all(hackathonList.map(getHackathonLite));
let hackathonsLite = hackathons;

if (options.status) {
switch (options.status) {
case "ENDED":
hackathonsLite = hackathons.filter(
(hackathon) => new Date(hackathon.end_date).getTime() < Date.now()
);
break;
case "ONGOING":
hackathonsLite = hackathons.filter(
(hackathon) =>
new Date(hackathon.start_date).getTime() <= Date.now() &&
new Date(hackathon.end_date).getTime() >= Date.now()
);
break;
case "UPCOMING":
hackathonsLite = hackathons.filter(
(hackathon) => new Date(hackathon.start_date).getTime() > Date.now()
);
break;
}
}

// If status is filtered, we need to count all matching hackathons, not just the page
let totalHackathons;
if (options.status) {
// Fetch all hackathons matching the filters to count by status
const allHackathons = await prisma.hackathon.findMany({
where: filters,
});
const allHackathonsLite = await Promise.all(allHackathons.map(getHackathonLite));
let filteredByStatus: any[] = [];

switch (options.status) {
case "ENDED":
filteredByStatus = allHackathonsLite.filter(
(hackathon) => new Date(hackathon.end_date).getTime() < Date.now()
);
break;
case "ONGOING":
filteredByStatus = allHackathonsLite.filter(
(hackathon) =>
new Date(hackathon.start_date).getTime() <= Date.now() &&
new Date(hackathon.end_date).getTime() >= Date.now()
);
break;
case "UPCOMING":
filteredByStatus = allHackathonsLite.filter(
(hackathon) => new Date(hackathon.start_date).getTime() > Date.now()
);
break;
}
totalHackathons = filteredByStatus.length;
} else {
totalHackathons = await prisma.hackathon.count({
where: filters,
});
}

return {
hackathons: hackathonsLite.map(
(hackathon) =>
Expand All @@ -306,7 +265,7 @@ export async function getFilteredHackathons(options: GetHackathonsOptions) {
),
} as HackathonHeader)
),
total: totalHackathons,
total: hackathonCount,
page,
pageSize,
};
Expand Down Expand Up @@ -370,8 +329,10 @@ export async function updateHackathon(
userId?: string
): Promise<HackathonHeader> {
// Skip validation if we're only updating is_public field
const isOnlyPublicUpdate = Object.keys(hackathonData).length === 1 && hackathonData.hasOwnProperty('is_public');

const isOnlyPublicUpdate =
Object.keys(hackathonData).length === 1 &&
hackathonData.hasOwnProperty("is_public");

if (!isOnlyPublicUpdate) {
const errors = validateHackathon(hackathonData);
console.log(errors);
Expand Down Expand Up @@ -401,10 +362,11 @@ export async function updateHackathon(
}
// Build update data object with only provided fields
const updateData: any = {};

if (hackathonData.id !== undefined) updateData.id = hackathonData.id;
if (hackathonData.title !== undefined) updateData.title = hackathonData.title;
if (hackathonData.description !== undefined) updateData.description = hackathonData.description;
if (hackathonData.description !== undefined)
updateData.description = hackathonData.description;
if (hackathonData.start_date !== undefined) {
updateData.start_date = getDateWithTimezone(
hackathonData.start_date,
Expand All @@ -417,22 +379,35 @@ export async function updateHackathon(
hackathonData.timezone ?? existingHackathon.timezone
);
}
if (hackathonData.location !== undefined) updateData.location = hackathonData.location;
if (hackathonData.total_prizes !== undefined) updateData.total_prizes = hackathonData.total_prizes;
if (hackathonData.location !== undefined)
updateData.location = hackathonData.location;
if (hackathonData.total_prizes !== undefined)
updateData.total_prizes = hackathonData.total_prizes;
if (hackathonData.tags !== undefined) updateData.tags = hackathonData.tags;
if (hackathonData.timezone !== undefined) updateData.timezone = hackathonData.timezone;
if (hackathonData.timezone !== undefined)
updateData.timezone = hackathonData.timezone;
if (hackathonData.icon !== undefined) updateData.icon = hackathonData.icon;
if (hackathonData.banner !== undefined) updateData.banner = hackathonData.banner;
if (hackathonData.small_banner !== undefined) updateData.small_banner = hackathonData.small_banner;
if (hackathonData.participants !== undefined) updateData.participants = hackathonData.participants;
if (hackathonData.top_most !== undefined) updateData.top_most = hackathonData.top_most;
if (hackathonData.organizers !== undefined) updateData.organizers = hackathonData.organizers;
if (hackathonData.custom_link !== undefined) updateData.custom_link = hackathonData.custom_link;
if (hackathonData.created_by !== undefined) updateData.created_by = hackathonData.created_by;
if (hackathonData.is_public !== undefined) updateData.is_public = hackathonData.is_public;
if (hackathonData.banner !== undefined)
updateData.banner = hackathonData.banner;
if (hackathonData.small_banner !== undefined)
updateData.small_banner = hackathonData.small_banner;
if (hackathonData.participants !== undefined)
updateData.participants = hackathonData.participants;
if (hackathonData.top_most !== undefined)
updateData.top_most = hackathonData.top_most;
if (hackathonData.organizers !== undefined)
updateData.organizers = hackathonData.organizers;
if (hackathonData.custom_link !== undefined)
updateData.custom_link = hackathonData.custom_link;
if (hackathonData.created_by !== undefined)
updateData.created_by = hackathonData.created_by;
if (hackathonData.is_public !== undefined)
updateData.is_public = hackathonData.is_public;
if (userId) updateData.updated_by = userId;
if (hackathonData.content !== undefined) {
const content = { ...hackathonData.content } as unknown as Prisma.JsonObject;
const content = {
...hackathonData.content,
} as unknown as Prisma.JsonObject;
updateData.content = content;
}

Expand Down