Skip to content

Change ordering on t2 review page #216

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
ArcaEge merged 1 commit into from
May 3, 2026
Merged

Change ordering on t2 review page #216

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
25 changes: 15 additions & 10 deletions src/routes/dashboard/admin/ysws-review/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { db } from '$lib/server/db/index.js';
import { project, user, devlog, t2Review } from '$lib/server/db/schema.js';
import { getProjectLinkType } from '$lib/utils';
import { error } from '@sveltejs/kit';
import { eq, and, sql, ne, inArray, desc, gt } from 'drizzle-orm';
import { eq, and, sql, ne, inArray, desc, gt, asc } from 'drizzle-orm';

export async function load({ locals, url }) {
if (!locals.user) {
Expand All @@ -29,7 +29,13 @@ export async function load({ locals, url }) {
? (url.searchParams.getAll('doubleDippingWith') as (typeof project.doubleDippingWith._.data)[])
: (['none'] as (typeof project.doubleDippingWith._.data)[]);

const projects = await getProjects(statusFilter, projectFilter, userFilter, typeFilter, doubleDippingFilter);
const projects = await getProjects(
statusFilter,
projectFilter,
userFilter,
typeFilter,
doubleDippingFilter
);

const allProjects = await db
.select({
Expand All @@ -47,14 +53,12 @@ export async function load({ locals, url }) {
.from(user)
.where(and(ne(user.trust, 'red'), ne(user.hackatimeTrust, 'red'))); // hide banned users

const t2Agg = db
.$with('t2Agg')
.as(
db
.select({ userId: t2Review.userId, t2Cnt: sql<number>`COUNT(*)`.as('t2Cnt') })
.from(t2Review)
.groupBy(t2Review.userId)
);
const t2Agg = db.$with('t2Agg').as(
db
.select({ userId: t2Review.userId, t2Cnt: sql<number>`COUNT(*)`.as('t2Cnt') })
.from(t2Review)
.groupBy(t2Review.userId)
);

const totalExpr = sql<number>`COALESCE(${t2Agg.t2Cnt}, 0)`;

Expand Down Expand Up @@ -136,6 +140,7 @@ async function getProjects(
user.id,
user.name
)
.orderBy(asc(project.updatedAt))
).filter((item) =>
typeFilter.length > 0
? typeFilter.includes(
Expand Down
Loading