fix projectCount query

Giveth · Sep 19, 2023 · 28c1299 · 28c1299
1 parent 5fec931
commit 28c1299
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/repositories/userRepository.ts b/src/repositories/userRepository.ts
@@ -36,7 +36,6 @@ export const isFirstTimeDonor = async (userId: number): Promise<boolean> => {
 export const findUserByWalletAddress = async (
   walletAddress: string,
   includeSensitiveFields = true,
-  ownerUserId?: number,
 ): Promise<User | null> => {
   const query = User.createQueryBuilder('user').where(
     `LOWER("walletAddress") = :walletAddress`,
@@ -52,22 +51,22 @@ export const findUserByWalletAddress = async (
 
   user.projectsCount = await fetchUserProjectsCount(
     user!.id,
-    Number(user?.id) === Number(ownerUserId),
+    includeSensitiveFields,
   );
 
   return user;
 };
 
 export const fetchUserProjectsCount = async (
   userId: number,
-  ownerViewing: boolean,
+  includeSensitiveFields: boolean,
 ) => {
   const projectsCount = Project.createQueryBuilder('project').where(
     'project."adminUserId" = :id',
     { id: userId },
   );
 
-  if (!ownerViewing) {
+  if (!includeSensitiveFields) {
     projectsCount.andWhere(
       `project.statusId = ${ProjStatus.active} AND project.reviewStatus = :reviewStatus`,
       { reviewStatus: ReviewStatus.Listed },

diff --git a/src/resolvers/userResolver.ts b/src/resolvers/userResolver.ts
@@ -66,7 +66,6 @@ export class UserResolver {
     const foundUser = await findUserByWalletAddress(
       address,
       includeSensitiveFields,
-      user?.userId,
     );
     return {
       isSignedIn: Boolean(user),
@@ -84,7 +83,6 @@ export class UserResolver {
     const foundUser = await findUserByWalletAddress(
       address,
       includeSensitiveFields,
-      user?.userId,
     );
 
     if (!foundUser) return;