Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches

This commit is contained in:
unknown 2025-03-31 12:21:20 +05:30
parent c69226c83e
commit 636a6aab7b
3 changed files with 13 additions and 5 deletions

View File

@ -1,5 +1,6 @@
using Marco.Pms.Model.Dtos.Tenant; using Marco.Pms.Model.Dtos.Tenant;
using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.Entitlements;
using Marco.Pms.Model.ViewModels.Tenant;
namespace Marco.Pms.Model.Mapper namespace Marco.Pms.Model.Mapper
{ {
@ -32,6 +33,5 @@ namespace Marco.Pms.Model.Mapper
OnBoardingDate = tenant.OnBoardingDate, OnBoardingDate = tenant.OnBoardingDate,
}; };
} }
} }
} }

View File

@ -1,3 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Marco.Pms.Model.ViewModels.Tenant namespace Marco.Pms.Model.ViewModels.Tenant
{ {
public class TenantVM public class TenantVM

View File

@ -140,8 +140,9 @@ namespace Marco.Pms.Services.Controllers
TenantVM tenantVM = tenant.ToTenantVMFromTenant(); TenantVM tenantVM = tenant.ToTenantVMFromTenant();
return Ok(ApiResponse<object>.SuccessResponse(tenantVM, "Tenant Profile.", 200)); return Ok(ApiResponse<object>.SuccessResponse(tenantVM, "Tenant Profile.", 200));
} }
[HttpPost("edit/{tenantId}")] [HttpPost("edit/{tenantId}")]
public async Task<IActionResult> SuspendTenant(int tenantId,UpdateTenantDto model) public async Task<IActionResult> SuspendTenant(int tenantId, UpdateTenantDto model)
{ {
if (tenantId <= 0) if (tenantId <= 0)
{ {
@ -165,7 +166,8 @@ namespace Marco.Pms.Services.Controllers
TenantVM tenantVM = tenant.ToTenantVMFromTenant(); TenantVM tenantVM = tenant.ToTenantVMFromTenant();
return Ok(ApiResponse<object>.SuccessResponse(tenantVM, "Tenant Profile.", 200)); return Ok(ApiResponse<object>.SuccessResponse(tenantVM, "Tenant Profile.", 200));
} }
private static Employee CreateTenantDtoToEmployee(CreateTenantDto model, int TenantId, string? ApplicationUserId,int jobRoleId)
private static Employee CreateTenantDtoToEmployee(CreateTenantDto model, int TenantId, string? ApplicationUserId, int jobRoleId)
{ {
return new Employee return new Employee
{ {