Skip to content
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

feat(users): allow search on family and given name too #597

Merged
merged 1 commit into from
Oct 15, 2024
Merged

feat(users): allow search on family and given name too #597

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
8 changes: 6 additions & 2 deletions packages/~/users/api/src/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import type { App_Context } from "@~/app.middleware/context";
import type { urls } from "@~/app.urls";
import { schema, type MonComptePro_PgDatabase } from "@~/moncomptepro.database";
import { and, desc, count as drizzle_count, ilike } from "drizzle-orm";
import { desc, count as drizzle_count, ilike, or } from "drizzle-orm";
import type { Env, InferRequestType } from "hono";
import { useRequestContext } from "hono/jsx-renderer";

Expand Down Expand Up @@ -50,7 +50,11 @@ export function get_users_list(
) {
const { page, page_size: take } = pagination;

const where = and(ilike(schema.users.email, `%${search ?? ""}%`));
const where = or(
ilike(schema.users.family_name, `%${search ?? ""}%`),
ilike(schema.users.given_name, `%${search ?? ""}%`),
ilike(schema.users.email, `%${search ?? ""}%`),
);
return pg.transaction(async function users_with_count(tx) {
const users = await tx
.select({
Expand Down