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

prevent db deadlocks while updating feature tags [MRXN23-316] #1578

Merged
merged 2 commits into from
Nov 16, 2023
Merged

prevent db deadlocks while updating feature tags [MRXN23-316] #1578

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058e391
use transactional queryRunner for all db ops in method
hotzevzl Nov 14, 2023
9fde377
add test for concurrent tag updates
hotzevzl Nov 15, 2023
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
21 changes: 14 additions & 7 deletions api/apps/api/src/modules/geo-feature-tags/geo-feature-tags.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,20 +160,27 @@ export class GeoFeatureTagsService {
await apiQueryRunner.startTransaction();

try {
const previousTag = await this.geoFeatureTagsRepo.findOne({
const previousTag = await apiQueryRunner.manager.findOne(GeoFeatureTag, {
where: { projectId, featureId },
});
if (previousTag) {
await this.geoFeatureTagsRepo.delete(previousTag.id);
await apiQueryRunner.manager.delete(GeoFeatureTag, previousTag.id);
}

await this.geoFeatureTagsRepo.save(
this.geoFeatureTagsRepo.create({ projectId, featureId, tag }),
await apiQueryRunner.manager.save(GeoFeatureTag, {
projectId,
featureId,
tag,
});

const updatedGeoFeature = await apiQueryRunner.manager.findOneOrFail(
GeoFeature,
{
where: { id: featureId, projectId },
},
);

const updatedGeoFeature = await this.geoFeaturesRepo.findOneOrFail({
where: { id: featureId, projectId },
});
await apiQueryRunner.commitTransaction();

return right(updatedGeoFeature);
} catch (err) {
Expand Down