Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion JobFlow.API/Services/OrganizationRealtimeNotifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ namespace JobFlow.API.Services;
public class OrganizationRealtimeNotifier : IOrganizationRealtimeNotifier
{
private readonly IHubContext<NotifierHub> _notifierHub;
private readonly ILogger<OrganizationRealtimeNotifier> _logger;

public OrganizationRealtimeNotifier(IHubContext<NotifierHub> notifierHub)
public OrganizationRealtimeNotifier(IHubContext<NotifierHub> notifierHub, ILogger<OrganizationRealtimeNotifier> logger)
{
_notifierHub = notifierHub;
_logger = logger;
}

public async Task NotifyJobStatusChangedAsync(Guid organizationId, Guid jobId, string jobTitle, JobLifecycleStatus status)
{
_logger.LogInformation("SignalR → JobStatusChanged | org:{OrgId} | job:{JobId}", organizationId, jobId);
await _notifierHub.Clients.Group($"org:{organizationId}:dashboard")
.SendAsync("JobStatusChanged", new
{
Expand All @@ -28,6 +31,7 @@ await _notifierHub.Clients.Group($"org:{organizationId}:dashboard")

public async Task NotifyAssignmentChangedAsync(Guid organizationId, Guid jobId, Guid assignmentId)
{
_logger.LogInformation("SignalR → AssignmentChanged | org:{OrgId} | assignment:{AssignmentId}", organizationId, assignmentId);
await _notifierHub.Clients.Group($"org:{organizationId}:dashboard")
.SendAsync("AssignmentChanged", new
{
Expand Down
27 changes: 27 additions & 0 deletions JobFlow.Business/Services/AssignmentService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@ public async Task<Result<AssignmentDto>> UpdateAssignmentStatusAsync(
await _realtimeNotifier.NotifyAssignmentChangedAsync(
organizationId, assignment.JobId, assignmentId);

// When assignment starts, promote the job to InProgress if not already active
if (dto.Status == AssignmentStatus.InProgress)
{
await TryStartJobAsync(organizationId, assignment.JobId);
}

// When assignment is completed, check if all assignments for the job are done
if (dto.Status == AssignmentStatus.Completed)
{
Expand Down Expand Up @@ -374,6 +380,27 @@ private async Task<AssignmentDto> MapToDtoAsync(Guid organizationId, Assignment
return MapToDto(assignment, labelMap);
}

private async Task TryStartJobAsync(Guid organizationId, Guid jobId)
{
var job = await _jobs.Query()
.Include(j => j.OrganizationClient)
.FirstOrDefaultAsync(j => j.Id == jobId);

if (job == null) return;

var promotable = new[] { JobLifecycleStatus.Draft, JobLifecycleStatus.Approved, JobLifecycleStatus.Booked };
if (!promotable.Contains(job.LifecycleStatus)) return;

var result = await _jobService.UpdateJobStatusAsync(organizationId, jobId, JobLifecycleStatus.InProgress);
if (result.IsFailure)
{
_logger.LogWarning(
"Auto-start failed for job {JobId} after assignment began: {Error}",
jobId,
result.Error.Description);
}
}

private async Task TryCompleteJobAsync(Guid organizationId, Guid jobId)
{
var allJobAssignments = await _assignments.Query()
Expand Down
Loading