From 2f88a4fcb6bea2fe5524e09be9410ab18a73440d Mon Sep 17 00:00:00 2001 From: Nikita Kudinov Date: Fri, 26 Jan 2024 15:41:08 +0300 Subject: [PATCH] chore: lint code --- src/core/services/packs.service.ts | 16 +++------ .../services/trades-to-user-items.service.ts | 27 ++++++++------ src/core/services/trades.service.ts | 12 ++----- src/core/services/user-items.service.ts | 36 ++++++------------- src/core/services/users.service.ts | 17 +++------ 5 files changed, 38 insertions(+), 70 deletions(-) diff --git a/src/core/services/packs.service.ts b/src/core/services/packs.service.ts index 97e5413..0e48464 100644 --- a/src/core/services/packs.service.ts +++ b/src/core/services/packs.service.ts @@ -25,18 +25,10 @@ export const mapFindPokemonsWhereToSql = ( where: FindPokemonsWhere ): Optional => { return and( - where.id !== undefined - ? eq(packsTable.id, where.id) - : undefined, - where.ids !== undefined - ? inArray(packsTable.id, where.ids) - : undefined, - where.name !== undefined - ? eq(packsTable.name, where.name) - : undefined, - where.nameLike !== undefined - ? like(packsTable.name, `%${where.nameLike}%`) - : undefined, + where.id !== undefined ? eq(packsTable.id, where.id) : undefined, + where.ids !== undefined ? inArray(packsTable.id, where.ids) : undefined, + where.name !== undefined ? eq(packsTable.name, where.name) : undefined, + where.nameLike !== undefined ? like(packsTable.name, `%${where.nameLike}%`) : undefined, ); } diff --git a/src/core/services/trades-to-user-items.service.ts b/src/core/services/trades-to-user-items.service.ts index 486c44e..3391970 100644 --- a/src/core/services/trades-to-user-items.service.ts +++ b/src/core/services/trades-to-user-items.service.ts @@ -5,7 +5,20 @@ import { zip } from 'lodash'; import { Optional, UUIDv4 } from 'src/common/types'; import { InjectDatabase } from 'src/infra/decorators/inject-database.decorator'; import { Database, Transaction } from 'src/infra/postgres/other/types'; -import { CreateTradeToReceiverItemEntityValues, CreateTradeToSenderItemEntityValues, CreateTradeToUserItemEntityValues, pokemonsTable, tradesTable, tradesToUserItemsTable, TradeToReceiverItemEntity, TradeToSenderItemEntity, TradeToUserItemEntity, TradeToUserItemUserType, userItemsTable, usersTable } from 'src/infra/postgres/tables'; +import { + CreateTradeToReceiverItemEntityValues, + CreateTradeToSenderItemEntityValues, + CreateTradeToUserItemEntityValues, + pokemonsTable, + tradesTable, + tradesToUserItemsTable, + TradeToReceiverItemEntity, + TradeToSenderItemEntity, + TradeToUserItemEntity, + TradeToUserItemUserType, + userItemsTable, + usersTable, +} from 'src/infra/postgres/tables'; import { mapTradesRowToEntity } from './trades.service'; import { mapUserItemsRowToEntity } from './user-items.service'; @@ -31,15 +44,9 @@ export const mapFindTradesToUserItemsWhereToSQL = ( where: FindTradesToUserItemsWhere, ): Optional => { return and( - where.tradeId !== undefined - ? eq(tradesToUserItemsTable.tradeId, where.tradeId) - : undefined, - where.userType !== undefined - ? eq(tradesToUserItemsTable.userType, where.userType) - : undefined, - where.userItemId !== undefined - ? eq(tradesToUserItemsTable.userItemId, where.userItemId) - : undefined, + where.tradeId !== undefined ? eq(tradesToUserItemsTable.tradeId, where.tradeId) : undefined, + where.userType !== undefined ? eq(tradesToUserItemsTable.userType, where.userType) : undefined, + where.userItemId !== undefined ? eq(tradesToUserItemsTable.userItemId, where.userItemId) : undefined, ); }; diff --git a/src/core/services/trades.service.ts b/src/core/services/trades.service.ts index e9a6cc3..a34295d 100644 --- a/src/core/services/trades.service.ts +++ b/src/core/services/trades.service.ts @@ -37,15 +37,9 @@ export const mapFindTradesWhereToSQL = ( where: FindTradesWhere, ): Optional => { return and( - where.id !== undefined - ? eq(tradesTable.id, where.id) - : undefined, - where.ids !== undefined - ? inArray(tradesTable.id, where.ids) - : undefined, - where.status !== undefined - ? eq(tradesTable.status, where.status) - : undefined, + where.id !== undefined ? eq(tradesTable.id, where.id) : undefined, + where.ids !== undefined ? inArray(tradesTable.id, where.ids) : undefined, + where.status !== undefined ? eq(tradesTable.status, where.status) : undefined, ); } diff --git a/src/core/services/user-items.service.ts b/src/core/services/user-items.service.ts index 9d5fc9f..8ef4615 100644 --- a/src/core/services/user-items.service.ts +++ b/src/core/services/user-items.service.ts @@ -30,32 +30,16 @@ export const mapFindUserItemsWhereToSQL = ( where: FindUserItemsWhere ): Optional => { return and( - where.id !== undefined - ? eq(userItemsTable.id, where.id) - : undefined, - where.ids !== undefined - ? inArray(userItemsTable.id, where.ids) - : undefined, - - where.userId !== undefined - ? eq(userItemsTable.userId, where.userId) - : undefined, - where.userName !== undefined - ? eq(usersTable.name, where.userName) - : undefined, - where.userNameLike !== undefined - ? like(usersTable.name, `%${where.userNameLike}%`) - : undefined, - - where.pokemonId !== undefined - ? eq(userItemsTable.pokemonId, where.pokemonId) - : undefined, - where.pokemonName !== undefined - ? eq(pokemonsTable.name, where.pokemonName) - : undefined, - where.pokemonNameLike !== undefined - ? like(pokemonsTable.name, `%${where.pokemonNameLike}%`) - : undefined, + where.id !== undefined ? eq(userItemsTable.id, where.id) : undefined, + where.ids !== undefined ? inArray(userItemsTable.id, where.ids) : undefined, + + where.userId !== undefined ? eq(userItemsTable.userId, where.userId) : undefined, + where.userName !== undefined ? eq(usersTable.name, where.userName) : undefined, + where.userNameLike !== undefined ? like(usersTable.name, `%${where.userNameLike}%`) : undefined, + + where.pokemonId !== undefined ? eq(userItemsTable.pokemonId, where.pokemonId) : undefined, + where.pokemonName !== undefined ? eq(pokemonsTable.name, where.pokemonName) : undefined, + where.pokemonNameLike !== undefined ? like(pokemonsTable.name, `%${where.pokemonNameLike}%`) : undefined, ); }; diff --git a/src/core/services/users.service.ts b/src/core/services/users.service.ts index 6ac229c..0604a42 100644 --- a/src/core/services/users.service.ts +++ b/src/core/services/users.service.ts @@ -22,23 +22,14 @@ type FindUsersWithPaginationOptions = FindUsersOptions & { paginationOptions: PaginationOptions, } - export const mapFindUsersWhereToSQL = ( where: FindUsersWhere, ): Optional => { return and( - where.id !== undefined - ? eq(usersTable.id, where.id) - : undefined, - where.ids !== undefined - ? inArray(usersTable.id, where.ids) - : undefined, - where.name !== undefined - ? eq(usersTable.name, where.name) - : undefined, - where.nameLike !== undefined - ? like(usersTable.name, `%${where.nameLike}%`) - : undefined, + where.id !== undefined ? eq(usersTable.id, where.id) : undefined, + where.ids !== undefined ? inArray(usersTable.id, where.ids) : undefined, + where.name !== undefined ? eq(usersTable.name, where.name) : undefined, + where.nameLike !== undefined ? like(usersTable.name, `%${where.nameLike}%`) : undefined, ); }