fix: error and types (#2295)

client/src/modules/CrossCheck/UploadCriteriaJSON.tsx

@@ -24,18 +24,19 @@ export const UploadCriteriaJSON = ({ onLoad }: IUploadCriteriaJSON) => {
       fileReader.readAsText(info.file.originFileObj as Blob, 'UTF-8');
       fileReader.onload = (e: Event) => {
         const target = e.target as Element & { result: string };
-        const { criteria } = JSON.parse(target.result);
+        const { criteria } = JSON.parse(target.result) as { criteria: CriteriaDto[] };
         const transformedCriteria = criteria?.map((item: CriteriaJSONType) => {
           if (item.type === TaskType.Title) {
             return { type: item.type, text: item.title };
-          } else return item;
+          }
+          return item;
         });
         if (!transformedCriteria?.length) {
           message.warning(`There is no criteria for downloading`);
           return;
         }
         message.success(`${info.file.name} file uploaded successfully`);
-        onLoad(transformedCriteria);
+        onLoad(transformedCriteria as CriteriaDto[]);
       };
     }
   };

client/src/pages/admin/tasks.tsx

@@ -181,7 +181,7 @@ function createRecord(values: any) {
     tags: values.tags,
     skills: values.skills?.map((skill: string) => skill.toLowerCase()),
     disciplineId: values.discipline,
-    attributes: JSON.parse(values.attributes ?? '{}'),
+    attributes: JSON.parse(values.attributes ?? '{}') as Record<string, unknown>,
   };
   return data;
 }

client/src/pages/course/mentor/dashboard.tsx

@@ -16,7 +16,7 @@ export interface MentorDashboardProps extends CoursePageProps {
 }
 
 function parseToken(token: string): Session {
-  return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+  return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString()) as Session;
 }
 
 export const getServerSideProps: GetServerSideProps<{ course: ProfileCourseDto }> = async ctx => {

client/src/reset.d.ts

@@ -0,0 +1 @@
+import '@total-typescript/ts-reset';

client/src/services/user.ts

@@ -50,7 +50,11 @@ export class UserService {
         },
       });
 
