diff --git a/utils/entity/foreignKey.util.ts b/utils/entity/foreignKey.util.ts index cd2da78..7c82a74 100644 --- a/utils/entity/foreignKey.util.ts +++ b/utils/entity/foreignKey.util.ts @@ -2,7 +2,7 @@ import { databaseConfig } from "@shared/config/database.config"; import { DataSource, DataSourceOptions, EntityTarget, FindOneOptions, ObjectLiteral } from "typeorm"; export async function getDataSource(entities: DataSourceOptions['entities']) { - const dataSource = new DataSource(Object.assign(Object.assign({}, databaseConfig), { entities })); + const dataSource = new DataSource({ ...databaseConfig, entities }); await dataSource.initialize(); return dataSource; } @@ -18,9 +18,9 @@ export async function findOneAndAssignReferenceId( if (keyValue && !referenceIdValue) { const item = await dataSource.getRepository(repository) .findOne({ - where: Object.assign(Object.assign({}, where), { userId: userId }) + where: { ...where, userId } }); - return item === null || item === void 0 ? void 0 : item.id; + return item?.id; } return referenceIdValue; } @@ -61,7 +61,7 @@ export async function findManyAndAssignReferenceIds( if (keyValue && !referenceIdValue) { const items = await dataSource.getRepository(repository) .find({ - where: Object.assign(Object.assign({}, where), { userId: userId }) + where: { ...where, userId } }); return items.map(item => item.id); } diff --git a/utils/validation/is-unique-date-range.ts b/utils/validation/is-unique-date-range.ts index e4ddb79..19b12d9 100644 --- a/utils/validation/is-unique-date-range.ts +++ b/utils/validation/is-unique-date-range.ts @@ -1,5 +1,5 @@ import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator'; -import { LessThanOrEqual, MoreThanOrEqual, Not } from "typeorm"; +import { FindOptionsWhere, LessThanOrEqual, MoreThanOrEqual, Not, ObjectLiteral } from "typeorm"; import { withTemporaryDataSource } from '../entity/temporaryDataSource.util'; import { getUserIdFromUser } from '@shared/auth/auth.util'; import { getCurrentUser } from './current-user.util'; @@ -25,7 +25,7 @@ export function IsUniqueDateRange( async validate(value: any, args: ValidationArguments) { if (!value) return true; - const fullObject = args.object as any; + const fullObject = args.object as Record; const startDate = fullObject[startDateField]; const endDate = fullObject[endDateField]; @@ -33,7 +33,7 @@ export function IsUniqueDateRange( const user = getCurrentUser(); - const whereConditions: any = { + const whereConditions: FindOptionsWhere = { [startDateField]: LessThanOrEqual(endDate), [endDateField]: MoreThanOrEqual(startDate), userId: fullObject.userId ?? getUserIdFromUser(user), diff --git a/utils/validation/max-count-by-user-limit.ts b/utils/validation/max-count-by-user-limit.ts index 9c46dbb..66b1f89 100644 --- a/utils/validation/max-count-by-user-limit.ts +++ b/utils/validation/max-count-by-user-limit.ts @@ -1,5 +1,5 @@ import { registerDecorator, ValidationOptions, ValidationArguments } from 'class-validator'; -import { DataSource, Not } from "typeorm"; +import { DataSource, FindOptionsWhere, Not, ObjectLiteral } from "typeorm"; import { withTemporaryDataSource } from '../entity/temporaryDataSource.util'; import { getUserIdFromUser } from '@shared/auth/auth.util'; import { getCurrentUser } from './current-user.util'; @@ -19,9 +19,9 @@ export function MaxCountByUserLimit(entity: Function, getMaxLimit: GetMaxLimitTy }, validator: { async validate(value: any, args: ValidationArguments) { - const fullObject = args.object as any; + const fullObject = args.object as Record; const user = getCurrentUser(); - const entityFilter: any = { + const entityFilter: FindOptionsWhere & { userId: number } = { userId: fullObject.userId ?? getUserIdFromUser(user), year: fullObject.year ?? getCurrentHebrewYear(), };