refactor: rename name→displayName in admin-users
This commit is contained in:
@@ -21,7 +21,7 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
|
|
||||||
const where = q
|
const where = q
|
||||||
? {
|
? {
|
||||||
OR: [{ email: { contains: q } }, { name: { contains: q } }],
|
OR: [{ email: { contains: q } }, { displayName: { contains: q } }],
|
||||||
}
|
}
|
||||||
: undefined
|
: undefined
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
email: true,
|
email: true,
|
||||||
name: true,
|
displayName: true,
|
||||||
createdAt: true,
|
createdAt: true,
|
||||||
updatedAt: true,
|
updatedAt: true,
|
||||||
},
|
},
|
||||||
@@ -43,7 +43,7 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
const items = users.map((u) => ({
|
const items = users.map((u) => ({
|
||||||
id: u.id,
|
id: u.id,
|
||||||
email: u.email,
|
email: u.email,
|
||||||
name: u.name,
|
displayName: u.displayName,
|
||||||
createdAt: u.createdAt,
|
createdAt: u.createdAt,
|
||||||
updatedAt: u.updatedAt,
|
updatedAt: u.updatedAt,
|
||||||
}))
|
}))
|
||||||
@@ -60,9 +60,9 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const nameRaw = body.name
|
const nameRaw = body.displayName
|
||||||
const name = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim()
|
const displayName = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim()
|
||||||
if (name !== null && name.length > 40) {
|
if (displayName !== null && displayName.length > 40) {
|
||||||
reply.code(400).send({ error: 'Имя/ник максимум 40 символов' })
|
reply.code(400).send({ error: 'Имя/ник максимум 40 символов' })
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -76,14 +76,14 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
const user = await prisma.user.create({
|
const user = await prisma.user.create({
|
||||||
data: {
|
data: {
|
||||||
email,
|
email,
|
||||||
name: name && name.length ? name : null,
|
displayName: displayName && displayName.length ? displayName : null,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
reply.code(201).send({
|
reply.code(201).send({
|
||||||
id: user.id,
|
id: user.id,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
name: user.name,
|
displayName: user.displayName,
|
||||||
createdAt: user.createdAt,
|
createdAt: user.createdAt,
|
||||||
updatedAt: user.updatedAt,
|
updatedAt: user.updatedAt,
|
||||||
})
|
})
|
||||||
@@ -117,21 +117,21 @@ export async function registerAdminUserRoutes(fastify) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (body.name !== undefined) {
|
if (body.displayName !== undefined) {
|
||||||
const nameRaw = body.name
|
const nameRaw = body.displayName
|
||||||
const name = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim()
|
const name = nameRaw === null || nameRaw === undefined ? null : String(nameRaw).trim()
|
||||||
if (name !== null && name.length > 40) {
|
if (name !== null && name.length > 40) {
|
||||||
reply.code(400).send({ error: 'Имя/ник максимум 40 символов' })
|
reply.code(400).send({ error: 'Имя/ник максимум 40 символов' })
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
data.name = name && name.length ? name : null
|
data.displayName = name && name.length ? name : null
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await prisma.user.update({ where: { id }, data })
|
const user = await prisma.user.update({ where: { id }, data })
|
||||||
return {
|
return {
|
||||||
id: user.id,
|
id: user.id,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
name: user.name,
|
displayName: user.displayName,
|
||||||
createdAt: user.createdAt,
|
createdAt: user.createdAt,
|
||||||
updatedAt: user.updatedAt,
|
updatedAt: user.updatedAt,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user