From aeae391034af6847b086eb316f0b9d739d84caa1 Mon Sep 17 00:00:00 2001 From: harid Date: Fri, 12 Jun 2026 17:53:23 +0700 Subject: [PATCH] no message --- src/app.ts | 3 +-- src/controllers/ProfileChangeNameController.ts | 10 ++++++++-- src/controllers/ProfileController.ts | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app.ts b/src/app.ts index ab3b372c..c2cbe5f7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -66,8 +66,7 @@ async function main() { }); // Cron job for updating org revision - every day at 01:00:00 - // const cronTime = "0 0 1 * * *"; - const cronTime = "0 10 16 * * *"; // test by dev + const cronTime = "0 0 1 * * *"; cron.schedule(cronTime, async () => { try { const orgController = new OrganizationController(); diff --git a/src/controllers/ProfileChangeNameController.ts b/src/controllers/ProfileChangeNameController.ts index 0261666f..18bd4922 100644 --- a/src/controllers/ProfileChangeNameController.ts +++ b/src/controllers/ProfileChangeNameController.ts @@ -111,9 +111,15 @@ export class ProfileChangeNameController extends Controller { setLogDataDiff(req, { before, after: history }); profile.firstName = body.firstName ?? profile.firstName; profile.lastName = body.lastName ?? profile.lastName; - profile.prefix = body.prefix ?? profile.prefix; + //old + // profile.prefix = body.prefix ?? profile.prefix; + // profile.rank = body.rank ?? profile.rank; + // profile.prefixMain = profile.rank ?? profile.prefix; + //new + profile.prefixMain = profile.prefix; + profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix; profile.rank = body.rank ?? profile.rank; - profile.prefixMain = profile.rank ?? profile.prefix; + await this.profileRepository.save(profile, { data: req }); setLogDataDiff(req, { before, after: profile }); diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 42b322d3..c2bb6420 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -5800,8 +5800,12 @@ export class ProfileController extends Controller { Object.assign(record, body); record.dateRetireLaw = calculateRetireLaw(record.birthDate); + //old record.prefixMain = record.prefix; record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefixMain; + //new + record.prefixMain = record.prefix; + record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefix; record.createdUserId = request.user.sub; record.createdFullName = request.user.name; record.createdAt = new Date();