Update src/routes/v1/api.route.js

Reviewed-on: #24

.husky/post-checkout

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn install

.husky/post-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-git status

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged

game_links.txt

@@ -0,0 +1,22 @@
+/guided-tracing/A/
+
+game_drawing    /drawing/?id=
+game_drawing_v2 /drawing/v2/?id=
+game_drawing_v3 /drawing/v3/?id=
+drawing_phonics /drawing/drawing_phonics/?id=
+game_tick_variant1  /tick/v1/?id=
+game_tick_variant2  /tick/v2/?id=
+game_tick_varient3  /tick/v3/?id=
+game_cross_varient1 /cross/v1/?id=
+game_cross_varient2 /cross/v2/?id=
+game_cross_varient3 /cross/v3/?id=
+game_drag   /drag/?id=
+game_drag_v2    /drag/v2/?id=
+game_drag_v3    /drag/v3/?id=    // we do't use this version
+game_drag_v4    /drag/v4/?id=
+game_tick_v3_phonics    /tick/tick_phonics_v1/?id=
+tick_phonics_option_6   /tick/tick_phonics_v2/?id=
+tick_phonics_option_9   /tick/tick_phonics_v3/?id=
+drag_drop_phonics   /drag/dragdrop_phonics/?id=
+drag_phonics /drag/match_phonics/?id=
+cross_phonics_option_9  /cross/cross_phonics_v2/?id=

package-lock.json

@@ -27,6 +27,7 @@
         "install": "^0.13.0",
         "joi": "^17.3.0",
         "jsonwebtoken": "^8.5.1",
+        "mariadb": "^3.4.0",
         "moment": "^2.24.0",
         "mongoose": "^8.7.1",
         "morgan": "^1.9.1",
@@ -1735,6 +1736,12 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.15",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz",
+      "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==",
+      "license": "MIT"
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -1789,7 +1796,6 @@
       "version": "22.10.2",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
       "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
