diff --git a/Sources/Api-lol/Controllers/Champions.cs b/Sources/Api-lol/Controllers/Champions.cs index 850cc8d..4467227 100644 --- a/Sources/Api-lol/Controllers/Champions.cs +++ b/Sources/Api-lol/Controllers/Champions.cs @@ -36,11 +36,10 @@ namespace Api_lol.Controllers public async Task Post(DtoChampions champDTO) { Champion tmp = champDTO.DtoToModel(); - var champion = await data.ChampionsMgr.AddItem(tmp); - //Convertir le resultat en dto - //Nom de la méthode, l'id du champion, et le champion + Champion champion = await data.ChampionsMgr.AddItem(tmp); + DtoChampions dtoChamp = champion.ModelToDto(); Console.WriteLine(champion.Name); - return CreatedAtAction(nameof(GetChampion),champion.Name,champion); + return CreatedAtAction(nameof(GetChampion),new { name = dtoChamp.name},dtoChamp); } diff --git a/Sources/EntityFramwork/BDD-APILOL.db-shm b/Sources/EntityFramwork/BDD-APILOL.db-shm deleted file mode 100644 index fe9ac28..0000000 Binary files a/Sources/EntityFramwork/BDD-APILOL.db-shm and /dev/null differ diff --git a/Sources/EntityFramwork/BDD-APILOL.db-wal b/Sources/EntityFramwork/BDD-APILOL.db-wal deleted file mode 100644 index e69de29..0000000 diff --git a/drone.yml b/drone.yml new file mode 100644 index 0000000..680b72e --- /dev/null +++ b/drone.yml @@ -0,0 +1,66 @@ +kind: pipeline +type: docker +name: default + +trigger: + event: + - push + +steps: + - name: build + image: mcr.microsoft.com/dotnet/sdk:6.0 + volumes: + - name: docs + path: /docs + commands: + - cd Sources/ + - dotnet restore Solution.sln + - dotnet build Solution.sln -c Release --no-restore + - dotnet publish Solution.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release + + - name: tests + image: mcr.microsoft.com/dotnet/sdk:6.0 + commands: + - cd Sources/ + - dotnet restore Solution.sln + - dotnet test Solution.sln --no-restore + depends_on: [build] + + - name: code-analysis + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 + commands: + - cd Sources/ + - dotnet restore Solution.sln + - dotnet sonarscanner begin /k:tmp /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 Solution.sln -c Release --no-restore + - dotnet test Solution.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 Solution.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] + + - name: generate-and-deploy-docs + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer + failure: ignore + volumes: + - name: docs + path: /docs + commands: + #- cd Documentation/doxygen + #- doxygen Doxyfile + - /entrypoint.sh + when: + branch: + - master + depends_on: [ build ] + +volumes: +- name: docs + temp: {}