-      const { username, discriminator, id } = await response.json();
+      const { username, discriminator, id } = (await response.json()) as {
+        username: string;
+        discriminator: string;
+        id: string;
+      };
 
       return {
         username,

common/models/stage-interview-feedback.ts

@@ -9,7 +9,7 @@ interface StageInterviewFeedback {
     otherAchievements: string | null;
     militaryService: 'served' | 'liable' | 'notLiable' | null;
   };
-  skills: {
+  skills?: {
     [index: string]: any;
     htmlCss: {
       level: number | null;

docker-compose.yml

@@ -75,6 +75,7 @@ services:
       RSSHCOOL_USERS_CLOUD_USERNAME: ${RSSHCOOL_USERS_CLOUD_USERNAME}
       RSSHCOOL_USERS_CLOUD_PASSWORD: ${RSSHCOOL_USERS_CLOUD_PASSWORD}
       RSSHCOOL_OPENAI_API_KEY: ${RSSHCOOL_OPENAI_API_KEY}
+      SENTRY_DSN: ${SENTRY_DSN}
     restart: on-failure
     networks:
       - shared-network

nestjs/package.json

@@ -75,7 +75,7 @@
     "@nestjs/schematics": "10.0.2",
     "@nestjs/testing": "10.1.3",
     "@openapitools/openapi-generator-cli": "2.7.0",
-    "@total-typescript/ts-reset": "0.4.2",
+    "@sentry/node": "7.68.0",
     "@types/cache-manager": "4.0.2",
     "@types/cookie-parser": "1.4.3",
     "@types/express": "4.17.17",

nestjs/src/core/filters/index.ts

@@ -1,2 +1,2 @@
 export * from './entity-not-found.filter';
-export * from './unhandled-exceptions.filter';
+export * from './sentry.filter';

nestjs/src/core/filters/sentry.filter.ts

@@ -0,0 +1,11 @@
+import { ArgumentsHost, Catch } from '@nestjs/common';
+import { BaseExceptionFilter } from '@nestjs/core';
+import * as Sentry from '@sentry/node';
+
+@Catch()
+export class SentryFilter extends BaseExceptionFilter {
+  catch(exception: unknown, host: ArgumentsHost) {
+    Sentry.captureException(exception);
+    super.catch(exception, host);
+  }
+}

nestjs/src/courses/interviews/interviews.service.ts

@@ -162,10 +162,10 @@ export class InterviewsService {
    * @deprecated - should be removed once Artsiom A. makes migration of the legacy feedback format
    */
   private static getInterviewRatings({ skills, programmingTask, resume }: StageInterviewFeedbackJson) {
-    const commonSkills = Object.values(skills.common).filter(Boolean) as number[];
-    const dataStructuresSkills = Object.values(skills.dataStructures).filter(Boolean) as number[];
+    const commonSkills = Object.values(skills?.common ?? {}).filter(Boolean) as number[];
+    const dataStructuresSkills = Object.values(skills?.dataStructures ?? {}).filter(Boolean) as number[];
 
-    const htmlCss = skills.htmlCss.level;
+    const htmlCss = skills?.htmlCss.level;
     const common = commonSkills.reduce((acc, cur) => acc + cur, 0) / commonSkills.length;
     const dataStructures = dataStructuresSkills.reduce((acc, cur) => acc + cur, 0) / dataStructuresSkills.length;
 

nestjs/src/setup.ts

@@ -1,10 +1,8 @@
 import { BadRequestException, INestApplication, ValidationError, ValidationPipe } from '@nestjs/common';
-import { HttpAdapterHost } from '@nestjs/core';
+import * as Sentry from '@sentry/node';
 import * as cookieParser from 'cookie-parser';
 import { Logger } from 'nestjs-pino';
-import { CloudApiService } from './cloud-api/cloud-api.service';
-import { ConfigService } from './config';
-import { EntityNotFoundFilter, UnhandledExceptionsFilter } from './core/filters';
+import { EntityNotFoundFilter, SentryFilter } from './core/filters';
 import { ValidationFilter } from './core/validation';
 
 export function setupApp(app: INestApplication) {
@@ -13,11 +11,11 @@ export function setupApp(app: INestApplication) {
   app.useLogger(logger);
   app.use(cookieParser());
 
-  const httpAdapterHost = app.get(HttpAdapterHost);
-  app.useGlobalFilters(
-    new UnhandledExceptionsFilter(httpAdapterHost, app.get(CloudApiService), app.get(ConfigService)),
-    new EntityNotFoundFilter(),
-  );
+  if (process.env.SENTRY_DSN) {
+    Sentry.init({ dsn: process.env.SENTRY_DSN });
+  }
+
+  app.useGlobalFilters(new EntityNotFoundFilter(), new SentryFilter());
   app.useGlobalPipes(
     new ValidationPipe({
       whitelist: true,

package.json

@@ -22,6 +22,7 @@
     "db:down": "docker-compose -f ./setup/docker-compose.yml down"
   },
   "devDependencies": {
+    "@total-typescript/ts-reset": "^0.5.1",
     "prettier": "3.0.2",
     "turbo": "1.10.13"
   }

server/src/reset.d.ts

@@ -0,0 +1 @@
+import '@total-typescript/ts-reset';

server/src/routes/profile/stage-interview-feedback.ts

@@ -20,38 +20,38 @@ type FeedbackData = {
   maxScore: number;
 };
 
-export const getStageInterviewFeedback = async (githubId: string): Promise<StageInterviewDetailedFeedback[]> =>
-  (
-    await getRepository(StageInterview)
-      .createQueryBuilder('stageInterview')
-      .select('"stageInterview"."decision" AS "decision"')
-      .addSelect('"stageInterview"."isGoodCandidate" AS "isGoodCandidate"')
-      .addSelect('"stageInterview"."score" AS "interviewScore"')
-      .addSelect('"course"."name" AS "courseName"')
-      .addSelect('"course"."fullName" AS "courseFullName"')
-      .addSelect('"stageInterviewFeedback"."json" AS "interviewResultJson"')
-      .addSelect('"stageInterviewFeedback"."updatedDate" AS "interviewFeedbackDate"')
-      .addSelect('"stageInterviewFeedback"."version" AS "feedbackVersion"')
-      .addSelect('"userMentor"."firstName" AS "interviewerFirstName"')
-      .addSelect('"userMentor"."lastName" AS "interviewerLastName"')
-      .addSelect('"userMentor"."githubId" AS "interviewerGithubId"')
-      .addSelect('"courseTask"."maxScore" AS "maxScore"')
-      .leftJoin(Student, 'student', '"student"."id" = "stageInterview"."studentId"')
-      .leftJoin(User, 'user', '"user"."id" = "student"."userId"')
-      .leftJoin(Course, 'course', '"course"."id" = "stageInterview"."courseId"')
-      .leftJoin(
-        StageInterviewFeedback,
-        'stageInterviewFeedback',
-        '"stageInterview"."id" = "stageInterviewFeedback"."stageInterviewId"',
-      )
-      .leftJoin(CourseTask, 'courseTask', '"courseTask"."id" = "stageInterview"."courseTaskId"')
-      .leftJoin(Mentor, 'mentor', '"mentor"."id" = "stageInterview"."mentorId"')
-      .leftJoin(User, 'userMentor', '"userMentor"."id" = "mentor"."userId"')
-      .where('"user"."githubId" = :githubId', { githubId })
-      .andWhere('"stageInterview"."isCompleted" = true')
-      .orderBy('"course"."updatedDate"', 'ASC')
-      .getRawMany()
-  )
+export const getStageInterviewFeedback = async (githubId: string): Promise<StageInterviewDetailedFeedback[]> => {
+  const data = await getRepository(StageInterview)
+    .createQueryBuilder('stageInterview')
+    .select('"stageInterview"."decision" AS "decision"')
+    .addSelect('"stageInterview"."isGoodCandidate" AS "isGoodCandidate"')
+    .addSelect('"stageInterview"."score" AS "interviewScore"')
+    .addSelect('"course"."name" AS "courseName"')
+    .addSelect('"course"."fullName" AS "courseFullName"')
+    .addSelect('"stageInterviewFeedback"."json" AS "interviewResultJson"')
+    .addSelect('"stageInterviewFeedback"."updatedDate" AS "interviewFeedbackDate"')
+    .addSelect('"stageInterviewFeedback"."version" AS "feedbackVersion"')
+    .addSelect('"userMentor"."firstName" AS "interviewerFirstName"')
+    .addSelect('"userMentor"."lastName" AS "interviewerLastName"')
+    .addSelect('"userMentor"."githubId" AS "interviewerGithubId"')
+    .addSelect('"courseTask"."maxScore" AS "maxScore"')
+    .leftJoin(Student, 'student', '"student"."id" = "stageInterview"."studentId"')
+    .leftJoin(User, 'user', '"user"."id" = "student"."userId"')
+    .leftJoin(Course, 'course', '"course"."id" = "stageInterview"."courseId"')
+    .leftJoin(
+      StageInterviewFeedback,
+      'stageInterviewFeedback',
+      '"stageInterview"."id" = "stageInterviewFeedback"."stageInterviewId"',
+    )
+    .leftJoin(CourseTask, 'courseTask', '"courseTask"."id" = "stageInterview"."courseTaskId"')
+    .leftJoin(Mentor, 'mentor', '"mentor"."id" = "stageInterview"."mentorId"')
+    .leftJoin(User, 'userMentor', '"userMentor"."id" = "mentor"."userId"')
+    .where('"user"."githubId" = :githubId', { githubId })
+    .andWhere('"stageInterview"."isCompleted" = true')
+    .orderBy('"course"."updatedDate"', 'ASC')
+    .getRawMany();
+
+  return data
     .map((data: FeedbackData) => {
       const {
         feedbackVersion,
@@ -67,7 +67,8 @@ export const getStageInterviewFeedback = async (githubId: string): Promise<Stage
         interviewResultJson,
         maxScore,
       } = data;
-      const feedbackTemplate = JSON.parse(interviewResultJson);
+      const feedbackTemplate = JSON.parse(interviewResultJson) as any;
+
       const { score, feedback } = !feedbackVersion
         ? parseLegacyFeedback(feedbackTemplate)
         : {
@@ -92,6 +93,7 @@ export const getStageInterviewFeedback = async (githubId: string): Promise<Stage
       };
     })
     .filter(Boolean);
+};
 
 // this is legacy form
 function parseLegacyFeedback(interviewResult: StageInterviewFeedbackJson) {

server/src/services/stageInterview.service.ts

@@ -2,10 +2,10 @@ import { StageInterview, StageInterviewFeedback } from '../models';
 import { StageInterviewFeedbackJson } from '../../../common/models';
 
 export function getInterviewRatings({ skills, programmingTask, resume }: StageInterviewFeedbackJson) {
-  const commonSkills = Object.values(skills.common).filter(Boolean) as number[];
-  const dataStructuresSkills = Object.values(skills.dataStructures).filter(Boolean) as number[];
+  const commonSkills = Object.values(skills?.common ?? {}).filter(Boolean) as number[];
+  const dataStructuresSkills = Object.values(skills?.dataStructures ?? {}).filter(Boolean) as number[];
 
-  const htmlCss = skills.htmlCss.level;
+  const htmlCss = skills?.htmlCss.level;
   const common = commonSkills.reduce((acc, cur) => acc + cur, 0) / commonSkills.length;
   const dataStructures = dataStructuresSkills.reduce((acc, cur) => acc + cur, 0) / dataStructuresSkills.length;
 
@@ -28,7 +28,7 @@ export const getStageInterviewRating = (stageInterviews: StageInterview[]) => {
       stageInterviewFeedbacks.map((feedback: StageInterviewFeedback) => ({
         date: feedback.updatedDate,
         // interviews in new template should have score precalculated
-        rating: score ?? getInterviewRatings(JSON.parse(feedback.json)).rating,
+        rating: score ?? getInterviewRatings(JSON.parse(feedback.json) as StageInterviewFeedbackJson).rating,
       })),
     )
     .reduce((acc, cur) => acc.concat(cur), [])

turbo.json

@@ -46,7 +46,8 @@
         "RSSHCOOL_PG_PASSWORD",
         "RSSHCOOL_PG_USERNAME",
         "RSSHCOOL_UI_GCP_MAPS_API_KEY",
-        "RSSHCOOL_OPENAI_API_KEY"
+        "RSSHCOOL_OPENAI_API_KEY",
+        "SENTRY_DSN"
       ]
     },
     "lint": {},