Skip to content

Dev to Prod #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MWG-Logan merged 4 commits into from
Oct 31, 2025
Merged

Dev to Prod #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
843cef4
Bump Microsoft.AspNetCore.Components.WebAssembly.DevServer from 9.0.0…
dependabot[bot] Oct 29, 2025
d1fca28
Bump Microsoft.Azure.Functions.Worker from 2.50.0-preview1 to 2.50.0-…
dependabot[bot] Oct 29, 2025
f62acbf
Bump Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore from…
dependabot[bot] Oct 29, 2025
1d4a8cd
Web refinement (#11)
MWG-Logan Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions Bezalu.ProjectReporting.API/Bezalu.ProjectReporting.API.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -12,12 +12,21 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<OpenApiReference Include="..\..\..\..\Downloads\All.json" ClassName="ConnectwisePSA" Link="OpenAPIs\All.json" />
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.50.0-preview1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.50.0-preview2" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.2" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="QuestPDF" Version="2025.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Bezalu.ProjectReporting.Shared\Bezalu.ProjectReporting.Shared.csproj" />
</ItemGroup>

<ItemGroup>
<Folder Include="DTOs\" />
</ItemGroup>

</Project>
6 changes: 0 additions & 6 deletions Bezalu.ProjectReporting.API/DTOs/ProjectCompletionReportRequest.cs
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions Bezalu.ProjectReporting.API/DTOs/ProjectCompletionReportResponse.cs
View file
Open in desktop

This file was deleted.

209 changes: 201 additions & 8 deletions Bezalu.ProjectReporting.API/Functions/ProjectCompletionReportFunction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
using Bezalu.ProjectReporting.API.DTOs;
using Bezalu.ProjectReporting.API.Services;
using Bezalu.ProjectReporting.Shared.DTOs;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.Functions.Worker;
using Microsoft.Extensions.Logging;
using QuestPDF;
using QuestPDF.Fluent;
using QuestPDF.Infrastructure;

namespace Bezalu.ProjectReporting.API.Functions;

Expand All @@ -13,7 +16,7 @@ public class ProjectCompletionReportFunction(
{
[Function("GenerateProjectCompletionReport")]
public async Task<IActionResult> Run(
[HttpTrigger(AuthorizationLevel.Function, "post", Route = "reports/project-completion")]
[HttpTrigger(AuthorizationLevel.Function, "post", Route = "reports/project-completion")]
HttpRequest req,
CancellationToken cancellationToken)
{
Expand All @@ -22,14 +25,12 @@ public async Task<IActionResult> Run(
try
{
var request = await req.ReadFromJsonAsync<ProjectCompletionReportRequest>(cancellationToken);

if (request == null || request.ProjectId <= 0)
{

if (request is not { ProjectId: > 0 })
return new BadRequestObjectResult(new { error = "Invalid project ID" });
}

var report = await reportingService.GenerateProjectCompletionReportAsync(
request.ProjectId,
request.ProjectId,
cancellationToken);

return new OkObjectResult(report);
Expand All @@ -48,4 +49,196 @@ public async Task<IActionResult> Run(
};
}
}
}

// Changed to POST and accepts full report body to avoid regeneration
[Function("GenerateProjectCompletionReportPdf")]
public async Task<IActionResult> RunPdf(
[HttpTrigger(AuthorizationLevel.Function, "post", Route = "reports/project-completion/pdf")]
HttpRequest req,
CancellationToken cancellationToken)
{
logger.LogInformation("Processing project completion report PDF request (direct report body)");

try
{
var report = await req.ReadFromJsonAsync<ProjectCompletionReportResponse>(cancellationToken);
if (report is not { ProjectId: > 0 })
return new BadRequestObjectResult(new { error = "Invalid report payload" });

Settings.License = LicenseType.Community;

var document = Document.Create(container =>
{
container.Page(page =>
{
page.Margin(30);
page.Header().Row(row =>
{
row.RelativeItem().Column(stack =>
{
stack.Item().Text(report.ProjectName ?? "Project").FontSize(18).SemiBold();
stack.Item().Text($"Generated: {report.GeneratedAt:yyyy-MM-dd HH:mm} UTC").FontSize(9);
});
row.ConstantItem(80).AlignRight().Column(stack =>
{
stack.Item().Text($"ID: {report.ProjectId}").FontSize(10);
stack.Item().Text(report.Summary?.Status ?? string.Empty).FontSize(10);
});
});

page.Content().Column(stack =>
{
if (report.Summary != null)
stack.Item().PaddingBottom(10).Element(SummarySection(report));
if (report.Timeline != null)
stack.Item().PaddingBottom(10).Element(TimelineSection(report));
if (report.Budget != null)
stack.Item().PaddingBottom(10).Element(BudgetSection(report));
if (!string.IsNullOrWhiteSpace(report.AiGeneratedSummary))
stack.Item().PaddingBottom(10).Element(AISummarySection(report));
if (report.Phases?.Any() == true)
stack.Item().PaddingBottom(10).Element(PhasesSection(report));
if (report.Tickets?.Any() == true)
stack.Item().PaddingBottom(10).Element(TicketsSection(report));
});

page.Footer().AlignCenter().Text(text =>
{
text.Span("Project Completion Report - Page ").FontSize(9);
text.CurrentPageNumber().FontSize(9);
text.Span(" / ").FontSize(9);
text.TotalPages().FontSize(9);
});
});
});

var pdfBytes = document.GeneratePdf();
return new FileContentResult(pdfBytes, "application/pdf")
{
FileDownloadName = $"project-{report.ProjectId}-completion-report.pdf"
};
}
catch (Exception ex)
{
logger.LogError(ex, "Error generating project completion report PDF");
return new ObjectResult(new { error = "An error occurred while generating the PDF" })
{
StatusCode = StatusCodes.Status500InternalServerError
};
}
}

private static Action<IContainer> SummarySection(ProjectCompletionReportResponse report)
{
return c =>
{
var s = report.Summary;
c.Column(col =>
{
col.Item().Text("Project Summary").FontSize(14).Bold();
col.Item().Text($"Manager: {s?.Manager ?? string.Empty}").FontSize(10);
col.Item().Text($"Company: {s?.Company ?? string.Empty}").FontSize(10);
col.Item().Text($"Status: {s?.Status ?? string.Empty}").FontSize(10);
if (s is { PlannedStart: not null, PlannedEnd: not null })
col.Item().Text($"Planned: {s.PlannedStart:yyyy-MM-dd} > {s.PlannedEnd:yyyy-MM-dd}").FontSize(10);
if (s is { ActualStart: not null, ActualEnd: not null })
col.Item().Text($"Actual: {s.ActualStart:yyyy-MM-dd} > {s.ActualEnd:yyyy-MM-dd}").FontSize(10);
});
};
}

private static Action<IContainer> TimelineSection(ProjectCompletionReportResponse report)
{
return c =>
{
var t = report.Timeline;
c.Column(col =>
{
col.Item().Text("Timeline Analysis").FontSize(14).Bold();
col.Item().Text($"Planned Days: {t?.PlannedDays}").FontSize(10);
col.Item().Text($"Actual Days: {t?.TotalDays}").FontSize(10);
col.Item().Text($"Variance: {t?.VarianceDays}").FontSize(10);
col.Item().Text($"Schedule Adherence: {t?.ScheduleAdherence}").FontSize(10);
col.Item().Text($"Schedule Performance: {t?.SchedulePerformance}").FontSize(10);
});
};
}

private static Action<IContainer> BudgetSection(ProjectCompletionReportResponse report)
{
return c =>
{
var b = report.Budget;
c.Column(col =>
{
col.Item().Text("Budget Analysis").FontSize(14).Bold();
col.Item().Text($"Estimated Hours: {b?.EstimatedHours}").FontSize(10);
col.Item().Text($"Actual Hours: {b?.ActualHours}").FontSize(10);
col.Item().Text($"Variance Hours: {b?.VarianceHours}").FontSize(10);
col.Item().Text($"Budget Adherence: {b?.BudgetAdherence}").FontSize(10);
col.Item().Text($"Cost Performance: {b?.CostPerformance}").FontSize(10);
});
};
}

private static Action<IContainer> AISummarySection(ProjectCompletionReportResponse report)
{
return c =>
{
c.Column(col =>
{
col.Item().Text("AI Generated Summary").FontSize(14).Bold();
col.Item().Text(report.AiGeneratedSummary ?? string.Empty).FontSize(10);
});
};
}

private static Action<IContainer> PhasesSection(ProjectCompletionReportResponse report)
{
return c =>
{
c.Column(col =>
{
col.Item().Text("Phases").FontSize(14).Bold();
foreach (var phase in report.Phases ?? [])
col.Item().BorderBottom(1).PaddingVertical(4).Column(inner =>
{
inner.Item().Text($"{phase.PhaseName} ({phase.Status})").SemiBold();
if (phase is { ActualStart: not null, ActualEnd: not null })
inner.Item().Text($"Actual: {phase.ActualStart:yyyy-MM-dd} > {phase.ActualEnd:yyyy-MM-dd}")
.FontSize(9);
inner.Item().Text($"Hours est/actual: {phase.EstimatedHours}/{phase.ActualHours}").FontSize(9);
});
});
};
}

private static Action<IContainer> TicketsSection(ProjectCompletionReportResponse report)
{
return c =>
{
c.Column(col =>
{
col.Item().Text("Tickets").FontSize(14).Bold();
foreach (var ticket in report.Tickets ?? [])
col.Item().BorderBottom(1).PaddingVertical(4).Column(inner =>
{
inner.Item().Text($"#{ticket.TicketNumber} {ticket.Summary} ({ticket.Status})").SemiBold();
inner.Item().Text($"Type: {ticket.Type}/{ticket.SubType}").FontSize(9);
inner.Item().Text($"Hours est/actual: {ticket.EstimatedHours}/{ticket.ActualHours}")
.FontSize(9);
if (ticket.ClosedDate != null)
inner.Item().Text($"Closed: {ticket.ClosedDate:yyyy-MM-dd}").FontSize(9);
if (!string.IsNullOrWhiteSpace(ticket.AssignedTo))
inner.Item().Text($"Assigned: {ticket.AssignedTo}").FontSize(9);
if (ticket.Notes?.Any() != true) return;
inner.Item().Text("Notes:").FontSize(9);
foreach (var n in ticket.Notes.Take(10))
inner.Item().Text($" - {n}").FontSize(9);
if (ticket.Notes.Count > 10)
inner.Item().Text($" - ... ({ticket.Notes.Count - 10} more notes truncated)").FontSize(9);
});
});
};
}
}
Loading
Loading