From abd187d8b1c757e6c321e619853022fa61180cb7 Mon Sep 17 00:00:00 2001
From: "Yoon, Daeki" <dowellware@gmail.com>
Date: Tue, 29 Sep 2020 23:09:10 +0900
Subject: [PATCH] =?UTF-8?q?edit=20problem=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nodemon.json                                  |  6 ++
 src/client/src/MainRouter.jsx                 |  8 ++
 src/client/src/core/Menu.jsx                  |  6 +-
 src/client/src/quiz/EditProblem.jsx           | 11 +++
 src/client/src/quiz/NewProblem.jsx            | 76 ++++++++++++++++++
 src/client/src/quiz/NewQuiz.jsx               | 53 +++++++++++++
 src/client/src/quiz/Problem.jsx               | 23 ++++++
 src/client/src/quiz/Problems.jsx              | 11 +++
 src/client/src/quiz/Quiz.jsx                  | 38 +++++++++
 src/client/src/quiz/api-quiz.js               | 39 ++++++++++
 src/server/quiz/answer.model.js               |  6 +-
 .../{question.model.js => problem.model.js}   |  8 +-
 src/server/quiz/quiz.controller.js            | 78 ++++++++++++++-----
 src/server/quiz/quiz.model.js                 |  5 +-
 src/server/quiz/quiz.routes.js                |  4 +
 src/server/user/user.controller.js            |  1 +
 16 files changed, 343 insertions(+), 30 deletions(-)
 create mode 100644 nodemon.json
 create mode 100644 src/client/src/quiz/EditProblem.jsx
 create mode 100644 src/client/src/quiz/NewProblem.jsx
 create mode 100644 src/client/src/quiz/NewQuiz.jsx
 create mode 100644 src/client/src/quiz/Problem.jsx
 create mode 100644 src/client/src/quiz/Problems.jsx
 create mode 100644 src/client/src/quiz/Quiz.jsx
 create mode 100644 src/client/src/quiz/api-quiz.js
 rename src/server/quiz/{question.model.js => problem.model.js} (68%)

diff --git a/nodemon.json b/nodemon.json
new file mode 100644
index 0000000..ed8c053
--- /dev/null
+++ b/nodemon.json
@@ -0,0 +1,6 @@
+{
+  "watch": ["src/server"],
+  "env": {
+    "NODE_ENV": "development"
+  }
+}
\ No newline at end of file
diff --git a/src/client/src/MainRouter.jsx b/src/client/src/MainRouter.jsx
index 3e2cc11..5653606 100644
--- a/src/client/src/MainRouter.jsx
+++ b/src/client/src/MainRouter.jsx
@@ -3,6 +3,8 @@ import { Route, Switch } from "react-router-dom";
 import Signin from "./auth/Signin";
 import Home from "./core/Home";
 import Menu from "./core/Menu";
