Fix progress calculation all 1 stars bug

Author: mmahdigh

src/flow/dto/responses.ts

@@ -149,6 +149,9 @@ export const delegateStatusExample = {
     ],
   },
   toYou: {
+    uniqueCollection: 3,
+    uniqueCollectionDelegators: 1,
+    uniqueBudgetDelegators: 3,
     budget: [
       {
         metadata: {
@@ -158,13 +161,13 @@ export const delegateStatusExample = {
       },
       {
         metadata: {
-          username: 'some2.eth',
+          username: 'some.eth',
           profileUrl: 'https://example.com/some.png',
         },
       },
       {
         metadata: {
-          username: 'some3.eth',
+          username: 'some.eth',
           profileUrl: 'https://example.com/some.png',
         },
       },
@@ -173,14 +176,14 @@ export const delegateStatusExample = {
       {
         collectionId: 1,
         metadata: {
-          username: 'elon.eth',
+          username: 'some.eth',
           profileUrl: 'https://example.com/elon.png',
         },
       },
       {
-        collectionId: 1,
+        collectionId: 2,
         metadata: {
-          username: 'adele.eth',
+          username: 'some.eth',
           profileUrl: 'https://example.com/some.png',
         },
       },
@@ -202,6 +205,9 @@ export const delegateStatusExample2 = {
     ],
   },
   toYou: {
+    uniqueCollection: 0,
+    uniqueCollectionDelegators: 0,
+    uniqueBudgetDelegators: 0,
     budget: [],
     collections: [],
   },

src/flow/flow.controller.ts

@@ -1136,6 +1136,12 @@ export class FlowController {
     return 'Success';
   }
 
+  @Get('/test')
+  async test() {
+    await this.flowService.test();
+    return 'Success';
+  }
+
   // @UseGuards(AuthGuard)
   // @Post('/reset')
   // async resetVotes(@Req() { userId }: AuthedReq, @Body('cid') cid: number) {

src/flow/flow.service.ts

@@ -647,6 +647,8 @@ export class FlowService {
 
     starSubcategories.null = nullProjects.length;
 
+    // console.log('dist', starSubcategories);
+
     let total = 0;
     for (const key in starSubcategories) {
       if (key === '1') continue;
@@ -661,9 +663,79 @@ export class FlowService {
         getStarsById(vote.project1Id) !== 1,
     );
 
+    // console.log('effectiveVotes', effectiveVotes);
+    // console.log('total:', total);
+
+    if (total === 0) {
+      return allVotes.length / combinations(allProjects.length, 2);
+    }
+
     return effectiveVotes.length / total;
   };
 
+  test = async () => {
+    const userId = 13;
+    const parentCollection = 1;
+
+    const [collection, votes, projects, allStars, projectCoIs] =
+      await Promise.all([
+        this.prismaService.project.findUnique({
+          where: {
+            id: parentCollection || -1,
+            type: ProjectType.collection,
+          },
+          select: { name: true, id: true },
+        }),
+        this.prismaService.vote.findMany({
+          where: {
+            userId: userId,
+            project1: { parentId: parentCollection },
+            project2: { parentId: parentCollection },
+          },
+        }),
+        this.prismaService.project.findMany({
+          where: {
+            parentId: parentCollection || -1,
+          },
+        }),
+        this.getUserProjectStars(userId, parentCollection || -1),
+        this.prismaService.projectCoI.findMany({
+          where: {
+            project: { parentId: parentCollection },
+            userId,
+          },
+        }),
+      ]);
+
+    // projects except those with conflict of interest
+    const allProjects = projects
+      .filter((item) => !projectCoIs.find((el) => el.projectId === item.id))
+      .sort((a, b) =>
+        (a.implicitCategory || '').localeCompare(b.implicitCategory || ''),
+      );
+
+    const projectStars = allStars.filter(
+      (item) => !projectCoIs.find((el) => el.projectId === item.projectId),
+    );
+
+    const allVotes = votes.filter(
+      (item) =>
+        !projectCoIs.find(
+          (el) =>
+            el.projectId === item.project1Id ||
+            el.projectId === item.project2Id,
+        ),
+    );
+
+    const realProgress = this.calculateProgress(
+      allVotes,
+      projectStars,
+      allProjects,
+    );
+
+    console.log(realProgress);
+  };
+
   // if projectId is provided, the returend pair must include that project if possible
   getPairs = async (
     userId: number,
@@ -727,7 +799,7 @@ export class FlowService {
       allProjects,
     );
 
-    const progress = Math.min(1, realProgress * 3);
+    const progress = Math.min(1, realProgress * 10);
 
     if (progress === 1) {
       if (collection) {
@@ -998,7 +1070,7 @@ export class FlowService {
 
     console.log('summation', summation);
     // console.log("to fn3 summation", summation)
-    if (Math.abs(1 - toFixedNumber(summation, 5)) > 0.00001)
+    if (Math.abs(1 - toFixedNumber(summation, 3)) > 0.001)
       throw new BadRequestException('Sumamtion of shares must equal 1');
   };