From 52cf2a247f0846efa425e35577bc1f2ba74488f0 Mon Sep 17 00:00:00 2001 From: Abdul Rahman Reza Date: Mon, 20 Jan 2025 08:35:31 +0700 Subject: [PATCH] update add param nik --- src/controllers/auth.ts | 2 +- src/controllers/user.ts | 3 +++ src/swagger/builder.js | 11 ++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts index 9876568..38d0b10 100644 --- a/src/controllers/auth.ts +++ b/src/controllers/auth.ts @@ -48,7 +48,7 @@ export class AuthController { const user = await userRepository.findOne({ relations: ['roles', 'roles.application'], - select: ['id', 'email', 'name', 'password', 'username', 'roles'], + select: ['id', 'email', 'name', 'nik', 'password', 'username', 'roles'], where: { username: param.username }, }) diff --git a/src/controllers/user.ts b/src/controllers/user.ts index e372209..59a510a 100644 --- a/src/controllers/user.ts +++ b/src/controllers/user.ts @@ -245,6 +245,7 @@ export class UserController { password: Joi.string().pattern(new RegExp('^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$')).min(8).required().label('Password'), retype_password: Joi.ref('password'), name: Joi.string().max(64).required().label('Name'), + nik: Joi.string().max(64).optional().allow('').label('NIK'), status: Joi.string().required().label('Status'), }); @@ -564,6 +565,7 @@ export class UserController { password: Joi.string().allow('').optional().label('Password'), retype_password: Joi.ref('password'), name: Joi.string().max(64).required().label('Name'), + nik: Joi.string().max(64).optional().allow('').label('NIK'), status: Joi.string().required().label('Status'), }); @@ -577,6 +579,7 @@ export class UserController { if (data != null) { data.name = param.name + data.nik = param.nik data.username = param.username data.email = param.email data.status = param.status diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 97fe9b2..c62f88d 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -27,11 +27,12 @@ const doc = { $password: "12345aA!", $retype_password: "12345aA!", $name: "Administrator", - $phone: "08123456789", - $jabatan: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", - $organisasi: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", - $divisi: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", - $unit: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", + $nik: "123456789", + // $phone: "08123456789", + // $jabatan: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", + // $organisasi: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", + // $divisi: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", + // $unit: "4a6991b6-78a0-4b3b-bf5c-fa0af5f69be8", $status: "Y" }, user_profile: {