From 44115a4c1d294b29000894f3ff3d1d6c226aaffb Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Tue, 14 Jan 2025 10:49:23 +0100 Subject: [PATCH 01/18] Adding pipeline for API :twisted_rightwards_arrows::twisted_rightwards_arrows: --- .drone.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 29 +++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 .drone.yml create mode 100644 Dockerfile diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..0955180 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,74 @@ +kind: pipeline +type: docker +name: default + +trigger: + event: + - push + +steps: + - name: build + image: mcr.microsoft.com/dotnet/sdk:8.0 + commands: + - dotnet restore API_dotnet.sln + - dotnet build API_dotnet.sln -c Release --no-restore + - dotnet publish API_dotnet.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release + + - name: tests + image: mcr.microsoft.com/dotnet/sdk:8.0 + commands: + - dotnet restore API_dotnet.sln + - dotnet test API_dotnet.sln --no-restore + depends_on: [build] + + - name: code-inspection + image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet8 + secrets: [ SECRET_SONAR_LOGIN ] + environment: + sonar_host: https://codefirst.iut.uca.fr/sonar/ + sonar_token: + from_secret: SECRET_SONAR_LOGIN # Secret de Drone + project_key: Optifit_API_ef + commands: + - dotnet restore API_dotnet.sln + - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="" /d:sonar.login=$${sonar_token} + - dotnet build API_dotnet.sln -c Release --no-restore + - dotnet test API_dotnet.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 API_dotnet.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release + - dotnet sonarscanner end /d:sonar.login=$${sonar_token} + when: + branch: + - master + event: + - push + - pull_request + depends_on: [build,tests] + + - name: docker-build-and-push + image: plugins/docker + settings: + dockerfile: Dockerfile + context: OptifitWebService + registry: hub.codefirst.iut.uca.fr + repo: hub.codefirst.iut.uca.fr/louis.laborie/optifit_ef_api + username: + from_secret: SECRET_REGISTRY_USERNAME + password: + from_secret: SECRET_REGISTRY_PASSWORD + when: + branch: + - master + - rebase + + - name: deploy-container + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: hub.codefirst.iut.uca.fr/louis.laborie/optifit_ef_api:latest + CONTAINERNAME: optifit-ef-api + COMMAND: create + OVERWRITE: true + CODEFIRST_CLIENTDRONE_ENV_ASPNETCORE_HTTP_PORTS: 80 + ADMINS: louislaborie,tonyfages,anthonyrichard + depends_on: + - docker-build-and-push \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6643758 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +WORKDIR /app + +EXPOSE 80 +EXPOSE 443 +EXPOSE 8080 +EXPOSE 8081 + +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"] +COPY ["Server/Server.csproj", "Server/"] +COPY ["Shared/Shared.csproj", "Shared/"] +RUN dotnet restore "Server/Server.csproj" +COPY . . +WORKDIR "/src/Server" +RUN dotnet build "Server.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "Server.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + + + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Server.dll"] \ No newline at end of file -- 2.36.3 From c45c8b2c0efa9bd275d476404647353d145b1e7c Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Tue, 14 Jan 2025 10:53:39 +0100 Subject: [PATCH 02/18] Adding pipeline branch to build image job :twisted_rightwards_arrows::twisted_rightwards_arrows: --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 0955180..b1ac82d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -60,6 +60,7 @@ steps: branch: - master - rebase + - pipeline - name: deploy-container image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest -- 2.36.3 From 06501cdf7b817bd4c9440e9faa0176bfa95b1ef7 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Tue, 14 Jan 2025 10:56:38 +0100 Subject: [PATCH 03/18] Fix context for build image job :twisted_rightwards_arrows::twisted_rightwards_arrows: --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b1ac82d..6419153 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,7 +49,7 @@ steps: image: plugins/docker settings: dockerfile: Dockerfile - context: OptifitWebService + context: . registry: hub.codefirst.iut.uca.fr repo: hub.codefirst.iut.uca.fr/louis.laborie/optifit_ef_api username: -- 2.36.3 From de4845bf122583d7737220b1e27a444aa043f6ba Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Tue, 14 Jan 2025 11:10:58 +0100 Subject: [PATCH 04/18] Try to fix max user instances exception :twisted_rightwards_arrows::twisted_rightwards_arrows: --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6643758..b3b1700 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,4 +26,5 @@ RUN dotnet publish "Server.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:Us FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +RUN sysctl -w fs.inotify.max_user_instances=1024 ENTRYPOINT ["dotnet", "Server.dll"] \ No newline at end of file -- 2.36.3 From cc0b7eee183adb314d6eb16dc43ecfb326d9f986 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Tue, 14 Jan 2025 11:42:56 +0100 Subject: [PATCH 05/18] Remove sysctl command in Dockerfile :twisted_rightwards_arrows::twisted_rightwards_arrows: --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b3b1700..6643758 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,5 +26,4 @@ RUN dotnet publish "Server.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:Us FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -RUN sysctl -w fs.inotify.max_user_instances=1024 ENTRYPOINT ["dotnet", "Server.dll"] \ No newline at end of file -- 2.36.3 From b3f549b18c5319e427e81d7ea65af6ee8c7a1fc7 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Fri, 17 Jan 2025 12:39:31 +0100 Subject: [PATCH 06/18] Adding pipeline branch for SonarQube deployment :triangular_flag_on_post::triangular_flag_on_post: --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 6419153..3f00746 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,6 +40,7 @@ steps: when: branch: - master + - pipelines event: - push - pull_request -- 2.36.3 From adaedf3ff8ee3f0a9830b1b8748bcf4aeb0bcece Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Fri, 17 Jan 2025 12:40:16 +0100 Subject: [PATCH 07/18] Adding pipeline branch for SonarQube deployment :triangular_flag_on_post::triangular_flag_on_post: --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3f00746..669a751 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: when: branch: - master - - pipelines + - pipeline event: - push - pull_request -- 2.36.3 From 016cf6f7bab7f15fbe9ae860df4459f1472afda9 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Fri, 17 Jan 2025 12:42:28 +0100 Subject: [PATCH 08/18] Removing exclusion parts :triangular_flag_on_post::triangular_flag_on_post: --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 669a751..16d400f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: project_key: Optifit_API_ef commands: - dotnet restore API_dotnet.sln - - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="" /d:sonar.login=$${sonar_token} + - dotnet sonarscanner begin /k:$${project_key} /d:sonar.host.url=$${sonar_host} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.login=$${sonar_token} - dotnet build API_dotnet.sln -c Release --no-restore - dotnet test API_dotnet.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" -- 2.36.3 From 2b7f8881b97abc8b67ff3aab4fa91569d06cd3dc Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Fri, 17 Jan 2025 12:55:13 +0100 Subject: [PATCH 09/18] Removing SonarQube job from pipeline branch :triangular_flag_on_post::triangular_flag_on_post: --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 16d400f..761bf8b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,6 @@ steps: when: branch: - master - - pipeline event: - push - pull_request -- 2.36.3 From 6de74044bf49c04f2e4ebfdacabb1caf195cacd8 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Fri, 24 Jan 2025 11:33:04 +0100 Subject: [PATCH 10/18] Add users routes :technologist::technologist: --- Server/Controller/v1/UsersController.cs | 36 +++++++++++++++++++++++ Server/IServices/IUsersService.cs | 4 +++ Server/Services/UsersService.cs | 38 +++++++++++++++++++++++-- Shared/ECategory.cs | 8 ++++++ Shared/ETarget.cs | 9 ++++++ 5 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 Shared/ECategory.cs create mode 100644 Shared/ETarget.cs diff --git a/Server/Controller/v1/UsersController.cs b/Server/Controller/v1/UsersController.cs index 4209c78..f62e714 100644 --- a/Server/Controller/v1/UsersController.cs +++ b/Server/Controller/v1/UsersController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Server.Dto.Request; using Server.Dto.Response; using Asp.Versioning; +using Microsoft.AspNetCore.Authorization; using Server.IServices; namespace Server.Controller.v1; @@ -39,4 +40,39 @@ public class UsersController : ControllerBase var alumni = _dataServices.GetUserById(id); return alumni.Result == null ? NotFound() : Ok(alumni); } + + [HttpPost] + [ProducesResponseType(typeof(ResponseUserDto), StatusCodes.Status201Created)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + [AllowAnonymous] + public async Task CreateUser([FromBody] RequestUserDto request) + { + if (!ModelState.IsValid) return BadRequest(ModelState); + + var createdUser = await _dataServices.CreateUser(request); + return CreatedAtAction(nameof(GetAlumniById), new { id = createdUser.Id }, createdUser); + } + + [HttpPut("{id}")] + [ProducesResponseType(typeof(ResponseUserDto), StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + [ProducesResponseType(StatusCodes.Status400BadRequest)] + [AllowAnonymous] + public async Task UpdateUser(string id, [FromBody] RequestUserDto request) + { + if (!ModelState.IsValid) return BadRequest(ModelState); + + var updatedProgram = await _dataServices.UpdateUser(id, request); + return updatedProgram == null ? NotFound() : Ok(updatedProgram); + } + + [HttpDelete("{id}")] + [ProducesResponseType(StatusCodes.Status204NoContent)] + [ProducesResponseType(StatusCodes.Status404NotFound)] + [AllowAnonymous] + public async Task DeleteUser(string id) + { + var deleted = await _dataServices.DeleteUser(id); + return deleted ? NoContent() : NotFound(); + } } \ No newline at end of file diff --git a/Server/IServices/IUsersService.cs b/Server/IServices/IUsersService.cs index c451027..831e88f 100644 --- a/Server/IServices/IUsersService.cs +++ b/Server/IServices/IUsersService.cs @@ -9,4 +9,8 @@ public interface IUsersService { Task GetUserById(string id); Task> GetUsers(int page, int size, bool ascending = true); + Task CreateUser(RequestUserDto request); + Task UpdateUser(string id, RequestUserDto request); + Task DeleteUser(string id); + } \ No newline at end of file diff --git a/Server/Services/UsersService.cs b/Server/Services/UsersService.cs index 84e3105..60d6c66 100644 --- a/Server/Services/UsersService.cs +++ b/Server/Services/UsersService.cs @@ -3,6 +3,9 @@ using Infrastructure.Repositories; using Server.Dto.Response; using Server.IServices; using AutoMapper; +using Azure; +using Infrastructure.Entities; +using Server.Dto.Request; using Shared; namespace Server.Services; @@ -31,8 +34,39 @@ public class UsersService : IUsersService return userDto; } - public Task> GetUsers(int page, int size, bool ascending = true) + public async Task> GetUsers(int page, int size, bool ascending = true) { - throw new NotImplementedException(); + var users = await _userRepository.GetPaginatedListAsync(page - 1, size, null, null); + var result = _mapper.Map>(users); + return result; + } + + public async Task CreateUser(RequestUserDto request) + { + var user = _mapper.Map(request); + await _userRepository.InsertAsync(user); + await _context.SaveChangesAsync(); + return _mapper.Map(user); + } + + public async Task UpdateUser(string id,RequestUserDto request) + { + var user = await _userRepository.GetByIdAsync(id); + if (user == null) return null; + + _mapper.Map(request, user); + _userRepository.Update(user); + await _context.SaveChangesAsync(); + return _mapper.Map(user); + } + + public async Task DeleteUser(string id) + { + var user = await _userRepository.GetByIdAsync(id); + if (user == null) return false; + + _userRepository.Delete(id); + await _context.SaveChangesAsync(); + return true; } } \ No newline at end of file diff --git a/Shared/ECategory.cs b/Shared/ECategory.cs new file mode 100644 index 0000000..11f823a --- /dev/null +++ b/Shared/ECategory.cs @@ -0,0 +1,8 @@ +namespace Shared; + +public enum ECategory +{ + WARM_UP, + TRAINING, + STRETCHING +} \ No newline at end of file diff --git a/Shared/ETarget.cs b/Shared/ETarget.cs new file mode 100644 index 0000000..8e03c04 --- /dev/null +++ b/Shared/ETarget.cs @@ -0,0 +1,9 @@ +namespace Shared; + +public enum ETarget +{ + LEG, + ARM, + CARDIO, + HAMSTRING +} \ No newline at end of file -- 2.36.3 From c72dcdf2998ccb45317d09abf8afdabdf23132ad Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:13:49 +0100 Subject: [PATCH 11/18] Try new Dockerfile for pipeline :beers::beers: --- Server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Dockerfile b/Server/Dockerfile index 18264a1..da6efa5 100644 --- a/Server/Dockerfile +++ b/Server/Dockerfile @@ -24,4 +24,4 @@ RUN dotnet publish "Server.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:Us FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "Server.dll"] +ENTRYPOINT ["dotnet", "Server.dll"] \ No newline at end of file -- 2.36.3 From eebb091a65389dc4a355ff411c980624e527bcac Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:22:51 +0100 Subject: [PATCH 12/18] Try to disable https redirection :mute::mute: --- Server/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/Program.cs b/Server/Program.cs index 9640653..2eb1ef5 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -67,6 +67,7 @@ if (app.Environment.IsDevelopment()) c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root }); + app.UseHttpsRedirection(); } app.UseHttpsRedirection(); -- 2.36.3 From 40cd8b26ac5010182fbf267d1c2f57cc8ee48bf0 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:27:10 +0100 Subject: [PATCH 13/18] Try new options for app builder :beers::beers: --- Server/Program.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Server/Program.cs b/Server/Program.cs index 2eb1ef5..cdc828e 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -70,6 +70,16 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); } +else if (app.Environment.IsProduction()) +{ + app.UseSwagger(); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); + c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root + }); +} + app.UseHttpsRedirection(); app.UseAuthorization(); app.MapControllers(); -- 2.36.3 From 97a22cdcd979b595d1eb0cf598c0b714156e2e5c Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:32:49 +0100 Subject: [PATCH 14/18] Try new options for app builder :beers::beers: --- Server/Program.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Server/Program.cs b/Server/Program.cs index cdc828e..32cfd0c 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -70,17 +70,7 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); } -else if (app.Environment.IsProduction()) -{ - app.UseSwagger(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); - c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root - }); -} -app.UseHttpsRedirection(); app.UseAuthorization(); app.MapControllers(); app.Run(); \ No newline at end of file -- 2.36.3 From 4d6f3eee73ff3fd0c1e367a31761c116b986e8e3 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:37:48 +0100 Subject: [PATCH 15/18] Try to put Swagger gen :mute::mute: --- Server/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Server/Program.cs b/Server/Program.cs index 32cfd0c..79a514f 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -70,7 +70,8 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); } - +app.UseSwagger(); +app.UseSwaggerUI(); app.UseAuthorization(); app.MapControllers(); app.Run(); \ No newline at end of file -- 2.36.3 From 1023151174330172fb985bfde2ca8b3b8eaff9f1 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:43:30 +0100 Subject: [PATCH 16/18] Hope this will work :mute::mute: --- Server/Program.cs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Server/Program.cs b/Server/Program.cs index 79a514f..b3d0dbf 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -59,19 +59,23 @@ builder.Services.AddRouting(options => options.LowercaseUrls = true); var app = builder.Build(); // Configure the HTTP request pipeline. -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(c => - { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); - c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root - }); - app.UseHttpsRedirection(); -} +//if (app.Environment.IsDevelopment()) +// { +// app.UseSwagger(); +// app.UseSwaggerUI(c => +// { +// c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); +// c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root +// }); +// app.UseHttpsRedirection(); +//} app.UseSwagger(); -app.UseSwaggerUI(); +app.UseSwaggerUI(c => +{ + c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); + c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root +}); app.UseAuthorization(); app.MapControllers(); app.Run(); \ No newline at end of file -- 2.36.3 From bd354344e41d41995501e36bae8b1d61d0a079e5 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 08:51:14 +0100 Subject: [PATCH 17/18] Removing swagger options :mute::mute: --- Server/Program.cs | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Server/Program.cs b/Server/Program.cs index b3d0dbf..1dee5c0 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -59,23 +59,17 @@ builder.Services.AddRouting(options => options.LowercaseUrls = true); var app = builder.Build(); // Configure the HTTP request pipeline. -//if (app.Environment.IsDevelopment()) -// { -// app.UseSwagger(); -// app.UseSwaggerUI(c => -// { -// c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); -// c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root -// }); -// app.UseHttpsRedirection(); -//} - -app.UseSwagger(); -app.UseSwaggerUI(c => +if (app.Environment.IsDevelopment()) { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); - c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root -}); + app.UseSwagger(); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/swagger/v1/swagger.json", "Optifit API v1"); + c.RoutePrefix = string.Empty; // Serve Swagger UI at the app's root + }); + app.UseHttpsRedirection(); +} + app.UseAuthorization(); app.MapControllers(); app.Run(); \ No newline at end of file -- 2.36.3 From cde0536dda437ae0bf5c30a71c98321a46ffa936 Mon Sep 17 00:00:00 2001 From: Louis LABORIE Date: Thu, 6 Feb 2025 09:15:38 +0100 Subject: [PATCH 18/18] Changing branch before merging :mute::mute: --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 761bf8b..0047e74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,7 +58,7 @@ steps: from_secret: SECRET_REGISTRY_PASSWORD when: branch: - - master + - main - rebase - pipeline -- 2.36.3