From dcbae4b07bd366e1b77ba7f44053bc6e7e255782 Mon Sep 17 00:00:00 2001 From: Raphael Rivas Date: Fri, 15 Dec 2023 11:49:39 -0300 Subject: [PATCH] chore: use UPPER instead of LOWER - test: test case accent name filter - chore: remove unecessary test envs and consts --- env-example | 4 +--- src/users/users.service.ts | 6 +++--- test/admin/users.e2e-spec.ts | 8 ++++++++ test/utils/constants.ts | 29 +++++++++++++---------------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/env-example b/env-example index 03360050..8150af9a 100644 --- a/env-example +++ b/env-example @@ -68,6 +68,4 @@ TWITTER_CONSUMER_SECRET= WORKER_HOST=redis://redis:6379/1 TEST_ADMIN_EMAIL= -TEST_ADMIN_PASSWORD= -TEST_LICENSEE_PERMIT_CODE= -TEST_LICENSEE_PASSWORD= \ No newline at end of file +TEST_ADMIN_PASSWORD= \ No newline at end of file diff --git a/src/users/users.service.ts b/src/users/users.service.ts index 08ea47d6..ddf5ca25 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -155,15 +155,15 @@ export class UsersService { return qb .where(() => (whereFields.length > 0 ? whereFields : '1 = 0')) .orWhere( - 'unaccent(LOWER("user"."fullName")) ILIKE unaccent(LOWER(:name))', + 'unaccent(UPPER("user"."fullName")) ILIKE unaccent(UPPER(:name))', { name: `%${fieldName}%` }, ) .orWhere( - 'unaccent(LOWER("user"."firstName")) ILIKE unaccent(LOWER(:name))', + 'unaccent(UPPER("user"."firstName")) ILIKE unaccent(UPPER(:name))', { name: `%${fieldName}%` }, ) .orWhere( - 'unaccent(LOWER("user"."lastName")) ILIKE unaccent(LOWER(:name))', + 'unaccent(UPPER("user"."lastName")) ILIKE unaccent(UPPER(:name))', { name: `%${fieldName}%` }, ); } else { diff --git a/test/admin/users.e2e-spec.ts b/test/admin/users.e2e-spec.ts index 82a3d189..c038f661 100644 --- a/test/admin/users.e2e-spec.ts +++ b/test/admin/users.e2e-spec.ts @@ -9,6 +9,7 @@ import { ADMIN_EMAIL, ADMIN_PASSWORD, APP_URL, + LICENSEE_CASE_ACCENT, LICENSEE_PERMIT_CODE, MAILDEV_URL, } from '../utils/constants'; @@ -63,6 +64,13 @@ describe('Admin managing users (e2e)', () => { .then(({ body }) => body.data); const licenseePartOfName = 'user'; const args = [ + { + filter: { name: stringUppercaseUnaccent(LICENSEE_CASE_ACCENT) }, + expect: (body: any) => + expect( + body.data.some((i: any) => i.fullName === LICENSEE_CASE_ACCENT), + ).toBeTruthy(), + }, { filter: { permitCode: licensee.permitCode }, expect: (body: any) => diff --git a/test/utils/constants.ts b/test/utils/constants.ts index f553661a..b3181212 100644 --- a/test/utils/constants.ts +++ b/test/utils/constants.ts @@ -3,23 +3,20 @@ config(); export const APP_URL = `http://localhost:${process.env.APP_PORT}`; export const MAILDEV_URL = `http://${process.env.MAIL_HOST}:${process.env.MAIL_CLIENT_PORT}`; -export const TESTER_EMAIL = 'john.doe@example.com'; -export const TESTER_PASSWORD = 'secret'; + export const ADMIN_EMAIL = process.env.TEST_ADMIN_EMAIL || 'admin@example.com'; export const ADMIN_PASSWORD = process.env.TEST_ADMIN_PASSWORD || 'secret'; -export const ADMIN_2_EMAIL = - process.env.TEST_ADMIN_2_EMAIL || 'admin.test@example.com'; -export const ADMIN_2_PASSWORD = process.env.TEST_ADMIN_2_PASSWORD || 'secret'; -export const LICENSEE_EMAIL = - process.env.TEST_LICENSEE_EMAIL || 'henrique@example.com'; -export const LICENSEE_2_EMAIL = - process.env.TEST_LICENSEE_2_EMAIL || 'marcia@example.com'; -export const LICENSEE_2_PERMIT_CODE = - process.env.TEST_LICENSEE_2_PERMIT_CODE || '319274392832023'; -export const LICENSEE_CASE_ACCENT = - process.env.TEST_LICENSEE_CASE_ACCENT || 'Márcia Clara Template'; -export const LICENSEE_PERMIT_CODE = - process.env.TEST_LICENSEE_PERMIT_CODE || '213890329890312'; -export const LICENSEE_PASSWORD = process.env.TEST_LICENSEE_PASSWORD || 'secret'; +export const ADMIN_2_EMAIL = 'admin.test@example.com'; +export const ADMIN_2_PASSWORD = 'secret'; + +export const LICENSEE_EMAIL = 'henrique@example.com'; +export const LICENSEE_PERMIT_CODE = '213890329890312'; +export const LICENSEE_PASSWORD = 'secret'; +export const LICENSEE_CASE_ACCENT = 'Márcia Clara Template'; + +export const LICENSEE_2_EMAIL = 'marcia@example.com'; +export const LICENSEE_2_PERMIT_CODE = '319274392832023'; +export const LICENSEE_2_PASSWORD = 'secret'; + export const MAIL_HOST = process.env.MAIL_HOST; export const MAIL_PORT = process.env.MAIL_CLIENT_PORT;