Skip to content
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

fix: Using existing transmission/activity IDs should return HTTP 422 #960

Merged
merged 3 commits into from
Aug 5, 2024
Merged

fix: Using existing transmission/activity IDs should return HTTP 422 #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178d2a4
Add transmission id check on create
oskogstad Aug 2, 2024
d1c351a
Add correct existing ID check back to update command
oskogstad Aug 4, 2024
2c8742a
Fix append transmission check
oskogstad Aug 4, 2024
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
7 changes: 7 additions & 0 deletions ...orten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities;
using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities.Activities;
using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities.Attachments;
using Digdir.Domain.Dialogporten.Domain.Dialogs.Entities.Transmissions;
using FluentValidation.Results;
using MediatR;
using OneOf;
Expand Down Expand Up @@ -121,6 +122,12 @@ public async Task<CreateDialogResult> Handle(CreateDialogCommand request, Cancel
_domainContext.AddError(DomainFailure.EntityExists<DialogAttachment>(existingAttachmentIds));
}

var existingTransmissionIds = await _db.GetExistingIds(dialog.Transmissions, cancellationToken);
if (existingTransmissionIds.Count != 0)
{
_domainContext.AddError(DomainFailure.EntityExists<DialogTransmission>(existingTransmissionIds));
}

await _db.Dialogs.AddAsync(dialog, cancellationToken);

var saveResult = await _unitOfWork.SaveChangesAsync(cancellationToken);
Expand Down
27 changes: 13 additions & 14 deletions ...orten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,14 @@ public async Task<UpdateDialogResult> Handle(UpdateDialogCommand request, Cancel
_mapper.Map(request.Dto, dialog);
ValidateTimeFields(dialog);

AppendActivity(dialog, request.Dto);
await AppendActivity(dialog, request.Dto, cancellationToken);
VerifyActivityRelations(dialog);

AppendTransmission(dialog, request.Dto);
VerifyActivityTransmissionRelations(dialog);
await AppendTransmission(dialog, request.Dto, cancellationToken);
VerifyTransmissionRelations(dialog);

VerifyActivityTransmissionRelations(dialog);

dialog.SearchTags
.Merge(request.Dto.SearchTags,
destinationKeySelector: x => x.Value,
Expand Down Expand Up @@ -205,19 +206,16 @@ private void ValidateTimeFields(DialogEntity dialog)
}
}

private void AppendActivity(DialogEntity dialog, UpdateDialogDto dto)
private async Task AppendActivity(DialogEntity dialog, UpdateDialogDto dto, CancellationToken cancellationToken)
{
var newDialogActivities = _mapper.Map<List<DialogActivity>>(dto.Activities);

var existingIds = dialog.Activities.Select(x => x.Id).ToList();

existingIds = existingIds.Intersect(newDialogActivities.Select(x => x.Id)).ToList();
var existingIds = await _db.GetExistingIds(newDialogActivities, cancellationToken);
if (existingIds.Count != 0)
{
_domainContext.AddError(
nameof(UpdateDialogDto.Activities),
$"Entity '{nameof(DialogActivity)}' with the following key(s) already exists: ({string.Join(", ", existingIds)}).");
return;
}

dialog.Activities.AddRange(newDialogActivities);
Expand Down Expand Up @@ -280,19 +278,16 @@ private void VerifyActivityRelations(DialogEntity dialog)
}
}

private void AppendTransmission(DialogEntity dialog, UpdateDialogDto dto)
private async Task AppendTransmission(DialogEntity dialog, UpdateDialogDto dto, CancellationToken cancellationToken)
{
var newDialogTransmissions = _mapper.Map<List<DialogTransmission>>(dto.Transmissions);

var existingIds = dialog.Transmissions.Select(x => x.Id).ToList();

existingIds = existingIds.Intersect(newDialogTransmissions.Select(x => x.Id)).ToList();
var existingIds = await _db.GetExistingIds(newDialogTransmissions, cancellationToken);
if (existingIds.Count != 0)
{
_domainContext.AddError(
nameof(UpdateDialogDto.Transmissions),
$"Entity '{nameof(DialogTransmission)}' with the following key(s) already exists: ({string.Join(", ", existingIds)}).");
return;
}

dialog.Transmissions.AddRange(newDialogTransmissions);
Expand All @@ -303,7 +298,11 @@ private void AppendTransmission(DialogEntity dialog, UpdateDialogDto dto)

private void VerifyTransmissionRelations(DialogEntity dialog)
{
var relatedTransmissionIds = dialog.Transmissions.Where(x => x.RelatedTransmissionId is not null).Select(x => x.RelatedTransmissionId).ToList();
var relatedTransmissionIds = dialog.Transmissions
.Where(x => x.RelatedTransmissionId is not null)
.Select(x => x.RelatedTransmissionId)
.ToList();

if (relatedTransmissionIds.Count == 0)
{
return;
Expand Down
Loading