From 3c8029625355c29d090596a3e401e9cc2a8f545e Mon Sep 17 00:00:00 2001 From: Stuart Long Chay Boon Date: Mon, 24 Oct 2022 21:27:40 +0800 Subject: [PATCH] [offers][refactor] refactor random name generator code --- .../router/offers/offers-profile-router.ts | 17 +------------ .../src/utils/offers/randomNameGenerator.ts | 24 +++++++++++++++++-- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/apps/portal/src/server/router/offers/offers-profile-router.ts b/apps/portal/src/server/router/offers/offers-profile-router.ts index 506b961b..c29dfde5 100644 --- a/apps/portal/src/server/router/offers/offers-profile-router.ts +++ b/apps/portal/src/server/router/offers/offers-profile-router.ts @@ -268,22 +268,7 @@ export const offersProfileRouter = createRouter() .digest('hex'); // Generate random name until unique - let uniqueName: string = generateRandomName(); - - let sameNameProfiles = await ctx.prisma.offersProfile.findMany({ - where: { - profileName: uniqueName - } - }) - - while (sameNameProfiles.length !== 0) { - uniqueName = generateRandomName(); - sameNameProfiles = await ctx.prisma.offersProfile.findMany({ - where: { - profileName: uniqueName - } - }) - } + const uniqueName: string = await generateRandomName(); const profile = await ctx.prisma.offersProfile.create({ data: { diff --git a/apps/portal/src/utils/offers/randomNameGenerator.ts b/apps/portal/src/utils/offers/randomNameGenerator.ts index ba286197..ff02e503 100644 --- a/apps/portal/src/utils/offers/randomNameGenerator.ts +++ b/apps/portal/src/utils/offers/randomNameGenerator.ts @@ -1,5 +1,8 @@ import type { Config } from 'unique-names-generator'; import { adjectives, animals,colors, uniqueNamesGenerator } from 'unique-names-generator'; +import { PrismaClient } from '@prisma/client'; + +const prisma = new PrismaClient() const customConfig: Config = { dictionaries: [adjectives, colors, animals], @@ -8,6 +11,23 @@ const customConfig: Config = { }; -export default function generateRandomName(): string { - return uniqueNamesGenerator(customConfig) +export default async function generateRandomName(): Promise { + let uniqueName: string = uniqueNamesGenerator(customConfig); + + let sameNameProfiles = await prisma.offersProfile.findMany({ + where: { + profileName: uniqueName + } + }) + + while (sameNameProfiles.length !== 0) { + uniqueName = uniqueNamesGenerator(customConfig); + sameNameProfiles = await prisma.offersProfile.findMany({ + where: { + profileName: uniqueName + } + }) + } + + return uniqueName } \ No newline at end of file