Update Domains

PSManagement.Domain/Customers/Aggregate/Customer.cs

 using PSManagement.Domain.Customers.DomainEvents;
 using PSManagement.Domain.Customers.Entities;
 using PSManagement.Domain.Customers.ValueObjects;
-using PSManagement.Domain.Projects.Aggregate;
+using PSManagement.Domain.Projects.Entities;
 using PSManagement.SharedKernel.Aggregate;
 using System;
 using System.Collections.Generic;

PSManagement.Domain/Employees/Entities/Employee.cs

 using PSManagement.Domain.Identity.Entities;
-using PSManagement.Domain.Projects.Aggregate;
 using PSManagement.Domain.Projects.Entities;
 using PSManagement.Domain.Tracking;
 using PSManagement.Domain.Tracking.Entities;
@@ -19,6 +18,8 @@ namespace PSManagement.Domain.Employees.Entities
         public int UserId { get; set; }
         public User User { get; set; }
         public PersonalInfo PersonalInfo { get; set; }
+        public WorkInfo WorkInfo { get; set; }
+
         public ICollection<Project> Projects { get; set; }
         
         public ICollection<EmployeeTrack> EmployeeTracks { get; set; }
@@ -36,5 +37,8 @@ namespace PSManagement.Domain.Employees.Entities
             HIASTId = hiastId;
         }
     }
-
+    public record WorkInfo (
+        String WorkType , 
+        String WorkJob 
+        );
 }

PSManagement.Domain/FinincialSpending/Entities/FinincialSpending.cs

+using PSManagement.SharedKernel.Entities;
+using PSManagement.SharedKernel.ValueObjects;
+using System;
+
+namespace PSManagement.Domain.Projects.Entities
+{
+    public class FinincialSpending: BaseEntity
+    {
+        public String CostType { get; set; }
+        public String Description { get; set; }
+        public Money LocalPurchase { get; set; }
+        public Money ExternalPurchase { get; set; }
+
+
+
+    }
+}

PSManagement.Domain/FinincialSpending/Repositories/IFinicialSpendingRepository.cs

+namespace PSManagement.Domain.FinincialSpending.Repositories
+{
+    public interface IFinicialSpendingRepository
+    {
+
+    }
+
+}

PSManagement.Domain/Identity/Entities/Role.cs

