Skip to content

Soft deletion in scl files #467

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

Closed
wants to merge 2 commits into from
Closed

Soft deletion in scl files #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6b164
Update CompasSclDataPostgreSQLRepository.java
pascalwilbrink Dec 11, 2024
83e9175
Create v1_5__add_is_deleted_flag.sql
pascalwilbrink Dec 11, 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
11 changes: 9 additions & 2 deletions ...org/lfenergy/compas/scl/data/repository/postgresql/CompasSclDataPostgreSQLRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public List<IItem> list(SclFileType type) {
from (select distinct on (scl_file.id) *
from scl_file
where scl_file.type = ?
AND scl_file.is_deleted = false
order by scl_file.id
, scl_file.major_version desc
, scl_file.minor_version desc
Expand Down Expand Up @@ -115,6 +116,7 @@ left outer join (
and scl_data.patch_version = scl_file.patch_version
where scl_file.id = ?
and scl_file.type = ?
and scl_file.is_deleted = false
order by scl_file.major_version
, scl_file.minor_version
, scl_file.patch_version
Expand Down Expand Up @@ -162,6 +164,7 @@ public String findByUUID(SclFileType type, UUID id, Version version) {
and scl_file.major_version = ?
and scl_file.minor_version = ?
and scl_file.patch_version = ?
and scl_file.is_deleted = false
""";

try (var connection = dataSource.getConnection();
Expand Down Expand Up @@ -191,6 +194,7 @@ public boolean hasDuplicateSclName(SclFileType type, String name) {
select distinct on (scl_file.id) scl_file.name
from scl_file
where scl_file.type = ?
and scl_file.is_deleted = false
order by scl_file.id
, scl_file.major_version desc
, scl_file.minor_version desc
Expand Down Expand Up @@ -221,6 +225,7 @@ public IAbstractItem findMetaInfoByUUID(SclFileType type, UUID id) {
from scl_file
where scl_file.id = ?
and scl_file.type = ?
and scl_file.is_deleted = false
order by scl_file.major_version desc, scl_file.minor_version desc, scl_file.patch_version desc
""";

Expand Down Expand Up @@ -305,7 +310,8 @@ insert into scl_label(scl_id, major_version, minor_version, patch_version, label
@Transactional(REQUIRED)
public void delete(SclFileType type, UUID id) {
var sql = """
delete from scl_file
UPDATE scl_file
SET scl_file.is_deleted = false
where scl_file.id = ?
and scl_file.type = ?
""";
Expand All @@ -324,7 +330,8 @@ public void delete(SclFileType type, UUID id) {
@Transactional(REQUIRED)
public void delete(SclFileType type, UUID id, Version version) {
var sql = """
delete from scl_file
UPDATE scl_file
SET scl_file.is_deleted = false
where scl_file.id = ?
and scl_file.type = ?
and scl_file.major_version = ?
Expand Down
14 changes: 14 additions & 0 deletions ...lfenergy/compas/scl/data/repository/postgresql/db/migration/v1_5__add_is_deleted_flag.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* SPDX-FileCopyrightText: 2021 Alliander N.V.
*
* SPDX-License-Identifier: Apache-2.0
*/

--
-- Update SCL File Table to add soft deletion
--

ALTER TABLE scl_file
ADD COLUMN is_deleted BOOLEAN DEFAULT false;

comment on column scl_file.is_deleted is 'Flag is the SCL File is deleted.';
Loading