Merge pull request 'Changement en DB du nom de la colonne personne_id en proprietaire_id dans la table enquete' (#8) from features/crud_entites into develop

Reviewed-on: #8

.gitea/workflows/cd-main.yml

@@ -88,12 +88,9 @@ jobs:
         shell: sh
         run: |
           cat > .env <<EOF
-          BASE_PATH=/home/ppmec-test/infocad
+          POSTGRES_DB_FISCAD=${{ secrets.POSTGRES_DB_FISCAD }}
-          POSTGRES_DB=${{ secrets.POSTGRES_DB }}
+          POSTGRES_USER_FISCAD=${{ secrets.POSTGRES_USER_FISCAD }}
-          POSTGRES_USER=${{ secrets.POSTGRES_USER }}
+          POSTGRES_PASSWORD_FISCAD=${{ secrets.POSTGRES_PASSWORD_FISCAD }}
-          POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
-          SPRING_DATASOURCE_URL=${{ secrets.SPRING_DATASOURCE_URL }}
-          JWT_SECRET=${{ secrets.JWT_SECRET }}
           EOF
           echo "Generated .env:"
           cat .env
@@ -108,11 +105,8 @@ jobs:
         shell: sh
         run: |
           # IMPORTANT : on fixe le nom du projet compose
-          export COMPOSE_PROJECT_NAME=infocad
+          export COMPOSE_PROJECT_NAME=fiscad
-            
+          
-          # On nettoie d'abord d'anciens conteneurs éventuels
-          docker rm -f postgres_db infocad_prod_1 infocad_prod_2 nginx_loadbalancer 2>/dev/null || true
-            
           # Puis on déploie avec un nom de projet fixe
           docker-compose -f docker-compose-prod.yml pull || true
           docker-compose -f docker-compose-prod.yml down --remove-orphans

Dockerfile

@@ -1,5 +1,5 @@
 # Étape 1 : Build avec Maven et Java 17
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:17-jdk-jammy
 
 
 WORKDIR /app

docker-compose-prod.yml

@@ -0,0 +1,46 @@
+version: '3.9'
+
+services:
+
+  db:
+    image: postgres:15
+    container_name: fiscad-db
+    restart: always
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB_FISCAD}
+      POSTGRES_USER: ${POSTGRES_USER_FISCAD}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD_FISCAD}
+    ports:
+      - "5432:5432"
+    volumes:
+      - db-data-fiscad:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: fiscad-app
+    depends_on:
+      - db
+    environment:
+      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
+      SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
+      SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD_FISCAD}
+      SERVER_PORT: 8282
+      IO_GMSS_FISCAD_PROFILE: abomey
+      SPRING_PROFILES_ACTIVE: abomey
+    ports:
+      - "8282:8282"
+    volumes:
+      - /fiscad/uploads:/app/uploads
+      - /fiscad/jasperReport:/app/jasperReport
+      - /fiscad/logs:/app/logs
+    restart: on-failure
+
+volumes:
+  db-data-fiscad:

src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java

@@ -80,6 +80,7 @@ public class Enquete extends BaseEntity implements Serializable {
 
     @JsonIgnore
     @ManyToOne
+    @JoinColumn(name = "proprietaire_id")
     private Personne personne ;
 
     @JsonIgnore