Merge pull request #40 from Arquisoft/stats-ui

Stats fixed

.github/workflows/build.yml

@@ -21,6 +21,8 @@ jobs:
     - run: npm --prefix questionservice ci
     - run: npm --prefix statsservice ci
     - run: npm --prefix webapp ci
+    - run: npm --prefix questionservice ci
+    - run: npm --prefix statsservice ci
     - run: npm --prefix users/authservice test -- --coverage
     - run: npm --prefix users/userservice test -- --coverage
     - run: npm --prefix gatewayservice test -- --coverage

.github/workflows/release.yml

@@ -40,6 +40,7 @@ jobs:
     - run: npm --prefix users/userservice install
     - run: npm --prefix gatewayservice install
     - run: npm --prefix questionservice install
+    - run: npm --prefix statsservice install
     - run: npm --prefix webapp install
     - run: npm --prefix webapp run build
     - run: npm --prefix webapp run test:e2e

docker-compose.yml

@@ -35,6 +35,22 @@ services:
       environment:
         MONGODB_URI: mongodb://mongodb:27017/userdb
 
+  statsservice:
+    container_name: statsservice-${teamname:-defaultASW}
+    image: ghcr.io/arquisoft/wiq_es1a/statsservice:latest
+    profiles: ["dev", "prod"]
+    build: ./statsservice
+    depends_on:
+      - mongodb
+      - userservice
+    ports:
+      - "8004:8004"
+    networks:
+      - mynetwork
+    environment:
+      MONGODB_URI: mongodb://mongodb:27017/userdb
+      USER_SERVICE_URL: http://userservice:8001
+
   authservice:
     container_name: authservice-${teamname:-defaultASW}
     image: ghcr.io/arquisoft/wiq_es1a/authservice:latest
@@ -74,12 +90,13 @@ services:
       - userservice
       - authservice
       - questionservice
+      - statsservice
     ports:
       - "8000:8000"
     networks:
       - mynetwork
     environment:
-      STATS_SERVICE_URL: http://questionservice:8004
+      STATS_SERVICE_URL: http://statsservice:8004
       QUESTION_SERVICE_URL: http://questionservice:8003
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001

gatewayservice/gateway-service.js

@@ -9,6 +9,7 @@ const port = 8000;
 const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
 const questionServiceUrl = process.env.QUESTION_SERVICE_URL || 'http://localhost:8003';
+const statsServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8004';
 
 app.use(cors());
 app.use(express.json());
@@ -52,6 +53,46 @@ app.get('/questions', async (req, res) => {
   }
 });
 
+app.get('/stats', async (req, res) => {
+  try {
+    // Forward the stats request to the stats service
+    const statsResponse = await axios.get(statsServiceUrl+'/stats', req.body);
+    res.json(statsResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
+app.post('/saveGame', async (req, res) => {
+  try {
+    // Forward the save game request to the stats service
+    const gameResponse = await axios.post(statsServiceUrl+'/saveGame', req.body);
+    res.json(gameResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
+app.get('/getstats', async (req, res) => {
+  try {
+    // Forward the stats request to the stats service
+    const statsResponse = await axios.get(userServiceUrl+'/getstats', req.body);
+    res.json(statsResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
+app.post('/userSaveGame', async (req, res) => {
+  try {
+    // Forward the save game request to the stats service
+    const gameResponse = await axios.post(userServiceUrl+'/userSaveGame', req.body);
+    res.json(gameResponse.data);
+  } catch (error) {
+    res.status(error.response.status).json({ error: error.response.data.error });
+  }
+});
+
 // Start the gateway service
 const server = app.listen(port, () => {
   console.log(`Gateway Service listening at http://localhost:${port}`);

package.json

@@ -1,5 +1,8 @@
 {
   "dependencies": {
+    "axios": "^1.6.7",
+    "cors": "^2.8.5",
+    "cron": "^3.1.6",
     "cross-fetch": "^4.0.0",
     "date-fns": "^3.3.1",
     "react-auth-kit": "^3.0.2-alpha.19"