From 0f3e4a78086785b6e60ffa048ead9549030e3d7e Mon Sep 17 00:00:00 2001
From: Pierre Ferreira <p.ferreira1@outlook.fr>
Date: Sun, 26 Feb 2023 15:32:20 +0100
Subject: [PATCH] :green_heart: mise a jour de la CI avec ajout de
 code-analysis, il faut penser a mettre le master a jour car les tests ne sont
 pas fonctionnel, contrairement aux autres branches :bug:

---
 .drone.yml                       | 20 ++++++++++++++++++++
 Sources/EF_UT/EntityTest.cs      |  8 +++++---
 Sources/EntityFramework/Skill.cs |  2 ++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 94a89f2..e694160 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -42,3 +42,23 @@ steps:
       - dotnet test LeagueOfLegends.sln --no-restore
     depends_on: [docker-build-and-push]
 
+  - name: code-analysis
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6
+    commands:
+      - cd Sources/
+      - dotnet restore LeagueOfLegends.sln
+      - dotnet sonarscanner begin /k:entityframework_consodeservices_tp /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 LeagueOfLegends.sln -c Release --no-restore
+      - dotnet test LeagueOfLegends.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 LeagueOfLegends.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: [docker-build-and-push]
+
diff --git a/Sources/EF_UT/EntityTest.cs b/Sources/EF_UT/EntityTest.cs
index 4d4ce34..d1f87b5 100644
--- a/Sources/EF_UT/EntityTest.cs
+++ b/Sources/EF_UT/EntityTest.cs
@@ -23,7 +23,7 @@ namespace EF_UT
             using (var context = new LoLDbContext(options))
             {
 
-                ChampionEntity chewie = new ChampionEntity("Chewbacca","","");
+                ChampionEntity chewie = new ChampionEntity("Chewbacca", "", "");
                 ChampionEntity yoda = new ChampionEntity("Yoda", "", "");
                 ChampionEntity ewok = new ChampionEntity("Ewok", "", "");
 
@@ -42,6 +42,8 @@ namespace EF_UT
                 Assert.AreEqual("Chewbacca", context.Champions.First().Name);
             }
         }
+
+
         [TestMethod]
         public void TestUpdate()
         {
@@ -52,8 +54,8 @@ namespace EF_UT
             //prepares the database with one instance of the context
             using (var context = new LoLDbContext(options))
             {
-                ChampionEntity chewie = new ChampionEntity ("Chewbacca", "", "");
-                ChampionEntity yoda = new ChampionEntity ("Yoda", "", "");
+                ChampionEntity chewie = new ChampionEntity("Chewbacca", "", "");
+                ChampionEntity yoda = new ChampionEntity("Yoda", "", "");
                 ChampionEntity ewok = new ChampionEntity("Ewok", "", "");
 
                 context.Add(chewie);
diff --git a/Sources/EntityFramework/Skill.cs b/Sources/EntityFramework/Skill.cs
index e9b1f32..be43702 100644
--- a/Sources/EntityFramework/Skill.cs
+++ b/Sources/EntityFramework/Skill.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,6 +11,7 @@ namespace EntityFramework
     {
         public SkillType Type { get; private set; }
 
+        [Key]
         public string Name
         {
             get => name;