Reformat Data Model 0.3

CervantesSec · Jul 24, 2022 · b45d733 · b45d733
1 parent 3ba45e8
commit b45d733
Show file tree

Hide file tree

Showing 106 changed files with 1,851 additions and 4,816 deletions.
diff --git a/Cervantes.Application/Cervantes.Application.csproj b/Cervantes.Application/Cervantes.Application.csproj
@@ -5,8 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DinkToPdf" Version="1.0.8" />
-        <PackageReference Include="RazorLight" Version="2.0.0" />
+        <PackageReference Include="RazorLight" Version="2.1.0" />
         <PackageReference Include="RazorLight.NetCore3" Version="3.0.2" />
     </ItemGroup>
 

diff --git a/Cervantes.Application/GenericManager.cs b/Cervantes.Application/GenericManager.cs
@@ -39,6 +39,12 @@ public T Add(T entity)
         return entity;
     }
 
+    public T Update(T entity)
+    {
+        Context.Set<T>().Update(entity);
+        return entity;
+    }
+
     /// <summary>
     /// Add entity to data context async
     /// </summary>
@@ -76,7 +82,7 @@ public T GetById(object[] key)
     /// </summary>
     /// <param name="id">id</param>
     /// <returns>Entity</returns>
-    public T GetById(int id)
+    public T GetById(Guid id)
     {
         return GetById(new object[] {id});
     }
@@ -89,4 +95,6 @@ public IQueryable<T> GetAll()
     {
         return Context.Set<T>();
     }
+
+
 }
diff --git a/Cervantes.Application/PDFManager.cs b/Cervantes.Application/PDFManager.cs
diff --git a/Cervantes.Application/ProjectUserManager.cs b/Cervantes.Application/ProjectUserManager.cs
@@ -18,8 +18,8 @@ public ProjectUserManager(IApplicationDbContext context) : base(context)
     {
     }
 
-    public ProjectUser VerifyUser(int project,string user)
+    public ProjectUser VerifyUser(Guid project,string user)
     {
-        return Context.Set<ProjectUser>().Where(x => x.ProjectId == project && x.UserId == user).FirstOrDefault();
+        return Context.Set<ProjectUser>().Where(x => x.ProjectId == project&& x.UserId == user).FirstOrDefault();
     }
 }
diff --git a/Cervantes.Application/TaskTargetManager.cs b/Cervantes.Application/TaskTargetManager.cs
@@ -0,0 +1,16 @@
+using Cervantes.Contracts;
+using Cervantes.CORE;
+
+namespace Cervantes.Application;
+
+public class TaskTargetManager: GenericManager<TaskTargets>, ITaskTargetManager
+{
+    /// <summary>
+    /// TaskTarget Manager Constructor
+    /// </summary>
+    /// <param name="context"></param>
+    public TaskTargetManager(IApplicationDbContext context) : base(context)
+    {
+
+    }
+}
diff --git a/Cervantes.Application/VulnTargetManager.cs b/Cervantes.Application/VulnTargetManager.cs
@@ -0,0 +1,15 @@
+using Cervantes.Contracts;
+using Cervantes.CORE;
+
+namespace Cervantes.Application;
+
+public class VulnTargetManager: GenericManager<VulnTargets>, IVulnTargetManager
+{
+    /// <summary>
+    /// VulnTarget Manager Constructor
+    /// </summary>
+    /// <param name="context"></param>
+    public VulnTargetManager(IApplicationDbContext context) : base(context)
+    {
+    }
+}
diff --git a/Cervantes.CORE/ApplicationUser.cs b/Cervantes.CORE/ApplicationUser.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Identity;
 
 namespace Cervantes.CORE;
@@ -25,5 +26,5 @@ public class ApplicationUser : IdentityUser
     /// </summary>
     public string Position { get; set; }
 
-    public int ClientId { get; set; }
+    public Guid ClientId { get; set; }
 }
diff --git a/Cervantes.CORE/Cervantes.CORE.csproj b/Cervantes.CORE/Cervantes.CORE.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.6" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
     </ItemGroup>
 
 </Project>
