Skip to content

Use sequential numbers for support task references #2861

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use sequential numbers for support task references #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 1 addition & 15 deletions TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/CheckAnswers.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Npgsql;
using TeachingRecordSystem.Core.DataStore.Postgres;
using TeachingRecordSystem.Core.DataStore.Postgres.Models;
using TeachingRecordSystem.Core.Models.SupportTasks;
Expand Down Expand Up @@ -36,7 +35,6 @@ public async Task<IActionResult> OnPostAsync()

var supportTask = new SupportTask()
{
SupportTaskReference = SupportTask.GenerateSupportTaskReference(),
CreatedOn = clock.UtcNow,
UpdatedOn = clock.UtcNow,
SupportTaskType = SupportTaskType.ConnectOneLoginUser,
Expand Down Expand Up @@ -65,19 +63,7 @@ await dbContext.AddEventAndBroadcastAsync(new LegacyEvents.SupportTaskCreatedEve
SupportTask = EventModels.SupportTask.FromModel(supportTask)
});

while (true)
{
try
{
await dbContext.SaveChangesAsync();
break;
}
catch (Exception ex) when (ex.InnerException is PostgresException postgresException && postgresException.SqlState == PostgresErrorCodes.UniqueViolation)
{
supportTask.SupportTaskReference = SupportTask.GenerateSupportTaskReference();
continue;
}
}
await dbContext.SaveChangesAsync();

await JourneyInstance.UpdateStateAsync(state => state.HasPendingSupportRequest = true);

Expand Down
2 changes: 1 addition & 1 deletion ...ordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Mappings/SupportTaskMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void Configure(EntityTypeBuilder<SupportTask> builder)
builder.ToTable("support_tasks");
builder.HasKey(p => p.SupportTaskReference);
builder.HasQueryFilter(q => EF.Property<DateTime?>(q, nameof(SupportTask.DeletedOn)) == null);
builder.Property(p => p.SupportTaskReference).HasMaxLength(16);
builder.Property(p => p.SupportTaskReference).HasMaxLength(16).HasDefaultValueSql("'TRS-' || nextval('support_task_reference')::text");
builder.HasOne(t => t.Person).WithMany().HasForeignKey(p => p.PersonId).HasConstraintName("fk_support_tasks_person");
builder.HasIndex(t => t.OneLoginUserSubject);
builder.HasIndex(t => t.PersonId);
Expand Down
Loading
Loading