Merge pull request #61 from GeneralMagicio/add-option-checking-to-setVote

fix setVote issues

Author: RamRamez

src/user/user.dto.ts

@@ -1,52 +1,132 @@
 import {
   IsNotEmpty,
   IsNumber,
-  IsObject,
   IsOptional,
   IsString,
+  IsEnum,
+  IsDate,
+  Validate,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
 } from 'class-validator';
 import { ActionType } from '@prisma/client';
 
 export class GetUserDataDto {
+  @IsString()
+  @IsNotEmpty()
   worldID: string;
 }
 
 export class UserDataResponseDto {
+  @IsNumber()
+  @IsNotEmpty()
   pollsCreated: number;
+
+  @IsNumber()
+  @IsNotEmpty()
   pollsParticipated: number;
+
+  @IsString()
+  @IsNotEmpty()
   worldID: string;
+
+  @IsString()
+  @IsOptional()
   worldProfilePic?: string | null;
 }
 
 export class GetUserActivitiesDto {
+  @IsString()
+  @IsNotEmpty()
   worldID: string;
+
+  @IsEnum(['active', 'inactive', 'created', 'participated'])
+  @IsOptional()
   filter?: 'active' | 'inactive' | 'created' | 'participated';
 }
 
 export class UserActionDto {
+  @IsNumber()
+  @IsNotEmpty()
   id: number;
+
+  @IsEnum([ActionType.CREATED, ActionType.VOTED])
+  @IsNotEmpty()
   type: ActionType;
+
+  @IsNumber()
+  @IsNotEmpty()
   pollId: number;
+
+  @IsString()
+  @IsNotEmpty()
   pollTitle: string;
+
+  @IsString()
+  @IsNotEmpty()
   pollDescription: string;
+
+  @IsDate()
+  @IsNotEmpty()
   endDate: Date;
+
+  @IsNumber()
+  @IsNotEmpty()
   votersParticipated: number;
+
+  @IsString()
+  @IsNotEmpty()
   authorWorldId: string;
+
+  @IsDate()
+  @IsNotEmpty()
   createdAt: Date;
 }
 
 export class UserActivitiesResponseDto {
+  @IsNotEmpty()
   userActions: UserActionDto[];
 }
 
 export class GetUserVotesDto {
+  @IsNumber()
+  @IsNotEmpty()
   pollId: number;
+
+  @IsString()
+  @IsNotEmpty()
   worldID: string;
 }
 
+@ValidatorConstraint({ name: 'IsRecordStringNumber', async: false })
+export class IsRecordStringNumberConstraint
+  implements ValidatorConstraintInterface
+{
+  validate(value: any): boolean {
+    if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+      return false;
+    }
+    return Object.entries(value).every(
+      ([key, val]) => typeof key === 'string' && typeof val === 'number',
+    );
+  }
+
+  defaultMessage(): string {
+    return 'weightDistribution must be a record with string keys and number values';
+  }
+}
+
 export class UserVotesResponseDto {
+  @IsNotEmpty()
+  @IsString({ each: true })
   options: string[];
+
+  @IsNumber()
+  @IsNotEmpty()
   votingPower: number;
+
+  @Validate(IsRecordStringNumberConstraint)
+  @IsOptional()
   weightDistribution?: Record<string, number>;
 }
 
@@ -60,22 +140,37 @@ export class SetVoteDto {
   worldID: string;
 
   @IsNotEmpty()
-  @IsObject()
+  @Validate(IsRecordStringNumberConstraint)
   weightDistribution: Record<string, number>;
 }
 
 export class SetVoteResponseDto {
+  @IsNotEmpty()
+  @IsString()
   voteID: string;
+
+  @IsNotEmpty()
+  @IsNumber()
   actionId: number;
 }
 
 export class EditVoteDto {
+  @IsNotEmpty()
+  @IsNumber()
   userId: number;
+
+  @IsNotEmpty()
+  @IsString()
   voteID: string;
+
+  @IsNotEmpty()
+  @Validate(IsRecordStringNumberConstraint)
   weightDistribution: Record<string, number>;
 }
 
 export class EditVoteResponseDto {
+  @IsNotEmpty()
+  @IsNumber()
   actionId: number;
 }
 
@@ -94,5 +189,7 @@ export class CreateUserDto {
 }
 
 export class CreateUserResponseDto {
+  @IsNotEmpty()
+  @IsNumber()
   userId: number;
 }

src/user/user.service.ts

@@ -176,6 +176,24 @@ export class UserService {
     if (!poll || poll.endDate < new Date()) {
       throw new Error('Poll is not active or does not exist');
     }
+    const dtoWeightKeys = Object.keys(dto.weightDistribution);
+    const areWeightKeysMatching =
+      dtoWeightKeys.length === poll.options.length &&
+      dtoWeightKeys.every((key) => poll.options.includes(key));
+    if (!areWeightKeysMatching) {
+      throw new Error(
+        'Weight distribution keys do not match poll options exactly',
+      );
+    }
+    const totalWeight = Object.values(dto.weightDistribution).reduce(
+      (acc, weight) => acc + weight,
+      0,
+    );
+    if (totalWeight > votingPower) {
+      throw new Error(
+        `Total weight distribution must be equal or lower than the voting power of ${votingPower}`,
+      );
+    }
     const existingVote = await this.databaseService.vote.findFirst({
       where: {
         pollId: dto.pollId,
@@ -191,7 +209,7 @@ export class UserService {
         pollId: dto.pollId,
         votingPower,
         weightDistribution: dto.weightDistribution,
-        proof: '', // TODO implement Bandada proof later
+        proof: '', // Implement Bandada proof in next phase
       },
     });
     const action = await this.databaseService.userAction.create({