Added Logging

ergen35 · Jun 23, 2021 · 760d998 · 760d998
1 parent d62b19a
commit 760d998
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 51 deletions.
diff --git a/PoliceOp.API/Controllers/AgentsController.cs b/PoliceOp.API/Controllers/AgentsController.cs
@@ -4,8 +4,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using PoliceOp.API.Data;
 using PoliceOp.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -21,12 +23,13 @@ public class AgentsController : ControllerBase
         private readonly PoliceOpAPIContext _context;
         private readonly IConfiguration configuration;
         private readonly Services.JWTServices jWTService;
+        private readonly ILogger<AgentsController> logger;
 
-
-        public AgentsController(PoliceOpAPIContext context, IConfiguration configuration)
+        public AgentsController(PoliceOpAPIContext context, IConfiguration configuration, ILogger<AgentsController> logger)
         {
             _context = context;
             this.configuration = configuration;
+            this.logger = logger;
             jWTService = new Services.JWTServices(this.configuration);
         }
 
@@ -55,9 +58,13 @@ public async Task<ActionResult<IEnumerable<Agent>>> GetAgents()
                     return NotFound();
                 }
 
+
                 await _context.Entry(agent).Reference(a => a.Residence).LoadAsync();
                 await _context.Entry(agent).Reference(a => a.Biometrie).LoadAsync();
 
+
+                logger.LogInformation($"Agent @{agent.Matricule} Connecté ::{HttpContext.Connection.RemotePort}, {DateTime.Now.ToShortDateString()}");
+
                 return agent;
             }
 

diff --git a/PoliceOp.API/Controllers/AvisRechercheController.cs b/PoliceOp.API/Controllers/AvisRechercheController.cs
@@ -38,7 +38,7 @@ public async Task<ActionResult<IEnumerable<AvisRecherche>>> GetAvisRecherches()
 
                 foreach (var item in liar)
                 {
-                    await _context.Entry(item).Reference(r => r.PersonneRecherchee).LoadAsync();
+                    item.PersonneRecherchee = await _context.Personnes.FindAsync(item.PersonneRechercheeId);
                 }
                 return liar;
             }

diff --git a/PoliceOp.API/Controllers/ZeroController.cs b/PoliceOp.API/Controllers/ZeroController.cs
@@ -31,18 +31,18 @@ public async Task<IActionResult> GetToken()
         {
             var token = jWTService.TokenizeID("89898598", "77a8zeea87", "Session", Models.Issuers.PoliceOpAPI, Models.Audiences.TerminalDesktop);
 
-            await GenerateData(1500, 450);
+            //await GenerateData(1500, 450, 22);
 
-            await ctx.SaveChangesAsync();
+            //await ctx.SaveChangesAsync();
             //EraseData();
-            Console.WriteLine("Done!");
+            //Console.WriteLine("Done!");
 
             int totalA = ctx.Agents.Count();
             int totalP = ctx.Personnes.Count();
 
             //return NoContent();
 
-            List<Models.Agent> LA = ctx.Agents.Take(2).AsEnumerable().ToList();
+            List<Models.Agent> LA = ctx.Agents.Skip(Faker.RandomNumber.Next(1, 400)).Take(2).AsEnumerable().ToList();
 
             return Json(new { token = token, totalAgents = totalA, totalPersonnes = totalP, Agebtx2 = LA });
         }
@@ -103,7 +103,7 @@ public ActionResult<string> Post([FromHeader] String value)
 
         }
 
-        public async Task GenerateData(long totalPersonnes, long totalAgents)
+        public async Task GenerateData(long totalPersonnes, long totalAgents, int totalAvis)
         {
             DataGenerator generator = new DataGenerator();
 
@@ -125,9 +125,19 @@ public async Task GenerateData(long totalPersonnes, long totalAgents)
                 Console.Write("|");
             }
 
-            Console.WriteLine("Fin Agents");
+            Console.WriteLine("Fin Agents\n");
 
 
+            Console.Write("[");
+            for (int i = 0; i < totalAvis; i++)
+            {
+                await ctx.AvisRecherches.AddAsync(await generator.GenerateAvis());
+
+                Console.Write("|");
+            }
+
+            Console.WriteLine("Fin Avis");
+
             ctx.SaveChanges();
 
         }