-using System;
+using PSManagement.SharedKernel.Entities;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace PSManagement.Domain.Identity.Entities
 {
-    public class Role  {
-        [Key]
-        public int Id { get; set; }
+    public class Role :BaseEntity {
         public String Name { get; set; }
         public ICollection<Permission> Permissions { get; set; }
         public ICollection<User> Users { get; set; }

PSManagement.Domain/PSManagement.Domain.csproj

@@ -7,6 +7,8 @@
   <ItemGroup>
     <Folder Include="Identity\ValueObjects\" />
     <Folder Include="Projects\DomainErrors\" />
+    <Folder Include="Reports\Entities\" />
+    <Folder Include="Reports\Repositories\" />
   </ItemGroup>
 
   <ItemGroup>

PSManagement.Domain/Projects/Entities/EmployeeParticipate.cs

 using PSManagement.Domain.Employees.Entities;
-using PSManagement.Domain.Projects.Aggregate;
 using PSManagement.SharedKernel.Entities;
 using System;
 

PSManagement.Domain/Projects/Aggregate/Project.cs → PSManagement.Domain/Projects/Entities/Project.cs

 using PSManagement.Domain.Customers.Aggregate;
 using PSManagement.Domain.Employees.Entities;
-using PSManagement.Domain.Projects.Entities;
+using PSManagement.Domain.Projects.ValueObjects;
+using PSManagement.Domain.ProjectsStatus.Entites;
 using PSManagement.Domain.ProjectTypes.Entities;
-using PSManagement.Domain.Steps.Entities;
 using PSManagement.Domain.Tracking;
 using PSManagement.SharedKernel.Aggregate;
-using PSManagement.SharedKernel.ValueObjects;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSManagement.Domain.Projects.Aggregate
+namespace PSManagement.Domain.Projects.Entities
 {
     public class Project : IAggregateRoot
     {
         // information about the project itself 
         public ProposalInfo ProposalInfo { get; set; }
         public ProjectInfo ProjectInfo { get; set; }
-        //public ProjectType ProjectType { get; set; }
         public ProjectStatus ProjectStatus { get; set; }
         public Aggreement ProjectAggreement { get; set; }
 
@@ -27,10 +26,11 @@ namespace PSManagement.Domain.Projects.Aggregate
         public Employee TeamLeader { get; set; }
         public int ProjectManagerId { get; set; }
         public Employee ProjectManager { get; set; }
-
+        public int ExecuterId { get; set; }
         public Department Executer { get; set; }
 
         // the proposer of the project 
+        public int ProposerId { get; private set; }
         public Customer Proposer { get; set; }
 
         // 
@@ -40,18 +40,33 @@ namespace PSManagement.Domain.Projects.Aggregate
 
         // finincial plan 
         public FinincialFund FinincialFund { get; set; }
+        public ICollection<FinincialSpending> FinincialSpending { get; set; }
+
 
 
         public ICollection<EmployeeParticipate> EmployeeParticipates { get; set; }
         public ICollection<Track> Tracks { get; set; }
+        public Project(
+            ProposalInfo proposalInfo,
+            ProjectInfo projectInfo,
+            Aggreement projectAggreement,
+            int proposerId,
+            int teamLeaderId,
+            int projectManagerId,
+            int executerId)
+        {
+            ProposalInfo = proposalInfo;
+            ProjectInfo = projectInfo;
+            ProjectAggreement = projectAggreement;
+            TeamLeaderId = teamLeaderId;
+            ProjectManagerId = projectManagerId;
+            ExecuterId = executerId;
+            ProposerId = proposerId;
 
+        }
         public Project()
         {
 
         }
     }
-    public record FinincialFund (
-        string FinicialStatus,
-        string Source 
-        );
 }

PSManagement.Domain/Steps/Entities/Step.cs → PSManagement.Domain/Projects/Entities/Step.cs

 using PSManagement.Domain.Employees.Entities;
-using PSManagement.Domain.Projects.Aggregate;
 using PSManagement.Domain.Tracking;
 using PSManagement.Domain.Tracking.Entities;
 using PSManagement.SharedKernel.Aggregate;
@@ -10,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSManagement.Domain.Steps.Entities
+namespace PSManagement.Domain.Projects.Entities
 {
     public class Step : BaseEntity
     {

PSManagement.Domain/Steps/Repositories/IStepsRepository.cs → PSManagement.Domain/Projects/Repositories/IStepsRepository.cs

-using PSManagement.Domain.Steps.Entities;
+using PSManagement.Domain.Projects.Entities;
 using PSManagement.SharedKernel.Repositories;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSManagement.Domain.Steps.Repositories
+namespace PSManagement.Domain.Projects.Repositories
 {
     public interface IStepsRepository : IRepository<Step>
     {

PSManagement.Domain/Projects/ValueObjects/Aggreement.cs

 using System;
 
-namespace PSManagement.Domain.Projects.Aggregate
+namespace PSManagement.Domain.Projects.ValueObjects
 {
-    public record Aggreement (
-        int AggreementNumber ,
+    public record Aggreement(
+        int AggreementNumber,
         DateTime AggreementDate
         );
 

PSManagement.Domain/Projects/ValueObjects/FinincialFund.cs

+namespace PSManagement.Domain.Projects.ValueObjects
+{
+    public record FinincialFund(
+        string FinicialStatus,
+        string Source
+        );
+}

PSManagement.Domain/Projects/ValueObjects/ProjectInfo.cs

 using System;
 
-namespace PSManagement.Domain.Projects.Aggregate
+namespace PSManagement.Domain.Projects.ValueObjects
 {
     public record ProjectInfo(
-        String Name , 
-        String Code ,
-        String Description 
+        string Name,
+        string Code,
+        string Description
         );
 
 }

PSManagement.Domain/Projects/ValueObjects/ProposalInfo.cs

 using PSManagement.Domain.Customers.Aggregate;
 using System;
 
-namespace PSManagement.Domain.Projects.Aggregate
+namespace PSManagement.Domain.Projects.ValueObjects
 {
-    public record ProposalInfo (
-        int ProposingBookNumber ,
+    public record ProposalInfo(
+        int ProposingBookNumber,
         DateTime ProposingBookDate
         );
 

PSManagement.Domain/Projects/Entities/ProjectStatus.cs → PSManagement.Domain/ProjectsStatus/Entites/ProjectStatus.cs

 using PSManagement.SharedKernel.Entities;
 
-namespace PSManagement.Domain.Projects.Entities
+namespace PSManagement.Domain.ProjectsStatus.Entites
 {
     public class ProjectStatus : BaseEntity
     {

PSManagement.Domain/Projects/Repositories/IProjectStatusRepository.cs → PSManagement.Domain/ProjectsStatus/Repositories/IProjectStatusRepository.cs

-using PSManagement.Domain.Projects.Entities;
+using PSManagement.Domain.ProjectsStatus.Entites;
 using PSManagement.SharedKernel.Repositories;
 
-namespace PSManagement.Domain.Projects.Repositories
+namespace PSManagement.Domain.ProjectsStatus.Repositories
 {
     public interface IProjectStatusRepository : IRepository<ProjectStatus>
     {
-
     }
 
 }

PSManagement.Domain/ProjectTypes/Entities/ProjectType.cs → PSManagement.Domain/ProjectsTypes/Entities/ProjectType.cs

-using PSManagement.Domain.Projects.Aggregate;
+using PSManagement.Domain.Projects.Entities;
 using PSManagement.SharedKernel.Aggregate;
 using PSManagement.SharedKernel.Entities;
 using System;

PSManagement.Domain/Steps/Entities/Item.cs

-using PSManagement.SharedKernel.Entities;
-using PSManagement.SharedKernel.ValueObjects;
-using System;
-
-namespace PSManagement.Domain.Steps.Entities
-{
-    public class Item : BaseEntity
-    {
-        public string ItemName { get; set; }
-        public string ItemDescription { get; set; }
-        public Money Price { get; set; }
-        public Item()
-        {
-
-        }
-    }
-
-}

PSManagement.Domain/Tracking/Entities/StepTrack.cs

-using PSManagement.Domain.Steps.Entities;
+using PSManagement.Domain.Projects.Entities;
 using PSManagement.SharedKernel.Entities;
 using System.Collections.Generic;
 

PSManagement.Domain/Tracking/Entities/Track.cs

 using PSManagement.Domain.Employees.Entities;
-using PSManagement.Domain.Projects.Aggregate;
-using PSManagement.Domain.Steps.Entities;
+using PSManagement.Domain.Projects.Entities;
 using PSManagement.Domain.Tracking.Entities;
 using PSManagement.SharedKernel.Aggregate;
 using PSManagement.SharedKernel.Entities;