MODINVSTOR-1284 User can delete local Subject types/sources when it linked to Instance #1119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…inked to Instance
JavokhirAbdullayev
requested review from
psmagin,
viacheslavkol,
mukhiddin-yusuf and
SvitlanaKovalova1
JavokhirAbdullayev
requested review from
dmytrokrutii,
VRohach,
KaterynaSenchenko,
RuslanLavrov and
RomanChernetskyi
psmagin
requested changes
Dec 2, 2024
psmagin
reviewed
Dec 4, 2024
# Conflicts: # src/main/resources/templates/db_scripts/schema.json
RuslanLavrov
reviewed
Dec 6, 2024
VRohach
approved these changes
Dec 6, 2024
psmagin
requested changes
Dec 10, 2024
|
|
||
| for (var subject : newInstance.getSubjects()) { | ||
| if (subject.getSourceId() == null) { | ||
| instanceRepository.unlinkInstanceFromSubjectSource(instanceId); |
There was a problem hiding this comment.
Here you unlink all subjects from the instance, but should unlink only one based on your logic.
Co-authored-by: Pavlo Smahin <[email protected]>
psmagin
reviewed
Dec 10, 2024
Comment on lines
47
to
98
| public void linkInstanceWithSubjectSourceAndType(Instance instance) { | ||
| instance.getSubjects().forEach(subject -> { | ||
| var sql = new StringBuilder(); | ||
| if (subject.getSourceId() != null) { | ||
| sql.append(" INSERT INTO "); | ||
| sql.append(postgresClientFuturized.getFullTableName(INSTANCE_SUBJECT_SOURCE_TABLE)); | ||
| sql.append(" (instance_id, source_id) "); | ||
| sql.append(" VALUES "); | ||
| sql.append(String.format("( '%s' , '%s' ) ON CONFLICT DO NOTHING; ", instance.getId(), subject.getSourceId())); | ||
| } | ||
| if (subject.getTypeId() != null) { | ||
| sql.append(" INSERT INTO "); | ||
| sql.append(postgresClientFuturized.getFullTableName(INSTANCE_SUBJECT_TYPE_TABLE)); | ||
| sql.append(" (instance_id, type_id) "); | ||
| sql.append(" VALUES "); | ||
| sql.append(String.format("( '%s' , '%s' ) ON CONFLICT DO NOTHING; ", instance.getId(), subject.getTypeId())); | ||
| } | ||
| var sqlString = sql.toString(); | ||
| if (!isBlank(sqlString)) { | ||
| postgresClient.execute(sql.toString()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| public void unlinkInstanceFromSubjectSource(String instanceId) { | ||
| var sql = unlinkInstanceFromSubjectSql(INSTANCE_SUBJECT_SOURCE_TABLE, instanceId); | ||
| postgresClient.execute(sql); | ||
| } | ||
|
|
||
| public void unlinkInstanceFromSubjectType(String instanceId) { | ||
| var sql = unlinkInstanceFromSubjectSql(INSTANCE_SUBJECT_TYPE_TABLE, instanceId); | ||
| postgresClient.execute(sql); | ||
| } | ||
|
|
||
| private String unlinkInstanceFromSubjectSql(String table, String id) { | ||
| return String.format("DELETE FROM %s WHERE instance_id = '%s'; ", postgresClientFuturized.getFullTableName(table), id); | ||
| } | ||
|
|
||
| public void unlinkSubjectSource(String instanceId, String sourceId) { | ||
| var sql = "DELETE FROM " + | ||
| postgresClientFuturized.getFullTableName(INSTANCE_SUBJECT_SOURCE_TABLE) + | ||
| String.format(" WHERE instance_id = '%s' AND source_id = '%s';", | ||
| instanceId, sourceId); | ||
| postgresClient.execute(sql); | ||
| } | ||
|
|
||
| public void unlinkSubjectType(String instanceId, String typeId) { | ||
| var sql = "DELETE FROM " + | ||
| postgresClientFuturized.getFullTableName(INSTANCE_SUBJECT_TYPE_TABLE) + | ||
| String.format(" WHERE instance_id = '%s' AND type_id = '%s';", instanceId, | ||
| typeId); | ||
| postgresClient.execute(sql); |
There was a problem hiding this comment.
Basicaly the logic should be like following:
- Get all source/type ids from new instance subjects.
- Get all source/type ids from old instance subjects.
- Identify distinction: what should be created, what should be deleted.
- Do queries for creating and deleting these relations in batch and not one by one.
psmagin
reviewed
Dec 11, 2024
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
MODINVSTOR-1284 User can delete local Subject types/sources when it linked to Instance
Approach
add validation to check if subject source/type linked with instance
Changes Checklist
Related Issues
List any Jira issues related to this pull request.
Learning and Resources (if applicable)
Discuss any research conducted during the development of this pull request. Include links to relevant blog posts, patterns, libraries, or addons that were used to solve the problem.
Screenshots (if applicable)