merge dev into main

.env.sample

@@ -1,4 +1,4 @@
-POSTGRES_USER=""
-POSTGRES_PASSWORD=""
-POSTGRES_DB=""
-NEXT_PUBLIC_API_TOKEN=""
+NEXT_PUBLIC_API_TOKEN=""
+JWT_SECRET=""
+NODE_ENV=""
+NEXT_PUBLIC_API_URL=""

.github/workflows/dev-cd.yml

@@ -1,72 +1,74 @@
-# .github/workflows/dev-client.yml
 name: Compile and push profile APP staging 
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
     branches: ["dev"]
     types:
       - closed
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # if pull request merged
-    if: github.event.pull_request.merged == true 
-
-    # The type of runner that the job will run on
+  check-build:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Vérifier que Docker Compose fonctionne
+        run: docker compose version
+
+      - name: Tester le build des services
+        run: |
+          docker compose -f docker-compose.yml build
+        continue-on-error: false  # Stoppe le workflow si le build échoue
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+  check-webhook:
+    needs: check-build  # Exécute cette étape seulement si le build a réussi
+    runs-on: ubuntu-latest
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - name: Vérifier l'accès au webhook
+        id: check_webhook
+        continue-on-error: true
+        run: |
+          HTTP_STATUS=$(curl -o /dev/null -s -w "%{http_code}\n" ${{ secrets.WEBHOOK_URL_MAIN }})
+          echo "Webhook status: $HTTP_STATUS"
+          if [[ "$HTTP_STATUS" -ne 200 ]]; then
+            echo "Erreur : Le webhook ne répond pas correctement (HTTP $HTTP_STATUS)."
+            exit 1
+          fi
+    #Deactivation due to new Docker Hub conditions
+    #   - uses: actions/checkout@v4
 
-      # login with Docker
-      - uses: docker/login-action@v2
-        name: Login to Docker Hub
-        with:
-          # generate some credentials from Dockerhub and store them into the repo secrets
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+    #   - uses: docker/login-action@v2
+    #     name: Login to Docker Hub
+    #     with:
+    #       username: ${{ secrets.DOCKERHUB_USERNAME }}
+    #       password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # prepare buildx for docker
-      - uses: docker/setup-buildx-action@v2
-        name: Set up Docker Build
+    #   - uses: docker/setup-buildx-action@v2
+    #     name: Set up Docker Build
 
-      # build an push the newly created image frontend
-      - uses: docker/build-push-action@v4
-        name: Build and push frontend
-        with:
-          context: ./frontend
-          file: ./frontend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/dev-frontend-portfolio:latest
+    #   - uses: docker/build-push-action@v4
+    #     name: Build and push frontend
+    #     with:
+    #       context: ./frontend
+    #       file: ./frontend/Dockerfile
+    #       push: true
+    #       tags: ${{ secrets.DOCKERHUB_USERNAME }}/dev-frontend-portfolio:latest
+    #       secrets: |
+    #         NEXT_PUBLIC_API_TOKEN=${{ secrets.NEXT_PUBLIC_API_TOKEN }}
 
-      # build an push the newly created image backend
-      - uses: docker/build-push-action@v4
-        name: Build and push backend
-        with:
-          context: ./backend
-          file: ./backend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/dev-backend-portfolio:latest
+    #   - uses: docker/build-push-action@v4
+    #     name: Build and push backend
+    #     with:
+    #       context: ./backend
+    #       file: ./backend/Dockerfile
+    #       push: true
+    #       tags: ${{ secrets.DOCKERHUB_USERNAME }}/dev-backend-portfolio:latest
 
-  # deployment:
-  #   needs: build
-  #   runs-on: ubuntu-latest
-  #     # send deploiement hook
-  #   steps:
-  #     - name: Invoke deployment hook
-  #       uses: distributhor/workflow-webhook@v3
-  #       with:
-  #         webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}
   deployment:
-    needs: build
+    needs: [check-build, check-webhook]
     runs-on: ubuntu-latest
     steps:
       - name: Invoke deployment hook
@@ -77,4 +79,4 @@ jobs:
           SIGNATURE=$(echo -n "$PAYLOAD" | openssl dgst -sha1 -hmac "$SECRET_KEY" | sed 's/^.* //')
           SIGNATURE="sha1=$SIGNATURE"
 
-          curl -X POST -H "Content-Type: application/json" -H "X-Hub-Signature: $SIGNATURE" -d "$PAYLOAD" ${{ secrets.WEBHOOK_URL_DEV }}
+          curl -X POST -H "Content-Type: application/json" -H "X-Hub-Signature: $SIGNATURE" -d "$PAYLOAD" ${{ secrets.WEBHOOK_URL_DEV }}

.github/workflows/main-cd.yml

@@ -1,60 +1,68 @@
-# .github/workflows/staging-client.yml
 name: Compile and push profile APP staging 
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
     branches: ["main"]
     types:
       - closed
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # if pull request merged
-    if: github.event.pull_request.merged == true 
-
-    # The type of runner that the job will run on
+  check-build:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Vérifier que Docker Compose fonctionne
+        run: docker compose version
+
+      - name: Tester le build des services
+        run: |
+          docker compose -f docker-compose.yml build
+        continue-on-error: false  # Stoppe le workflow si le build échoue
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
+  check-webhook:
+    needs: check-build  # Exécute cette étape seulement si le build a réussi
+    runs-on: ubuntu-latest
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - name: Vérifier l'accès au webhook
+        id: check_webhook
+        continue-on-error: true
+        run: |
+          HTTP_STATUS=$(curl -o /dev/null -s -w "%{http_code}\n" ${{ secrets.WEBHOOK_URL_MAIN }})
+          echo "Webhook status: $HTTP_STATUS"
+          if [[ "$HTTP_STATUS" -ne 200 ]]; then
+            echo "Erreur : Le webhook ne répond pas correctement (HTTP $HTTP_STATUS)."
+            exit 1
+          fi
 
