Merge pull request #55 from Giveth/update-givpower-calculation

Update givpower calculation

Author: alireza-sharifpour

src/modules/data-fetching/graphql/queries.ts

@@ -473,15 +473,6 @@ export const ALL_PROJECTS_WITH_FILTERS_QUERY = gql`
   }
 `;
 
-/**
- * Query to get the top power rank value for GIVpower scoring normalization
- */
-export const GET_TOP_POWER_RANK_QUERY = gql`
-  query GetTopPowerRank {
-    getTopPowerRank
-  }
-`;
-
 /**
  * Mutation to bulk update cause project evaluation scores
  * Used to send evaluation results back to Impact Graph after evaluation completion

src/modules/data-fetching/services/data-fetching.service.ts

@@ -327,38 +327,4 @@ export class DataFetchingService {
       return false;
     }
   }
-
-  /**
-   * Get the top power rank value for GIVpower scoring normalization
-   * This replaces the need to use totalProjectCount in scoring calculations
-   * @returns The top power rank value from Impact Graph, or null if unavailable
-   */
-  async getTopPowerRank(): Promise<number | null> {
-    try {
-      // Return 100 for staging environment to fix staging-specific issues
-      const isStaging = this.configService.get<boolean>('IS_STAGING', false);
-      if (isStaging) {
-        this.logger.debug(
-          'Staging environment detected - returning fixed top power rank: 100',
-        );
-        return 100;
-      }
-
-      this.logger.debug('Fetching top power rank for scoring normalization');
-      const topPowerRank = await this.impactGraphService.getTopPowerRank();
-      this.logger.debug(
-        `Successfully retrieved top power rank: ${topPowerRank}`,
-      );
-      return topPowerRank;
-    } catch (error) {
-      this.logger.warn(
-        'Failed to fetch top power rank - GIVpower scores will be set to 0 for this evaluation',
-        {
-          error: error instanceof Error ? error.message : String(error),
-        },
-      );
-      // Return null to indicate that GIVpower scoring should be disabled
-      return null;
-    }
-  }
 }

src/modules/data-fetching/services/impact-graph.service.ts

@@ -10,7 +10,6 @@ import {
   ALL_CAUSES_WITH_PROJECTS_QUERY,
   CAUSE_BY_ID_QUERY,
   ALL_PROJECTS_WITH_FILTERS_QUERY,
-  GET_TOP_POWER_RANK_QUERY,
   BULK_UPDATE_CAUSE_PROJECT_EVALUATION_MUTATION,
 } from '../graphql/queries';
 import {
@@ -640,41 +639,6 @@ export class ImpactGraphService {
     }
   }
 
-  /**
-   * Get the top power rank value for GIVpower scoring normalization
-   * This replaces the need to use totalProjectCount as it provides the actual maximum rank
-   * @returns The top power rank value
-   * @throws HttpException when the query fails
-   */
-  async getTopPowerRank(): Promise<number> {
-    try {
-      this.logger.debug('Fetching top power rank from Impact-Graph');
-
-      const response = await this.graphqlClient.request<{
-        getTopPowerRank: number;
-      }>(GET_TOP_POWER_RANK_QUERY);
-
-      const topPowerRank = response.getTopPowerRank;
-
-      this.logger.debug(`Retrieved top power rank: ${topPowerRank}`);
-
-      return topPowerRank;
-    } catch (error) {
-      this.logger.error(
-        'Failed to fetch top power rank from Impact-Graph',
-        error as GraphQLError,
-      );
-
-      this.handleGraphQLError(error as GraphQLError, 'getTopPowerRank');
-
-      // Throw error instead of providing fallback - let calling service handle appropriately
-      throw new HttpException(
-        'Failed to fetch top power rank from Impact-Graph',
-        HttpStatus.SERVICE_UNAVAILABLE,
-      );
-    }
-  }
-
   /**
    * Check if the Impact-Graph service is healthy
    * @returns Boolean indicating service health

src/modules/evaluation/dto/evaluate-multiple-causes-request.dto.ts

@@ -1,4 +1,10 @@
-import { IsArray, ValidateNested, ArrayMinSize } from 'class-validator';
+import {
+  IsArray,
+  ValidateNested,
+  ArrayMinSize,
+  IsNumber,
+  IsOptional,
+} from 'class-validator';
 import { Type } from 'class-transformer';
 import { EvaluateProjectsRequestDto } from './evaluate-projects-request.dto';
 
@@ -8,4 +14,8 @@ export class EvaluateMultipleCausesRequestDto {
   @ValidateNested({ each: true })
   @Type(() => EvaluateProjectsRequestDto)
   causes: EvaluateProjectsRequestDto[];
+
+  @IsOptional()
+  @IsNumber()
+  highestPowerRank?: number;
 }

src/modules/evaluation/dto/evaluate-projects-request.dto.ts

@@ -8,6 +8,20 @@ import {
 } from 'class-validator';
 import { Type } from 'class-transformer';
 
+export class ProjectWithPowerDto {
+  @IsNumber()
+  @IsNotEmpty()
+  id: number;
+
+  @IsOptional()
+  @IsNumber()
+  powerRank?: number;
+
+  @IsOptional()
+  @IsNumber()
+  totalPower?: number;
+}
+
 export class CategoryDto {
   @IsString()
   @IsNotEmpty()
@@ -53,7 +67,8 @@ export class EvaluateProjectsRequestDto {
   cause: CauseDto;
 
   @IsArray()
-  @IsNumber({}, { each: true })
+  @ValidateNested({ each: true })
+  @Type(() => ProjectWithPowerDto)
   @IsNotEmpty()
-  projectIds: number[];
+  projectIds: ProjectWithPowerDto[];
 }