diff --git a/PoliceOp.API/DataGenerator.cs b/PoliceOp.API/DataGenerator.cs
@@ -92,5 +92,18 @@ public async Task<Agent> GenerateAgent()
 
             return A;
         }
+
+        public async Task<AvisRecherche> GenerateAvis()
+        {
+            AvisRecherche avis = new AvisRecherche()
+            {
+                DateEmission = Faker.Identification.DateOfBirth(),
+                Informations = Faker.Lorem.Sentence(5),
+                PersonneRechercheeId = Faker.RandomNumber.Next(1, 1400),
+                StatutRecherche = "Actif"
+            };
+
+            return avis;
+        }
     }
 }
diff --git a/PoliceOp.API/Migrations/20210623170714_InitialMigration001.cs b/PoliceOp.API/Migrations/20210623170714_InitialMigration001.cs
@@ -1,5 +1,5 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
 
 namespace PoliceOp.API.Migrations
 {

diff --git a/PoliceOp.API/PoliceOp.API.csproj b/PoliceOp.API/PoliceOp.API.csproj
@@ -23,6 +23,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.15" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.15" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration" Version="3.1.5" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="3.1.5" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="3.1.5" />

diff --git a/PoliceOp.API/Program.cs b/PoliceOp.API/Program.cs
@@ -5,6 +5,7 @@ namespace PoliceOp.API
 {
     public class Program
     {
+
         public static void Main(string[] args)
         {
             CreateHostBuilder(args).Build().Run();
@@ -17,6 +18,5 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
                     webBuilder.UseStartup<Startup>();
 
                 });
-
     }
 }
diff --git a/PoliceOp.API/Startup.cs b/PoliceOp.API/Startup.cs
@@ -33,6 +33,7 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();

diff --git a/PoliceOp.Models/Agent.cs b/PoliceOp.Models/Agent.cs
@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 
 
 namespace PoliceOp.Models

