diff --git a/.drone.yml b/.drone.yml index f2bfbc5..dc9711e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,4 +20,24 @@ steps: - cd Code - dotnet restore CI_CONSECO.sln - dotnet test CI_CONSECO.sln --no-restore - depends_on: [build] \ No newline at end of file + depends_on: [build] + - name: code-analysis + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 + commands: + - cd Code/ + - dotnet restore CI_CONSECO.sln + - dotnet sonarscanner begin /k:ConsEco /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + - dotnet build CI_CONSECO.sln -c Release --no-restore + - dotnet test CI_CONSECO.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" + - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" + - dotnet publish CI_CONSECO.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release + - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN} + secrets: [ SECRET_SONAR_LOGIN ] + settings: + # accessible en ligne de commande par ${PLUGIN_SONAR_HOST} + sonar_host: https://codefirst.iut.uca.fr/sonar/ + # accessible en ligne de commande par ${PLUGIN_SONAR_TOKEN} + sonar_token: + from_secret: SECRET_SONAR_LOGIN + depends_on: [tests] + \ No newline at end of file diff --git a/Code/LinqToPgSQL/PersLinqToPgSQL.cs b/Code/LinqToPgSQL/PersLinqToPgSQL.cs index 0496ce2..73dcfd6 100644 --- a/Code/LinqToPgSQL/PersLinqToPgSQL.cs +++ b/Code/LinqToPgSQL/PersLinqToPgSQL.cs @@ -7,6 +7,8 @@ using Npgsql; using Model; using System.IO; using System.Diagnostics; +using System.Windows; +using System.Threading; namespace LinqToPgSQL { @@ -40,6 +42,8 @@ namespace LinqToPgSQL catch { conn.Close(); + + MessageBox.Show("Problème de connection à la base de données. L'application se fermera après fermeture de la fenêtre"); Environment.Exit(0); } @@ -104,14 +108,18 @@ namespace LinqToPgSQL string requete = $"DELETE FROM INSCRIT WHERE id=(@p)"; - string requeteFKey = $"DELETE FROM DEVISEINSCRIT WHERE idInscrit=(@p2)"; - using (var command1 = new NpgsqlCommand(requeteFKey, conn)) + using (var command1 = new NpgsqlCommand(requete, conn)) { command1.Parameters.AddWithValue("p2", i.Id); await command1.ExecuteNonQueryAsync(); } + /* SupprimerBanqueBdd(i); + SupprimerCompteBdd(i); + SupprimerEcheancierBdd(i); + SupprimerPlanificationBdd(i); +*/ using (var command = new NpgsqlCommand(requete, conn)) { command.Parameters.AddWithValue("p", i.Id);