OV-8: * modify find method in user repository instead of findById

BinaryStudioAcademy · Aug 21, 2024 · a88eca1 · a88eca1
1 parent b4fbbde
commit a88eca1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/backend/src/bundles/users/user.repository.ts b/backend/src/bundles/users/user.repository.ts
@@ -10,8 +10,10 @@ class UserRepository implements Repository {
         this.userModel = userModel;
     }
 
-    public find(): ReturnType<Repository['find']> {
-        return Promise.resolve(null);
+    public async find(userId: number): Promise<UserEntity | null> {
+        const user = await this.userModel.query().findById(userId).execute();
+
+        return user ? UserEntity.initialize(user) : null;
     }
 
     public async findByEmail(email: string): Promise<UserEntity | null> {
@@ -20,11 +22,11 @@ class UserRepository implements Repository {
         return user ? UserEntity.initialize(user) : null;
     }
 
-    public async findById(userId: number): Promise<UserEntity | null> {
-        const user = await this.userModel.query().findById(userId).execute();
+    // public async findById(userId: number): Promise<UserEntity | null> {
+    //     const user = await this.userModel.query().findById(userId).execute();
 
-        return user ? UserEntity.initialize(user) : null;
-    }
+    //     return user ? UserEntity.initialize(user) : null;
+    // }
 
     public async findAll(): Promise<UserEntity[]> {
         const users = await this.userModel.query().execute();

diff --git a/backend/src/bundles/users/user.service.ts b/backend/src/bundles/users/user.service.ts
@@ -17,7 +17,7 @@ class UserService implements Service {
     }
 
     public async find(userId: number): Promise<UserEntity | null> {
-        return await this.userRepository.findById(userId);
+        return await this.userRepository.find(userId);
     }
 
     public async findByEmail(email: string): Promise<UserEntity | null> {

diff --git a/backend/src/common/types/repository.type.ts b/backend/src/common/types/repository.type.ts
@@ -1,10 +1,9 @@
 type Repository<T = unknown> = {
-    find(): Promise<T>;
+    find(userId: number): Promise<T | null>;
     findAll(): Promise<T[]>;
     create(payload: unknown): Promise<T>;
     update(): Promise<T>;
     delete(): Promise<boolean>;
-    findById(userId: number): Promise<T | null>;
 };
 
 export { type Repository };