diff --git a/Cervantes.CORE/Client.cs b/Cervantes.CORE/Client.cs
@@ -12,20 +12,21 @@ namespace Cervantes.CORE;
 public class Client
 {
     /// <summary>
-    /// Porject Note Id
+    /// Client Id
     /// </summary>
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// User who created project
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     /// <summary>

diff --git a/Cervantes.CORE/Document.cs b/Cervantes.CORE/Document.cs
@@ -10,7 +10,8 @@ public class Document
     /// Porject Note Id
     /// </summary>
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// Note Name
@@ -30,12 +31,12 @@ public class Document
     /// <summary>
     /// User who created project
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     /// <summary>

diff --git a/Cervantes.CORE/Language.cs b/Cervantes.CORE/Language.cs
@@ -2,6 +2,6 @@ namespace Cervantes.CORE;
 
 public enum Language
 {
-    English = 0,
-    Español = 1
+    English = 1,
+    Español = 2
 }
diff --git a/Cervantes.CORE/Note.cs b/Cervantes.CORE/Note.cs
@@ -10,7 +10,8 @@ public class Note
     /// Porject Note Id
     /// </summary>
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// Note Name
@@ -25,12 +26,12 @@ public class Note
     /// <summary>
     /// User who created project
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     public DateTime CreatedDate { get; set; }

diff --git a/Cervantes.CORE/Project.cs b/Cervantes.CORE/Project.cs
@@ -15,7 +15,8 @@ public class Project
     /// </summary>
     ///
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// Project Name
@@ -40,24 +41,24 @@ public class Project
     /// <summary>
     /// User who created project
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     /// <summary>
     /// Client asssociated to project
     /// </summary>
+    [ForeignKey("ClientId")]
     public virtual Client Client { get; set; }
 
     /// <summary>
     /// Client ID
     /// </summary>
-    [ForeignKey("Client")]
-    public int ClientId { get; set; }
+    public Guid ClientId { get; set; }
 
     /// <summary>
     /// Is project a template
@@ -73,4 +74,9 @@ public class Project
     /// Project Type
     /// </summary>
     public ProjectType ProjectType { get; set; }
+
+    /// <summary>
+    /// Project Language
+    /// </summary>
+    public Language Language { get; set; }
 }
diff --git a/Cervantes.CORE/ProjectAttachment.cs b/Cervantes.CORE/ProjectAttachment.cs
@@ -14,7 +14,8 @@ public class ProjectAttachment
     /// Project Attachment Id
     /// </summary>
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// ProjectAttachment Name
@@ -29,22 +30,23 @@ public class ProjectAttachment
     /// <summary>
     /// User who created the attachment
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     /// <summary>
     /// Project Associated
     /// </summary>
+    [ForeignKey("ProjectId")]
     public virtual Project Project { get; set; }
 
     /// <summary>
     /// Id Project
     /// </summary>
-    [ForeignKey("Project")]
-    public int ProjectId { get; set; }
+
+    public Guid ProjectId { get; set; }
 }
diff --git a/Cervantes.CORE/ProjectNote.cs b/Cervantes.CORE/ProjectNote.cs
@@ -14,7 +14,8 @@ public class ProjectNote
     /// Porject Note Id
     /// </summary>
     [Key]
-    public int Id { get; set; }
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid Id { get; set; }
 
     /// <summary>
     /// Note Name
@@ -29,12 +30,12 @@ public class ProjectNote
     /// <summary>
     /// User who created project
     /// </summary>
+    [ForeignKey("UserId")]
     public virtual ApplicationUser User { get; set; }
 
     /// <summary>
     /// Id user
     /// </summary>
-    [ForeignKey("User")]
     public string UserId { get; set; }
 
     /// <summary>
@@ -45,8 +46,7 @@ public class ProjectNote
     /// <summary>
     /// Id Project
     /// </summary>
-    [ForeignKey("Project")]
-    public int ProjectId { get; set; }
+    public Guid ProjectId { get; set; }
 
     /// <summary>
     /// Visibility of the project note