@@ -8464,6 +8470,40 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/mariadb": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.4.0.tgz",
+      "integrity": "sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==",
+      "license": "LGPL-2.1-or-later",
+      "dependencies": {
+        "@types/geojson": "^7946.0.14",
+        "@types/node": "^22.5.4",
+        "denque": "^2.1.0",
+        "iconv-lite": "^0.6.3",
+        "lru-cache": "^10.3.0"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/mariadb/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mariadb/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -15768,7 +15808,6 @@
       "version": "6.20.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
       "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/union-value": {

package.json

@@ -66,6 +66,7 @@
     "install": "^0.13.0",
     "joi": "^17.3.0",
     "jsonwebtoken": "^8.5.1",
+    "mariadb": "^3.4.0",
     "moment": "^2.24.0",
     "mongoose": "^8.7.1",
     "morgan": "^1.9.1",

src/routes/api/aiFeedbackOnReport.js

@@ -1,11 +1,10 @@
 const aiFeedbackOnReport = async (req, res) => {
-  // const fetch = require('node-fetch');
+  const fetch = require('node-fetch');
   const url = process.env.AI_API_ENDOINT;
-  const api_key = process.env.AI_API_KEY;
+  const api_key = process.env.OPENAI_KEY;
   const payload = {
     "model": "gpt-4o-mini",
-    "messages": [{ "role": "user", 
-      "content": JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction }]
+    "messages": [{ "role": "user", "content": JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction }]
   }
   try {
     const apiResponse = await fetch(url, {

src/routes/api/aiFeedbackOnReportWithFollowup.js

@@ -11,7 +11,7 @@ const aiFollowupQuestion = async (req, res) => {
   const database = client.db(dbName); // Replace with your database name
   const conversationsCollection = database.collection('conversations'); // Replace with your collection name
   
-  async function fetchOpenAICompletion(prompt, messages, model = "gpt-3.5-turbo-16k", max_tokens = 200) {
+  async function fetchOpenAICompletion(prompt, messages, model = "gpt-3.5-turbo-16k", max_tokens = 600) {
     const response = await fetch('https://api.openai.com/v1/chat/completions', {
       method: 'POST',
       headers: {
@@ -26,12 +26,13 @@ const aiFollowupQuestion = async (req, res) => {
     });
   
     const data = await response.json();
-    return data.choices[0].message.content;
+    return data;
+    // return data.choices[0].message.content;
   }
   
   
     try {
-      const { prompt, sessionId, model = "gpt-4o-mini", max_tokens = 200 } = req.body;
+      const { prompt, sessionId, model = "gpt-4o-mini", max_tokens = 600 } = req.body;
       if (!conversationsCollection) {
         return res.status(500).json({
           success: false,
@@ -48,9 +49,10 @@ const aiFollowupQuestion = async (req, res) => {
           conversationHistory: [
             { role: 'system', content: 'You are a helpful assistant.' },
             // { role: 'user', content: prompt },
-            { role: 'user', content: req.body.score + "   -  is the students report card. " + req.body.instruction },
+            { role: 'user', content: JSON.stringify(req.body.score) + "   -  is the students report card. " + req.body.instruction },
           ],
         };
+        // console.log(req.body.score[0])
         await conversationsCollection.insertOne(conversation);
       } else {
         conversation = await conversationsCollection.findOne({ sessionId: sessionId });

src/routes/api/aiFollowupQuestion.js

@@ -21,11 +21,17 @@ const aiFollowupQuestion = async (req, res) => {
       body: JSON.stringify({
         model: model,
         messages: messages,
+        // messages: [
+        //     { role: "system", content: "reply must not exceed 20 words" },
+        //     { role: "user", content: messages }
+        // ],
         max_tokens: max_tokens,
       }),
     });
   
     const data = await response.json();
+    // console.log(process.env.OPENAI_KEY)
+    // console.log(data)
     return data;
   }
   
@@ -46,7 +52,7 @@ const aiFollowupQuestion = async (req, res) => {
         conversation = {
           sessionId: newSessionId,
           conversationHistory: [
-            { role: 'system', content: 'answer within 50 words' },
+            { role: 'system', content: 'answer within 10 words' },
             { role: 'user', content: prompt },
           ],
         };

src/routes/api/aiTest.js

@@ -0,0 +1,166 @@
+const aiFollowupQuestion = async (req, res) => {
+  const { MongoClient } = require('mongodb');
+  const fetch = require('node-fetch');
+  const { v4: uuidv4 } = require('uuid');
+  const url = process.env.MONGODB_URL;
+  const dbName = process.env.MONGO_DB_NAME;
+  const client = new MongoClient(url);
+
+  await client.connect();
+  const database = client.db(dbName);
+  const conversationsCollection = database.collection('conversations');
+
+  const MAX_TOKENS = 200;
+  const PROVIDER_KEYS = JSON.parse(process.env.PROVIDER_KEY || '[]');
+
+  const PROVIDER_MODELS = {
+    openai: [ "gpt-4o", "gpt-4o-mini", "o1", "o1-mini", "gpt-3.5-turbo", "gpt-3.5-turbo-mini", "gpt-3.5-mini", "gpt-3.5-turbo-2", "gpt-3.5-2", "gpt-3.5-turbo-2-mini", "gpt-3.5-2-mini" ],
+    deepseek: [ "deepseek-chat", "deepseek-reasoner", "deepseek-qa", "deepseek-qa-mini" ],
+    // Add more providers and models as needed
+  };
+
+  async function fetchOpenAICompletion(messages, model, max_tokens = MAX_TOKENS) {
+    // console.log(messages)
+    const response = await fetch('https://api.openai.com/v1/chat/completions', {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${process.env.OPENAI_KEY}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        model: model,
+        messages: messages,
+        max_tokens: max_tokens,
+      }),
+    });
+    return response.json();
+  }
+
+  async function fetchDeepSeekCompletion(messages, model) {
+    const response = await fetch('https://api.deepseek.com/chat/completions', {
+      method: 'POST',
+      headers: {
+        'Authorization': `Bearer ${process.env.DEEPSEEK_KEY}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        model: model,
+        messages: messages,
+        stream: false,
+      }),
+    });
+    return response.json();
+  }
+
+  // Similar function for Gemini can be added here...
+
+  try {
+
+    const { prompt, sessionId, provider, model = "gpt-4o-mini", key } = req.body;
+
+    if (!key || !PROVIDER_KEYS.includes(key)) {
+      return res.status(403).json({
+        success: false,
+        error: 'Unauthorized: Invalid or missing key.',
+      });
+    }
+    
+    if (provider && req.body['list-models']) {
+      if (PROVIDER_MODELS[provider]) {
+        return res.json({
+          success: true,
+          models: PROVIDER_MODELS[provider],
+        });
+      } else {
+        return res.status(400).json({
+          success: false,
+          error: 'Invalid provider specified.',
+        });
+      }
+    }
+
+    // Check if the request is for listing AI providers
+    if (req.body['list-ais']) {
+      return res.json({
+        success: true,
+        providers: ['openai', 'deepseek', 'gemini', 'manual'],
+      });
+    }
+
+    if (!conversationsCollection) {
+      return res.status(500).json({
+        success: false,
+        error: 'MongoDB is not connected yet. Please try again later.',
+      });
+    }
+
+    let conversation;
+
+    if (!sessionId) {
+      const newSessionId = uuidv4();
+      conversation = {
+        sessionId: newSessionId,
+        conversationHistory: [
+          { role: 'system', content: 'answer within 10 words' },
+          { role: 'user', content: prompt },
+        ],
+      };
+      await conversationsCollection.insertOne(conversation);
+    } else {
+      conversation = await conversationsCollection.findOne({ sessionId: sessionId });
+      if (!conversation) {
+        return res.status(400).json({
+          success: false,
+          error: 'Invalid session ID.',
+        });
+      }
+      conversation.conversationHistory.push({ role: 'user', content: prompt });
+    }
+
+    let aiResponse;
+
+    if(prompt.length > 3) {
+      switch (provider) {
+        case 'openai':
+          aiResponse = await fetchOpenAICompletion([{ role: 'user', content: prompt }], model);
+          // console.log(aiResponse)
+          break;
+        case 'deepseek':
+          aiResponse = await fetchDeepSeekCompletion([{ role: 'user', content: prompt }], model);
+          break;
+        // case 'gemini':
+        //   aiResponse = await fetchGeminiCompletion(conversation.conversationHistory, model);
+        //   break;
+        // Add more cases for other providers as needed
+        default:
+          return res.status(400).json({
+            success: false,
+            error: 'Invalid provider specified.',
+          });
+      }
+    }
+      
+
+    conversation.conversationHistory.push({ role: 'assistant', content: aiResponse.choices ? aiResponse.choices[0].message.content : aiResponse.response });
+
+    await conversationsCollection.updateOne(
+      { sessionId: conversation.sessionId },
+      { $set: { conversationHistory: conversation.conversationHistory } }
+    );
+
+    res.json({
+      success: true,
+      data: aiResponse.choices ? aiResponse.choices[0].message.content : aiResponse.response,
+      total_tokens: aiResponse.usage ? aiResponse.usage.total_tokens : undefined,
+      sessionId: conversation.sessionId,
+    });
+  } catch (error) {
+    console.error('Error generating response:', error.message);
+    res.status(500).json({
+      success: false,
+      error: 'Something went wrong. Please try again later.',
+    });
+  }
+};
+
+module.exports = aiFollowupQuestion;

src/routes/api/getGameInfo.js

@@ -0,0 +1,136 @@
+const mariadb = require('mariadb');
+
+const gameInfo = async (req, res) => {
+
+// Create a connection pool
+const pool = mariadb.createPool({
+    host: process.env.MARIA_HOST,
+    user: process.env.MARIA_USER,
+    password: process.env.MARIA_PASS,
+    database: process.env.MARIA_DBNM,
+    connectionLimit: 5,
+  });
+  
+  const { schoolId, teacherId } = req.query;
+
+  if (!schoolId && !teacherId) {
+    return res.status(400).send({ error: 'Either schoolId or teacherId is required in the query parameters.' });
+  }
+
+  let connection;
+  try {
+    // Establish a connection to the database
+    connection = await pool.getConnection();
+
+    let queryCondition;
+    let queryValue;
+
+    // Determine the query condition based on the parameters provided
+    if (schoolId) {
+      queryCondition = 'schoolId = ?';
+      queryValue = schoolId;
+    } else {
+      queryCondition = 'teacherId = ?';
+      queryValue = teacherId;
+    }
+
+    // Query both game1 and game2 tables
+    const query1 = `SELECT * FROM game_drawing WHERE ${queryCondition}`;
+    const query2 = `SELECT * FROM game_drawing_v2 WHERE ${queryCondition}`;
+    const query3 = `SELECT * FROM game_drawing_v3 WHERE ${queryCondition}`;
+    const query4 = `SELECT * FROM drawing_phonics WHERE ${queryCondition}`;
+    const query5 = `SELECT * FROM game_tick_variant1 WHERE ${queryCondition}`;
+    const query6 = `SELECT * FROM game_tick_variant2 WHERE ${queryCondition}`;
+    const query7 = `SELECT * FROM game_tick_varient3 WHERE ${queryCondition}`;
+    const query8 = `SELECT * FROM game_cross_varient1 WHERE ${queryCondition}`;
+    const query9 = `SELECT * FROM game_cross_varient2 WHERE ${queryCondition}`;
+    const query10 = `SELECT * FROM game_cross_varient3 WHERE ${queryCondition}`;
+    const query11 = `SELECT * FROM game_drag WHERE ${queryCondition}`;
+    const query12 = `SELECT * FROM game_drag_v2 WHERE ${queryCondition}`;
+    const query13 = `SELECT * FROM game_drag_v4 WHERE ${queryCondition}`;
+    const query14 = `SELECT * FROM game_tick_v3_phonics WHERE ${queryCondition}`;
+    const query15 = `SELECT * FROM tick_phonics_option_6 WHERE ${queryCondition}`;
+    const query16 = `SELECT * FROM tick_phonics_option_9 WHERE ${queryCondition}`;
+    const query17 = `SELECT * FROM drag_drop_phonics WHERE ${queryCondition}`;
+    const query18 = `SELECT * FROM drag_phonics WHERE ${queryCondition}`;
+    const query19 = `SELECT * FROM cross_phonics_option_9 WHERE ${queryCondition}`;
+
+    const [game_drawing, game_drawing_v2, game_drawing_v3, drawing_phonics, game_tick_variant1, game_tick_variant2, game_tick_varient3, game_cross_varient1, game_cross_varient2,  game_cross_varient3, game_drag, game_drag_v2, game_drag_v4, game_tick_v3_phonics, tick_phonics_option_6, tick_phonics_option_9, drag_drop_phonics, drag_phonics, cross_phonics_option_9 ] = await Promise.all([
+      connection.query(query1, [queryValue]),
+      connection.query(query2, [queryValue]),
+      connection.query(query3, [queryValue]),
+      connection.query(query4, [queryValue]),
+      connection.query(query5, [queryValue]),
+      connection.query(query6, [queryValue]),
+      connection.query(query7, [queryValue]),
+      connection.query(query8, [queryValue]),
+      connection.query(query9, [queryValue]),
+      connection.query(query10, [queryValue]),
+      connection.query(query11, [queryValue]),
+      connection.query(query12, [queryValue]),
+      connection.query(query13, [queryValue]),
+      connection.query(query14, [queryValue]),
+      connection.query(query15, [queryValue]),
+      connection.query(query16, [queryValue]),
+      connection.query(query17, [queryValue]),
+      connection.query(query18, [queryValue]),
+      connection.query(query19, [queryValue])
+    ]);
+
+    // const domain = 'https://domain.com/gamelink/?id=';
+    const domain =  process.env.GAME_DOMAIN;
+
+    const formattedGame1  = game_drawing.map(game => ({ ...game, game_id: `game_drawing-${game.id}`, game_link: `${domain}/drawing/?id=${game.id}`, }));
+    const formattedGame2  = game_drawing_v2.map(({ status, ...game }) => ({ ...game, game_id: `game_drawing_v2-${game.id}`, game_link: `${domain}/drawing/v2/?id=${game.id}`, }));
+    const formattedGame3  = game_drawing_v3.map(({ status, ...game }) => ({ ...game, game_id: `game_drawing_v3-${game.id}`, game_link: `${domain}/drawing/v3/?id=${game.id}`, }));
+    const formattedGame4  = drawing_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drawing_phonics-${game.id}`, game_link: `${domain}/drawing/drawing_phonics/?id=${game.id}`, }));
+    const formattedGame5  = game_tick_variant1.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_variant1-${game.id}`, game_link: `${domain}/tick/v1/?id=${game.id}`, }));
+    const formattedGame6  = game_tick_variant2.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_variant2-${game.id}`, game_link: `${domain}/tick/v2/?id=${game.id}`, }));
+    const formattedGame7  = game_tick_varient3.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_varient3-${game.id}`, game_link: `${domain}/tick/v3/?id=${game.id}`, }));
+    const formattedGame8  = game_cross_varient1.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient1-${game.id}`, game_link: `${domain}/cross/v1/?id=${game.id}`, }));
+    const formattedGame9  = game_cross_varient2.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient2-${game.id}`, game_link: `${domain}/cross/v2/?id=${game.id}`, }));
+    const formattedGame10  = game_cross_varient3.map(({ status, ...game }) => ({ ...game, game_id: `game_cross_varient3-${game.id}`, game_link: `${domain}/cross/v3/?id=${game.id}`, }));
+    const formattedGame11  = game_drag.map(({ status, ...game }) => ({ ...game, game_id: `game_drag-${game.id}`, game_link: `${domain}/drag/?id=${game.id}`, }));
+    const formattedGame12  = game_drag_v2.map(({ status, ...game }) => ({ ...game, game_id: `game_drag_v2-${game.id}`, game_link: `${domain}/drag/v2/?id=${game.id}`, }));
+    const formattedGame13  = game_drag_v4.map(({ status, ...game }) => ({ ...game, game_id: `game_drag_v4-${game.id}`, game_link: `${domain}/drag/v4/?id=${game.id}`, }));
+    const formattedGame14  = game_tick_v3_phonics.map(({ status, ...game }) => ({ ...game, game_id: `game_tick_v3_phonics-${game.id}`, game_link: `${domain}/tick/tick_phonics_v1/?id=${game.id}`, }));
+    const formattedGame15  = tick_phonics_option_6.map(({ status, ...game }) => ({ ...game, game_id: `tick_phonics_option_6-${game.id}`, game_link: `${domain}/tick/tick_phonics_v2/?id=${game.id}`, }));
+    const formattedGame16  = tick_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_id: `tick_phonics_option_9-${game.id}`, game_link: `${domain}/tick/tick_phonics_v3/?id=${game.id}`, }));
+    const formattedGame17  = drag_drop_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drag_drop_phonics-${game.id}`, game_link: `${domain}/drag/dragdrop_phonics/?id=${game.id}`, }));
+    const formattedGame18  = drag_phonics.map(({ status, ...game }) => ({ ...game, game_id: `drag_phonics-${game.id}`, game_link: `${domain}/drag/match_phonics/?id=${game.id}`, }));
+    const formattedGame19  = cross_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_id: `cross_phonics_option_9-${game.id}`, game_link: `${domain}/cross/cross_phonics_v2/?id=${game.id}`, }));
+
+
+    const combinedResults = {
+      game_drawing: formattedGame1,
+      game_drawing_v2: formattedGame2,
+      game_drawing_v3: formattedGame3,
+      drawing_phonics: formattedGame4,
+      game_tick_variant1: formattedGame5,
+      game_tick_variant2: formattedGame6,
+      game_tick_varient3: formattedGame7,
+      game_cross_varient1: formattedGame8,
+      game_cross_varient2: formattedGame9,
+      game_cross_varient3: formattedGame10,
+      game_drag: formattedGame11,
+      game_drag_v2: formattedGame12,
+      game_drag_v4: formattedGame13,
+      game_tick_v3_phonics: formattedGame14,
+      tick_phonics_option_6: formattedGame15,
+      tick_phonics_option_9: formattedGame16,
+      drag_drop_phonics: formattedGame17,
+      drag_phonics: formattedGame18,
+      cross_phonics_option_9: formattedGame19
+    };
+
+    res.status(200).send(combinedResults);
+  } catch (error) {
+    console.error('Error querying game tables:', error);
+    res.status(500).send({ error: 'An error occurred while fetching game data.' });
+  } finally {
+    // Release the connection back to the pool
+    if (connection) connection.release();
+  }
+};
+
+module.exports = gameInfo;

