Merge pull request #37 from GeneralMagicio/add-setVote()

add setVote and editVote endpoint

Author: RamRamez

prisma/schema.prisma

@@ -7,58 +7,56 @@
 generator client {
   provider = "prisma-client-js"
 }
+
 datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")
 }
 
-
 model User {
-  id                      Int   @id @default(autoincrement())
-  worldID                 String   @unique
-  name                    String
-  profilePicture          String?
-  pollsCreatedCount       Int      @default(0)
-  pollsParticipatedCount  Int      @default(0)
-  createdPolls            Poll[]   @relation("PollAuthor")
-  votes                   Vote[]
-  actions                 UserAction[]
+  id                     Int          @id @default(autoincrement())
+  worldID                String       @unique
+  name                   String
+  profilePicture         String?
+  pollsCreatedCount      Int          @default(0)
+  pollsParticipatedCount Int          @default(0)
+  createdPolls           Poll[]       @relation("PollAuthor")
+  votes                  Vote[]
+  actions                UserAction[]
 }
 
 model UserAction {
-  id        Int   @id @default(autoincrement())
-  userId   Int
-  actionID  String   @unique
-  pollId  Int
-  type      ActionType
-  user      User     @relation(fields: [userId], references: [id])
-  poll      Poll       @relation(fields: [pollId], references: [pollId],onDelete: Cascade)
- 
+  id     Int        @id @default(autoincrement())
+  userId Int
+  pollId Int
+  type   ActionType
+  user   User       @relation(fields: [userId], references: [id])
+  poll   Poll       @relation(fields: [pollId], references: [pollId],onDelete: Cascade)
 }
 
 model Poll {
-  pollId           Int   @id @default(autoincrement())
+  pollId           Int          @id @default(autoincrement())
   authorUserId     Int
   title            String
   description      String?
   options          String[]
-  creationDate     DateTime @default(now())
+  creationDate     DateTime     @default(now())
   startDate        DateTime
-  endDate          DateTime 
+  endDate          DateTime
   tags             String[]
-  isAnonymous      Boolean  @default(false)
-  participantCount Int      @default(0)
+  isAnonymous      Boolean      @default(false)
+  participantCount Int          @default(0)
   voteResults      Json
-  author          User      @relation("PollAuthor", fields: [authorUserId], references: [id])
-  votes           Vote[]
+  author           User         @relation("PollAuthor", fields: [authorUserId], references: [id])
+  votes            Vote[]
   userAction       UserAction[]
 }
 
 model Vote {
-  voteID            String   @id @default(uuid())
-  userId           Int
-  pollId            Int
-  votingPower       Int
+  voteID             String @id @default(uuid())
+  userId             Int
+  pollId             Int
+  votingPower        Int
   weightDistribution Json
   proof             String
   user             User     @relation(fields: [userId], references: [id])

src/poll/poll.controller.ts

@@ -4,14 +4,12 @@ import {
   Post,
   Body,
   Param,
-  Delete,
   Req,
   Query,
   Res,
 } from '@nestjs/common';
 import { Response } from 'express';
 import { PollService } from './poll.service';
-import { Prisma } from '@prisma/client';
 import { CreatePollDto, GetPollsDto } from './Poll.dto';
 
 @Controller('poll')

src/poll/poll.service.ts

@@ -46,7 +46,6 @@ export class PollService {
       await tx.userAction.create({
         data: {
           userId,
-          actionID: `created-${newPoll.pollId}-${userId}-${Date.now()}`,
           pollId: newPoll.pollId,
           type: ActionType.CREATED,
         },

src/user/user.controller.ts

@@ -1,9 +1,13 @@
 import { Body, Controller, Get, Post, Query } from '@nestjs/common';
 import { UserService } from './user.service';
 import {
+  EditVoteDto,
+  EditVoteResponseDto,
   GetUserActivitiesDto,
   GetUserDataDto,
   GetUserVotesDto,
+  SetVoteDto,
+  SetVoteResponseDto,
   UserActivitiesResponseDto,
   UserDataResponseDto,
   UserVotesResponseDto,
@@ -33,4 +37,14 @@ export class UserController {
   ): Promise<UserVotesResponseDto> {
     return this.userService.getUserVotes(body);
   }
+
+  @Post('setVote')
+  async setVote(@Body() dto: SetVoteDto): Promise<SetVoteResponseDto> {
+    return this.userService.setVote(dto);
+  }
+
+  @Post('editVote')
+  async editVote(@Body() dto: EditVoteDto): Promise<EditVoteResponseDto> {
+    return this.userService.editVote(dto);
+  }
 }

src/user/user.dto.ts

@@ -14,7 +14,7 @@ export class GetUserActivitiesDto {
 }
 
 export class UserActionDto {
-  actionID: string;
+  id: number;
   type: 'created' | 'voted';
   pollId: number;
   pollTitle: string;
@@ -38,3 +38,23 @@ export class UserVotesResponseDto {
   votingPower: number;
   weightDistribution?: Record<string, number>;
 }
+
+export class SetVoteDto {
+  pollId: number;
+  worldID: string;
+  weightDistribution: Record<string, number>;
+}
+
+export class SetVoteResponseDto {
+  voteID: string;
+  actionId: number;
+}
+
+export class EditVoteDto {
+  voteID: string;
+  weightDistribution: Record<string, number>;
+}
+
+export class EditVoteResponseDto {
+  actionId: number;
+}

src/user/user.service.ts

@@ -1,4 +1,3 @@
-// src/user/user.service.ts
 import { Injectable } from '@nestjs/common';
 import { DatabaseService } from '../database/database.service';
 import {
@@ -9,7 +8,14 @@ import {
   UserActionDto,
   GetUserVotesDto,
   UserVotesResponseDto,
+  SetVoteDto,
+  SetVoteResponseDto,
+  EditVoteDto,
+  EditVoteResponseDto,
 } from './user.dto';
+import { ActionType } from '@prisma/client';
+
+const votingPower = 100; // Set as a constant for now
 
 type UserActionFilters = {
   userId: number;
@@ -70,7 +76,7 @@ export class UserService {
       where: filters,
       orderBy: { poll: { endDate: 'desc' } },
       select: {
-        actionID: true,
+        id: true,
         type: true,
         poll: {
           select: {
@@ -85,7 +91,7 @@ export class UserService {
       },
     });
     const actions: UserActionDto[] = userActions.map((action) => ({
-      actionID: action.actionID,
+      id: action.id,
       type: action.type.toLowerCase() as 'created' | 'voted',
       pollId: action.poll.pollId,
       pollTitle: action.poll.title,
@@ -130,4 +136,81 @@ export class UserService {
       weightDistribution: vote.weightDistribution as Record<string, number>,
     };
   }
+
+  async setVote(dto: SetVoteDto): Promise<SetVoteResponseDto> {
+    const user = await this.databaseService.user.findUnique({
+      where: { worldID: dto.worldID },
+      select: { id: true },
+    });
+    if (!user) {
+      throw new Error('User not found');
+    }
+
+    const poll = await this.databaseService.poll.findUnique({
+      where: { pollId: dto.pollId },
+      select: { endDate: true, options: true },
+    });
+    if (!poll || poll.endDate < new Date()) {
+      throw new Error('Poll is not active or does not exist');
+    }
+
+    const vote = await this.databaseService.vote.create({
+      data: {
+        userId: user.id,
+        pollId: dto.pollId,
+        votingPower,
+        weightDistribution: dto.weightDistribution,
+        proof: '', // TODO implement Bandada proof later
+      },
+    });
+    const action = await this.databaseService.userAction.create({
+      data: {
+        userId: user.id,
+        pollId: dto.pollId,
+        type: ActionType.VOTED,
+      },
+    });
+    return {
+      voteID: vote.voteID,
+      actionId: action.id,
+    };
+  }
+
+  async editVote(dto: EditVoteDto): Promise<EditVoteResponseDto> {
+    const vote = await this.databaseService.vote.findUnique({
+      where: { voteID: dto.voteID },
+      select: {
+        userId: true,
+        poll: {
+          select: { endDate: true },
+        },
+      },
+    });
+    if (!vote) {
+      throw new Error('Vote not found');
+    }
+    if (vote.poll.endDate < new Date()) {
+      throw new Error('Cannot edit vote for an inactive poll');
+    }
+    const updatedVote = await this.databaseService.vote.update({
+      where: { voteID: dto.voteID },
+      data: {
+        weightDistribution: dto.weightDistribution,
+      },
+    });
+    const userAction = await this.databaseService.userAction.findFirst({
+      where: {
+        userId: vote.userId,
+        pollId: updatedVote.pollId,
+        type: ActionType.VOTED,
+      },
+      select: { id: true },
+    });
+    if (!userAction) {
+      throw new Error('User action not found');
+    }
+    return {
+      actionId: userAction.id,
+    };
+  }
 }