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

JNG-6138 Duplicate reference deletion in a junction table #231

Merged
merged 3 commits into from
Feb 4, 2025
Merged

JNG-6138 Duplicate reference deletion in a junction table #231

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
2cac896
JNG-6138 Initial feature commit [ci skip]
gaborflorian Jan 31, 2025
ea9e7d4
also check for single relation the duplicated id removes
gaborflorian Jan 31, 2025
a6d7b12
filter out the duplicated junction table refenreces
gaborflorian Feb 3, 2025
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
34 changes: 15 additions & 19 deletions ...in/java/hu/blackbelt/judo/runtime/core/dao/core/processors/DeletePayloadDaoProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,32 +156,28 @@ private void statementCollector(EClass entityType,
}
}

Set<ID> collectRemoveReferenceStatementIds = statements.stream().filter(s -> s instanceof RemoveReferenceStatement<ID>).map(s -> s.getInstance().getIdentifier()).collect(toSet());

// All references have to remove before deleting. It will contain the containment references too.
for (InstanceReference<ID> ref : instanceGraph.getReferences().stream()
.filter(r -> !processedReferences.contains(r.getReference()))
.filter(r -> r.getReference().getEOpposite() == null || !processedReferences.contains(r.getReference().getEOpposite())).toList()) {

if(ref.getReference().getEOpposite() == null || !collectRemoveReferenceStatementIds.contains(ref.getReferencedElement().getId())) {
collectRemoveReferenceStatementIds.add(ref.getReferencedElement().getId());
statements.add(InstanceExistsValidationStatement.<ID>buildInstanceExistsValidationStatement()
.type(ref.getReference().getEContainingClass())
.identifier(instanceGraph.getId())
.build());
statements.add(InstanceExistsValidationStatement.<ID>buildInstanceExistsValidationStatement()
.type(ref.getReference().getEContainingClass())
.identifier(instanceGraph.getId())
.build());

statements.add(InstanceExistsValidationStatement.<ID>buildInstanceExistsValidationStatement()
.type(ref.getReference().getEReferenceType())
.identifier(ref.getReferencedElement().getId())
.build());
statements.add(InstanceExistsValidationStatement.<ID>buildInstanceExistsValidationStatement()
.type(ref.getReference().getEReferenceType())
.identifier(ref.getReferencedElement().getId())
.build());

statements.add(RemoveReferenceStatement.<ID>buildRemoveReferenceStatement()
.type(ref.getReference().getEContainingClass())
.reference(ref.getReference())
.referenceIdentifier(ref.getReferencedElement().getId())
.identifier(instanceGraph.getId())
.build());

statements.add(RemoveReferenceStatement.<ID>buildRemoveReferenceStatement()
.type(ref.getReference().getEContainingClass())
.reference(ref.getReference())
.referenceIdentifier(ref.getReferencedElement().getId())
.identifier(instanceGraph.getId())
.build());
}
if (ref.getReference().getEOpposite() != null && AsmUtils.annotatedAsTrue(ref.getReference().getEOpposite(), "reverseCascadeDelete")) {
statementCollector(ref.getReference().getEReferenceType(),
getInstanceCollector().collectGraph(ref.getReference().getEReferenceType(), ref.getReferencedElement().getId()),
Expand Down
32 changes: 27 additions & 5 deletions .../hu/blackbelt/judo/runtime/core/dao/rdbms/executors/RemoveReferenceStatementExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
import org.springframework.jdbc.core.namedparam.SqlParameterSource;

import java.sql.SQLException;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;

import static com.google.common.base.Preconditions.checkState;
Expand Down Expand Up @@ -172,12 +169,24 @@ public void executeRemoveReferenceStatements(NamedParameterJdbcTemplate jdbcTemp
});

// Join reference
collectRdbmsReferencesReferenceStatements(statements)
List<RdbmsReference<ID>> rdbmsReferenceList = collectRdbmsReferencesReferenceStatements(statements)
.filter(r ->
r.getRule().isJoinTable() &&
// Just one side required
r.getReference().equals(((ReferenceStatement<ID>) r.getStatement()).getReference())
)
.toList();

Set<RdbmsReference<ID>> filteredRbmsReferences = new HashSet<>();

for (RdbmsReference<ID> rdbmsReference : rdbmsReferenceList) {
boolean isDuplicate = filteredRbmsReferences.stream().anyMatch(filtered -> isTheSameRecord(rdbmsReference, filtered));
if (!isDuplicate) {
filteredRbmsReferences.add(rdbmsReference);
}
}

filteredRbmsReferences
.forEach(r -> {

RdbmsTable joinTable = getRdbmsResolver().rdbmsJunctionTable(r.getReference());
Expand Down Expand Up @@ -228,4 +237,17 @@ public void executeRemoveReferenceStatements(NamedParameterJdbcTemplate jdbcTemp
checkState(count == 1, "There is illegal state, no records updated on delete reference");
});
}

// Check if two RdbmsReference objects are considered the same table record
private boolean isTheSameRecord(RdbmsReference<ID> first, RdbmsReference<ID> second) {
RdbmsTable joinTableFirst = getRdbmsResolver().rdbmsJunctionTable(first.getReference());
RdbmsTable joinTableSecond = getRdbmsResolver().rdbmsJunctionTable(second.getReference());
// same table
if (!joinTableFirst.getSqlName().equals(joinTableSecond.getSqlName())) {
return false;
}
// same id (first and second record)
return (first.getIdentifier().equals(second.getIdentifier()) && first.getOppositeIdentifier().equals(second.getOppositeIdentifier())) ||
(first.getIdentifier().equals(second.getOppositeIdentifier()) && first.getOppositeIdentifier().equals(second.getIdentifier()));
}
}
Loading