admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Removed tenantid filed from Dtos

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-26 12:05:44 +05:30
parent c338140210
commit c1a55fa17b
3 changed files with 109 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.Model/Dtos/Forum/AddCommentDto.cs
View File

@ -9,6 +9,5 @@
public DateTime SentAt { get; set; }
public Guid? ParentMessageId { get; set; } // For threaded replies
public ICollection<ForumAttachmentDto>? Attachments { get; set; }
public int TenantId { get; set; }
}
}

1
Marco.Pms.Model/Dtos/Forum/CreateTicketDto.cs
View File

@ -14,6 +14,5 @@
public ICollection<ForumAttachmentDto>? Attachments { get; set; }
public Guid PriorityId { get; set; }
public ICollection<Guid>? TagIds { get; set; }
public int TenantId { get; set; }
}
}

14
Marco.Pms.Services/Controllers/ForumController.cs
View File

@ -47,9 +47,9 @@ namespace Marco.Pms.Services.Controllers
return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
}
int tenantId = _userHelper.GetTenantId();
if (tenantId == createTicketDto.TenantId)
{
TicketForum ticketForum = createTicketDto.ToTicketForumFromCreateTicketDto();
//if (tenantId == createTicketDto.TenantId)
//{
TicketForum ticketForum = createTicketDto.ToTicketForumFromCreateTicketDto(tenantId);
_context.Tickets.Add(ticketForum);
await _context.SaveChangesAsync();
@ -160,9 +160,9 @@ namespace Marco.Pms.Services.Controllers
}
_logger.LogInfo("Ticket created by Employee {EmployeeId} for project {ProjectId}", ticketForum.CreatedById, project.Id);
return Ok(ApiResponse<object>.SuccessResponse(ticketVM, "Ticket Created Successfully", 200));
}
_logger.LogWarning("Employee {EmployeeId} tries to create ticket in different Tenant", createTicketDto.CreatedById);
return Unauthorized(ApiResponse<object>.ErrorResponse("Not Authorized", "Not Authorized", 401));
//}
//_logger.LogWarning("Employee {EmployeeId} tries to create ticket in different Tenant", createTicketDto.CreatedById);
// return Unauthorized(ApiResponse<object>.ErrorResponse("Not Authorized", "Not Authorized", 401));
}
[HttpPost("ticket/edit")]
public async Task<IActionResult> UpdateNewTicket([FromBody] UpdateTicketDto updateTicketDto)
@ -368,7 +368,7 @@ namespace Marco.Pms.Services.Controllers
List<TicketAttachment> attachments = new List<TicketAttachment>();
List<Document> documents = new List<Document>();
TicketComment comment = addCommentDto.ToTicketCommentFromAddCommentDto();
TicketComment comment = addCommentDto.ToTicketCommentFromAddCommentDto(tenantId);
_context.TicketComments.Add(comment);
await _context.SaveChangesAsync();