gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b1de52dbb4 - Show all commits

14
apps/backend/src/routes/assessmentRequest/route.ts
View File

@ -1,12 +1,10 @@
import { eq, sql, ilike, isNull, and, desc } from "drizzle-orm";
import { eq, sql, ilike, and, desc} from "drizzle-orm";
import { Hono } from "hono";
import { z } from "zod";
import db from "../../drizzle";
import { respondents } from "../../drizzle/schema/respondents";
import { assessments } from "../../drizzle/schema/assessments";
import { users } from "../../drizzle/schema/users";
import { rolesToUsers } from "../../drizzle/schema/rolesToUsers";
import { rolesSchema } from "../../drizzle/schema/roles";
import HonoEnv from "../../types/HonoEnv";
import authInfo from "../../middlewares/authInfo";
import { forbidden, notFound } from "../../errors/DashboardError";
@ -52,7 +50,9 @@ const assessmentRequestRoute = new Hono<HonoEnv>()
.where(
and(
eq(users.id, userId),
q ? ilike(assessments.status, `%${q}%`) : undefined
q && q.trim() !== ""
? ilike(sql`${assessments.status}::text`, `%${q}%`) // Cast status to text for ilike
: undefined
)
)
@ -70,14 +70,14 @@ const assessmentRequestRoute = new Hono<HonoEnv>()
respondentId: respondents.id,
})
.from(users)
.leftJoin(rolesToUsers, eq(users.id, rolesToUsers.userId))
.leftJoin(rolesSchema, eq(rolesToUsers.roleId, rolesSchema.id))
.leftJoin(respondents, eq(users.id, respondents.userId))
.leftJoin(assessments, eq(respondents.id, assessments.respondentId))
.where(
and(
eq(users.id, userId),
q ? ilike(assessments.status, `%${q}%`) : undefined
q && q.trim() !== ""
? ilike(sql`${assessments.status}::text`, `%${q}%`) // Cast status to text for ilike
: undefined
)
)
.orderBy(desc(assessments.createdAt))