refine and update user entity

lehquy13 · Mar 22, 2023 · e00f7ee · e00f7ee
1 parent 4c93f97
commit e00f7ee
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 194 deletions.
diff --git a/CED.Contracts/Users/AdminDto.cs b/CED.Contracts/Users/AdminDto.cs
@@ -1,10 +1,10 @@
-using CED.Domain.Shared.ClassInformationConsts;
+using Abp.Application.Services.Dto;
+using CED.Domain.Shared.ClassInformationConsts;
 
 namespace CED.Contracts.Users;
-public class AdminDto
+public class AdminDto : FullAuditedEntityDto<Guid>
 {
     //Admin information
-    public Guid Id { get; set; } = Guid.NewGuid();
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
     public Gender Gender { get; set; } = Gender.Male;

diff --git a/CED.Contracts/Users/StudentDto .cs b/CED.Contracts/Users/StudentDto .cs
@@ -1,10 +1,10 @@
-using CED.Domain.Shared.ClassInformationConsts;
+using Abp.Application.Services.Dto;
+using CED.Domain.Shared.ClassInformationConsts;
 
 namespace CED.Contracts.Users;
-public class StudentDto
+public class StudentDto : FullAuditedEntityDto<Guid>
 {
     //Admin information
-    public Guid Id { get; set; } = Guid.NewGuid();
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
     public Gender Gender { get; set; } = Gender.Male;

diff --git a/CED.Contracts/Users/TutorDto.cs b/CED.Contracts/Users/TutorDto.cs
@@ -1,10 +1,10 @@
-using CED.Domain.Shared.ClassInformationConsts;
+using Abp.Application.Services.Dto;
+using CED.Domain.Shared.ClassInformationConsts;
 
 namespace CED.Contracts.Users;
-public class TutorDto
+public class TutorDto : FullAuditedEntityDto<Guid>
 {
     //Admin information
-    public Guid Id { get; set; } = Guid.NewGuid();
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
     public Gender Gender { get; set; } = Gender.Male;

diff --git a/CED.Contracts/Users/UserDto.cs b/CED.Contracts/Users/UserDto.cs
@@ -1,10 +1,10 @@
-using CED.Domain.Shared.ClassInformationConsts;
+using Abp.Application.Services.Dto;
+using CED.Domain.Shared.ClassInformationConsts;
 
 namespace CED.Contracts.Users;
-public class UserDto
+public class UserDto : FullAuditedEntityDto<Guid>
 {
     //User information
-    public Guid Id { get; set; } = Guid.NewGuid();
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
     public Gender Gender { get; set; } = Gender.Male;

diff --git a/CED.Domain.Shared/ClassInformationConsts/UserRole.cs b/CED.Domain.Shared/ClassInformationConsts/UserRole.cs
@@ -4,5 +4,6 @@ public enum UserRole
     Undefined,
     Admin,
     Tutor,
-    Student
+    Student,
+    All
 }
diff --git a/CED.Domain/Users/User.cs b/CED.Domain/Users/User.cs
@@ -1,10 +1,10 @@
-using CED.Domain.Shared.ClassInformationConsts;
+using Abp.Domain.Entities.Auditing;
+using CED.Domain.Shared.ClassInformationConsts;
 
 namespace CED.Domain.Users;
-public class User
+public class User : FullAuditedAggregateRoot<Guid>
 {
     //User information
-    public Guid Id { get; set; } = Guid.NewGuid();
     public string FirstName { get; set; } = string.Empty;
     public string LastName { get; set; } = string.Empty;
     public Gender Gender { get; set; } = Gender.Male;
@@ -25,12 +25,56 @@ public class User
     public string University { get; set;} = string.Empty;
     public bool isVerified { get; set; } = false;
 
-    public void TutorRegistration(User tutorDto)
+    /// <summary>
+    /// Update current user to be tutor
+    /// </summary>
+    /// <param name="tutor"></param>
+
+    public void RegisterToBeTutor(User tutor)
+    {
+        Role = tutor.Role;
+        AcademicLevel = tutor.AcademicLevel;
+        University = tutor.University;
+    }
+
+    /// <summary>
+    /// Update tutor's information and change the state into being verified
+    /// </summary>
+    /// <param name="tutor"></param>
+
+    public void UpdateTutorInformation(User tutor)
     {
-        Role = tutorDto.Role;
-        AcademicLevel = tutorDto.AcademicLevel;
-        University = tutorDto.University;
+        FirstName = tutor.FirstName;
+        LastName = tutor.LastName;
+        Gender = tutor.Gender;
+        BirthYear = tutor.BirthYear;
+        Address = tutor.Address;
+        Description = tutor.Description;
+
+        PhoneNumber = tutor.PhoneNumber;
+
+        AcademicLevel = tutor.AcademicLevel;
+        University = tutor.University;
+
+        //wait for being verified
+        isVerified = false;
+
     }
 
+    /// <summary>
+    /// Update standard user's information
+    /// </summary>
+    /// <param name="user"></param>
+    public void UpdateUserInformation(User user)
+    {
+        FirstName = user.FirstName;
+        LastName = user.LastName;
+        Gender = user.Gender;
+        BirthYear = user.BirthYear;
+        Address = user.Address;
+        Description = user.Description;
+
+        PhoneNumber = user.PhoneNumber;
+    }
 }
 
diff --git a/CED.WebAPI/Controllers/Persistence/Repository/ClassInformationRepository.cs b/CED.WebAPI/Controllers/Persistence/Repository/ClassInformationRepository.cs
diff --git a/CED.WebAPI/Controllers/Persistence/Repository/Repository.cs b/CED.WebAPI/Controllers/Persistence/Repository/Repository.cs
diff --git a/CED.WebAPI/Controllers/Persistence/Repository/SubjectRepository.cs b/CED.WebAPI/Controllers/Persistence/Repository/SubjectRepository.cs
diff --git a/CED.WebAPI/Controllers/Persistence/Repository/UserRepository.cs b/CED.WebAPI/Controllers/Persistence/Repository/UserRepository.cs