From cc834989d52fd7de68b43d103d7f280aca4fe82a Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 14 Mar 2024 06:25:33 +0100 Subject: [PATCH] fix ci --- src/Entities/AthleteEntity.cs | 2 +- src/HeartTrackAPI/AppBootstrap.cs | 4 --- .../Controllers/ActivityController.cs | 6 ++-- src/HeartTrackAPI/HeartTrackAPI.csproj | 8 +---- src/HeartTrackAPI/Utils/SwaggerOptions.cs | 2 +- .../Manager/Contract/IActivityManager.cs | 1 - src/Model/Model.csproj | 6 ---- src/Model/Service/EmailSender.cs | 31 ------------------- 8 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 src/Model/Service/EmailSender.cs diff --git a/src/Entities/AthleteEntity.cs b/src/Entities/AthleteEntity.cs index 88fac38..6d6f351 100644 --- a/src/Entities/AthleteEntity.cs +++ b/src/Entities/AthleteEntity.cs @@ -89,7 +89,7 @@ namespace Entities /// public bool IsCoach { get; set; } - public byte[] ProfilPicture { get; set; } + public byte[]? ProfilPicture { get; set; } diff --git a/src/HeartTrackAPI/AppBootstrap.cs b/src/HeartTrackAPI/AppBootstrap.cs index ce01163..61be631 100644 --- a/src/HeartTrackAPI/AppBootstrap.cs +++ b/src/HeartTrackAPI/AppBootstrap.cs @@ -10,11 +10,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Options; using Microsoft.OpenApi.Models; using Model.Manager; -using Model.Service; using Model2Entities; -using StubAPI; -using Swashbuckle.AspNetCore.SwaggerGen; - namespace HeartTrackAPI; diff --git a/src/HeartTrackAPI/Controllers/ActivityController.cs b/src/HeartTrackAPI/Controllers/ActivityController.cs index 3827b10..f5498e3 100644 --- a/src/HeartTrackAPI/Controllers/ActivityController.cs +++ b/src/HeartTrackAPI/Controllers/ActivityController.cs @@ -15,7 +15,6 @@ public class ActivityController : Controller { private readonly IActivityRepository _activityService; private readonly ILogger _logger; - private readonly IActivityManager _activityManager; public ActivityController(IDataManager dataManager, ILogger logger) { @@ -39,9 +38,12 @@ public class ActivityController : Controller } _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(GetActivities), pageRequest); var activities = await _activityService.GetActivities(pageRequest.Index, pageRequest.Count, ActivityOrderCriteria.None, pageRequest.Descending ?? false); + if(activities == null) + { + return BadRequest("No activities found"); + } var pageResponse = new PageResponse(pageRequest.Index, pageRequest.Count, totalCount, activities.Select(a => a.ToDto())); return Ok(pageResponse); - return Ok(); } catch (Exception e) { diff --git a/src/HeartTrackAPI/HeartTrackAPI.csproj b/src/HeartTrackAPI/HeartTrackAPI.csproj index 133b59f..2329d47 100644 --- a/src/HeartTrackAPI/HeartTrackAPI.csproj +++ b/src/HeartTrackAPI/HeartTrackAPI.csproj @@ -29,11 +29,5 @@ - - - - ..\..\..\..\..\.nuget\packages\newtonsoft.json\13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll - - - + diff --git a/src/HeartTrackAPI/Utils/SwaggerOptions.cs b/src/HeartTrackAPI/Utils/SwaggerOptions.cs index 7754a52..e9aed2c 100644 --- a/src/HeartTrackAPI/Utils/SwaggerOptions.cs +++ b/src/HeartTrackAPI/Utils/SwaggerOptions.cs @@ -35,7 +35,7 @@ public class SwaggerOptions: IConfigureNamedOptions /// /// /// - public void Configure(string name, SwaggerGenOptions options) + public void Configure(string? name, SwaggerGenOptions options) { Configure(options); } diff --git a/src/Model/Manager/Contract/IActivityManager.cs b/src/Model/Manager/Contract/IActivityManager.cs index 5722a41..2be28cc 100644 --- a/src/Model/Manager/Contract/IActivityManager.cs +++ b/src/Model/Manager/Contract/IActivityManager.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Http; namespace Model.Manager; public interface IActivityManager diff --git a/src/Model/Model.csproj b/src/Model/Model.csproj index a957f97..ead9f5a 100644 --- a/src/Model/Model.csproj +++ b/src/Model/Model.csproj @@ -15,10 +15,4 @@ - - - ..\..\..\..\..\.dotnet\shared\Microsoft.AspNetCore.App\8.0.1\Microsoft.AspNetCore.Identity.dll - - - diff --git a/src/Model/Service/EmailSender.cs b/src/Model/Service/EmailSender.cs deleted file mode 100644 index fc9d5e6..0000000 --- a/src/Model/Service/EmailSender.cs +++ /dev/null @@ -1,31 +0,0 @@ - -using Entities; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.UI.Services; - -namespace Model.Service; - -public class EmailSender : IEmailSender -{ - private IEmailSender _emailSenderImplementation; - - public async Task SendEmailAsync(string email, string subject, string htmlMessage) - { - throw new NotImplementedException(); - } - - public async Task SendConfirmationLinkAsync(AthleteEntity user, string email, string confirmationLink) - { - throw new NotImplementedException(); - } - - public async Task SendPasswordResetLinkAsync(AthleteEntity user, string email, string resetLink) - { - throw new NotImplementedException(); - } - - public async Task SendPasswordResetCodeAsync(AthleteEntity user, string email, string resetCode) - { - throw new NotImplementedException(); - } -} \ No newline at end of file