+import NewQuiz from './quiz/NewQuiz'
+import Quiz from './quiz/Quiz'
 
 function MainRouter() {
   return (
@@ -16,6 +18,12 @@ function MainRouter() {
         <Route path="/signin">
           <Signin />
         </Route>
+        <Route path='/quiz/new'>
+          <NewQuiz />
+        </Route>
+        <Route path="/quiz/:quizId">
+          <Quiz />
+        </Route>
       </Switch>
     </div>
     // <BrowserRouter>
diff --git a/src/client/src/core/Menu.jsx b/src/client/src/core/Menu.jsx
index 19ec027..5927f80 100644
--- a/src/client/src/core/Menu.jsx
+++ b/src/client/src/core/Menu.jsx
@@ -14,13 +14,13 @@ function Menu() {
   return (
     <Navbar sticky="top" bg="dark" variant="dark" expand="sm">
       <Navbar.Brand href="/">
-        <i className="fas fa-child fa-2x"></i>
+        <i className="fas fa-diagnoses fa-2x"></i>
       </Navbar.Brand>
       <Navbar.Toggle aria-controls="basic-navbar-nav" />
       <Navbar.Collapse id="basic-navbar-nav">
         <Nav className="mr-auto">
-          <Nav.Link href="#home">Home</Nav.Link>
-          <Nav.Link href="#link">Link</Nav.Link>
+          <Nav.Link href="/">Home</Nav.Link>
+          <Nav.Link href="/quiz/new">New Quiz</Nav.Link>
           <NavDropdown title="Dropdown" id="basic-nav-dropdown">
             <NavDropdown.Item href="#action/3.1">Action</NavDropdown.Item>
             <NavDropdown.Item href="#action/3.2">
diff --git a/src/client/src/quiz/EditProblem.jsx b/src/client/src/quiz/EditProblem.jsx
new file mode 100644
index 0000000..c1b2258
--- /dev/null
+++ b/src/client/src/quiz/EditProblem.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+function EditProblem() {
+  return (
+    <div>
+      
+    </div>
+  )
+}
+
+export default EditProblem
diff --git a/src/client/src/quiz/NewProblem.jsx b/src/client/src/quiz/NewProblem.jsx
new file mode 100644
index 0000000..1855169
--- /dev/null
+++ b/src/client/src/quiz/NewProblem.jsx
@@ -0,0 +1,76 @@
+import React, { useState } from "react";
+import Button from "react-bootstrap/Button";
+import Form from "react-bootstrap/Form";
+import Col from "react-bootstrap/Col";
+
+function NewProblem({ addProblem }) {
+  const [answers, setAnswers] = useState([""]);
+  const [question, setQuestion] = useState("");
+
+  const addAnswer = () => {
+    setAnswers([...answers, ""]);
+  };
+
+  const removeAnswer = (index) => {
+    const list = [...answers];
+    list.splice(index, 1);
+    setAnswers(list);
+  };
+
+  const handleAnswer = (event, index) => {
+    const { value } = event.target;
+    const list = [...answers];
+    list[index] = value;
+    setAnswers(list);
+  };
+
+  const handleQuestion = (event) => {
+    setQuestion(event.target.value);
+  };
+
+  const clickAdd = (event) => {
+    event.preventDefault();
+    addProblem({ question, answers });
+  };
+
+  return (
+    <div>
+      <Form>
+        <Form.Group controlId="question">
+          <Form.Label>Question</Form.Label>
+          <Form.Control
+            name="question"
+            as="textarea"
+            rows={5}
+            onChange={handleQuestion}
+          />
+        </Form.Group>
+        <Form.Label>Answers</Form.Label>
+        {answers.map((answer, index) => {
+          return (
+            <Form.Row key={index}>
+              <Col>
+                <Form.Control
+                  type="text"
+                  value={answer}
+                  onChange={(event) => handleAnswer(event, index)}
+                />
+              </Col>
+              <Col>
+                {answers.length !== 1 && (
+                  <Button onClick={removeAnswer}>Remove</Button>
+                )}
+                {answers.length - 1 === index && (
+                  <Button onClick={addAnswer}>Add</Button>
+                )}
+              </Col>
+            </Form.Row>
+          );
+        })}
+        <Button onClick={clickAdd}>Add</Button>
+      </Form>
+    </div>
+  );
+}
+
+export default NewProblem;
diff --git a/src/client/src/quiz/NewQuiz.jsx b/src/client/src/quiz/NewQuiz.jsx
new file mode 100644
index 0000000..e924138
--- /dev/null
+++ b/src/client/src/quiz/NewQuiz.jsx
@@ -0,0 +1,53 @@
+import React, { useState } from "react";
+import Button from "react-bootstrap/Button";
+import authHelpers from "../auth/auth-helpers";
+import { create } from "./api-quiz";
+import NewProblem from "./NewProblem";
+import Problem from "./Problem";
+
+function NewQuiz() {
+
+  const [problems, setProblems] = useState([])
+
+  const jwt = authHelpers.isAuthenticated();
+
+  const addProblem = (problem) => {
+    console.log(problem)
+    setProblems([...problems, problem])
+  }
+
+  const clickSubmit = (event) => {
+    event.preventDefault();
+
+    const quizData = {
+      problems
+    }
+
+    create({ userId: jwt.user._id }, { t: jwt.token }, quizData).then(
+      (data) => {
+        if (data.error) {
+          console.log(data.error);
+        } else {
+          console.log(data);
+        }
+      }
+    );
+  };
+
+  return (
+    <div>
+      <h1 className="text-center">
+        Quiz List
+      </h1>
+      {
+        problems.map((problem, index) => {
+          return <Problem key={index} problem={problem} />
+        })
+      }
+      <NewProblem addProblem={addProblem} />
+      <Button onClick={clickSubmit}>퀴즈 저장</Button>
+    </div>
+  );
+}
+
+export default NewQuiz;
diff --git a/src/client/src/quiz/Problem.jsx b/src/client/src/quiz/Problem.jsx
new file mode 100644
index 0000000..761106b
--- /dev/null
+++ b/src/client/src/quiz/Problem.jsx
@@ -0,0 +1,23 @@
+import React from "react";
+import Card from "react-bootstrap/Card";
+import Button from "react-bootstrap/Button";
+
+function Problem({ problem, number }) {
+  return (
+    <Card>
+      <Card.Body>
+        <Card.Title>
+          {number}번. {problem.question}
+        </Card.Title>
+        Answers
+        {problem.answers.map((answer, index) => {
+          return <Card.Text key={index}>{answer}</Card.Text>;
+        })}
+        <Button>수정</Button>
+        <Button>삭제</Button>
+      </Card.Body>
+    </Card>
+  );
+}
+
+export default Problem;
diff --git a/src/client/src/quiz/Problems.jsx b/src/client/src/quiz/Problems.jsx
new file mode 100644
index 0000000..8cf0cc4
--- /dev/null
+++ b/src/client/src/quiz/Problems.jsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+function Problems() {
+  return (
+    <div>
+      
+    </div>
+  )
+}
+
+export default Problems
diff --git a/src/client/src/quiz/Quiz.jsx b/src/client/src/quiz/Quiz.jsx
new file mode 100644
index 0000000..be93834
--- /dev/null
+++ b/src/client/src/quiz/Quiz.jsx
@@ -0,0 +1,38 @@
+import React, { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+import { read } from "./api-quiz";
+import auth from "../auth/auth-helpers";
+import Problem from './Problem'
+
+function Quiz() {
+  const { quizId } = useParams();
+  const [quiz, setQuiz] = useState({});
+
+  const jwt = auth.isAuthenticated();
+
+  useEffect(() => {
+    const abortController = new AbortController();
+    const signal = abortController.signal;
+
+    read({ quizId: quizId }, { t: jwt.token }, signal).then((data) => {
+      if (data.error) {
+        console.log(data.error);
+      } else {
+        setQuiz(data);
+      }
+    });
+    return () => {
+      abortController.abort();
+    };
+  }, [quizId]);
+
+  return (
+    <div>
+      {quiz.problems?.map((problem, i) => {
+        return <Problem key={i} problem={problem} number={i+1} />;
+      })}
+    </div>
+  );
+}
+
+export default Quiz;
diff --git a/src/client/src/quiz/api-quiz.js b/src/client/src/quiz/api-quiz.js
new file mode 100644
index 0000000..1074aea
--- /dev/null
+++ b/src/client/src/quiz/api-quiz.js
@@ -0,0 +1,39 @@
+
+const create = async (params, credentials, quiz) => {
+  try {
+    let response = await fetch('/api/quiz/' + params.userId, {
+      method: 'POST',
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'Authorization': 'Bearer ' + credentials.t,
+      },
+      body: JSON.stringify(quiz),
+    })
+    return await response.json()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const read = async (params, credentials, signal) => {
+  try {
+    let response = await fetch('/api/quiz/' + params.quizId, {
+      method: 'GET',
+      signal: signal,
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'Authorization': 'Bearer ' + credentials.t,
+      },
+    })
+    return await response.json()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+export {
+  create,
+  read,
+}
\ No newline at end of file
diff --git a/src/server/quiz/answer.model.js b/src/server/quiz/answer.model.js
index 42708a6..0d68365 100644
--- a/src/server/quiz/answer.model.js
+++ b/src/server/quiz/answer.model.js
@@ -1,13 +1,13 @@
 import mongoose from 'mongoose'
 
 const AnswerSchema = new mongoose.Schema({
-  questionId: {
+  problemId: {
     type: mongoose.Schema.Types.ObjectId,
-    ref: 'Question',
+    ref: 'Problem',
   },
   type: String, // single/multiple choice?
   score: Number, // 맞힌 점수
-  points: Number, // Question.score와 자동 연결 필요
+  points: Number, // Problem.score와 자동 연결 필요
   content: String, // 기록한 답
 })
 
diff --git a/src/server/quiz/question.model.js b/src/server/quiz/problem.model.js
similarity index 68%
rename from src/server/quiz/question.model.js
rename to src/server/quiz/problem.model.js
index c96d25e..b9b4ea5 100644
--- a/src/server/quiz/question.model.js
+++ b/src/server/quiz/problem.model.js
@@ -1,6 +1,6 @@
 import mongoose from 'mongoose'
 
-const QuestionSchema = new mongoose.Schema({
+const ProblemSchema = new mongoose.Schema({
   type: String, // 객관식, 주관식 single/multiple choice
   created: {
     type: Date,
@@ -10,12 +10,12 @@ const QuestionSchema = new mongoose.Schema({
   level: String,
   category: [String],
   score: Number, //문제당 할당 점수
-  content: String, //질문
-  choices: [String], // 선택형 항목
+  question: String, //질문
+  answers: [String], // 선택형 항목
   correct: {
     type: mongoose.Schema.Types.ObjectId,
     ref: 'Answer'
   }, // 정답; Answer Model 객체
 })
 
-export default mongoose.model('Question', QuestionSchema)
\ No newline at end of file
+export default mongoose.model('Problem', ProblemSchema)
\ No newline at end of file
diff --git a/src/server/quiz/quiz.controller.js b/src/server/quiz/quiz.controller.js
index 90c968b..8603f3c 100644
--- a/src/server/quiz/quiz.controller.js
+++ b/src/server/quiz/quiz.controller.js
@@ -1,35 +1,75 @@
 import formidable from 'formidable'
 import fs from 'fs'
-import quizModel from './quiz.model.js'
+import Problem from './problem.model.js'
+import Quiz from './quiz.model.js'
 
 const create = async (req, res) => {
-  const form = new formidable.IncomingForm()
-  form.keepExtensions = true
-  form.parse(req, async (err, fields, files) => {
-    if (err) {
-      return res.status(400).json({
-        error: 'Image could not be uploaded'
-      })
+  try {
+    const { problems } = req.body
+
+    const quiz = new Quiz()
+    // console.log('quiz in quiz.controller:', quiz);
+
+    for await (let problem of problems) {
+      // console.log('problem in quiz.controller:', problem);
+      const p = new Problem(problem)
+      // console.log('problem in quiz.controller:', p);
+      await p.save()
+      quiz.problems.push(p._id)
     }
 
-    const quiz = new quizModel(fields)
     quiz.author = req.profile
-    if (files.image) {
-      quiz.image.data = fs.readFileSync(files.image.path)
-      quiz.image.contentType = files.image.type
-    }
 
-    try {
-      const result = await quiz.save()
-      res.json(result)
-    } catch (error) {
+    // console.log('quiz in quiz.controller:', quiz);
+    await quiz.save()
+    quiz.author.hashedPassword = undefined
+    quiz.author.salt = undefined
+    res.json(quiz)
+  } catch (error) {
+    return res.status(400).json({
+      error: 'Quiz save DB error' + error
+    })
+  }
+}
+
+const isAuthor = (req, res, next) => {
+  const isAuthor = req.auth && req.quiz && req.auth._id == req.quiz.author._id
+  if (!isAuthor) {
+    return res.status(403).json({
+      error: 'User is not an author'
+    })
+  }
+  next()
+}
+
+const read = async (req, res) => {
+  let quiz = req.quiz
+  res.json(quiz)
+}
+
+const quizById = async (req, res, next, id) => {
+  try {
+    const quiz = await Quiz.findById(id)
+      .populate('author', '_id name')
+      .populate('problems')
+      .exec()
+    if (!quiz) {
       return res.status(400).json({
-        error: 'Quiz save db error'
+        error: 'Quiz not found'
       })
     }
-  })
+    req.quiz = quiz
+    next()
+  } catch (error) {
+    return res.status(400).json({
+      error: 'Quiz by id query db error: ' + error
+    })
+  }
 }
 
 export default {
   create,
+  read,
+  isAuthor,
+  quizById,
 }
\ No newline at end of file
diff --git a/src/server/quiz/quiz.model.js b/src/server/quiz/quiz.model.js
index f766dec..903970d 100644
--- a/src/server/quiz/quiz.model.js
+++ b/src/server/quiz/quiz.model.js
@@ -16,7 +16,10 @@ const QuizSchema = new mongoose.Schema({
   publishedAt: Date,
   startAt: Date,
   endAt: Date,
-  questions: [], // Question Schemas
+  problems: [{
+    type: mongoose.SchemaTypes.ObjectId,
+    ref: 'Problem'
+  }], // Problem Schemas
   image: {
     type: Buffer,
     contentType: String,
diff --git a/src/server/quiz/quiz.routes.js b/src/server/quiz/quiz.routes.js
index 61dbcd1..8a6b1b8 100644
--- a/src/server/quiz/quiz.routes.js
+++ b/src/server/quiz/quiz.routes.js
@@ -7,7 +7,11 @@ const router = express.Router()
 
 router.route('/api/quiz/:userId')
   .post(authCtrl.requireSignin, authCtrl.hasAuthorization, userCtrl.isInstructor, quizCtrl.create)
+  
+router.route('/api/quiz/:quizId')
+  .get(authCtrl.requireSignin, quizCtrl.isAuthor, quizCtrl.read)
 
 
 router.param('userId', userCtrl.userById)
+router.param('quizId', quizCtrl.quizById)
 export default router
\ No newline at end of file
diff --git a/src/server/user/user.controller.js b/src/server/user/user.controller.js
index 8f31923..4982f21 100644
--- a/src/server/user/user.controller.js
+++ b/src/server/user/user.controller.js
@@ -89,6 +89,7 @@ const isInstructor = (req, res, next) => {
 }
 
 const userById = async (req, res, next, id) => {
+  // console.log('req.body in userById', req.body);
   try {
     let user = await User.findById(id)
       .exec()
-- 
GitLab