Model Optimization

Models/Agent.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+
+
+namespace PoliceOp.Models
+{
+    public class Agent : Personne
+    {
+
+        /// <summary>
+        /// Propriétés relatives à l'agent
+        /// </summary>
+
+        [Required]
+        public string Matricule { get; set; }
+
+        [Required]
+        public string Grade { get; set; }
+
+        [Required]
+        public string Corps { get; set; }
+
+        [Required]
+        public string PasswordHash { get; set; }
+
+
+    }
+}

Models/Audiences.cs

@@ -0,0 +1,9 @@
+namespace PoliceOp.Models
+{
+    public enum Audiences
+    {
+        TerminalMobile,
+        TerminalDesktop,
+        PoliceOpAPI
+    }
+}

Models/AvisRecherche.cs

@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace PoliceOp.Models
+{
+    public class AvisRecherche
+    {
+        [Key]
+        public Guid UID { get; set; }
+
+        [Required]
+        public DateTime DateEmission { get; set; }
+
+        [Required]
+        public string StatutRecherche { get; set; }
+
+        public string Informations { get; set; }
+
+        public virtual Personne PersonneRecherchee { get; set; }
+    }
+}

Models/Biometrie.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+
+namespace PoliceOp.Models
+{
+    public class Biometrie
+    {
+        [Key]
+        public Guid UID { get; set; }
+
+        public virtual byte[] DonneesFaciales { get; set; }
+
+        public virtual byte[] DonneesDigitales { get; set; }
+
+        public bool Comparer()
+        {
+            return true;
+        }
+
+    }
+}

Models/CaptPhoto.cs

@@ -0,0 +1,7 @@
+namespace PoliceOp.Models
+{
+    public enum CaptPhoto
+    {
+        EliteCap1, EliteCap2, EliteCap3, EliteCap4
+    }
+}

Models/Diffusion.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace PoliceOp.Models
+{
+    public class Diffusion
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int DiffusionId { get; set; }
+
+        [ForeignKey("PersonneId")]
+        public int AuthorId { get; set; }
+
+        public string Sujet { get; set; }
+
+        [Required]
+        public string Details { get; set; }
+
+        public string Cible { get; set; } = "Agents";
+
+        public DateTime DateDiffusion { get; set; }
+
+        public virtual ICollection<PieceJointe> PiecesJointes { get; set; }
+    }
+}

Models/Issuers.cs

@@ -0,0 +1,9 @@
+namespace PoliceOp.Models
+{
+    public enum Issuers
+    {
+        FastlaneApp,
+        OpCenterApp,
+        PoliceOpAPI
+    }
+}

Models/Operateur.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace PoliceOp.Models
+{
+    public class Operateur : Agent
+    {
+        [Required]
+        public string Service { get; set; }
+
+    }
+}

Models/Personne.cs

@@ -0,0 +1,78 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace PoliceOp.Models
+{
+    public class Personne
+    {
+        [Key]
+        public int PersonneId { get; set; }
+
+        [Required]
+        public string UID { get; set; }
+
+        [Required]
+        public string NPI { get; set; }
+
+        [Required]
+        public string IFU { get; set; }
+
+        [Required]
+        public string Nom { get; set; }
+
+        [Required]
+        public string Prenom { get; set; }
+
+        [Required]
+        [DataType(DataType.Date)]
+        public DateTime DateNaissance { get; set; }
+
+        [Required]
+        public string Telephone { get; set; }
+
+        [Required]
+        public string Sexe { get; set; }
+
+        [Required]
+        public string LieuNaissance { get; set; }
+
+        [Required]
+        public string Nationalite { get; set; }
+
+        [Required]
+        public string Profession { get; set; }
+
+        [Required]
+        public string SituationMatrimoniale { get; set; }
+
+        [Required]
+        public string SignesParticuliers { get; set; }
+
+        [Required]
+        public string CouleurYeux { get; set; }
+
+        [Required]
+        public string CouleurCheveux { get; set; }
+
+        [Required]
+        public string Teint { get; set; }
+
+        [Required]
+        public double Taille { get; set; }
+
+        [Required]
+        public string PersonnePhoto { get; set; }
+
+        public virtual Biometrie Biometrie { get; set; }
+
+        [Required]
+        public virtual Residence Residence { get; set; }
+
+        [Required]
+        public int PereId { get; set; }
+
+        [Required]
+        public int MereId { get; set; }
+    }
+
+}

