Mise à jour de '.drone.yml'

.drone.yml

@@ -1,81 +1,14 @@
 kind: pipeline
 type: docker
-name: HeartTrack-Admin-CI
+name: dronePipeline
 
 trigger:
   event:
     - push
-
 steps:
   - name: build
     image: mcr.microsoft.com/dotnet/sdk:6.0
     commands:
-      - cd Sources/HeartTrack/
+      - cd Sources/HeartTrack
       - dotnet restore HeartTrack.sln
       - dotnet build HeartTrack.sln -c Release --no-restore
-      - dotnet publish HeartTrack.sln -c Release --no-restore -o CI_PROJECT_DIR/build/release
-
-  - name: tests
-    image: mcr.microsoft.com/dotnet/sdk:6.0
-    commands:
-      - cd Sources/HeartTrack/
-      - dotnet restore HeartTrack.sln
-      - dotnet test HeartTrack.sln --no-restore 
-    depends_on: [build]
-
-  - name: code-analysis
-    image: hub.codefirst.iut.uca.fr/marc.chevaldonne/codefirst-dronesonarplugin-dotnet8
-    secrets: [ SECRET_SONAR_LOGIN ]
-    settings:
-      sonar_host: https://codefirst.iut.uca.fr/sonar/
-      sonar_token:
-        from_secret: SECRET_SONAR_LOGIN
-      project_key: HeartTrack-API
-      coverage_exclusions: Tests/**, StubbedContextLib/**, StubAPI/**
-      duplication_exclusions: Tests/**, StubbedContextLib/**
-    commands:
-      - cd Sources/HeartTrack/
-      - dotnet restore HeartTrack.sln
-      - dotnet sonarscanner begin /k:HeartTrack-API /d:sonar.host.url=$${PLUGIN_SONAR_HOST} /d:sonar.login=$${PLUGIN_SONAR_TOKEN} /d:sonar.coverage.exclusions="Tests/**, StubbedContextLib/**, StubAPI/**, HeartTrackAPI/Utils/**" /d:sonar.cpd.exclusions="Tests/**, StubbedContextLib/**, StubAPI/**" /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml"
-      - dotnet build HeartTrack.sln -c Release --no-restore
-      - dotnet test HeartTrack.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 HeartTrack.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release
-      - dotnet sonarscanner end /d:sonar.login=$${PLUGIN_SONAR_TOKEN}
-    depends_on: [ tests ]
-
----   
-
-
-kind: pipeline
-type: docker
-name: HeartTrack-Admin-CD
-
-trigger:
-  event:
-    - push
-steps: 
-
-  - name: docker-build-and-push
-    image: plugins/docker
-    settings:
-       dockerfile: Sources/HeartTrack/Dockerfile
-       context: Sources/HeartTrack/
-       registry: hub.codefirst.iut.uca.fr
-       repo: hub.codefirst.iut.uca.fr/david.d_almeida/admin
-       username:
-         from_secret: SECRET_REGISTRY_USERNAME
-       password:
-         from_secret: SECRET_REGISTRY_PASSWORD
-    
-  # database container admin
-  - name: deploy-container-admin
-    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    environment:
-        CODEFIRST_CLIENTDRONE_ENV_TYPE: ADMIN
-        IMAGENAME: hub.codefirst.iut.uca.fr/david.d_almeida/admin:latest
-        CONTAINERNAME: heart_track_admin
-        COMMAND: create
-        ADMINS: davidd_almeida,kevinmonteiro,antoineperederii,paullevrault,antoinepinagot,nicolasraymond,marcchevaldonne
-        OVERWRITE: true
-    depends_on: [ docker-build-and-push ]

Sources/HeartTrack/Dockerfile

@@ -1,20 +0,0 @@
-# Utiliser l'image SDK .NET pour construire l'application
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /app
-
-# Copier les fichiers du projet et restaurer les dépendances
-COPY *.csproj .
-RUN dotnet restore
-
-# Copier tout le reste et construire l'application
-COPY . .
-RUN dotnet publish -c Release -o out
-
-# Utiliser l'image runtime .NET pour exécuter l'application
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
-WORKDIR /app
-COPY --from=build /app/out .
-
-EXPOSE 8080
-
-ENTRYPOINT ["dotnet", "HeartTrack.dll"]

Sources/HeartTrack/HeartTrack.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.1" />
     <PackageReference Include="MudBlazor" Version="6.12.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
   </ItemGroup>
 
   <ItemGroup>

Sources/HeartTrack/HeartTrack.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188

Sources/HeartTrack/Models/Activity/Activity.cs

@@ -4,9 +4,9 @@
     {
         public int IdActivity { get; set; }
         public string Type { get; set; }
-        public DateOnly Date { get; set; }
+        public DateTime Date { get; set; }
-        public DateOnly StartTime { get; set; }
+        public DateTime StartTime { get; set; }
-        public DateOnly EndTime { get; set; }
+        public DateTime EndTime { get; set; }
         public int EffortRessenti { get; set; }
         public float Variability { get; set; }
         public float Variance { get; set; }

Sources/HeartTrack/Models/Report/Message.cs

@@ -0,0 +1,9 @@
+namespace HeartTrack.Models
+{
+    public class Message
+    {
+        public DateTime Id { get; set; }
+        public string Username { get; set; }
+        public string Texte { get; set; }
+    }
+}

Sources/HeartTrack/Models/Report/Report.cs

@@ -9,6 +9,6 @@ namespace HeartTrack.Models
         public string ReportedUser { get; set; }
         public string Raison { get; set; }
         public string Description { get; set; }
-        public Image Image { get; set; }
+        public List<Message> Messages { get; set; }
     }
 }

Sources/HeartTrack/Models/Report/ReportModel.cs

@@ -1,25 +0,0 @@
-using Blazorise;
-using System.ComponentModel.DataAnnotations;
-
-namespace HeartTrack.Models
-{
-    public class ReportModel
-    {
-        [Required]
-        [Range(0, 2500000)]
-        public int Id { get; set; }
-        [Required]
-        [StringLength(50)]
-        public string Username { get; set; }
-        [Required]
-        [StringLength(50)]
-        public string ReportedUser { get; set; }
-        [Required]
-        [StringLength(150)]
-        public string Raison { get; set; }
-        [Required]
-        [StringLength(500)]
-        public string Description { get; set; }
-        public Image Image { get; set; }
-    }
-}

Sources/HeartTrack/Models/Ticket/TicketModel.cs

@@ -7,7 +7,7 @@ namespace HeartTrack.Models
     public class TicketModel
     {
         [Required]
-        [Range(0, 2500000)]
+        [Range(0, 121425711425541)]
         public int Id { get; set; }
 
         [Required]

Sources/HeartTrack/Models/User/UserModel.cs

@@ -6,7 +6,7 @@ namespace HeartTrack.Models
     public class UserModel
     {
         [Required]
-        [Range(0,2500000)]
+        [Range(0,121425711425541)]
         public int Id { get; set; }
 
         [Required]

Sources/HeartTrack/Pages/Activities.razor

@@ -13,8 +13,6 @@
           Data="@activities"
           ReadData="@OnReadData"
           TotalItems="@totalActivity"
-          PageSize="10"
-          ShowPager
           Responsive>
     <DataGridColumn TItem="Activity" Field="@nameof(Activity.IdActivity)" Caption="Id" />
     <DataGridColumn TItem="Activity" Field="@nameof(Activity.Type)" Caption="Type" />

Sources/HeartTrack/Pages/Report.razor

@@ -0,0 +1,3 @@
+@page "/reports"
+
+<h3>Report</h3>

Sources/HeartTrack/Pages/Report.razor.cs

@@ -0,0 +1,7 @@
+namespace HeartTrack.Pages
+{
+    public partial class Report
+    {
+
+    }
+}

Sources/HeartTrack/Services/ActivityDataService/ActivityDataServiceFactice.cs

@@ -29,6 +29,7 @@ namespace HeartTrack.Services.ActivityDataServiceFactice
 
             this.EmplacementLocalStorage = "activitiesData";
             this.EmplacementJson = $"{_navigationManager.BaseUri}data/fake-activities.json";
+            Console.WriteLine($"{_navigationManager.BaseUri}data/fake-activities.json");
         }
 
         public async Task AddActivity(Activity a)

Sources/HeartTrack/Shared/CultureSelector.razor.cs

@@ -33,10 +33,5 @@ namespace HeartTrack.Shared
                 this.NavigationManager.NavigateTo("/Culture/SetCulture" + query, forceLoad: true);
             }
         }
-
-        public int getSizeCultures()
-        {
-            return supportedCultures.Length;
-        }
     }
 }

Sources/HeartTrack/Shared/MainLayout.razor.cs

@@ -13,14 +13,13 @@ namespace HeartTrack.Shared
 
         private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
 
-        public void ToggleNavMenu()
+        private void ToggleNavMenu()
         {
             collapseNavMenu = !collapseNavMenu;
         }
-
+        private void ToggleProfilMenu()
-        public bool getCollapseNavMenu()
         {
-            return this.collapseNavMenu;
+
         }
     }
 }

Sources/HeartTrack/Tests/Controller/CultureControllerTests.cs

@@ -1,25 +0,0 @@
-using HeartTrack.Controllers;
-using Microsoft.AspNetCore.Mvc;
-using Xunit;
-
-namespace HeartTrack.Tests.Controller
-{
-    public class CultureControllerTests
-    {
-        [Fact]
-        public void IsCultureControllerInstanceOfCultureController()
-        {
-            var culture = new CultureController();
-
-            Assert.IsType<CultureController>(culture);
-        }
-
-        [Fact]
-        public void IsSetCultureRedirecting()
-        {
-            var culture = new CultureController();
-
-            Assert.IsAssignableFrom<IActionResult>(culture.SetCulture("",""));
-        }
-    }
-}

Sources/HeartTrack/Tests/Models/ActivityTests.cs

@@ -1,37 +0,0 @@
-using HeartTrack.Models;
-using Xunit;
-
-namespace HeartTrack.Tests.Models
-{
-    public class ActivityTests
-    {
-        [Fact]
-        public void IsActivityInstanceOfActivity()
-        {
-            var activity = new Activity();
-            Assert.IsType<Activity>(activity);
-        }
-
-        [Fact]
-        public void HasActivityAttrivutesRightInstance()
-        {
-            var activity = new Activity();
-
-            Assert.IsType<int>(activity.IdActivity);
-            Assert.IsType<string>(activity.Type);
-            Assert.IsType<DateOnly>(activity.Date);
-            Assert.IsType<DateOnly>(activity.StartTime);
-            Assert.IsType<DateOnly>(activity.EndTime);
-            Assert.IsType<int>(activity.EffortRessenti);
-            Assert.IsType<float>(activity.Variability);
-            Assert.IsType<float>(activity.Variance);
-            Assert.IsType<float>(activity.StandardDeviation);
-            Assert.IsType<float>(activity.Average);
-            Assert.IsType<int>(activity.Maximum);
-            Assert.IsType<int>(activity.Minimum);
-            Assert.IsType<float>(activity.AvrTemperature);
-            Assert.IsType<bool>(activity.HasAutoPause);
-
-        }
-    }
-}

Sources/HeartTrack/Tests/Models/ReportTests.cs

@@ -1,42 +0,0 @@
-using Blazorise;
-using HeartTrack.Models;
-using Xunit;
-
-namespace HeartTrack.Tests.Models
-{
-    public class ReportTests
-    {
-        [Fact]
-        public void IsReportInstanceOfReport()
-        {
-            var report = new Report();
-
-            Assert.IsType<Report>(report);
-        }
-
-        [Fact]
-        public void HasReportAttributeRightInstace() 
-        {
-            var report = new Report();
-
-            Assert.IsType<int>(report.Id);
-            Assert.IsType<string>(report.Username);
-            Assert.IsType<string>(report.ReportedUser);
-            Assert.IsType<string>(report.Raison);
-            Assert.IsType<string>(report.Description);
-            Assert.IsType<Image>(report.Image);
-        }
-
-        [Fact]
-        public void IsReportModelValidate()
-        {
-            var report = new ReportModel();
-
-            Assert.True(report.Id < 2500000);
-            Assert.True(report.Username.Length < 50 && report.Username.Length>0);
-            Assert.True(report.ReportedUser.Length < 50 && report.ReportedUser.Length > 0);
-            Assert.True(report.Raison.Length < 150 && report.Raison.Length > 0);
-            Assert.True(report.Description.Length < 500 && report.Description.Length > 0);
-        }
-    }
-}

Sources/HeartTrack/Tests/Models/TicketTests.cs

@@ -1,40 +0,0 @@
-using HeartTrack.Models;
-using Xunit;
-
-namespace HeartTrack.Tests.Models
-{
-    public class TicketTests
-    {
-        [Fact]
-        public void IsTicketInstanceOfTicket()
-        {
-            var ticket = new Ticket();
-
-            Assert.IsType<Ticket>(ticket);
-        }
-
-        [Fact]
-        public void HasTicketAttributeRightInstance() 
-        { 
-            var ticket = new Ticket();
-
-            Assert.IsType<int>(ticket.Id);
-            Assert.IsType<string>(ticket.Username);
-            Assert.IsType<string>(ticket.Contexte);
-            Assert.IsType<string>(ticket.Description);
-            Assert.IsType<Boolean>(ticket.isCheck);
-        }
-
-        [Fact]
-        public void IsTicketModelValidate()
-        {
-            var ticket = new TicketModel();
-
-            Assert.True(ticket.Id < 2500000);
-            Assert.True(ticket.Username.Length > 0 && ticket.Username.Length < 50);
-            Assert.True(ticket.Contexte.Length > 0 && ticket.Contexte.Length < 25);
-            Assert.True(ticket.Description.Length > 0 && ticket.Description.Length < 500);
-            Assert.True(ticket.isCheck);
-        }
-    }
-}

Sources/HeartTrack/Tests/Models/UserTests.cs

@@ -1,52 +0,0 @@
-using Xunit;
-using HeartTrack.Models;
-
-namespace HeartTrack.Tests.Models
-{
-    public class UserTests
-    {
-        [Fact]
-        public void IsUserInstanceOfUser()
-        {
-            var user = new User();
-
-            Assert.IsType<User>(user);
-        }
-
-        [Fact]
-        public void HasUserAttributeRightInstance() 
-        {
-            var user = new User();
-
-            Assert.IsType<int>(user.Id);
-            Assert.IsType<string>(user.Username);
-            Assert.IsType<string>(user.Nom);
-            Assert.IsType<string>(user.Prenom);
-            Assert.IsType<string>(user.Email);
-            Assert.IsType<string>(user.Password);
-            Assert.IsType<string>(user.Sexe);
-            Assert.IsType<float>(user.Taille);
-            Assert.IsType<float>(user.Poids);
-            Assert.IsType<DateTime>(user.BirthDate);
-            Assert.IsType<Boolean>(user.isBan);
-        }
-
-        [Fact]
-        public void IsUserModelValidate()
-        {
-            var user = new UserModel();
-
-            Assert.NotNull(user.Username);
-            Assert.NotNull(user.FirstName);
-            Assert.NotNull(user.LastName);
-            Assert.NotNull(user.Email);
-            Assert.NotNull(user.Password);
-            Assert.NotNull(user.Sexe);
-
-            Assert.True(user.Id<2500000);
-            Assert.True(user.Username.Length >= 0 && user.Username.Length < 50);
-            Assert.True(user.FirstName.Length >= 0 && user.FirstName.Length < 50);
-            Assert.True(user.LastName.Length >= 0 && user.LastName.Length < 25);
-        }
-    }
-}

Sources/HeartTrack/Tests/Shared/CultureSelectorTests.cs

@@ -1,24 +0,0 @@
-using HeartTrack.Shared;
-using Xunit;
-
-namespace HeartTrack.Tests.Shared
-{
-    public class CultureSelectorTests
-    {
-        [Fact]
-        public void IsCultureSelectorInstanceOfCultureSelector()
-        {
-            var culture = new CultureSelector();
-
-            Assert.IsType<CultureSelector>(culture);
-        }
-
-        [Fact]
-        public void HasCultureEnoughLanguages()
-        {
-            var culture = new CultureSelector();
-
-            Assert.Equal(2, culture.getSizeCultures());
-        }
-    }
-}

Sources/HeartTrack/Tests/Shared/MainLayoutTests.cs

@@ -1,25 +0,0 @@
-using HeartTrack.Shared;
-using Xunit;
-
-namespace HeartTrack.Tests.Shared
-{
-    public class MainLayoutTests
-    {
-        [Fact]
-        public void IsMainLayoutInstanceOfMainLayout()
-        {
-            var main = new MainLayout();
-
-            Assert.IsType<MainLayout>(main);
-        }
-
-        [Fact]
-        public void StateChangeOnToggleNavMenu()
-        {
-            var main = new MainLayout();
-            Assert.True(main.getCollapseNavMenu());
-            main.ToggleNavMenu();
-            Assert.False(main.getCollapseNavMenu());
-        }
-    }
-}