diff --git a/server/src/routes/api/admin-users.js b/server/src/routes/api/admin-users.js index 38f50c0..f6b3f6d 100644 --- a/server/src/routes/api/admin-users.js +++ b/server/src/routes/api/admin-users.js @@ -21,7 +21,7 @@ export async function registerAdminUserRoutes(fastify) { const where = q ? { - OR: [{ email: { contains: q } }, { name: { contains: q } }], + OR: [{ email: { contains: q } }, { displayName: { contains: q } }], } : undefined @@ -32,7 +32,7 @@ export async function registerAdminUserRoutes(fastify) { select: { id: true, email: true, - name: true, + displayName: true, createdAt: true, updatedAt: true, }, @@ -43,7 +43,7 @@ export async function registerAdminUserRoutes(fastify) { const items = users.map((u) => ({ id: u.id, email: u.email, - name: u.name, + displayName: u.displayName, createdAt: u.createdAt, updatedAt: u.updatedAt, })) @@ -60,9 +60,9 @@ export async function registerAdminUserRoutes(fastify) { return } - const nameRaw = body.name - const name = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim() - if (name !== null && name.length > 40) { + const nameRaw = body.displayName + const displayName = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim() + if (displayName !== null && displayName.length > 40) { reply.code(400).send({ error: 'Имя/ник максимум 40 символов' }) return } @@ -76,14 +76,14 @@ export async function registerAdminUserRoutes(fastify) { const user = await prisma.user.create({ data: { email, - name: name && name.length ? name : null, + displayName: displayName && displayName.length ? displayName : null, }, }) reply.code(201).send({ id: user.id, email: user.email, - name: user.name, + displayName: user.displayName, createdAt: user.createdAt, updatedAt: user.updatedAt, }) @@ -117,21 +117,21 @@ export async function registerAdminUserRoutes(fastify) { } } - if (body.name !== undefined) { - const nameRaw = body.name + if (body.displayName !== undefined) { + const nameRaw = body.displayName const name = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim() if (name !== null && name.length > 40) { reply.code(400).send({ error: 'Имя/ник максимум 40 символов' }) return } - data.name = name && name.length ? name : null + data.displayName = name && name.length ? name : null } const user = await prisma.user.update({ where: { id }, data }) return { id: user.id, email: user.email, - name: user.name, + displayName: user.displayName, createdAt: user.createdAt, updatedAt: user.updatedAt, }