From 65a8618e547b478773b509f08626a9dfbb0de02a Mon Sep 17 00:00:00 2001 From: Bryann Yeap Kok Keong Date: Mon, 24 Oct 2022 18:40:20 +0800 Subject: [PATCH 1/3] [offers][chore] Add a secondary sorting by monthYearReceived descending in addition to other primary sorting filters applied --- .../portal/src/server/router/offers/offers.ts | 64 ++++++++++++------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/apps/portal/src/server/router/offers/offers.ts b/apps/portal/src/server/router/offers/offers.ts index 1a1bd354..b333fa66 100644 --- a/apps/portal/src/server/router/offers/offers.ts +++ b/apps/portal/src/server/router/offers/offers.ts @@ -103,22 +103,32 @@ export const offersRouter = createRouter().query('list', { monthYearReceived: order, } : sortingKey === sortingKeysMap.totalCompensation - ? { - offersIntern: { - monthlySalary: { - baseValue: order, + ? [ + { + offersIntern: { + monthlySalary: { + baseValue: order, + }, }, }, - } + { + monthYearReceived: 'desc', + }, + ] : sortingKey === sortingKeysMap.totalYoe - ? { - profile: { - background: { - totalYoe: order, + ? [ + { + profile: { + background: { + totalYoe: order, + }, }, }, - } - : undefined, + { + monthYearReceived: 'desc', + }, + ] + : { monthYearReceived: 'desc' }, where: { AND: [ { @@ -207,22 +217,32 @@ export const offersRouter = createRouter().query('list', { monthYearReceived: order, } : sortingKey === sortingKeysMap.totalCompensation - ? { - offersFullTime: { - totalCompensation: { - baseValue: order, + ? [ + { + offersIntern: { + monthlySalary: { + baseValue: order, + }, }, }, - } + { + monthYearReceived: 'desc', + }, + ] : sortingKey === sortingKeysMap.totalYoe - ? { - profile: { - background: { - totalYoe: order, + ? [ + { + profile: { + background: { + totalYoe: order, + }, }, }, - } - : undefined, + { + monthYearReceived: 'desc', + }, + ] + : { monthYearReceived: 'desc' }, where: { AND: [ { From ef5892a0d684015da3da4d9a428867e0642332ea Mon Sep 17 00:00:00 2001 From: Stuart Long Chay Boon Date: Mon, 24 Oct 2022 20:56:28 +0800 Subject: [PATCH 2/3] [offers][feat] add random name generator --- apps/portal/package.json | 1 + apps/portal/src/utils/offers/randomNameGenerator.ts | 13 +++++++++++++ yarn.lock | 5 +++++ 3 files changed, 19 insertions(+) create mode 100644 apps/portal/src/utils/offers/randomNameGenerator.ts diff --git a/apps/portal/package.json b/apps/portal/package.json index 208b1940..a8a184d8 100644 --- a/apps/portal/package.json +++ b/apps/portal/package.json @@ -38,6 +38,7 @@ "react-popper-tooltip": "^4.4.2", "react-query": "^3.39.2", "superjson": "^1.10.0", + "unique-names-generator": "^4.7.1", "zod": "^3.18.0" }, "devDependencies": { diff --git a/apps/portal/src/utils/offers/randomNameGenerator.ts b/apps/portal/src/utils/offers/randomNameGenerator.ts new file mode 100644 index 00000000..ba286197 --- /dev/null +++ b/apps/portal/src/utils/offers/randomNameGenerator.ts @@ -0,0 +1,13 @@ +import type { Config } from 'unique-names-generator'; +import { adjectives, animals,colors, uniqueNamesGenerator } from 'unique-names-generator'; + +const customConfig: Config = { + dictionaries: [adjectives, colors, animals], + length: 3, + separator: '-', +}; + + +export default function generateRandomName(): string { + return uniqueNamesGenerator(customConfig) +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index f5517ea1..f2dd81c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14405,6 +14405,11 @@ unique-filename@^1.1.1: dependencies: unique-slug "^2.0.0" +unique-names-generator@^4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/unique-names-generator/-/unique-names-generator-4.7.1.tgz#966407b12ba97f618928f77322cfac8c80df5597" + integrity sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow== + unique-slug@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz" From e77bb0363982209806b7480e00e252140c3849cd Mon Sep 17 00:00:00 2001 From: Stuart Long Chay Boon Date: Mon, 24 Oct 2022 21:09:33 +0800 Subject: [PATCH 3/3] [offers][chore] integrate random name generator to create profile --- .../router/offers/offers-profile-router.ts | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 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 d395c9ec..506b961b 100644 --- a/apps/portal/src/server/router/offers/offers-profile-router.ts +++ b/apps/portal/src/server/router/offers/offers-profile-router.ts @@ -1,4 +1,4 @@ -import crypto, { randomUUID } from 'crypto'; +import crypto from 'crypto'; import { z } from 'zod'; import { JobType } from '@prisma/client'; import * as trpc from '@trpc/server'; @@ -10,6 +10,7 @@ import { } from '~/mappers/offers-mappers'; import { baseCurrencyString } from '~/utils/offers/currency'; import { convert } from '~/utils/offers/currency/currencyExchange'; +import generateRandomName from '~/utils/offers/randomNameGenerator'; import { createValidationRegex } from '~/utils/offers/zodRegex'; import { createRouter } from '../context'; @@ -266,6 +267,24 @@ export const offersProfileRouter = createRouter() .update(Date.now().toString()) .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 profile = await ctx.prisma.offersProfile.create({ data: { background: { @@ -538,7 +557,7 @@ export const offersProfileRouter = createRouter() }), ), }, - profileName: randomUUID().substring(0, 10), + profileName: uniqueName, }, });