fix test

Reviewed-on: #10

.github/workflows/build_docker_astro.yml

@@ -6,9 +6,9 @@ on: #declancheur
       - '*'
     tags:
       - v*
-  # pull_request:
+  pull_request:
-  #   branches:
+    branches:
-  #     - master
+      - master
 
 jobs:
   run: #jobs ID (nom du jobs)
@@ -32,8 +32,6 @@ jobs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
           type=semver,pattern=latest
-        labels: |
-          org.opencontainers.image.title=AstroFront
 
     - name: Login to Gitea
       uses: docker/login-action@v3

.github/workflows/build_docker_express.yml

@@ -32,8 +32,6 @@ jobs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
           type=semver,pattern=latest
-        labels: |
-          org.opencontainers.image.title=AstroFront
 
     - name: Login to Gitea
       uses: docker/login-action@v3
@@ -48,8 +46,8 @@ jobs:
     - name: Build and push back
       uses: docker/build-push-action@v5
       with:
-        context: ./front
+        context: ./Express/barAndCafe
         push: true
-        file: ./front/Dockerfile
+        file: ./Express/barAndCafe/Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build_jsdoc_drink.yml

@@ -0,0 +1,46 @@
+name: JsDocs
+on:
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout # rapatrie le depot
+      uses: actions/checkout@v3
+    
+
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          git.lab-ouest.org/Epitech/ratrapage_T-WEB_drink_jsdocs
+        tags: |
+          type=edge
+          type=ref,event=pr
+          type=ref,event=branch
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}
+          type=semver,pattern=latest
+
+    - name: Login to Gitea
+      uses: docker/login-action@v3
+      with:
+        registry: git.lab-ouest.org
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+
+    # - name: Set up Docker Buildx
+    #   uses: docker/setup-buildx-action@v3
+
+    - name: Build and push back
+      uses: docker/build-push-action@v5
+      with:
+        context: ./Express/barAndCafe
+        push: true
+        file: ./Express/barAndCafe/Dockerfile_docs
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

Express/barAndCafe/Dockerfile

@@ -1,5 +1,3 @@
-# This Dockerfile allows you to run AstroJS in server mode
-
 #########
 # Build #
 #########

Express/barAndCafe/Dockerfile_docs

@@ -0,0 +1,35 @@
+#########
+# Build #
+#########
+FROM docker.io/node:20-alpine as BUILD_IMAGE
+
+# External deps (for node-gyp add: "python3 make g++")
+RUN apk add --no-cache git
+
+# run as non root user
+USER node
+
+# go to user repository
+WORKDIR /home/node
+
+# Add package json
+ADD --chown=node:node package.json package-lock.json ./
+
+# install dependencies from package lock
+RUN npm ci
+
+# Add project files
+ADD --chown=node:node . .
+
+# build
+RUN npm run docs
+
+# remove dev deps
+RUN npm prune --omit=dev
+
+##############
+# Production #
+##############
+FROM httpd:alpine
+
+COPY --from=BUILD_IMAGE /home/node/out/ /usr/local/apache2/htdocs/

Express/barAndCafe/package.json

@@ -2,9 +2,9 @@
   "main": "dist/server.js",
   "scripts": {
     "build": "rimraf dist && npx tsc",
-    "start": "node dist/index.js",
+    "start": "node dist/src/server.js",
     "predev": "npm run build",
-    "dev": "npx tsc -w & nodemon dist/server.js",
+    "dev": "npx tsc -w & nodemon dist/src/server.js",
     "docs": "jsdoc -c jsdoc.json",
     "test": "jest"
   },

Express/barAndCafe/src/app.ts

@@ -9,14 +9,15 @@ const app = express();
 
 /**
  * Handle GET request for homepage route ('/').
- * Send back a simple text response.
+ * Send back a simple json response.
  * @param {express.Request} req - HTTP Request object.
  * @param {express.Response} res - HTTP Response object.
  */