src/routes/api/saveGameScore.js

@@ -1,69 +0,0 @@
-var MongoClient = require('mongodb').MongoClient;
-const AWS = require('aws-sdk');
-
-const saveGameScore = (req, res) => {
-    const url = process.env.MONGODB_URL;
-    const dbName = process.env.MONGO_DB_NAME;
-    const client = new MongoClient(url, { useUnifiedTopology: true });
-    client.connect((err) => {
-        if (err) {
-            console.error('Failed to connect to the server', err);
-            return;
-        }
-        // console.log('Connected successfully to server');
-        const db = client.db(dbName);
-        const collection = db.collection('gameData');
-        // const data = req.body;
-        const { userId, gameName, gameID, gameTime, score,gameStar, screenShot } = req.body;
-        const data = {
-            userId: userId,
-            gameName: gameName,
-            gameID: gameID,
-            gameTime: gameTime,
-            score: score,
-            gameStar:gameStar
-        };
-
-        collection.insertOne(data, (err, result) => {
-            if (err) {
-                console.error('Failed to insert document', err);
-            } else {
-                // console.log('Document inserted with _id: ', result.insertedId);
-            }
-            client.close((err) => {
-                if (err) {
-                    console.error('Failed to close connection', err);
-                } else {
-                    // console.log('Connection closed');
-                    const s3 = new AWS.S3({
-                        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-                        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-                        region: process.env.AWS_REGION
-                    });
-                    if (screenShot != undefined) {
-                        // Upload image to S3
-                        let base64Image = screenShot.split(";base64,").pop();
-                        const buffer = Buffer.from(base64Image, 'base64');
-                        const s3Params = {
-                          Bucket: process.env.S3_BUCKET_NAME,
-                          Key: `images/${result.insertedId}.png`, // Change the file extension to .png
-                          Body: buffer,
-                          ContentEncoding: 'base64',
-                          ContentType: 'image/jpeg' // Change the content type to image/png
-                        };
-                        try {
-                          const data = s3.upload(s3Params).promise();
-                          console.log(`File uploaded successfully at ${data.Location}`);
-                        } catch (err) {
-                          console.error(err);
-                        }
-                      };
-                    res.send(result.insertedId);
-                }
-            });
-        });
-    });
-  };
-  
-  module.exports = saveGameScore;
-  