-      # login with Docker
-      - uses: docker/login-action@v2
-        name: Login to Docker Hub
-        with:
-          # generate some credentials from Dockerhub and store them into the repo secrets
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+    #Deactivation due to new Docker Hub conditions
+    #   - uses: docker/login-action@v2
+    #     name: Login to Docker Hub
+    #     with:
+    #       username: ${{ secrets.DOCKERHUB_USERNAME }}
+    #       password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # prepare buildx for docker
-      - uses: docker/setup-buildx-action@v2
-        name: Set up Docker Build
+    #   - uses: docker/setup-buildx-action@v2
+    #     name: Set up Docker Build
 
-      # build an push the newly created image frontend
-      - uses: docker/build-push-action@v4
-        name: Build and push frontend
-        with:
-          context: ./frontend
-          file: ./frontend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/main-frontend-portfolio:latest
+    #   - uses: docker/build-push-action@v4
+    #     name: Build and push frontend
+    #     with:
+    #       context: ./frontend
+    #       file: ./frontend/Dockerfile
+    #       push: true
+    #       tags: ${{ secrets.DOCKERHUB_USERNAME }}/main-frontend-portfolio:latest
 
-            # build an push the newly created image backend
-      - uses: docker/build-push-action@v4
-        name: Build and push backend
-        with:
-          context: ./backend
-          file: ./backend/Dockerfile
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/main-backend-portfolio:latest
+    #   - uses: docker/build-push-action@v4
+    #     name: Build and push backend
+    #     with:
+    #       context: ./backend
+    #       file: ./backend/Dockerfile
+    #       push: true
+    #       tags: ${{ secrets.DOCKERHUB_USERNAME }}/main-backend-portfolio:latest
 
   # deployment:
   #   needs: build
@@ -66,7 +74,7 @@ jobs:
   #       with:
   #         webhook_url: ${{ secrets.WEBHOOK_URL_MAIN }}
   deployment:
-    needs: build
+    needs: [check-build, check-webhook]
     runs-on: ubuntu-latest
     steps:
       - name: Invoke deployment hook

.gitignore

@@ -1,3 +1,4 @@
 .vscode
 node_modules
-.env
+.env
+mysql-data

backend/.env.sample

@@ -8,4 +8,26 @@ PORT_MAIL=""
 AUTH_USER_MAIL=""
 AUTH_PASS_MAIL=""
 API_KEY=""
-BASE_URL=""
+BASE_URL=""
+JWT_SECRET=""
+NODE_ENV=""
+
+# This was inserted by `prisma init`:
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+# The following `prisma+postgres` URL is similar to the URL produced by running a local Prisma Postgres 
+# server with the `prisma dev` CLI command, when not choosing any non-default ports or settings. The API key, unlike the 
+# one found in a remote Prisma Postgres URL, does not contain any sensitive information.
+
+DATABASE_URL=""
+
+# url d'exemple :
+#  version windows
+# DATABASE_URL="mysql://user:password@host.docker.internal:3306/bddname"
+
+#pour linux 
+# DATABASE_URL="mysql://user:password@172.17.0.1:3306/bddname"

backend/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+# Keep environment variables out of version control
+.env
+
+/src/generated/prisma

backend/Dockerfile

@@ -1,4 +1,5 @@
-FROM node:16-alpine3.14
+# FROM node:16-alpine3.14
+FROM node:18.18-alpine
 
 RUN apk --no-cache add \
     build-base \
@@ -9,15 +10,22 @@ RUN apk --no-cache add \
     musl-dev \
     giflib-dev \
     librsvg-dev \
+    mysql-client \
     python3
 
 RUN mkdir /app
 WORKDIR /app
 COPY package.json .
 RUN npm i 
 
+COPY src/prisma ./src/prisma
+RUN npx prisma generate --schema=src/prisma/schema.prisma
+
 COPY src src
-COPY codegen.ts .
+COPY tests tests
+COPY jest.config.ts jest.config.ts
+
+# COPY codegen.ts .
 
 COPY tsconfig.json .
 

backend/codegen.yml

@@ -0,0 +1,14 @@
+verbose: true
+
+schema:
+  - http://localhost:4000/graphql:
+      headers:
+        x-api-key: "${API_KEY}"
+
+generates:
+  ./src/types/graphql.ts:
+    plugins:
+      - typescript
+      - typescript-operations
+    config:
+      useIndexSignature: true

backend/jest.config.ts

@@ -0,0 +1,8 @@
+export default {
+  preset: "ts-jest",
+  testEnvironment: "node",
+  moduleFileExtensions: ["ts", "js", "json"],
+  testMatch: ["**/tests/**/*.test.ts"],
+  setupFiles: ["dotenv/config"],
+  transformIgnorePatterns: ["/node_modules/"],
+};