feat: introduced bio field in member

apps/web-api/prisma/fixtures/members.ts

@@ -46,6 +46,7 @@ const membersFactory = Factory.define<Omit<Member, 'id'>>(
       plnFriend: faker.datatype.boolean(),
       airtableRecId: `airtable-rec-id-${sequence}`,
       externalId: null,
+      bio: faker.datatype.string(),
       isFeatured: faker.datatype.boolean(),
       createdAt: faker.date.past(),
       approvedAt: faker.date.past(),

apps/web-api/prisma/migrations/20240902052447_discover_question/migration.sql

@@ -0,0 +1,48 @@
+-- AlterTable
+ALTER TABLE "Member" ADD COLUMN     "bio" TEXT;
+
+-- CreateTable
+CREATE TABLE "DiscoveryQuestion" (
+    "id" SERIAL NOT NULL,
+    "uid" TEXT NOT NULL,
+    "title" TEXT,
+    "content" TEXT NOT NULL,
+    "viewCount" INTEGER,
+    "shareCount" INTEGER,
+    "slug" TEXT NOT NULL,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "teamUid" TEXT,
+    "projectUid" TEXT,
+    "eventUid" TEXT,
+    "createdBy" TEXT NOT NULL,
+    "modifiedBy" TEXT NOT NULL,
+    "answer" TEXT,
+    "answerSources" JSONB[],
+    "answerSourceFrom" TEXT,
+    "relatedQuestions" JSONB[],
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "DiscoveryQuestion_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "DiscoveryQuestion_uid_key" ON "DiscoveryQuestion"("uid");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "DiscoveryQuestion_slug_key" ON "DiscoveryQuestion"("slug");
+
+-- AddForeignKey
+ALTER TABLE "DiscoveryQuestion" ADD CONSTRAINT "DiscoveryQuestion_teamUid_fkey" FOREIGN KEY ("teamUid") REFERENCES "Team"("uid") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscoveryQuestion" ADD CONSTRAINT "DiscoveryQuestion_projectUid_fkey" FOREIGN KEY ("projectUid") REFERENCES "Project"("uid") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscoveryQuestion" ADD CONSTRAINT "DiscoveryQuestion_eventUid_fkey" FOREIGN KEY ("eventUid") REFERENCES "PLEvent"("uid") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscoveryQuestion" ADD CONSTRAINT "DiscoveryQuestion_createdBy_fkey" FOREIGN KEY ("createdBy") REFERENCES "Member"("uid") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscoveryQuestion" ADD CONSTRAINT "DiscoveryQuestion_modifiedBy_fkey" FOREIGN KEY ("modifiedBy") REFERENCES "Member"("uid") ON DELETE RESTRICT ON UPDATE CASCADE;

apps/web-api/prisma/schema.prisma

@@ -48,7 +48,7 @@ model Team {
   eventGuests                  PLEventGuest[]
   teamFocusAreas               TeamFocusArea[]
   teamFocusAreasVersionHistory TeamFocusAreaVersionHistory[]
-  relatedQuestions             QuestionAndAnswer[]           @relation("TeamRelatedQuestionAndAnswers")
+  relatedQuestions             DiscoveryQuestion[]           @relation("TeamRelatedDiscoveryQuestions")
 }
 
 model Member {
@@ -65,6 +65,7 @@ model Member {
   telegramHandler              String?
   officeHours                  String?
   moreDetails                  String?
+  bio                          String?
   plnFriend                    Boolean                       @default(false)
   plnStartDate                 DateTime?
   airtableRecId                String?                       @unique
@@ -89,8 +90,8 @@ model Member {
   targetInteractions           MemberInteraction[]           @relation("TargetMemberInteractions")
   followUps                    MemberFollowUp[]
   feedbacks                    MemberFeedback[]
-  createdQuestions             QuestionAndAnswer[]           @relation("MemberCreatedQuestionAndAnswers")
-  modifiedQuestions            QuestionAndAnswer[]           @relation("MemberModifiedQuestionAndAnswers")
+  createdQuestions             DiscoveryQuestion[]           @relation("MemberCreatedDiscoveryQuestions")
+  modifiedQuestions            DiscoveryQuestion[]           @relation("MemberModifiedDiscoveryQuestions")
 }
 
 model MemberRole {
@@ -338,7 +339,7 @@ model Project {
   isFeatured         Boolean?              @default(false)
   projectFocusAreas  ProjectFocusArea[]
   contributions      ProjectContribution[]
-  relatedQuestions   QuestionAndAnswer[]   @relation("ProjectRelatedQuestionAndAnswers")
+  relatedQuestions   DiscoveryQuestion[]   @relation("ProjectRelatedDiscoveryQuestions")
 }
 
 model PLEvent {
@@ -366,7 +367,7 @@ model PLEvent {
   createdAt        DateTime            @default(now())
   updatedAt        DateTime            @updatedAt
   eventGuests      PLEventGuest[]
-  relatedQuestions QuestionAndAnswer[] @relation("PLEventRelatedQuestionAndAnswers")
+  relatedQuestions DiscoveryQuestion[] @relation("PLEventRelatedDiscoveryQuestions")
 }
 
 model PLEventGuest {
@@ -505,7 +506,7 @@ model MemberFeedback {
   updatedAt   DateTime                   @updatedAt
 }
 
-model QuestionAndAnswer {
+model DiscoveryQuestion {
   id               Int      @id @default(autoincrement())
   uid              String   @unique @default(cuid())
   title            String?
@@ -515,15 +516,15 @@ model QuestionAndAnswer {
   slug             String   @unique
   isActive         Boolean  @default(true)
   teamUid          String?
-  team             Team?    @relation("TeamRelatedQuestionAndAnswers", fields: [teamUid], references: [uid])
+  team             Team?    @relation("TeamRelatedDiscoveryQuestions", fields: [teamUid], references: [uid])
   projectUid       String?
-  project          Project? @relation("ProjectRelatedQuestionAndAnswers", fields: [projectUid], references: [uid])
+  project          Project? @relation("ProjectRelatedDiscoveryQuestions", fields: [projectUid], references: [uid])
   eventUid         String?
-  plevent          PLEvent? @relation("PLEventRelatedQuestionAndAnswers", fields: [eventUid], references: [uid])
+  plevent          PLEvent? @relation("PLEventRelatedDiscoveryQuestions", fields: [eventUid], references: [uid])
   createdBy        String
-  creator          Member?  @relation("MemberCreatedQuestionAndAnswers", fields: [createdBy], references: [uid])
+  creator          Member?  @relation("MemberCreatedDiscoveryQuestions", fields: [createdBy], references: [uid])
   modifiedBy       String
-  modifier         Member?  @relation("MemberModifiedQuestionAndAnswers", fields: [modifiedBy], references: [uid])
+  modifier         Member?  @relation("MemberModifiedDiscoveryQuestions", fields: [modifiedBy], references: [uid])
   answer           String?
   answerSources    Json[]
   answerSourceFrom String?

apps/web-api/src/app.module.ts

@@ -38,6 +38,7 @@ import { EmptyStringToNullInterceptor } from './interceptors/empty-string-to-nul
 import { OfficeHoursModule } from './office-hours/office-hours.module';
 import { MemberFollowUpsModule } from './member-follow-ups/member-follow-ups.module';
 import { MemberFeedbacksModule } from './member-feedbacks/member-feedbacks.module';
+import { HuskyModule } from './husky/husky.module';
 import { HomeModule } from './home/home.module';
 
 @Module({
@@ -92,6 +93,7 @@ import { HomeModule } from './home/home.module';
     OfficeHoursModule,
     MemberFollowUpsModule,
     MemberFeedbacksModule,
+    HuskyModule,
     HomeModule
   ],
   providers: [

apps/web-api/src/home/home.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Req, Body, Param, UsePipes, UseGuards, ForbiddenException, ConflictException } from '@nestjs/common';
+import { Controller, Req, Body, Param, UsePipes, UseGuards, ForbiddenException, BadRequestException } from '@nestjs/common';
 import { Api, initNestServer } from '@ts-rest/nest';
 import { ZodValidationPipe } from 'nestjs-zod';
 import { Request } from 'express';
@@ -7,17 +7,18 @@ import { ApiOkResponseFromZod } from '../decorators/api-response-from-zod';
 import { apiHome } from 'libs/contracts/src/lib/contract-home';
 import { HomeService } from './home.service';
 import { 
-  QuestionAndAnswerQueryParams,
-  ResponseQuestionAndAnswerSchemaWithRelations,
-  ResponseQuestionAndAnswerSchema,
-  CreateQuestionAndAnswerSchemaDto,
-  UpdateQuestionAndAnswerSchemaDto
+  DiscoveryQuestionQueryParams,
+  ResponseDiscoveryQuestionSchemaWithRelations,
+  ResponseDiscoveryQuestionSchema,
+  CreateDiscoveryQuestionSchemaDto,
+  UpdateDiscoveryQuestionSchemaDto
 } from 'libs/contracts/src/schema';
 import { UserTokenValidation } from '../guards/user-token-validation.guard';
 import { MembersService } from '../members/members.service'; 
 import { NoCache } from '../decorators/no-cache.decorator';
 import { PrismaQueryBuilder } from '../utils/prisma-query-builder';
 import { prismaQueryableFieldsFromZod } from '../utils/prisma-queryable-fields-from-zod';
+import { HuskyService } from '../husky/husky.service';
 
 const server = initNestServer(apiHome);
 type RouteShape = typeof server.routeShapes;
@@ -26,42 +27,43 @@ type RouteShape = typeof server.routeShapes;
 export class HomeController {
   constructor(
     private homeService: HomeService,
-    private memberService: MembersService
+    private memberService: MembersService,
+    private huskyService:  HuskyService
   ) {}
 
   @Api(server.route.getAllFeaturedData)
   async getAllFeaturedData() {
     return await this.homeService.fetchAllFeaturedData();
   }
 
-  @Api(server.route.getAllQuestionAndAnswers) 
-  @ApiQueryFromZod(QuestionAndAnswerQueryParams)
-  @ApiOkResponseFromZod(ResponseQuestionAndAnswerSchemaWithRelations.array())
+  @Api(server.route.getAllDiscoveryQuestions) 
+  @ApiQueryFromZod(DiscoveryQuestionQueryParams)
+  @ApiOkResponseFromZod(ResponseDiscoveryQuestionSchemaWithRelations.array())
   @NoCache()
-  async getQuestionAndAnswers(@Req() request: Request) {
+  async getDiscoveryQuestions(@Req() request: Request) {
     const queryableFields = prismaQueryableFieldsFromZod(
-      ResponseQuestionAndAnswerSchema
+      ResponseDiscoveryQuestionSchema
     );
     const builder = new PrismaQueryBuilder(queryableFields);
     const builtQuery = builder.build(request.query);
-    return await this.homeService.fetchQuestionAndAnswers(builtQuery);
+    return await this.huskyService.fetchDiscoverQuestions(builtQuery);
   }
 
 
-  @Api(server.route.getQuestionAndAnswer) 
-  @ApiQueryFromZod(QuestionAndAnswerQueryParams)
-  @ApiOkResponseFromZod(ResponseQuestionAndAnswerSchemaWithRelations)
+  @Api(server.route.getDiscoveryQuestion) 
+  @ApiQueryFromZod(DiscoveryQuestionQueryParams)
+  @ApiOkResponseFromZod(ResponseDiscoveryQuestionSchemaWithRelations)
   @NoCache()
-  async getQuestionAndAnswer(@Param('slug') slug: string) 
+  async getDiscoveryQuestion(@Param('slug') slug: string) 
   {
-    return await this.homeService.fetchQuestionAndAnswerBySlug(slug);
+    return await this.huskyService.fetchDiscoverQuestionBySlug(slug);
   }
 
-  @Api(server.route.createQuestionAndAnswer)
+  @Api(server.route.createDiscoveryQuestion)
   @UsePipes(ZodValidationPipe)
   @UseGuards(UserTokenValidation)
-  async addQuestionAndAnswer(
-    @Body() questionAndAnswer: CreateQuestionAndAnswerSchemaDto,
+  async addDiscoveryQuestion(
+    @Body() discoveryQuestion: CreateDiscoveryQuestionSchemaDto,
     @Req() request
   ) {
     const userEmail = request["userEmail"];
@@ -70,15 +72,15 @@ export class HomeController {
     if (!result) {
       throw new ForbiddenException(`Member with email ${userEmail} isn't admin`);
     }
-    return await this.homeService.createQuestionAndAnswer(questionAndAnswer as any, member);
+    return await this.huskyService.createDiscoverQuestion(discoveryQuestion as any, member);
   }
 
-  @Api(server.route.updateQuestionAndAnswer)
+  @Api(server.route.updateDiscoveryQuestion)
   @UsePipes(ZodValidationPipe)
   @UseGuards(UserTokenValidation)
-  async modifyQuestionAndAnswer(
+  async modifyDiscoveryQuestion(
     @Param('slug') slug: string,
-    @Body() questionAndAnswer: UpdateQuestionAndAnswerSchemaDto,
+    @Body() discoveryQuestion: UpdateDiscoveryQuestionSchemaDto,
     @Req() request
   ) {
     const userEmail = request["userEmail"];
@@ -87,20 +89,22 @@ export class HomeController {
     if (!result) {
       throw new ForbiddenException(`Member with email ${userEmail} isn't admin`);
     }
-    return await this.homeService.updateQuestionAndAnswerBySlug(slug, questionAndAnswer as any, member);
+    return await this.huskyService.updateDiscoveryQuestionBySlug(slug, discoveryQuestion as any, member);
   }
 
-  @Api(server.route.updateQuestionAndAnswerViewCount)
-  async modifyQuestionAndAnswerViewCount(
-    @Param('slug') slug: string
-  ) {
-    return await this.homeService.updateQuestionAndAnswerViewCount(slug);
-  }
-
-  @Api(server.route.updateQuestionAndAnswerShareCount)
-  async modifyQuestionAndAnswerShareCount(
-    @Param('slug') slug: string
+  @Api(server.route.updateDiscoveryQuestionShareCountOrViewCount)
+  async modifyDiscoveryQuestionShareCountOrViewCount(
+    @Param('slug') slug: string,
+    @Body() body
   ) {
-    return await this.homeService.updateQuestionAndAnswerShareCount(slug);
+    const attribute = body.attribute;
+    switch (attribute) {
+      case "shareCount":  
+        return this.huskyService.updateDiscoveryQuestionShareCount(slug);
+      case "viewCount":
+        return this.huskyService.updateDiscoveryQuestionViewCount(slug);
+      default:
+        throw new BadRequestException(`Invalid attribute: ${attribute}`);
+    }
   }
 }

apps/web-api/src/home/home.module.ts

@@ -5,6 +5,7 @@ import { MembersModule } from '../members/members.module';
 import { TeamsModule } from '../teams/teams.module';
 import { ProjectsModule} from '../projects/projects.module';
 import { PLEventsModule } from '../pl-events/pl-events.module';
+import { HuskyModule } from '../husky/husky.module';
 
 @Module({
   controllers: [HomeController],
@@ -15,7 +16,8 @@ import { PLEventsModule } from '../pl-events/pl-events.module';
     MembersModule,
     TeamsModule,
     ProjectsModule,
-    PLEventsModule
+    PLEventsModule,
+    HuskyModule
   ],
   exports: [
     HomeService