-function getRoot(req: express.Request, res: express.Response) {
+function getWelcome(req: express.Request, res: express.Response) {
-    res.send("hello world from dev");
+    const out = {hello:"world"};
+    res.send(out);
 }
 
-app.get("/", getRoot);
+app.get("/welcome", getWelcome);
 
 export default app;

Express/barAndCafe/test/app.test.ts

@@ -1,12 +1,14 @@
 import request from "supertest";
 import app from "../src/app";
 import { Server, IncomingMessage, ServerResponse } from "http";
+import * as dotenv from "dotenv";
 
-const port = 3000;
+dotenv.config({path: '../../.env'})
+const port = parseInt(process.env.BAR_PORT || '3000')
 
 let serveur : Server<typeof IncomingMessage, typeof ServerResponse>
 
-describe("Test the root path", () => {
+describe("Test the welcome path", () => {
 
     beforeEach(() => {
         serveur = app.listen(port, () =>{
@@ -20,7 +22,7 @@ describe("Test the root path", () => {
 
     test("It should response the GET method", done => {
         request(app)
-        .get("/")
+        .get("/welcome")
         .then(response => {
             expect(response.statusCode).toBe(200);
             done();
@@ -28,10 +30,11 @@ describe("Test the root path", () => {
     });
 
     test("It should response the GET method", done => {
+        const out = {hello:"world"};
         request(app)
-        .get("/")
+        .get("/welcome")
         .then(response => {
-            expect(response.text).toEqual("hello world from dev")
+            expect(response.text).toEqual(JSON.stringify(out))
             done();
         });
     });

docker-compose.yml

@@ -1,12 +1,14 @@
 version: "3.8"
+
 services:
+
   pocketbase:
     image: ghcr.io/coollabsio/pocketbase:latest
     environment:
       - SERVICE_FQDN_POCKETBASE_8080
     volumes:
-      - ./.pb/pocketbase-data:/app/pb_data
+      - ./pb/pocketbase-data:/app/pb_data
-      - ./.pb/pocketbase-hooks:/app/pb_hooks
+      - ./pb/pocketbase-hooks:/app/pb_hooks
     labels:
       - traefik.enable=true
       - traefik.http.routers.poketBaseTweb.rule=Host(`${POCKET_BASE_URL}`)
@@ -14,8 +16,9 @@ services:
       - traefik.http.routers.poketBaseTweb.tls.certresolver=le
     networks:
       - public
+
   front:
-    image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-7-head
+    image: git.lab-ouest.org/epitech/ratrapage_t-web_front:pr-1-head
     depends_on:
       - pocketbase
     labels:
@@ -25,10 +28,66 @@ services:
       - traefik.http.routers.astroTweb.tls.certresolver=le
     networks:
       - public
+
+  back_drink:
+    image: git.lab-ouest.org/epitech/ratrapage_t-web_back:pr-6-head
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.expressDrinkTweb.rule=Host(`${DRINK_URL}`)
+      - traefik.http.services.expressDrinkTweb.loadbalancer.server.port=${BACK_BASE_PORT}
+      - traefik.http.routers.expressDrinkTweb.tls.certresolver=le
+    networks:
+      - public
+
+  docs_drink:
+    image: git.lab-ouest.org/epitech/ratrapage_t-web_drink_jsdocs:pr-6-head
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.docsDrinkTweb.rule=Host(`${DOCS_DRINK_URL}`)
+      - traefik.http.services.docsDrinkTweb.loadbalancer.server.port=${DOCS_BACK_BASE_PORT}
+      - traefik.http.routers.docsDrinkTweb.tls.certresolver=le
+    networks:
+      - public
+
+
+  blazegraph:
+    image: conjecto/blazegraph:2.1.5
+    # ports:
+    #   - 9999:9999
+    environment:
+      JAVA_OPTS: -Xms6G -Xmx6G
+    volumes:
+      - ./datatourisme/dataset:/docker-entrypoint-initdb.d
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
+    networks:
+      - graphQL
+    restart: unless-stopped
+
+  datatourisme:
+    image: git.lab-ouest.org/epitech/fork-open-data-tourism:master
+    depends_on:
+      - blazegraph
+    networks:
+      - graphQL
+      - public
+    restart: unless-stopped
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.dataTourisme.rule=Host(`${DATA_TOURISME_URL}`)
+      - traefik.http.services.dataTourisme.loadbalancer.server.port=${DATA_TOURISME_BASE_PORT}
+      - traefik.http.routers.dataTourisme.tls.certresolver=le
+
 networks:
+  graphQL: {}
   public:
     external: true
 x-dockge:
   urls:
     - https://${POCKET_BASE_URL}/
     - https://${FRONT_URL}/
+    - https://${DOCS_DRINK_URL}/
+    - https://${DRINK_URL}/
+    - https://${DATA_TOURISME_URL}/