src/routes/v1/api.route.js

@@ -22,7 +22,7 @@ const saveQuizResponse = require("../api/saveQuizResponse");
 const getGameScore = require("../api/getGameScore");
 const resultAfterQuizSubmit = require("../api/resultAfterQuizSubmit");
 const generateQuestions = require("../api/generateQuestions");
-const saveGameScore = require("../api/saveGameScore");
+// const saveGameScore = require("../api/saveGameScore");
 const saveGameScore2 = require("../api/saveGameScore2");
 const aiFeedbackOnReport = require("../api/aiFeedbackOnReport");
 const aiFeedbackActionParent = require("../api/aiFeedbackActionParent");
@@ -31,7 +31,7 @@ const aiMarkDrawing = require("../api/aiMarkDrawing");
 const aiFeedbackOnReportWithFollowup = require("../api/aiFeedbackOnReportWithFollowup");
 const aiTextToSpeech = require("../api/aiTextToSpeech");
 const aiEvaluateImageToStar = require("../api/aiEvaluateImageToStar");
-// const getGameInfo = require("../api/getGameInfo");
+const getGameInfo = require("../api/getGameInfo");
 const saveGalleryImage = require("../api/saveGalleryImage");
 const getGalleryImage = require("../api/getGalleryImage");
 // const aiTest = require("../api/aiTest");
@@ -150,9 +150,9 @@ router.get("/ping", (req, res) => {
   });
   
   // For Quiz Result After Submit Quiz
-  router.post("/saveGameScore", (req, res) => {
-    saveGameScore(req, res);
-  });
+  // router.post("/saveGameScore", (req, res) => {
+  //   saveGameScore(req, res);
+  // });
   
   // For Quiz Result After Submit Quiz
   router.post("/saveGameScore2", (req, res) => {
@@ -195,9 +195,9 @@ router.get("/ping", (req, res) => {
   });
 
   // getGameInfo.
-  // router.get("/getGameInfo", (req, res) => {
-  //   getGameInfo(req, res);
-  // });
+  router.get("/getGameInfo", (req, res) => {
+    getGameInfo(req, res);
+  });
   
   // Save Drawing Game Gallery Image
   router.post("/saveGalleryImage", (req, res) => {