Fix project ids order and duplication bug

Author: mmahdigh

src/auth/auth.controller.ts

@@ -49,7 +49,7 @@ export class AuthController {
     // expire the token from the db because the expiration time of the tokens are rather long
     res.clearCookie('auth', {
       httpOnly: true,
-      // sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
+      sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
       domain: process.env.NODE_ENV === 'development' ? undefined : STAGING_API,
       secure: true,
     });
@@ -90,7 +90,7 @@ export class AuthController {
 
     res.cookie('auth', nonce, {
       httpOnly: true,
-      // sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
+      sameSite: process.env.NODE_ENV === 'staging' ? 'none' : 'lax',
       domain: process.env.NODE_ENV === 'development' ? undefined : STAGING_API,
       secure: true,
       expires: new Date(Date.now() + this.authService.TokenExpirationDuration),

src/flow/flow.controller.ts

@@ -18,6 +18,7 @@ import { VoteProjectsDTO } from './dto/voteProjects.dto';
 import { VoteCollectionsDTO } from './dto/voteCollections.dto';
 import { AuthedReq } from 'src/utils/types/AuthedReq.type';
 import { PairsResult } from './dto/pairsResult';
+import { sortProjectId } from 'src/utils';
 
 @Controller({ path: 'flow' })
 export class FlowController {
@@ -46,12 +47,8 @@ export class FlowController {
     @Req() { userId }: AuthedReq,
     @Body() { project1Id, project2Id, pickedId }: VoteProjectsDTO,
   ) {
-    return this.flowService.voteForProjects(
-      userId,
-      project1Id,
-      project2Id,
-      pickedId,
-    );
+    const [id1, id2] = sortProjectId(project1Id, project2Id);
+    return await this.flowService.voteForProjects(userId, id1, id2, pickedId);
   }
 
   @UseGuards(AuthGuard)
@@ -60,10 +57,11 @@ export class FlowController {
     @Req() { userId }: AuthedReq,
     @Body() { collection1Id, collection2Id, pickedId }: VoteCollectionsDTO,
   ) {
-    return this.flowService.voteForCollections(
+    const [id1, id2] = sortProjectId(collection1Id, collection2Id);
+    return await this.flowService.voteForCollections(
       userId,
-      collection1Id,
-      collection2Id,
+      id1,
+      id2,
       pickedId,
     );
   }
@@ -136,4 +134,40 @@ export class FlowController {
       where: { user_id: userId },
     });
   }
+
+  // @Get('/correctInvalid')
+  // async checkForInvalid() {
+  //   const allInvalidVotes = await this.prismaService.projectVote.findMany({
+  //     select: { id: true, project1_id: true, project2_id: true },
+  //     where: {
+  //       project1_id: { lt: this.prismaService.projectVote.fields.project2_id },
+  //     },
+  //   });
+
+  //   console.log('number of votes:', allInvalidVotes.length);
+
+  // for (let i = 0; i < allInvalidVotes.length; i++) {
+  //   const item = allInvalidVotes[i];
+  //   console.log('this id was invalid:', item.id);
+  //   await this.prismaService.projectVote.update({
+  //     where: { id: item.id },
+  //     data: { project1_id: item.project2_id, project2_id: item.project1_id },
+  //   });
+  // }
+
+  // allVotes.forEach((vote, i, votes) => {
+  //   const index = votes.findIndex(
+  //     (vote2) =>
+  //       (vote.id !== vote2.id &&
+  //         vote.user_id === vote2.user_id &&
+  //         vote.project1_id === vote2.project1_id &&
+  //         vote.project2_id === vote2.project2_id) ||
+  //       (vote.id !== vote2.id &&
+  //         vote.user_id === vote2.user_id &&
+  //         vote.project1_id === vote2.project2_id &&
+  //         vote.project2_id === vote2.project1_id),
+  //   );
+  //   if (index !== -1) console.log(vote, votes[index]);
+  // });
+  // }
 }

src/flow/flow.service.ts

@@ -1,4 +1,9 @@
-import { BadRequestException, Injectable, Logger } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  InternalServerErrorException,
+  Logger,
+} from '@nestjs/common';
 import { PrismaService } from 'src/prisma.service';
 import { getPairwiseCombinations, sortCombinations } from 'src/utils';
 import {
@@ -510,6 +515,11 @@ export class FlowService {
         'Collection 1 and collection 2 ids should be different',
       );
 
+    if (collection1Id > collection2Id)
+      throw new InternalServerErrorException(
+        'Conventionally, collection1Id must be less than collection2Id',
+      );
+
     if (
       pickedId !== null &&
       pickedId !== collection1Id &&
@@ -540,6 +550,11 @@ export class FlowService {
         'Project 1 and project 2 ids should be different',
       );
 
+    if (project1Id > project2Id)
+      throw new InternalServerErrorException(
+        'Conventionally, project1Id must be less than project2Id',
+      );
+
     if (pickedId !== null && pickedId !== project1Id && pickedId !== project2Id)
       throw new BadRequestException('Picked project invalid id');
 

src/utils/index.ts

@@ -82,4 +82,13 @@ export const sortCombinations = (combinations: number[][], order: number[]) => {
   return sorted;
 };
 
-export const STAGING_API = 'pairwise.iran.liara.run/';
+export const sortProjectId = (
+  project1Id: number,
+  project2Id: number,
+): [number, number] => {
+  return project1Id > project2Id
+    ? [project2Id, project1Id]
+    : [project1Id, project2Id];
+};
+
+export const STAGING_API = 'pairwise.iran.liara.run';