fix: database option for find one

andrechristikan · Oct 3, 2024 · 13b9e43 · 13b9e43
1 parent 7081007
commit 13b9e43
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 42 deletions.
diff --git a/src/modules/activity/services/activity.service.ts b/src/modules/activity/services/activity.service.ts
@@ -5,8 +5,8 @@ import {
     IDatabaseCreateOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
 } from 'src/common/database/interfaces/database.interface';
 import { ActivityCreateByAdminResponse } from 'src/modules/activity/dtos/request/activity.create-by-admin.response.dto';
 import { ActivityCreateResponse } from 'src/modules/activity/dtos/request/activity.create.response.dto';
@@ -50,14 +50,14 @@ export class ActivityService implements IActivityService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ActivityDoc> {
         return this.activityRepository.findOneById<ActivityDoc>(_id, options);
     }
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ActivityDoc> {
         return this.activityRepository.findOne<ActivityDoc>(find, options);
     }

diff --git a/src/modules/api-key/services/api-key.service.ts b/src/modules/api-key/services/api-key.service.ts
@@ -5,8 +5,8 @@ import {
     IDatabaseCreateOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
     IDatabaseSaveOptions,
     IDatabaseUpdateManyOptions,
 } from 'src/common/database/interfaces/database.interface';
@@ -54,28 +54,28 @@ export class ApiKeyService implements IApiKeyService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ApiKeyDoc> {
         return this.apiKeyRepository.findOneById(_id, options);
     }
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ApiKeyDoc> {
         return this.apiKeyRepository.findOne(find, options);
     }
 
     async findOneByKey(
         key: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ApiKeyDoc> {
         return this.apiKeyRepository.findOne<ApiKeyDoc>({ key }, options);
     }
 
     async findOneByActiveKey(
         key: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<ApiKeyDoc> {
         return this.apiKeyRepository.findOne<ApiKeyDoc>(
             {

diff --git a/src/modules/country/services/country.service.ts b/src/modules/country/services/country.service.ts
@@ -8,8 +8,8 @@ import {
     IDatabaseCreateManyOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
 } from 'src/common/database/interfaces/database.interface';
 import { AwsS3Service } from 'src/modules/aws/services/aws.s3.service';
 import { CountryCreateRequestDto } from 'src/modules/country/dtos/request/country.create.request.dto';
@@ -49,14 +49,14 @@ export class CountryService implements ICountryService {
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<CountryDoc> {
         return this.countryRepository.findOne(find, options);
     }
 
     async findOneByName(
         name: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<CountryDoc> {
         return this.countryRepository.findOne(
             DatabaseQueryContain('name', name),
@@ -66,7 +66,7 @@ export class CountryService implements ICountryService {
 
     async findOneByAlpha2(
         alpha2: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<CountryDoc> {
         return this.countryRepository.findOne(
             DatabaseQueryContain('alpha2Code', alpha2),
@@ -76,7 +76,7 @@ export class CountryService implements ICountryService {
 
     async findOneByPhoneCode(
         phoneCode: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<CountryDoc> {
         return this.countryRepository.findOne(
             {
@@ -88,7 +88,7 @@ export class CountryService implements ICountryService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<CountryDoc> {
         return this.countryRepository.findOneById(_id, options);
     }

diff --git a/src/modules/password-history/services/password-history.service.ts b/src/modules/password-history/services/password-history.service.ts
@@ -6,8 +6,8 @@ import {
     IDatabaseCreateOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
 } from 'src/common/database/interfaces/database.interface';
 import { HelperDateService } from 'src/common/helper/services/helper.date.service';
 import { PasswordHistoryCreateByAdminRequestDto } from 'src/modules/password-history/dtos/request/password-history.create-by-admin.request.dto';
@@ -62,7 +62,7 @@ export class PasswordHistoryService implements IPasswordHistoryService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<PasswordHistoryDoc> {
         return this.passwordHistoryRepository.findOneById<PasswordHistoryDoc>(
             _id,
@@ -72,7 +72,7 @@ export class PasswordHistoryService implements IPasswordHistoryService {
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<PasswordHistoryDoc> {
         return this.passwordHistoryRepository.findOne<PasswordHistoryDoc>(
             find,
@@ -83,7 +83,7 @@ export class PasswordHistoryService implements IPasswordHistoryService {
     async findOneByUser(
         user: string,
         password: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<PasswordHistoryDoc> {
         return this.passwordHistoryRepository.findOne<PasswordHistoryDoc>(
             {
@@ -97,7 +97,7 @@ export class PasswordHistoryService implements IPasswordHistoryService {
     async findOneUsedByUser(
         user: string,
         password: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<PasswordHistoryDoc> {
         const today = this.helperDateService.create();
 

diff --git a/src/modules/role/services/role.service.ts b/src/modules/role/services/role.service.ts
@@ -9,8 +9,8 @@ import {
     IDatabaseGetTotalOptions,
     IDatabaseCreateManyOptions,
     IDatabaseSaveOptions,
-    IDatabaseOptions,
     IDatabaseDeleteManyOptions,
+    IDatabaseFindOneOptions,
 } from 'src/common/database/interfaces/database.interface';
 import { ENUM_POLICY_ROLE_TYPE } from 'src/modules/policy/enums/policy.enum';
 import { RoleCreateRequestDto } from 'src/modules/role/dtos/request/role.create.request.dto';
@@ -82,28 +82,28 @@ export class RoleService implements IRoleService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<RoleDoc> {
         return this.roleRepository.findOneById(_id, options);
     }
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<RoleDoc> {
         return this.roleRepository.findOne(find, options);
     }
 
     async findOneByName(
         name: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<RoleDoc> {
         return this.roleRepository.findOne({ name }, options);
     }
 
     async findOneActiveById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<RoleDoc> {
         return this.roleRepository.findOne({ _id, isActive: true }, options);
     }

diff --git a/src/modules/session/services/session.service.ts b/src/modules/session/services/session.service.ts
@@ -11,6 +11,7 @@ import {
     IDatabaseCreateOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
     IDatabaseOptions,
     IDatabaseUpdateManyOptions,
@@ -71,21 +72,21 @@ export class SessionService implements ISessionService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SessionDoc> {
         return this.sessionRepository.findOneById<SessionDoc>(_id, options);
     }
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SessionDoc> {
         return this.sessionRepository.findOne<SessionDoc>(find, options);
     }
 
     async findOneActiveById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SessionDoc> {
         const today = this.helperDateService.create();
 
@@ -103,7 +104,7 @@ export class SessionService implements ISessionService {
     async findOneActiveByIdAndUser(
         _id: string,
         user: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SessionDoc> {
         const today = this.helperDateService.create();
 

diff --git a/src/modules/setting/services/setting.service.ts b/src/modules/setting/services/setting.service.ts
@@ -4,8 +4,8 @@ import {
     IDatabaseCreateOptions,
     IDatabaseDeleteManyOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
     IDatabaseSaveOptions,
 } from 'src/common/database/interfaces/database.interface';
 import { ENUM_HELPER_DATE_FORMAT } from 'src/common/helper/enums/helper.enum';
@@ -53,21 +53,21 @@ export class SettingService implements ISettingService {
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SettingDoc> {
         return this.settingRepository.findOne(find, options);
     }
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SettingDoc> {
         return this.settingRepository.findOneById(_id, options);
     }
 
     async findOneByName(
         name: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<SettingDoc> {
         return this.settingRepository.findOne({ name }, options);
     }

diff --git a/src/modules/user/services/user.service.ts b/src/modules/user/services/user.service.ts
@@ -6,8 +6,8 @@ import {
     IDatabaseExistOptions,
     IDatabaseFindAllAggregateOptions,
     IDatabaseFindAllOptions,
+    IDatabaseFindOneOptions,
     IDatabaseGetTotalOptions,
-    IDatabaseOptions,
     IDatabaseSaveOptions,
     IDatabaseUpdateOptions,
 } from 'src/common/database/interfaces/database.interface';
@@ -190,29 +190,29 @@ export class UserService implements IUserService {
 
     async findOneById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<UserDoc> {
         return this.userRepository.findOneById<UserDoc>(_id, options);
     }
 
     async findOne(
         find: Record<string, any>,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<UserDoc> {
         return this.userRepository.findOne<UserDoc>(find, options);
     }
 
     async findOneByEmail(
         email: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<UserDoc> {
         return this.userRepository.findOne<UserDoc>({ email }, options);
     }
 
     async findOneByMobileNumber(
         country: string,
         mobileNumber: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<UserDoc> {
         return this.userRepository.findOne<UserDoc>(
             {
@@ -225,7 +225,7 @@ export class UserService implements IUserService {
 
     async findOneWithRoleAndCountry(
         find?: Record<string, any>,
-        options?: IDatabaseFindAllOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<IUserDoc> {
         return this.userRepository.findOne<IUserDoc>(find, {
             ...options,
@@ -235,7 +235,7 @@ export class UserService implements IUserService {
 
     async findOneWithRoleAndCountryById(
         _id: string,
-        options?: IDatabaseFindAllOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<IUserDoc> {
         return this.userRepository.findOneById<IUserDoc>(_id, {
             ...options,
@@ -271,7 +271,7 @@ export class UserService implements IUserService {
 
     async findOneActiveById(
         _id: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<IUserDoc> {
         return this.userRepository.findOne<IUserDoc>(
             { _id, status: ENUM_USER_STATUS.ACTIVE },
@@ -284,7 +284,7 @@ export class UserService implements IUserService {
 
     async findOneActiveByEmail(
         email: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<IUserDoc> {
         return this.userRepository.findOne<IUserDoc>(
             { email, status: ENUM_USER_STATUS.ACTIVE },
@@ -298,7 +298,7 @@ export class UserService implements IUserService {
     async findOneActiveByMobileNumber(
         country: string,
         mobileNumber: string,
-        options?: IDatabaseOptions
+        options?: IDatabaseFindOneOptions
     ): Promise<IUserDoc> {
         return this.userRepository.findOne<IUserDoc>(
             {