Release v2.1.1 (#178)

Co-authored-by: Mayura Andrew <[email protected]>

package.json

@@ -15,6 +15,7 @@
     "typeorm:db": "npm run build && npx typeorm -d dist/src/configs/dbConfig.js",
     "migration:generate": "npm run typeorm:db -- migration:generate",
     "migration:run": "npm run typeorm:db -- migration:run",
+    "migration:revert": "npm run typeorm:db -- migration:revert",
     "sync:db": "npm run typeorm:db schema:sync",
     "seed": "npm run build && node dist/src/scripts/seed-db.js"
   },

src/controllers/admin/mentor.controller.ts

@@ -51,6 +51,8 @@ export const updateMentorHandler = async (
 
     const mentorUpdateData: Partial<Mentor> = { ...data }
     const profileUpdateData: Partial<Profile> = { ...data.profile }
+    const categoryId: string = data.categoryId
+    const countryId: string = data.countryId
 
     if (req.file) {
       profileUpdateData.image_url = `${IMG_HOST}/${req.file.filename}`
@@ -61,7 +63,9 @@ export const updateMentorHandler = async (
     const { mentor, statusCode, message } = await updateMentorDetails(
       mentorId,
       mentorUpdateData,
-      profileUpdateData
+      profileUpdateData,
+      categoryId,
+      countryId
     )
     return res.status(statusCode).json({ mentor, message })
   } catch (err) {

src/controllers/mentor.controller.ts

@@ -18,12 +18,13 @@ export const mentorApplicationHandler = async (
 ): Promise<ApiResponse<Mentor>> => {
   try {
     const user = req.user as Profile
-    const { application, categoryId } = req.body
+    const { application, categoryId, countryId } = req.body
 
     const { mentor, statusCode, message } = await createMentor(
       user,
       application,
-      categoryId
+      categoryId,
+      countryId
     )
 
     return res.status(statusCode).json({ mentor, message })

src/controllers/monthlyChecking.controller.ts

@@ -0,0 +1,95 @@
+import type { Request, Response } from 'express'
+import { type ApiResponse } from '../types'
+import type MonthlyCheckIn from '../entities/checkin.entity'
+
+import {
+  addFeedbackByMentor,
+  addMonthlyCheckInByMentee,
+  fetchMonthlyCheckIns
+} from '../services/monthlyChecking.service'
+
+export const postMonthlyCheckIn = async (
+  req: Request,
+  res: Response
+): Promise<Response<ApiResponse<MonthlyCheckIn>>> => {
+  try {
+    const {
+      menteeId,
+      title,
+      generalUpdatesAndFeedback,
+      progressTowardsGoals,
+      mediaContentLinks
+    } = req.body
+
+    const newCheckIn = await addMonthlyCheckInByMentee(
+      menteeId,
+      title,
+      generalUpdatesAndFeedback,
+      progressTowardsGoals,
+      mediaContentLinks
+    )
+
+    return res
+      .status(201)
+      .json({ checkIn: newCheckIn, message: 'Check-in added successfully' })
+  } catch (err) {
+    if (err instanceof Error) {
+      console.error('Error executing query', err)
+      return res
+        .status(500)
+        .json({ error: 'Internal server error', message: err.message })
+    }
+    throw err
+  }
+}
+
+export const getMonthlyCheckIns = async (
+  req: Request,
+  res: Response
+): Promise<Response<ApiResponse<MonthlyCheckIn>>> => {
+  try {
+    const { menteeId } = req.params
+
+    const { statusCode, checkIns, message } = await fetchMonthlyCheckIns(
+      menteeId
+    )
+
+    return res.status(statusCode).json({ checkIns, message })
+  } catch (err) {
+    if (err instanceof Error) {
+      console.error('Error executing query', err)
+      return res
+        .status(500)
+        .json({ error: 'Internal server error', message: err.message })
+    }
+    throw err
+  }
+}
+
+export const addFeedbackMonthlyCheckIn = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
+  try {
+    const { checkInId, menteeId, mentorFeedback, isCheckedByMentor } = req.body
+
+    const newMentorFeedbackCheckIn = await addFeedbackByMentor(
+      menteeId,
+      checkInId,
+      mentorFeedback,
+      isCheckedByMentor
+    )
+
+    res.status(201).json({
+      feedbackCheckIn: newMentorFeedbackCheckIn
+    })
+  } catch (err) {
+    if (err instanceof Error) {
+      console.error('Error executing query', err)
+      res
+        .status(500)
+        .json({ error: 'Internal server error', message: err.message })
+    }
+    throw err
+  }
+}

src/entities/checkin.entity.ts

@@ -0,0 +1,63 @@
+import { Entity, Column, ManyToOne, JoinColumn } from 'typeorm'
+import BaseEntity from './baseEntity'
+import Mentee from './mentee.entity'
+
+@Entity('monthly-check-in')
+class MonthlyCheckIn extends BaseEntity {
+  @Column({ type: 'text' })
+  title: string
+
+  @Column({ type: 'text' })
+  generalUpdatesAndFeedback: string
+
+  @Column({ type: 'text' })
+  progressTowardsGoals: string
+
+  @Column({ type: 'json' })
+  mediaContentLinks: string[]
+
+  @Column({ type: 'text', nullable: true })
+  mentorFeedback: string
+
+  @Column({ type: 'boolean', default: false })
+  isCheckedByMentor: boolean
+
+  @Column({ type: 'timestamp', nullable: true })
+  mentorCheckedDate: Date
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  checkInDate: Date
+
+  @ManyToOne(() => Mentee, (mentee) => mentee.checkIns)
+  @JoinColumn({ name: 'menteeId' })
+  mentee: Mentee
+
+  constructor(
+    title: string,
+    generalUpdatesAndFeedback: string,
+    progressTowardsGoals: string,
+    mediaContentLinks: string[],
+    mentorFeedback: string,
+    isCheckedByMentor: boolean,
+    mentorCheckedDate: Date,
+    checkInDate: Date,
+    mentee: Mentee
+  ) {
+    super()
+    this.title = title
+    this.generalUpdatesAndFeedback = generalUpdatesAndFeedback
+    this.progressTowardsGoals = progressTowardsGoals
+    this.mediaContentLinks = mediaContentLinks
+    this.mentorFeedback = mentorFeedback
+    this.isCheckedByMentor = isCheckedByMentor
+    this.mentorCheckedDate = mentorCheckedDate
+    this.checkInDate = checkInDate
+    this.mentee = mentee
+  }
+
+  validate(): boolean {
+    return this.mediaContentLinks.length >= 3
+  }
+}
+
+export default MonthlyCheckIn

src/entities/country.entity.ts

@@ -1,5 +1,6 @@
-import { Column, Entity } from 'typeorm'
+import { Column, Entity, OneToMany } from 'typeorm'
 import BaseEntity from './baseEntity'
+import Mentor from './mentor.entity'
 
 @Entity()
 export class Country extends BaseEntity {
@@ -9,6 +10,9 @@ export class Country extends BaseEntity {
   @Column()
   name: string
 
+  @OneToMany(() => Mentor, (mentor) => mentor.country)
+  mentors?: Mentor[]
+
   constructor(code: string, name: string) {
     super()
     this.code = code

src/entities/mentee.entity.ts

@@ -1,9 +1,10 @@
-import { Column, Entity, ManyToOne } from 'typeorm'
+import { Column, Entity, ManyToOne, OneToMany } from 'typeorm'
 import Mentor from './mentor.entity'
 import profileEntity from './profile.entity'
 import { MenteeApplicationStatus, StatusUpdatedBy } from '../enums'
 import BaseEntity from './baseEntity'
 import { UUID } from 'typeorm/driver/mongodb/bson.typings'
+import MonthlyCheckIn from './checkin.entity'
 
 @Entity('mentee')
 class Mentee extends BaseEntity {
@@ -35,17 +36,22 @@ class Mentee extends BaseEntity {
   @ManyToOne(() => Mentor, (mentor) => mentor.mentees)
   mentor: Mentor
 
+  @OneToMany(() => MonthlyCheckIn, (checkIn) => checkIn.mentee)
+  checkIns?: MonthlyCheckIn[]
+
   constructor(
     state: MenteeApplicationStatus,
     application: Record<string, unknown>,
     profile: profileEntity,
-    mentor: Mentor
+    mentor: Mentor,
+    checkIns?: MonthlyCheckIn[]
   ) {
     super()
     this.state = state || MenteeApplicationStatus.PENDING
     this.application = application
     this.profile = profile
     this.mentor = mentor
+    this.checkIns = checkIns
   }
 }
 

src/entities/mentor.entity.ts

@@ -4,6 +4,7 @@ import Mentee from './mentee.entity'
 import Category from './category.entity'
 import { MentorApplicationStatus } from '../enums'
 import BaseEntity from './baseEntity'
+import { Country } from './country.entity'
 
 @Entity('mentor')
 class Mentor extends BaseEntity {
@@ -28,6 +29,10 @@ class Mentor extends BaseEntity {
   @JoinColumn()
   profile: Profile
 
+  @ManyToOne(() => Country, (country) => country.mentors)
+  @JoinColumn()
+  country: Country
+
   @OneToMany(() => Mentee, (mentee) => mentee.mentor)
   mentees?: Mentee[]
 
@@ -36,14 +41,16 @@ class Mentor extends BaseEntity {
     category: Category,
     application: Record<string, unknown>,
     availability: boolean,
-    profile: Profile
+    profile: Profile,
+    country: Country
   ) {
     super()
     this.state = state
     this.category = category
     this.application = application
     this.availability = availability
     this.profile = profile
+    this.country = country
   }
 }
 

src/migrations/1722051742722-RemoveUniqueConstraintFromProfileUuid.ts

@@ -6,14 +6,25 @@ export class RemoveUniqueConstraintFromProfileUuid1722051742722
   name = 'RemoveUniqueConstraintFromProfileUuid1722051742722'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    // Check if the constraint exists before attempting to drop it
+    const constraintExists = await queryRunner.query(`
+      SELECT 1
+      FROM information_schema.table_constraints
+      WHERE constraint_name = 'REL_f671cf2220d1bd0621a1a5e92e'
+        AND table_name = 'mentee'
+    `)
+
+    if (constraintExists.length > 0) {
+      await queryRunner.query(
+        `ALTER TABLE "mentee" DROP CONSTRAINT "REL_f671cf2220d1bd0621a1a5e92e"`
+      )
+    }
+
     await queryRunner.query(
       `ALTER TABLE "mentee" DROP CONSTRAINT "FK_f671cf2220d1bd0621a1a5e92e7"`
     )
     await queryRunner.query(
-      `ALTER TABLE "mentee" DROP CONSTRAINT "REL_f671cf2220d1bd0621a1a5e92e"`
-    )
-    await queryRunner.query(
-      `ALTER TABLE "mentee" ADD CONSTRAINT "FK_f671cf2220d1bd0621a1a5e92e7" FOREIGN KEY ("profileUuid") REFERENCES "profile"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`
+      `ALTER TABLE "mentee" ADD CONSTRAINT "FK_f671cf2220d1bd0621a1a5e92e7" FOREIGN KEY ("profileUuid") REFERENCES "profile"("uuid") ON DELETE CASCADE ON UPDATE NO ACTION`
     )
   }
 

src/migrations/1726930041488-UpdateMentorTableWithCountry.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdateMentorTableWithCountry1726930041488
+  implements MigrationInterface
+{
+  name = 'UpdateMentorTableWithCountry1726930041488'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "mentor" ADD "countryUuid" uuid`)
+    await queryRunner.query(
+      `ALTER TABLE "mentor" ADD CONSTRAINT "FK_3302c22eb1636f239d605eb61c3" FOREIGN KEY ("countryUuid") REFERENCES "country"("uuid") ON DELETE NO ACTION ON UPDATE NO ACTION`
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "mentor" DROP CONSTRAINT "FK_3302c22eb1636f239d605eb61c3"`
+    )
+    await queryRunner.query(`ALTER TABLE "mentor" DROP COLUMN "countryUuid"`)
+  }
+}

src/migrations/1727197270336-monthly-checking-tags.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MonthlyCheckingTags1727197270336 implements MigrationInterface {
+    name = 'MonthlyCheckingTags1727197270336'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "monthly-check-in" ADD "tags" json`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "monthly-check-in" DROP COLUMN "tags"`);
+    }
+
+}

src/migrations/1727636762101-monthlychecking.ts

@@ -0,0 +1,13 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm'
+
+export class Monthlychecking1727636762101 implements MigrationInterface {
+  name = 'Monthlychecking1727636762101'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "monthly-check-in" DROP COLUMN "tags"`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "monthly-check-in" ADD "tags" json`)
+  }
+}