diff --git a/PoliceOp.Models/AvisRecherche.cs b/PoliceOp.Models/AvisRecherche.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.Design;
 
 namespace PoliceOp.Models
 {

diff --git a/PoliceOp.Models/Personne.cs b/PoliceOp.Models/Personne.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace PoliceOp.Models
 {

diff --git a/PoliceOp.OpCenter/Dialogs/NewWantedNoticeDialog.xaml.cs b/PoliceOp.OpCenter/Dialogs/NewWantedNoticeDialog.xaml.cs
@@ -1,13 +1,8 @@
-using System;
+using RestSharp;
+using RestSharp.Authenticators;
+using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using RestSharp;
-using RestSharp.Authenticators;
 
 namespace PoliceOp.OpCenter.Dialogs
 {
@@ -27,17 +22,17 @@ public NewWantedNoticeDialog()
 
         private async void DetailsBtn_Click(object sender, RoutedEventArgs e)
         {
-           
+
         }
 
         private async void SendAvisBtn_Click(object sender, RoutedEventArgs e)
         {
-            this.SendAvisBtn.IsEnabled = false;
+            SendAvisBtn.IsEnabled = false;
 
-            if (this.PersonnesListView.SelectedIndex < 0 || this.StatutCbbx.SelectedIndex < 0)
+            if (PersonnesListView.SelectedIndex < 0 || StatutCbbx.SelectedIndex < 0)
             {
                 MessageBox.Show("Veuillez Renseigner tous les champs néccessaires");
-                this.SendAvisBtn.IsEnabled = false;
+                SendAvisBtn.IsEnabled = false;
                 return;
             }
 
@@ -46,8 +41,8 @@ private async void SendAvisBtn_Click(object sender, RoutedEventArgs e)
             Models.AvisRecherche avis = new Models.AvisRecherche()
             {
                 DateEmission = DateTime.Now,
-                Informations = this.InfosTxtb.Text,
-                PersonneRecherchee = (this.PersonnesListView.SelectedItem as Models.Personne),
+                Informations = InfosTxtb.Text,
+                PersonneRechercheeId = (PersonnesListView.SelectedItem as Models.Personne).PersonneId,
                 StatutRecherche = StatutCbbx.SelectedItem.ToString(),
             };
 
@@ -67,7 +62,7 @@ private async void SendAvisBtn_Click(object sender, RoutedEventArgs e)
             else
             {
                 AppLevel.NotificationManagers.ShowNotification(response.ResponseStatus.ToString(), "Info", AppLevel.NotificationLevel.Error);
-                this.SendAvisBtn.IsEnabled = true;
+                SendAvisBtn.IsEnabled = true;
             }
 
             LoadingInd.Visibility = Visibility.Collapsed;

diff --git a/PoliceOp.OpCenter/MainWindow.xaml.cs b/PoliceOp.OpCenter/MainWindow.xaml.cs
@@ -1,6 +1,4 @@
 using ControlzEx.Theming;
-using Enterwell.Clients.Wpf.Notifications;
-using LazyCache;
 using PoliceOp.OpCenter.Services;
 using RestSharp;
 using System;
@@ -197,9 +195,9 @@ private async void SideMenu_ItemSelected(object sender, RoutedEventArgs e)
                 DrawerLeft.IsOpen = false;
                 LoadingIndicator.Visibility = Visibility.Visible;
                 await System.Threading.Tasks.Task.Delay(new TimeSpan(0, 0, 5));
-                
+
                 ContentFrame.Navigate(new Pages.NoticesListPage());
-                
+
                 LoadingIndicator.Visibility = Visibility.Collapsed;
             }
 
@@ -230,7 +228,7 @@ private async void SideMenu_ItemSelected(object sender, RoutedEventArgs e)
 
                 LoadingIndicator.Visibility = Visibility.Collapsed;
             }
-           
+
             if (((sender as HandyControl.Controls.SideMenuItem).Header as string).ToLower().Contains("diffusions"))
             {
                 DrawerLeft.IsOpen = false;
@@ -241,7 +239,7 @@ private async void SideMenu_ItemSelected(object sender, RoutedEventArgs e)
 
                 LoadingIndicator.Visibility = Visibility.Collapsed;
             }
-            
+
             if (((sender as HandyControl.Controls.SideMenuItem).Header as string).ToLower().Contains("admin"))
             {
                 DrawerLeft.IsOpen = false;
@@ -252,7 +250,7 @@ private async void SideMenu_ItemSelected(object sender, RoutedEventArgs e)
 
                 LoadingIndicator.Visibility = Visibility.Collapsed;
             }
-            
+
             if (((sender as HandyControl.Controls.SideMenuItem).Header as string).ToLower().Contains("center"))
             {
                 DrawerLeft.IsOpen = false;

diff --git a/PoliceOp.OpCenter/Pages/AgentsManagementPage.xaml.cs b/PoliceOp.OpCenter/Pages/AgentsManagementPage.xaml.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Windows.Controls;
+using RestSharp;
+using RestSharp.Authenticators;
+using System;
 using System.Collections.Generic;
 using System.Windows;
-using System.Linq;
-using RestSharp;
-using RestSharp.Authenticators;
+using System.Windows.Controls;
 
 namespace PoliceOp.OpCenter.Pages
 {
@@ -20,7 +19,7 @@ public partial class AgentsManagementPage : Page
         public AgentsManagementPage()
         {
             AList = new List<Models.Agent>();
-            
+
             InitializeComponent();
 
             Loaded += AgentsManagementPage_Loaded;
@@ -73,7 +72,7 @@ private async void SearchWdgt_SearchStarted(object sender, HandyControl.Data.Fun
 
             SearchLoadingLine.Visibility = Visibility.Collapsed;
         }
-        
- 
+
+
     }
 }
diff --git a/PoliceOp.OpCenter/Pages/NoticesListPage.xaml.cs b/PoliceOp.OpCenter/Pages/NoticesListPage.xaml.cs
@@ -1,6 +1,6 @@
-using System;
-using RestSharp;
+using RestSharp;
 using RestSharp.Authenticators;
+using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
 
@@ -99,7 +99,7 @@ private async void FetchData()
             if (response.IsSuccessful)
             {
                 ListWanted = response.Data;
-                this.WantedListView.ItemsSource = ListWanted;
+                WantedListView.ItemsSource = ListWanted;
             }
             else
             {

diff --git a/PoliceOp.OpCenter/Pages/SearchPage.xaml.cs b/PoliceOp.OpCenter/Pages/SearchPage.xaml.cs
@@ -2,7 +2,6 @@
 using RestSharp.Authenticators;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 

diff --git a/PoliceOp.OpCenter/Resources/images/Wanted.jpeg b/PoliceOp.OpCenter/Resources/images/Wanted.jpeg