Skip to content

fix bugs and unclear messages and use Database Progress modal for ext… #930

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

Open
nbeatty-gpa wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix bugs and unclear messages and use Database Progress modal for ext… #930

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
b1571f0
fix bugs and unclear messages and use Database Progress modal for ext…
nbeatty-gpa Aug 19, 2026
5f6b3b4
update status messages and add warning if multiple rows returned for …
nbeatty-gpa Aug 20, 2026
8a751d4
only list a record as updated if a field of it has been updated
nbeatty-gpa Aug 20, 2026
71762b2
prevent errors from comparing Integer to Null in flee expression
nbeatty-gpa Aug 20, 2026
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
128 changes: 116 additions & 12 deletions Source/Applications/SystemCenter/Controllers/SystemCenter/SystemCenterController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,20 +1836,72 @@ public static AppStatus CreateErrorStatus(InvalidOperationException e)
}

[HttpGet, Route("UnscheduledUpdate/{recordID:int}")]
public IHttpActionResult UnscheduledUpdate(int recordID)
public HttpResponseMessage UnscheduledUpdate(int recordID)
{
HttpResponseMessage response = Request.CreateResponse();

if (!PostAuthCheck())
return Unauthorized();
{
response.StatusCode = HttpStatusCode.Unauthorized;
return response;
}

ExternalDatabases? extDB;
using (AdoDataConnection connection = ConnectionFactory())
{
ExternalDatabases? extDB = new TableOperations<ExternalDatabases>(connection).QueryRecordWhere("ID = {0}", recordID);
extDB = new TableOperations<ExternalDatabases>(connection).QueryRecordWhere("ID = {0}", recordID);

if (extDB == null)
return NotFound();

return Ok(ScheduledExtDBTask.Run(extDB));
{
response.StatusCode = HttpStatusCode.NotFound;
return response;
}
}

ConcurrentQueue<ExtDBTaskStatus> logQueue = new ConcurrentQueue<ExtDBTaskStatus>();

Task runTask = Task.Run(() => ScheduledExtDBTask.Run(extDB, logQueue));

response.Content = new PushStreamContent(async (stream, content, context) =>
{
try
{
while (!runTask.IsCompleted || !logQueue.IsEmpty)
{
if (!logQueue.TryDequeue(out ExtDBTaskStatus? msg))
{
await Task.Delay(250);
continue;
}

byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(msg) + "\n");
await stream.WriteAsync(bytes, 0, bytes.Length);
await stream.FlushAsync();
}

if (runTask.IsFaulted)
{
ExtDBTaskStatus errorMessage = new ExtDBTaskStatus()
{
PercentFinished = 100,
Status = "Error",
Message = runTask.Exception.GetBaseException().Message
};

byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(errorMessage) + "\n");
await stream.WriteAsync(bytes, 0, bytes.Length);
await stream.FlushAsync();
}
}
finally
{
stream.Close();
}
}, "application/x-ndjson");

response.Headers.CacheControl = new CacheControlHeaderValue() { NoCache = true };
response.Headers.TransferEncodingChunked = true;
return response;
}

[HttpGet, Route("UnscheduledUpdate/{recordID:int}/{parentTable}")]
Expand Down Expand Up @@ -1922,20 +1974,72 @@ public HttpResponseMessage UnscheduledUpdate(int recordID, string parentTable)
}

[HttpGet, Route("UnscheduledUpdate/{recordID:int}/{parentTable}/{parentID:int}")]
public IHttpActionResult UnscheduledUpdate(int recordID, string parentTable, int parentID)
public HttpResponseMessage UnscheduledUpdate(int recordID, string parentTable, int parentID)
{
HttpResponseMessage response = Request.CreateResponse();

if (!PostAuthCheck())
return Unauthorized();
{
response.StatusCode = HttpStatusCode.Unauthorized;
return response;
}

ExternalDatabases? extDB;
using (AdoDataConnection connection = ConnectionFactory())
{
ExternalDatabases? extDB = new TableOperations<ExternalDatabases>(connection).QueryRecordWhere("ID = {0}", recordID);
extDB = new TableOperations<ExternalDatabases>(connection).QueryRecordWhere("ID = {0}", recordID);

if (extDB == null)
return NotFound();

return Ok(ScheduledExtDBTask.Run(extDB, parentTable, parentID));
{
response.StatusCode = HttpStatusCode.NotFound;
return response;
}
}

ConcurrentQueue<ExtDBTaskStatus> logQueue = new ConcurrentQueue<ExtDBTaskStatus>();

Task runTask = Task.Run(() => ScheduledExtDBTask.Run(extDB, parentTable, parentID, logQueue));

response.Content = new PushStreamContent(async (stream, content, context) =>
{
try
{
while (!runTask.IsCompleted || !logQueue.IsEmpty)
{
if (!logQueue.TryDequeue(out ExtDBTaskStatus? msg))
{
await Task.Delay(250);
continue;
}

byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(msg) + "\n");
await stream.WriteAsync(bytes, 0, bytes.Length);
await stream.FlushAsync();
}

if (runTask.IsFaulted)
{
ExtDBTaskStatus errorMessage = new ExtDBTaskStatus()
{
PercentFinished = 100,
Status = "Error",
Message = runTask.Exception.GetBaseException().Message
};

byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(errorMessage) + "\n");
await stream.WriteAsync(bytes, 0, bytes.Length);
await stream.FlushAsync();
}
}
finally
{
stream.Close();
}
}, "application/x-ndjson");

response.Headers.CacheControl = new CacheControlHeaderValue() { NoCache = true };
response.Headers.TransferEncodingChunked = true;
return response;
}
}

Expand Down
Loading