From 2394473dc208090582f696e3f96f1d274250fe55 Mon Sep 17 00:00:00 2001
From: uptown <uptownhr@gmail.com>
Date: Sat, 26 Aug 2023 09:23:23 -0700
Subject: [PATCH] feat: added ability to answer

---
 apps/backend/src/app/app.controller.ts       | 13 +++----
 apps/backend/src/app/app.model.ts            |  7 +---
 apps/website/src/modules/qna/Question.svelte | 41 ++++++++++++++++++++
 apps/website/src/modules/qna/Topic.svelte    | 10 ++---
 apps/website/src/modules/qna/Topics.svelte   | 18 +++++++--
 5 files changed, 69 insertions(+), 20 deletions(-)
 create mode 100644 apps/website/src/modules/qna/Question.svelte

diff --git a/apps/backend/src/app/app.controller.ts b/apps/backend/src/app/app.controller.ts
index 541413e..508e437 100644
--- a/apps/backend/src/app/app.controller.ts
+++ b/apps/backend/src/app/app.controller.ts
@@ -74,11 +74,13 @@ export class AppController {
           },
         },
       },
+      include: {
+        answers: true,
+      },
     });
 
     return {
       ...question,
-      answerCount: 0,
       voteCount: 0,
     };
   }
@@ -120,6 +122,7 @@ export class AppController {
             answers: {
               select: {
                 id: true,
+                value: true,
               },
             },
           },
@@ -157,10 +160,7 @@ export class AppController {
       },
     });
 
-    return {
-      ...answer,
-      voteCount: 0,
-    };
+    return answer;
   }
 
   @ApiResponse({ type: Answer, status: 200, isArray: true })
@@ -206,7 +206,6 @@ export class AppController {
     return {
       ...vote.question,
       voteCount: vote.question.votes.length,
-      answerCount: vote.question.answers.length,
     };
   }
 
@@ -232,7 +231,7 @@ export class AppController {
 
     return {
       ...vote.answer,
-      voteCount: vote.answer.votes.length,
+      //      voteCount: vote.answer.votes.length,
     };
   }
 }
diff --git a/apps/backend/src/app/app.model.ts b/apps/backend/src/app/app.model.ts
index 44904e9..2ec20b9 100644
--- a/apps/backend/src/app/app.model.ts
+++ b/apps/backend/src/app/app.model.ts
@@ -20,10 +20,10 @@ export class Question {
   title: string;
 
   @ApiProperty()
-  answerCount: number;
+  voteCount: number;
 
   @ApiProperty()
-  voteCount: number;
+  answers: Answer[];
 }
 
 export class Page {
@@ -62,7 +62,4 @@ export class Answer {
 
   @ApiProperty()
   value: string;
-
-  @ApiProperty()
-  voteCount: number;
 }
diff --git a/apps/website/src/modules/qna/Question.svelte b/apps/website/src/modules/qna/Question.svelte
new file mode 100644
index 0000000..c308953
--- /dev/null
+++ b/apps/website/src/modules/qna/Question.svelte
@@ -0,0 +1,41 @@
+<script>
+  import { questionApi } from '@modules/qna/api';
+  export let question;
+
+  let form = {
+    answer: null,
+  };
+
+  async function addAnswer(questionId, a) {
+    const answer = await questionApi(`/answer`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        questionId,
+        value: a,
+      }),
+    });
+
+    question.answers = [...question.answers, answer];
+
+    form.answer = null;
+  }
+</script>
+
+<div>
+  {question.title} <br />
+  Votes: {question.voteCount} | Answers: {question.answers.length}
+  <ul>
+    {#each question.answers as answer}
+      <li>
+        {answer.value}
+      </li>
+    {/each}
+  </ul>
+  <form on:submit|preventDefault={() => addAnswer(question.id, form.answer)}>
+    <textarea bind:value={form.answer} />
+    <input type="submit" value="Add Answer" />
+  </form>
+</div>
diff --git a/apps/website/src/modules/qna/Topic.svelte b/apps/website/src/modules/qna/Topic.svelte
index 640ee9b..12db6b7 100644
--- a/apps/website/src/modules/qna/Topic.svelte
+++ b/apps/website/src/modules/qna/Topic.svelte
@@ -1,6 +1,7 @@
 <script>
   import { onMount } from 'svelte';
   import { questionApi } from '@modules/qna/api';
+  import Question from '@modules/qna/Question.svelte';
 
   const url = new URL(window.location.href);
   const id = parseInt(url.searchParams.get('id'));
@@ -15,14 +16,14 @@
     question: null,
   };
 
-  async function addQuestion(x) {
+  async function addQuestion(q) {
     const question = await questionApi(`/question`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({
-        title: form.question,
+        title: q,
         pageId: id,
       }),
     });
@@ -36,7 +37,7 @@
   {#if topic}
     <h1>{topic.title}</h1>
   {/if}
-  <form on:submit|preventDefault={() => addQuestion('test')}>
+  <form on:submit|preventDefault={() => addQuestion(form.question)}>
     <input
       type="text"
       bind:value={form.question}
@@ -49,8 +50,7 @@
     <ul>
       {#each topic.questions as question}
         <li>
-          {question.title} <br />
-          Votes: {question.voteCount} | Answers: {question.answerCount}
+          <Question {question} />
         </li>
       {/each}
     </ul>
diff --git a/apps/website/src/modules/qna/Topics.svelte b/apps/website/src/modules/qna/Topics.svelte
index 54a92d3..678ce43 100644
--- a/apps/website/src/modules/qna/Topics.svelte
+++ b/apps/website/src/modules/qna/Topics.svelte
@@ -2,18 +2,30 @@
   import { onMount } from 'svelte';
   import { questionApi } from '@modules/qna/api';
 
-  let topics = []
+  let topics = [];
+  let form = {
+    answer: null,
+  };
 
   onMount(async () => {
     topics = await questionApi('/pages');
   });
+
+  async function addAnswer() {}
 </script>
 
 <div>
-  <h2>Topics <a href="/tools/question-answer/new" style="float: right; font-size: 1rem">+ New Topic</a></h2>
+  <h2>
+    Topics <a
+      href="/tools/question-answer/new"
+      style="float: right; font-size: 1rem">+ New Topic</a
+    >
+  </h2>
   <ul>
     {#each topics as topic (topic.id)}
-      <li><a href="/tools/question-answer/topic?id={topic.id}">{topic.title}</a></li>
+      <li>
+        <a href="/tools/question-answer/topic?id={topic.id}">{topic.title}</a>
+      </li>
     {/each}
   </ul>
 </div>