From 5717bb6dacf491405842fd114e55d399a183f346 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 12 Sep 2025 12:46:07 +0530
Subject: [PATCH] Added the joining date parameter when creating or update
 employee using the mobiles

---
 .../Dtos/Employees/CreateUserDto.cs           | 23 ++++++++++---------
 Marco.Pms.Model/Mapper/EmployeeMapper.cs      |  2 +-
 .../Controllers/EmployeeController.cs         |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
index f9d31d3..0aebff2 100644
--- a/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
+++ b/Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs
@@ -3,18 +3,18 @@
     public class CreateUserDto
     {
         public Guid? Id { get; set; }
-        public string? FirstName { get; set; }
+        public required string FirstName { get; set; }
         public string? LastName { get; set; }
         public string? MiddleName { get; set; }
         public string? Email { get; set; }
 
-        public string? Gender { get; set; }
-        public string? BirthDate { get; set; }
-        public string? JoiningDate { get; set; }
+        public required string Gender { get; set; }
+        public required string BirthDate { get; set; }
+        public required string JoiningDate { get; set; }
 
-        public string? PermanentAddress { get; set; }
-        public string? CurrentAddress { get; set; }
-        public string? PhoneNumber { get; set; }
+        public required string PermanentAddress { get; set; }
+        public required string CurrentAddress { get; set; }
+        public required string PhoneNumber { get; set; }
 
         public string? EmergencyPhoneNumber { get; set; }
         public string? EmergencyContactPerson { get; set; }
@@ -33,10 +33,11 @@
     public class MobileUserManageDto
     {
         public Guid? Id { get; set; }
-        public string FirstName { get; set; } = string.Empty;
-        public string? LastName { get; set; }
-        public string PhoneNumber { get; set; } = string.Empty;
-        public string? Gender { get; set; }
+        public required string FirstName { get; set; }
+        public required string LastName { get; set; }
+        public required string PhoneNumber { get; set; }
+        public required DateTime JoiningDate { get; set; }
+        public required string Gender { get; set; }
         public Guid JobRoleId { get; set; }
         public string? ProfileImage { get; set; }
     }
diff --git a/Marco.Pms.Model/Mapper/EmployeeMapper.cs b/Marco.Pms.Model/Mapper/EmployeeMapper.cs
index 8e5b507..0e3dbf1 100644
--- a/Marco.Pms.Model/Mapper/EmployeeMapper.cs
+++ b/Marco.Pms.Model/Mapper/EmployeeMapper.cs
@@ -74,7 +74,7 @@ namespace Marco.Pms.Model.Mapper
                 PhoneNumber = model.PhoneNumber,
                 Photo = image,
                 JobRoleId = model.JobRoleId,
-                JoiningDate = null,
+                JoiningDate = model.JoiningDate,
 
             };
         }
diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs
index 2926db1..ae3dcca 100644
--- a/Marco.Pms.Services/Controllers/EmployeeController.cs
+++ b/Marco.Pms.Services/Controllers/EmployeeController.cs
@@ -502,6 +502,7 @@ namespace MarcoBMS.Services.Controllers
                 existingEmployee.LastName = model.LastName;
                 existingEmployee.Gender = model.Gender;
                 existingEmployee.PhoneNumber = model.PhoneNumber;
+                existingEmployee.JoiningDate = model.JoiningDate;
                 existingEmployee.JobRoleId = model.JobRoleId;
                 existingEmployee.Photo = imageBytes;