feat(ProjectListItem): average project score

taskany-inc · Jul 20, 2023 · 54cd60b · 54cd60b
1 parent 1103386
commit 54cd60b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 11 deletions.
diff --git a/prisma/migrations/20230718153020_/migration.sql b/prisma/migrations/20230718153020_/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "averageScore" INTEGER;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -150,6 +150,7 @@ model Project {
   tags         Tag[]
   watchers     Activity[] @relation("projectWatchers")
   stargizers   Activity[] @relation("projectStargizers")
+  averageScore Int?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @default(now()) @updatedAt

diff --git a/src/components/DashboardPage/DashboardPage.tsx b/src/components/DashboardPage/DashboardPage.tsx
@@ -228,6 +228,7 @@ export const DashboardPage = ({ user, ssrTime }: ExternalPageProps) => {
                                                 participants={group.project?.participants}
                                                 starred={group.project?._isStarred}
                                                 watching={group.project?._isWatching}
+                                                averageScore={group.project?.averageScore}
                                             />
                                         </NextLink>
                                     </ProjectListContainer>

diff --git a/src/components/ExploreTopProjectsPage/ExploreTopProjectsPage.tsx b/src/components/ExploreTopProjectsPage/ExploreTopProjectsPage.tsx
@@ -33,6 +33,7 @@ export const ExploreProjectsPage = ({ user, ssrTime }: ExternalPageProps) => {
                                         starred={p._isStarred}
                                         watching={p._isWatching}
                                         participants={p.participants}
+                                        averageScore={p.averageScore}
                                     />
                                 </NextLink>
                             )),

diff --git a/src/components/ExporeProjectsPage/ExporeProjectsPage.tsx b/src/components/ExporeProjectsPage/ExporeProjectsPage.tsx
@@ -33,6 +33,7 @@ export const ExploreProjectsPage = ({ user, ssrTime }: ExternalPageProps) => {
                                         starred={p._isStarred}
                                         watching={p._isWatching}
                                         participants={p.participants}
+                                        averageScore={p.averageScore}
                                     />
                                 </NextLink>
                             )),

diff --git a/src/components/ProjectListItem.tsx b/src/components/ProjectListItem.tsx
@@ -1,5 +1,5 @@
 import { FC, ReactNode, forwardRef } from 'react';
-import { EyeIcon, StarFilledIcon, Text, nullable } from '@taskany/bricks';
+import { CircleProgressBar, EyeIcon, StarFilledIcon, Text, nullable } from '@taskany/bricks';
 import styled from 'styled-components';
 
 import { ActivityByIdReturnType } from '../../trpc/inferredTypes';
@@ -18,20 +18,24 @@ interface ProjectListItemProps {
     watching?: boolean;
     className?: string;
     disabled?: boolean;
+    averageScore: number | null;
 }
 
 const StyledTitleCell = styled(TableCell)`
     justify-content: space-between;
 `;
 
 export const ProjectListContainer: FC<{ children: ReactNode; offset?: number }> = ({ children, offset = 0 }) => (
-    <Table columns={5} offset={offset}>
+    <Table columns={6} offset={offset}>
         {children}
     </Table>
 );
 
 export const ProjectListItem = forwardRef<HTMLDivElement, ProjectListItemProps>(
-    ({ as = 'div', children, title, owner, participants, starred, watching, className, ...props }, ref) => (
+    (
+        { as = 'div', children, title, owner, participants, starred, watching, averageScore, className, ...props },
+        ref,
+    ) => (
         <TableRow as={as} className={className} ref={ref} {...props}>
             <StyledTitleCell>
                 <Text size="l" weight="bold">
@@ -47,6 +51,7 @@ export const ProjectListItem = forwardRef<HTMLDivElement, ProjectListItemProps>(
             </TableCell>
 
             <TableCell>{nullable(participants, (p) => (p.length ? <UserGroup users={p} /> : null))}</TableCell>
+            <TableCell>{averageScore != null ? <CircleProgressBar value={averageScore} size="m" /> : null}</TableCell>
 
             <TableCell>
                 {nullable(starred, () => (

diff --git a/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx b/src/components/ProjectListItemCollapsable/ProjectListItemCollapsable.tsx
@@ -102,6 +102,7 @@ export const ProjectListItemCollapsable: React.FC<ProjectListItemCollapsableProp
                         starred={project._isStarred}
                         watching={project._isWatching}
                         disabled={!onClickEnabled}
+                        averageScore={project.averageScore}
                     >
                         <StyledProjectListItemActionsContainer>
                             <StyledProjectListItemAction forceVisibility={!collapsedGoals}>

diff --git a/src/utils/db.ts b/src/utils/db.ts
@@ -1,13 +1,14 @@
 import { nanoid } from 'nanoid';
 import { z } from 'zod';
 import { GoalHistory, Comment, Activity, User, Goal } from '@prisma/client';
+import { TRPCError } from '@trpc/server';
 
 import { GoalCommon, GoalUpdate, dependencyKind } from '../schema/goal';
 import { addCalclulatedGoalsFields, calcAchievedWeight } from '../../trpc/queries/goals';
-import { HistoryRecordWithActivity, HistoryRecordMeta, HistoryRecordSubject, HistoryAction } from '../types/history';
+import { HistoryRecordWithActivity, HistoryRecordSubject, HistoryAction } from '../types/history';
 
 import { prisma } from './prisma';
-import { castToMetaDto, subjectToEnumValue } from './goalHistory';
+import { subjectToEnumValue } from './goalHistory';
 
 export const findOrCreateEstimate = async (
     estimate: GoalCommon['estimate'] | GoalUpdate['estimate'],
@@ -316,10 +317,31 @@ export const updateGoalWithCalculatedWeight = async (goalId: string) => {
         },
     });
 
-    await prisma.goal.update({
-        where: { id: goalId },
-        data: {
-            completedCriteriaWeight: criteriaList.length ? calcAchievedWeight(criteriaList) : null,
-        },
-    });
+    try {
+        await prisma.$transaction(async (ctx) => {
+            // update goal score by criteria list
+            const updatedGoal = await ctx.goal.update({
+                where: { id: goalId },
+                data: {
+                    completedCriteriaWeight: criteriaList.length ? calcAchievedWeight(criteriaList) : null,
+                },
+            });
+
+            if (!updatedGoal) {
+                throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR' });
+            }
+
+            // update project score after goal score update
+            if (updatedGoal.projectId) {
+                await ctx.$executeRaw`
+                    UPDATE "Project"
+                    SET "averageScore" = (SELECT AVG("completedCriteriaWeight") FROM "Goal"
+                        WHERE "projectId" = ${updatedGoal.projectId})
+                    WHERE "id" = ${updatedGoal.projectId};
+                `;
+            }
+        });
+    } catch (error: any) {
+        throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', cause: error, message: error?.message });
+    }
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Project" ADD COLUMN "averageScore" INTEGER;