Merge branch 'master' into 62-add-functionality-for-maintainer

Author: KJunWei

.gitignore

@@ -40,5 +40,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# IDE files
+# IDE metadata
 /*/.idea/

AuthService/src/auth/auth.controller.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from "express";
-import { signUp, login, logout } from "./auth.service";
+import { signUp, login, logout, removeUser } from "./auth.service";
 
 export async function handleSignUp(req: Request, res: Response) {
   try {
@@ -35,3 +35,14 @@ export async function handleLogout(req: Request, res: Response) {
     res.status(500).send(error);
   }
 }
+
+export async function handleDelete(req: Request, res: Response) {
+  try {
+    console.log(`deleting user`);
+    await removeUser();
+    res.status(200).send();
+  } catch (error) {
+    console.error(error);
+    res.status(500).send(error);
+  }
+}

AuthService/src/auth/auth.service.ts

@@ -5,6 +5,7 @@ import {
   signInWithEmailAndPassword,
   signOut,
   UserCredential,
+  deleteUser,
 } from "firebase/auth";
 import { firebaseConfig } from "../firebase/firebase.config";
 
@@ -51,3 +52,14 @@ export async function logout(): Promise<void> {
     return Promise.reject(error);
   }
 }
+
+export async function removeUser(): Promise<void> {
+  try {
+    if (auth.currentUser) {
+      await deleteUser(auth.currentUser);
+    }
+    return Promise.resolve();
+  } catch (error) {
+    return Promise.reject(error);
+  }
+}

AuthService/src/index.ts

@@ -4,6 +4,7 @@ import {
   handleLogin,
   handleLogout,
   handleSignUp,
+  handleDelete
 } from "./auth/auth.controller";
 // import { Socket, Server } from 'socket.io';
 // import { initializeApp } from 'firebase/app';
@@ -24,6 +25,7 @@ app.get("/", (req, res) => {
 app.post("/signup", handleSignUp);
 app.post("/login", handleLogin);
 app.delete("/logout", handleLogout);
+app.delete("/delete", handleDelete);
 
 
 

QuestionService/javascript/index.js

@@ -15,6 +15,7 @@ app.get("/", (req, res) => {
 });
 app.get("/questions", question_controller_1.handleGetQuestions);
 app.post("/questions", question_controller_1.handleAddQuestion);
+app.put("/questions/:questionId", question_controller_1.handleUpdateQuestion);
 app.delete("/questions/:questionId", question_controller_1.handleDeleteQuestion);
 app.listen(port, () => {
     console.log(`Question Service listening on port ${port}`);

QuestionService/javascript/question/question.controller.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleAddQuestion = exports.handleDeleteQuestion = exports.handleGetQuestions = void 0;
+exports.handleAddQuestion = exports.handleUpdateQuestion = exports.handleDeleteQuestion = exports.handleGetQuestions = void 0;
 const question_service_1 = require("./question.service");
 const firestore_1 = require("firebase/firestore");
 function handleGetQuestions(req, res) {
@@ -63,8 +63,9 @@ function handleDeleteQuestion(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         const questionId = req.params.questionId;
         try {
-            const docRef = (0, firestore_1.doc)(question_service_1.db, "questions", questionId);
-            const result = yield (0, firestore_1.deleteDoc)(docRef);
+            console.log(`deleting question with id ${questionId}`);
+            yield (0, question_service_1.deleteQuestion)(questionId);
+            res.status(200).send(`question with id "${questionId}" deleted`);
         }
         catch (err) {
             console.log(`error when deleting question with id ${questionId}` + err);
@@ -73,23 +74,45 @@ function handleDeleteQuestion(req, res) {
     });
 }
 exports.handleDeleteQuestion = handleDeleteQuestion;
-function handleAddQuestion(req, res) {
+function handleUpdateQuestion(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
+        const questionId = req.params.questionId;
         try {
-            const { qtitle, qtags, qcategories, qconstraints, qdifficulty, qdescription, qexamples, } = req.body;
-            const docRef = yield (0, firestore_1.addDoc)((0, firestore_1.collection)(question_service_1.db, "questions"), {
-                title: qtitle,
-                tags: qtags,
-                categories: qcategories,
-                constraints: qconstraints,
-                difficulty: qdifficulty,
-                description: qdescription,
+            const { title, tags, categories, constraints, difficulty, description, examples, } = req.body;
+            console.log(`updating question ${questionId}: ${title}`);
+            const question = yield (0, question_service_1.updateQuestion)(questionId, {
+                title: title,
+                tags: tags,
+                categories: categories,
+                constraints: constraints,
+                difficulty: difficulty,
+                description: description,
+                examples: examples,
             });
-            const exampleRef = (0, firestore_1.collection)(docRef, "examples");
-            qexamples.map((e) => {
-                const add = (0, firestore_1.addDoc)(exampleRef, e);
+            res.status(200).send(question);
+        }
+        catch (err) {
+            console.log(err);
+            res.status(500).send(err);
+        }
+    });
+}
+exports.handleUpdateQuestion = handleUpdateQuestion;
+function handleAddQuestion(req, res) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const { title, tags, categories, constraints, difficulty, description, examples, } = req.body;
+            console.log(`adding question ${title}`);
+            const question = yield (0, question_service_1.addQuestion)({
+                title: title,
+                tags: tags,
+                categories: categories,
+                constraints: constraints,
+                difficulty: difficulty,
+                description: description,
+                examples: examples,
             });
-            // const addExample = setDoc(exampleRef, qexamples)
+            res.status(200).send(question);
         }
         catch (err) {
             console.log(err);

QuestionService/javascript/question/question.service.js

@@ -1,8 +1,64 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.db = void 0;
+exports.addQuestion = exports.updateQuestion = exports.deleteQuestion = exports.db = void 0;
 const app_1 = require("firebase/app");
 const firestore_1 = require("firebase/firestore");
 const firebase_config_1 = require("../firebase/firebase.config");
 (0, app_1.initializeApp)(firebase_config_1.firebaseConfig);
 exports.db = (0, firestore_1.getFirestore)();
+function deleteQuestion(questionId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const docRef = (0, firestore_1.doc)(exports.db, "questions", questionId);
+            yield (0, firestore_1.deleteDoc)(docRef);
+            return Promise.resolve();
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
+    });
+}
+exports.deleteQuestion = deleteQuestion;
+function updateQuestion(questionId, question) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            let questionDoc = question;
+            const docRef = (0, firestore_1.doc)(exports.db, "questions", questionId);
+            yield (0, firestore_1.setDoc)(docRef, questionDoc);
+            for (let i = 0; i < question.examples.length; i++) {
+                const add = (0, firestore_1.setDoc)((0, firestore_1.doc)(docRef, "examples", (i + 1).toString()), question.examples[i]);
+            }
+            return Promise.resolve(question);
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
+    });
+}
+exports.updateQuestion = updateQuestion;
+function addQuestion(question) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            let questionDoc = question;
+            const docRef = (0, firestore_1.doc)(exports.db, "questions", question.title);
+            yield (0, firestore_1.setDoc)(docRef, questionDoc);
+            for (let i = 0; i < question.examples.length; i++) {
+                const add = (0, firestore_1.setDoc)((0, firestore_1.doc)(docRef, "examples", (i + 1).toString()), question.examples[i]);
+            }
+            return Promise.resolve(question);
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
+    });
+}
+exports.addQuestion = addQuestion;

QuestionService/src/index.ts

@@ -1,7 +1,7 @@
 import express from "express";
 import cors from "cors";
 
-import { handleGetQuestions, handleAddQuestion, handleDeleteQuestion } from "./question/question.controller";
+import { handleGetQuestions, handleAddQuestion, handleUpdateQuestion, handleDeleteQuestion } from "./question/question.controller";
 const app = express();
 const port = 3002;  
 
@@ -15,6 +15,7 @@ app.get("/", (req, res) => {
 
 app.get("/questions", handleGetQuestions);
 app.post("/questions", handleAddQuestion)
+app.put("/questions/:questionId", handleUpdateQuestion)
 app.delete("/questions/:questionId", handleDeleteQuestion)
 
 app.listen(port, () => {

QuestionService/src/question/question.controller.ts

@@ -1,14 +1,20 @@
 import { Request, Response } from "express";
-import { db } from "./question.service";
+import {addQuestion, db, deleteQuestion, updateQuestion} from "./question.service";
 import {
   getDocs,
   collection,
-  deleteDoc,
-  doc,
-  addDoc,
-  setDoc,
 } from "firebase/firestore";
 
+interface Question {
+  title: string;
+  tags: string[];
+  categories: string[];
+  constraints: string[];
+  difficulty: string;
+  description: string;
+  examples: Example[];
+}
+
 interface Example {
   text: string;
   image: string;
@@ -68,38 +74,66 @@ const getExamples = async (id: string) => {
 export async function handleDeleteQuestion(req: Request, res: Response) {
   const questionId = req.params.questionId;
   try {
-    const docRef = doc(db, "questions", questionId);
-    const result = await deleteDoc(docRef);
+    console.log(`deleting question with id ${questionId}`);
+    await deleteQuestion(questionId);
+    res.status(200).send(`question with id "${questionId}" deleted`);
   } catch (err) {
     console.log(`error when deleting question with id ${questionId}` + err);
     res.status(500).send(err);
   }
 }
 
-export async function handleAddQuestion(req: Request, res: Response) {
+export async function handleUpdateQuestion(req: Request, res: Response) {
+  const questionId = req.params.questionId;
   try {
     const {
-      qtitle,
-      qtags,
-      qcategories,
-      qconstraints,
-      qdifficulty,
-      qdescription,
-      qexamples,
+      title,
+      tags,
+      categories,
+      constraints,
+      difficulty,
+      description,
+      examples,
     } = req.body;
-    const docRef = await addDoc(collection(db, "questions"), {
-      title: qtitle,
-      tags: qtags,
-      categories: qcategories,
-      constraints: qconstraints,
-      difficulty: qdifficulty,
-      description: qdescription,
+    console.log(`updating question ${questionId}: ${title}`);
+    const question = await updateQuestion(questionId,{
+      title: title,
+      tags: tags,
+      categories: categories,
+      constraints: constraints,
+      difficulty: difficulty,
+      description: description,
+      examples: examples,
     });
-    const exampleRef = collection(docRef, "examples");
-    qexamples.map((e: Example) => {
-      const add = addDoc(exampleRef, e);
+    res.status(200).send(question);
+  } catch (err) {
+    console.log(err);
+    res.status(500).send(err);
+  }
+}
+
+export async function handleAddQuestion(req: Request, res: Response) {
+  try {
+    const {
+      title,
+      tags,
+      categories,
+      constraints,
+      difficulty,
+      description,
+      examples,
+    } = req.body;
+    console.log(`adding question ${title}`);
+    const question = await addQuestion({
+      title: title,
+      tags: tags,
+      categories: categories,
+      constraints: constraints,
+      difficulty: difficulty,
+      description: description,
+      examples: examples,
     });
-    // const addExample = setDoc(exampleRef, qexamples)
+    res.status(200).send(question);
   } catch (err) {
     console.log(err);
     res.status(500).send(err);