Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 111 additions & 63 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx

Large diffs are not rendered by default.

19 changes: 16 additions & 3 deletions platforms/eVoting/src/app/(app)/create/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,17 @@ export default function CreatePoll() {
}
}, [watchedVotingWeight, watchedMode, setValue]);

// Prevent blind voting (private visibility) + eReputation weighted combination
React.useEffect(() => {
if (watchedVisibility === "private" && watchedVotingWeight === "ereputation") {
// If private visibility is selected and user tries to select eReputation, force to 1p1v
setValue("votingWeight", "1p1v");
} else if (watchedVotingWeight === "ereputation" && watchedVisibility === "private") {
// If eReputation is selected and user tries to select private visibility, force to public
setValue("visibility", "public");
}
}, [watchedVisibility, watchedVotingWeight, setValue]);

const addOption = () => {
const newOptions = [...options, ""];
setOptions(newOptions);
Expand Down Expand Up @@ -552,7 +563,7 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVotingWeight === "ereputation"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedMode === "rank"
: watchedMode === "rank" || watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
Expand All @@ -561,7 +572,7 @@ export default function CreatePoll() {
value="ereputation"
{...register("votingWeight")}
className="sr-only"
disabled={watchedMode === "rank"}
disabled={watchedMode === "rank" || watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All @@ -572,6 +583,8 @@ export default function CreatePoll() {
<div className="text-sm opacity-90">
{watchedMode === "rank"
? "Not available with Rank Based Voting"
: watchedVisibility === "private"
? "Not available with Blind Voting"
: "Votes weighted by eReputation"}
</div>
</div>
Expand All @@ -581,7 +594,7 @@ export default function CreatePoll() {
</RadioGroup>
{watchedVotingWeight === "ereputation" && (
<p className="mt-2 text-sm text-gray-600">
Votes will be weighted by each voter's eReputation score. The poll title will automatically include "(eReputation Weighted)".
Votes will be weighted by each voter's eReputation score.
</p>
)}
{errors.votingWeight && (
Expand Down
16 changes: 15 additions & 1 deletion platforms/eVoting/src/app/(app)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import Link from "next/link";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight } from "lucide-react";
import { Plus, Vote, BarChart3, LogOut, Eye, UserX, Search, ChevronLeft, ChevronRight, ChartLine, CircleUser } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Badge } from "@/components/ui/badge";
Expand Down Expand Up @@ -163,6 +163,11 @@ export default function Home() {
>
Visibility {getSortIcon("visibility")}
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Voting Weight
</th>
<th
className="text-left py-3 px-4 font-medium text-gray-700 cursor-pointer hover:bg-gray-50"
>
Expand Down Expand Up @@ -211,6 +216,15 @@ export default function Home() {
)}
</Badge>
</td>
<td className="py-3 px-4">
<Badge variant={poll.votingWeight === "ereputation" ? "default" : "secondary"} className="text-xs">
{poll.votingWeight === "ereputation" ? (
<><ChartLine className="w-3 h-3 mr-1" />eReputation Weighted</>
) : (
<><CircleUser className="w-3 h-3 mr-1" />1P 1V</>
)}
</Badge>
</td>
<td className="py-3 px-4">
{poll.group ? (
<Badge variant="outline" className="text-xs">
Expand Down
3 changes: 2 additions & 1 deletion platforms/eVoting/src/lib/pollApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@ export interface VoterDetail {
export interface PollResults {
poll: Poll;
totalVotes: number;
totalWeightedVotes?: number;
totalEligibleVoters?: number;
turnout?: number;
mode?: "normal" | "point" | "rank";
mode?: "normal" | "point" | "rank" | "ereputation";
results: PollResultOption[];
irvDetails?: IRVDetails;
voterDetails?: VoterDetail[];
Expand Down
12 changes: 4 additions & 8 deletions platforms/evoting-api/src/controllers/WebhookController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,7 @@ export class WebhookController {
const pollIdValue = local.data.pollId.includes("(")
? local.data.pollId.split("(")[1].split(")")[0]
: local.data.pollId;
pollId = await this.adapter.mappingDb.getLocalId(pollIdValue);
if (!pollId) {
console.error("Poll not found for globalId:", pollIdValue);
return res.status(400).send();
}
pollId = pollIdValue;
}

// Resolve groupId from global to local ID
Expand All @@ -235,8 +231,8 @@ export class WebhookController {
}
}

if (!pollId || !groupId) {
console.error("Missing pollId or groupId:", { pollId, groupId });
if (!pollId) {
console.error("Missing pollId:", { pollId, groupId });
return res.status(400).send();
}

Expand All @@ -258,7 +254,7 @@ export class WebhookController {
// Create new result
const newResult = voteReputationResultRepository.create({
pollId: pollId,
groupId: groupId,
groupId: groupId || null,
results: results
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ export class VoteReputationResult {
@Column("uuid")
pollId!: string;

@ManyToOne(() => Group)
@ManyToOne(() => Group, { nullable: true })
@JoinColumn({ name: "groupId" })
group!: Group;
group!: Group | null;

@Column("uuid")
groupId!: string;
@Column("uuid", { nullable: true })
groupId!: string | null;

/**
* Array of reputation scores for each group member
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { MigrationInterface, QueryRunner } from "typeorm";

export class Migration1763745645194 implements MigrationInterface {
name = 'Migration1763745645194'

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" DROP NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "vote_reputation_results" DROP CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5"`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ALTER COLUMN "groupId" SET NOT NULL`);
await queryRunner.query(`ALTER TABLE "vote_reputation_results" ADD CONSTRAINT "FK_292664ed7ffc8782ab097e28ba5" FOREIGN KEY ("groupId") REFERENCES "group"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

}
5 changes: 5 additions & 0 deletions platforms/evoting-api/src/services/PollService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ export class PollService {
throw new Error("eReputation weighted voting cannot be combined with Rank Based Voting (RBV). Please use Simple or PBV mode instead.");
}

// Validate that blind voting (private visibility) and eReputation weighted are not combined
if (pollData.visibility === "private" && votingWeight === "ereputation") {
throw new Error("Blind voting (private visibility) cannot be combined with eReputation weighted voting.");
}

const pollDataForEntity = {
title: pollData.title,
mode: pollData.mode as "normal" | "point" | "rank",
Expand Down
15 changes: 10 additions & 5 deletions platforms/evoting-api/src/services/VoteService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,20 @@ export class VoteService {

/**
* Get reputation score for a user from reputation results using ename
* Returns the actual eReputation score (1-5) to be used as a multiplier
*/
private getReputationScore(ename: string, reputationResults: VoteReputationResult | null): number {
if (!reputationResults || !reputationResults.results) {
return 1.0; // Default weight if no reputation data
return 1.0; // Default score if no reputation data
}

const memberRep = reputationResults.results.find((r: MemberReputation) => r.ename === ename);
if (!memberRep) {
return 1.0; // Default weight if user not found in reputation results
return 1.0; // Default score if user not found in reputation results
}

// Normalize score to a weight (assuming score is 0-5, convert to 0-1 weight)
// You can adjust this formula based on your needs
return Math.max(0.1, memberRep.score / 5.0); // Minimum weight of 0.1, max of 1.0
// Return the actual eReputation score (1-5) to multiply votes/points by
return memberRep.score;
}

/**
Expand Down Expand Up @@ -210,6 +210,11 @@ export class VoteService {
const isWeighted = this.isEReputationWeighted(poll);
const reputationResults = isWeighted ? await this.getReputationResults(pollId) : null;

// Validate that reputation results exist if this is a weighted poll
if (isWeighted && !reputationResults) {
throw new Error("eReputation calculation is not yet complete. Results will be available once the calculation finishes.");
}

if (poll.mode === "normal") {
// STEP 1: Calculate results normally (without eReputation weighting)
const optionCounts: Record<string, number> = {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"tableName": "vote_reputation_results",
"schemaId": "660e8400-e29b-41d4-a716-446655440102",
"localToUniversalMap": {
"pollId": "pollId",
"pollId": "polls(pollId),pollId",
"groupId": "groupId",
"results": "results",
"createdAt": "createdAt",
Expand Down