Models/PhotoEnum.cs

@@ -0,0 +1,13 @@
+namespace PoliceOp.Models
+{
+    public enum PhotoEnum
+    {
+        Homme1,
+        Homme2,
+        Homme3,
+        Femme1,
+        Femme2,
+        Femme3
+    }
+
+}

Models/PieceJointe.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace PoliceOp.Models
+{
+    public class PieceJointe
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public Guid PieceJointeId { get; set; }
+
+        [Required]
+        public string NomFichier { get; set; }
+
+        [Required]
+        public string ExtensionFichier { get; set; }
+
+        [Required]
+        public byte[] Fichier { get; set; }
+    }
+}

Models/Requete.cs

@@ -0,0 +1,17 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace PoliceOp.Models
+{
+    public class Requete
+    {
+        [Key]
+        public Guid UID { get; set; }
+
+        [Required]
+        public string TermeRequete { get; set; }
+
+        public DateTime DateRequete { get; set; } = DateTime.Now;
+
+    }
+}

Models/Residence.cs

@@ -0,0 +1,38 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+
+namespace PoliceOp.Models
+{
+    [ComplexType]
+    public class Residence
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public Guid ResidenceId { get; set; }
+
+        [Required]
+        public string Type { get; set; }
+
+        public string Rue { get; set; }
+
+        public string NumeroParcelle { get; set; }
+
+        public string NumeroChambre { get; set; }
+
+        public virtual string CoordonneesGeo { get; set; }
+
+        public string Description { get; set; }
+
+        [ForeignKey("PersonneId")]
+        public virtual Personne Proprietaire { get; set; }
+
+        [NotMapped]
+        public string AdresseComplete
+        {
+            get { return $"{NumeroParcelle} Rue {Rue}, C{NumeroChambre}"; }
+        }
+
+    }
+}

Models/Session.cs

@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace PoliceOp.Models
+{
+    public class Session
+    {
+        [Key]
+        public Guid SessionID { get; set; }
+
+        public override string ToString()
+        {
+            return SessionID.ToString();
+        }
+    }
+}

Models/SessionVM.cs

@@ -0,0 +1,8 @@
+namespace PoliceOp.Models
+{
+    public class SessionVM
+    {
+        public string SessionID { get; set; }
+        public int AgentID { get; set; }
+    }
+}

Models/Sexe.cs

@@ -0,0 +1,8 @@
+namespace PoliceOp.Models
+{
+    public enum Sexe
+    {
+        M,
+        F
+    }
+}

PoliceOp.API/Controllers/AvisRechercheController.cs

@@ -59,6 +59,8 @@ public async Task<ActionResult<AvisRecherche>> GetAvisRecherche(Guid id)
                     return NotFound();
                 }
 
+                avisRecherche.PersonneRecherchee = await _context.Personnes.FindAsync(avisRecherche.PersonneRechercheeId);
+
                 return avisRecherche;
 
             }
@@ -67,8 +69,6 @@ public async Task<ActionResult<AvisRecherche>> GetAvisRecherche(Guid id)
         }
 
         // PUT: api/AvisRecherche/5
-        // To protect from overposting attacks, enable the specific properties you want to bind to, for
-        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
         [HttpPut("{id}")]
         public async Task<IActionResult> PutAvisRecherche(Guid id, AvisRecherche avisRecherche)
         {
@@ -106,17 +106,17 @@ public async Task<IActionResult> PutAvisRecherche(Guid id, AvisRecherche avisRec
         }
 
         // POST: api/AvisRecherche
-        // To protect from overposting attacks, enable the specific properties you want to bind to, for
-        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
         [HttpPost]
         public async Task<ActionResult<AvisRecherche>> PostAvisRecherche(AvisRecherche avisRecherche)
         {
             if (await SessionExists(HttpContext))
             {
+                //Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(avisRecherche.PersonneRecherchee));
+
                 _context.AvisRecherches.Add(avisRecherche);
                 await _context.SaveChangesAsync();
 
-                return CreatedAtAction("GetAvisRecherche", new { id = avisRecherche.UID }, avisRecherche);
+                return Ok();
             }
 
             return Unauthorized("Session ID is Required");