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

Fixed remaining int to Guid conversions

Browse Source
This commit is contained in:
ashutosh.nehete 2025-05-03 11:55:08 +05:30
parent c7feae1047
commit 3d28b2eb97
10 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marco.Pms.Model/Dtos/Forum/ForumAttachmentDto.cs
View File

@ -2,7 +2,7 @@
{
public class ForumAttachmentDto
{
public Guid TicketId { get; set; } = Guid.Empty;
public Guid? TicketId { get; set; }
public Guid? CommentId { get; set; }
public string FileName { get; set; } = string.Empty;
public string? Base64Data { get; set; }

2
Marco.Pms.Model/Dtos/Forum/TicketPriorityMasterDto.cs
View File

@ -2,7 +2,7 @@
{
public class TicketPriorityMasterDto
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public string Name { get; set; } = string.Empty; // e.g., Low, Medium, High, Critical
public int Level { get; set; } // 1 = Low, 2 = Medium...
public string? ColorCode { get; set; }

2
Marco.Pms.Model/Dtos/Forum/TicketStatusMasterDto.cs
View File

@ -2,7 +2,7 @@
{
public class TicketStatusMasterDto
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public string Name { get; set; } = string.Empty; // e.g., "Open", "In Progress"
public string? Description { get; set; }
public string? ColorCode { get; set; } // e.g., "#FF0000"

2
Marco.Pms.Model/Dtos/Forum/TicketTagMasterDto.cs
View File

@ -2,7 +2,7 @@
{
public class TicketTagMasterDto
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public string Name { get; set; } = string.Empty; // e.g., "Bug", "UI", "Urgent"
public string? ColorCode { get; set; }
public bool IsDefault { get; set; }

2
Marco.Pms.Model/Dtos/Forum/TicketTypeMasterDto.cs
View File

@ -2,7 +2,7 @@
{
public class TicketTypeMasterDto
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public string Name { get; set; } = string.Empty; // e.g., "Quality Issue"
public string? Description { get; set; }
public bool IsDefault { get; set; } // true for system defaults

6
Marco.Pms.Model/Dtos/Forum/UpdateTicketDto.cs
View File

@ -7,10 +7,10 @@
public string Description { get; set; } = string.Empty;
public Guid StatusId { get; set; }
public Guid TypeId { get; set; } // QualityIssue, HelpDesk, Feedback
public int CreatedById { get; set; }
public Guid CreatedById { get; set; }
public DateTime CreatedAt { get; set; }
public int LinkedProjectId { get; set; }
public int? LinkedActivityId { get; set; } // task or project ID
public Guid? LinkedProjectId { get; set; }
public Guid? LinkedActivityId { get; set; } // task or project ID
public ICollection<UpdateAttachmentDto>? Attachments { get; set; }
public Guid PriorityId { get; set; }
public ICollection<Guid>? TagIds { get; set; }

8
Marco.Pms.Model/Mapper/ForumMapper.cs
View File

@ -172,7 +172,7 @@ namespace Marco.Pms.Model.Mapper
{
return new TicketStatusMaster
{
Id = statusMasterDto.Id,
Id = statusMasterDto.Id != null ? statusMasterDto.Id.Value : Guid.Empty,
Name = statusMasterDto.Name,
Description = statusMasterDto.Description,
ColorCode = statusMasterDto.ColorCode,
@ -196,7 +196,7 @@ namespace Marco.Pms.Model.Mapper
{
return new TicketPriorityMaster
{
Id = priorityMasterDto.Id,
Id = priorityMasterDto.Id != null ? priorityMasterDto.Id.Value : Guid.Empty,
Name = priorityMasterDto.Name,
Level = priorityMasterDto.Level,
ColorCode = priorityMasterDto.ColorCode,
@ -218,7 +218,7 @@ namespace Marco.Pms.Model.Mapper
{
return new TicketTypeMaster
{
Id = typeMasterDto.Id,
Id = typeMasterDto.Id != null ? typeMasterDto.Id.Value : Guid.Empty,
Name = typeMasterDto.Name,
Description = typeMasterDto.Description,
IsDefault = typeMasterDto.IsDefault,
@ -239,7 +239,7 @@ namespace Marco.Pms.Model.Mapper
{
return new TicketTagMaster
{
Id = tagMasterDto.Id,
Id = tagMasterDto.Id != null ? tagMasterDto.Id.Value : Guid.Empty,
Name = tagMasterDto.Name,
ColorCode = tagMasterDto.ColorCode,
IsDefault = tagMasterDto.IsDefault,

17
Marco.Pms.Services/Controllers/AuthController.cs
View File

@ -43,7 +43,7 @@ namespace MarcoBMS.Services.Controllers
{
var user = await _context.ApplicationUsers.FirstOrDefaultAsync(u => u.Email == loginDto.Username || u.PhoneNumber == loginDto.Username);
if (user != null && await _userManager.CheckPasswordAsync(user, loginDto.Password ?? string.Empty))
if (user != null)
{
if (!user.IsActive)
{
@ -53,15 +53,18 @@ namespace MarcoBMS.Services.Controllers
{
return BadRequest(ApiResponse<object>.ErrorResponse("Your email is not verified, Please verify your email", "Your email is not verified, Please verify your email", 400));
}
Employee emp = await _employeeHelper.GetEmployeeByApplicationUserID(user.Id);
//var refreshToken = GenerateRefreshToken();
if (user.UserName == null) return NotFound(ApiResponse<object>.ErrorResponse("UserName Not found", "UserName Not found", 404)); ;
if (await _userManager.CheckPasswordAsync(user, loginDto.Password ?? string.Empty))
{
Employee emp = await _employeeHelper.GetEmployeeByApplicationUserID(user.Id);
//var refreshToken = GenerateRefreshToken();
if (user.UserName == null) return NotFound(ApiResponse<object>.ErrorResponse("UserName Not found", "UserName Not found", 404)); ;
var token = _refreshTokenService.GenerateJwtToken(user.UserName, emp.TenantId, _jwtSettings);
var token = _refreshTokenService.GenerateJwtToken(user.UserName, emp.TenantId, _jwtSettings);
var refreshToken = await _refreshTokenService.CreateRefreshToken(user.Id, emp.TenantId.ToString(), _jwtSettings);
var refreshToken = await _refreshTokenService.CreateRefreshToken(user.Id, emp.TenantId.ToString(), _jwtSettings);
return Ok(ApiResponse<object>.SuccessResponse(new { token = token, refreshToken = refreshToken }, "User logged in successfully.", 200));
return Ok(ApiResponse<object>.SuccessResponse(new { token = token, refreshToken = refreshToken }, "User logged in successfully.", 200));
}
}

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

@ -291,7 +291,7 @@ namespace Marco.Pms.Services.Controllers
ticketVM.Attachments = ticketAttachmentVMs;
Project project = await _context.Projects.FirstOrDefaultAsync(p => p.Id == ticketForum.LinkedProjectId) ?? new Project();
ticketVM.ProjectName = project.Name;
if (updateTicketDto.LinkedActivityId != null && updateTicketDto.LinkedActivityId != 0)
if (updateTicketDto.LinkedActivityId != null && updateTicketDto.LinkedActivityId != null)
{
WorkItem workItem = await _context.WorkItems.Include(w => w.ActivityMaster).FirstOrDefaultAsync(w => w.Id == ticketForum.LinkedActivityId) ?? new WorkItem();
if (workItem.ActivityMaster != null)
@ -357,7 +357,7 @@ namespace Marco.Pms.Services.Controllers
_context.TicketAttachments.AddRange(attachments);
await _context.SaveChangesAsync();
}
Employee employee = await _context.Employees.FirstOrDefaultAsync(e => e.ApplicationUserId == addCommentDto.AuthorId.ToString()) ?? new Employee();
Employee employee = await _context.Employees.FirstOrDefaultAsync(e => e.Id == addCommentDto.AuthorId) ?? new Employee();
TicketCommentVM commentVM = comment.ToTicketCommentVMFromTicketComment(employee);
List<TicketAttachmentVM> attachmentVMs = new List<TicketAttachmentVM>();
@ -447,7 +447,7 @@ namespace Marco.Pms.Services.Controllers
}
await _context.SaveChangesAsync();
Employee employee = await _context.Employees.FirstOrDefaultAsync(e => e.ApplicationUserId == existingComment.AuthorId.ToString()) ?? new Employee();
Employee employee = await _context.Employees.FirstOrDefaultAsync(e => e.Id == existingComment.AuthorId) ?? new Employee();
TicketCommentVM commentVM = updateComment.ToTicketCommentVMFromTicketComment(employee);
List<TicketAttachmentVM> attachmentVMs = new List<TicketAttachmentVM>();
@ -499,14 +499,18 @@ namespace Marco.Pms.Services.Controllers
_logger.LogError("Base64 data is missing");
return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
}
if (forumAttachmentDto.TicketId == null)
{
_logger.LogError("ticket ID is missing");
return BadRequest(ApiResponse<object>.ErrorResponse("ticket ID is missing", "ticket ID is missing", 400));
}
var objectKey = await _s3Service.UploadFileAsync(forumAttachmentDto.Base64Data, tenantId, "forum");
Document document = forumAttachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, forumAttachmentDto.SentAt, tenantId);
_context.Documents.Add(document);
await _context.SaveChangesAsync();
attachment = forumAttachmentDto.ToTicketAttachmentFromForumAttachmentDto(forumAttachmentDto.TicketId, document.Id, forumAttachmentDto.CommentId);
attachment = forumAttachmentDto.ToTicketAttachmentFromForumAttachmentDto(forumAttachmentDto.TicketId != null ? forumAttachmentDto.TicketId.Value : Guid.Empty, document.Id, forumAttachmentDto.CommentId);
_context.TicketAttachments.Add(attachment);
await _context.SaveChangesAsync();

32
Marco.Pms.Services/Controllers/MasterController.cs
View File

@ -260,8 +260,8 @@ namespace Marco.Pms.Services.Controllers
await _context.SaveChangesAsync();
TicketStatusVM statusVM = statusMaster.ToTicketStatusVMFromTicketStatusMaster();
_logger.LogInfo("Ticket Status master {TicketStatusId} updated successfully from tenant {tenantId}", statusMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(statusVM, "Ticket Status master updated successfully", 200));
_logger.LogInfo("Ticket Status master {TicketStatusId} added successfully from tenant {tenantId}", statusMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(statusVM, "Ticket Status master added successfully", 200));
}
_logger.LogError("User sent empyt payload");
return BadRequest(ApiResponse<object>.ErrorResponse("Sent Empty payload", "Sent Empty payload", 400));
@ -278,8 +278,8 @@ namespace Marco.Pms.Services.Controllers
await _context.SaveChangesAsync();
TicketTypeVM typeVM = typeMaster.ToTicketTypeVMFromTicketTypeMaster();
_logger.LogInfo("Ticket Type master {TicketTypeId} updated successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket type master updated successfully", 200));
_logger.LogInfo("Ticket Type master {TicketTypeId} added successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket type master added successfully", 200));
}
_logger.LogError("User sent empyt payload");
@ -298,8 +298,8 @@ namespace Marco.Pms.Services.Controllers
await _context.SaveChangesAsync();
TicketPriorityVM typeVM = typeMaster.ToTicketPriorityVMFromTicketPriorityMaster();
_logger.LogInfo("Ticket Priority master {TicketPriorityId} updated successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket Priority master updated successfully", 200));
_logger.LogInfo("Ticket Priority master {TicketPriorityId} added successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket Priority master added successfully", 200));
}
_logger.LogError("User sent empyt payload");
@ -317,8 +317,8 @@ namespace Marco.Pms.Services.Controllers
await _context.SaveChangesAsync();
TicketTagVM typeVM = tagMaster.ToTicketTagVMFromTicketTagMaster();
_logger.LogInfo("Ticket Tag master {TicketTypeId} updated successfully from tenant {tenantId}", tagMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket tag master updated successfully", 200));
_logger.LogInfo("Ticket Tag master {TicketTypeId} added successfully from tenant {tenantId}", tagMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket tag master added successfully", 200));
}
_logger.LogError("User sent empyt payload");
@ -330,7 +330,7 @@ namespace Marco.Pms.Services.Controllers
Guid tenantId = _userHelper.GetTenantId();
if (statusMasterDto != null)
{
TicketStatusMaster? statusMaster = await _context.TicketStatusMasters.FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == statusMasterDto.Id);
TicketStatusMaster? statusMaster = await _context.TicketStatusMasters.AsNoTracking().FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == statusMasterDto.Id);
if (statusMaster != null)
{
statusMaster = statusMasterDto.ToTicketStatusMasterFromTicketStatusMasterDto(tenantId);
@ -341,7 +341,7 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Ticket Status master {TicketStatusId} updated successfully from tenant {tenantId}", statusMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(statusVM, "Ticket Status master updated successfully", 200));
}
_logger.LogError("Ticket Status master {TicketStatusId} not found in database", statusMasterDto.Id);
_logger.LogError("Ticket Status master {TicketStatusId} not found in database", statusMasterDto.Id != null ? statusMasterDto.Id.Value : Guid.Empty);
return NotFound(ApiResponse<object>.ErrorResponse("Ticket Status master not found", "Ticket Status master not found", 404));
}
_logger.LogError("User sent empyt payload");
@ -354,7 +354,7 @@ namespace Marco.Pms.Services.Controllers
Guid tenantId = _userHelper.GetTenantId();
if (typeMasterDto != null)
{
TicketTypeMaster? typeMaster = await _context.TicketTypeMasters.FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == typeMasterDto.Id);
TicketTypeMaster? typeMaster = await _context.TicketTypeMasters.AsNoTracking().FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == typeMasterDto.Id);
if (typeMaster != null)
{
typeMaster = typeMasterDto.ToTicketTypeMasterFromTicketTypeMasterDto(tenantId);
@ -365,7 +365,7 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Ticket Type master {TicketTypeId} updated successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket type master updated successfully", 200));
}
_logger.LogError("Ticket type master {TicketTypeId} not found in database", typeMasterDto.Id);
_logger.LogError("Ticket type master {TicketTypeId} not found in database", typeMasterDto.Id != null ? typeMasterDto.Id.Value : Guid.Empty);
return NotFound(ApiResponse<object>.ErrorResponse("Ticket type master not found", "Ticket type master not found", 404));
}
_logger.LogError("User sent empyt payload");
@ -378,7 +378,7 @@ namespace Marco.Pms.Services.Controllers
Guid tenantId = _userHelper.GetTenantId();
if (priorityMasterDto != null)
{
TicketPriorityMaster? typeMaster = await _context.TicketPriorityMasters.FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == priorityMasterDto.Id);
TicketPriorityMaster? typeMaster = await _context.TicketPriorityMasters.AsNoTracking().FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == priorityMasterDto.Id);
if (typeMaster != null)
{
typeMaster = priorityMasterDto.ToTicketPriorityMasterFromTicketPriorityMasterDto(tenantId);
@ -389,7 +389,7 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Ticket Priority master {TicketPriorityId} updated successfully from tenant {tenantId}", typeMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket Priority master updated successfully", 200));
}
_logger.LogError("Ticket Priority master {TicketPriorityId} not found in database", priorityMasterDto.Id);
_logger.LogError("Ticket Priority master {TicketPriorityId} not found in database", priorityMasterDto.Id != null ? priorityMasterDto.Id.Value : Guid.Empty);
return NotFound(ApiResponse<object>.ErrorResponse("Ticket Priority master not found", "Ticket Priority master not found", 404));
}
_logger.LogError("User sent empyt payload");
@ -402,7 +402,7 @@ namespace Marco.Pms.Services.Controllers
var tenantId = _userHelper.GetTenantId();
if (tagMasterDto != null)
{
TicketTagMaster? tagMaster = await _context.TicketTagMasters.FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == tagMasterDto.Id);
TicketTagMaster? tagMaster = await _context.TicketTagMasters.AsNoTracking().FirstOrDefaultAsync(s => s.TenantId == tenantId && s.Id == tagMasterDto.Id);
if (tagMaster != null)
{
tagMaster = tagMasterDto.ToTicketTagMasterFromTicketTagMasterDto(tenantId);
@ -413,7 +413,7 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Ticket Tag master {TicketTypeId} updated successfully from tenant {tenantId}", tagMaster.Id, tenantId);
return Ok(ApiResponse<object>.SuccessResponse(typeVM, "Ticket tag master updated successfully", 200));
}
_logger.LogError("Ticket tag master {TicketTypeId} not found in database", tagMasterDto.Id);
_logger.LogError("Ticket tag master {TicketTypeId} not found in database", tagMasterDto.Id != null ? tagMasterDto.Id.Value : Guid.Empty);
return NotFound(ApiResponse<object>.ErrorResponse("Ticket tag master not found", "Ticket tag master not found", 404));
}
_logger.LogError("User sent empyt payload");