Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
15
Issues
15
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
07edb134
Commit
07edb134
authored
Oct 15, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: remove files from Repository when dataset is deleted
parent
aeb3084b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
0 deletions
+33
-0
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
.../org/genesys/catalog/service/impl/DatasetServiceImpl.java
+9
-0
src/test/java/org/genesys/test/catalog/services/DatasetServiceTest.java
...org/genesys/test/catalog/services/DatasetServiceTest.java
+24
-0
No files found.
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
View file @
07edb134
...
...
@@ -460,6 +460,15 @@ public class DatasetServiceImpl implements DatasetService {
@PreAuthorize
(
"hasRole('ADMINISTRATOR') or hasPermission(#dataset, 'delete')"
)
public
Dataset
removeDataset
(
final
Dataset
dataset
)
{
final
Dataset
loadedDataset
=
loadDataset
(
dataset
);
for
(
RepositoryFile
repositoryFile
:
loadedDataset
.
getRepositoryFiles
())
{
try
{
repositoryService
.
removeFile
(
repositoryFile
);
}
catch
(
NoSuchRepositoryFileException
|
IOException
e
)
{
LOG
.
warn
(
"Could not delete file {} from dataset {}"
,
repositoryFile
.
getUuid
(),
dataset
.
getUuid
());
}
}
datasetRepository
.
delete
(
loadedDataset
);
return
loadedDataset
;
}
...
...
src/test/java/org/genesys/test/catalog/services/DatasetServiceTest.java
View file @
07edb134
...
...
@@ -511,6 +511,29 @@ public class DatasetServiceTest extends AbstractDatasetServiceTest {
assertThat
(
dataset
.
getRepositoryFiles
().
get
(
0
).
getVersion
(),
is
(
1
));
}
@Test
public
void
testRemoveFilesOnDatasetDelete
()
throws
IOException
,
InvalidRepositoryFileDataException
,
NotFoundElement
,
InvalidRepositoryPathException
{
final
File
file
=
new
File
(
getClass
().
getResource
(
"/mcpd20177.csv"
).
getPath
());
final
FileInputStream
fileInputStream
=
new
FileInputStream
(
file
);
final
MockMultipartFile
mockMultipartFile
=
new
MockMultipartFile
(
"file"
,
file
.
getName
(),
"multipart/form-data"
,
fileInputStream
);
final
Dataset
created
=
buildAndSaveDataset
(
DATASET_TITLE_1
,
DATASET_DESCRIPTION_1
,
partner
,
PublishState
.
DRAFT
);
Dataset
dataset
=
datasetService
.
addDatasetFile
(
created
,
mockMultipartFile
);
final
FileInputStream
fileInputStream2
=
new
FileInputStream
(
file
);
final
MockMultipartFile
mockMultipartFile2
=
new
MockMultipartFile
(
"file"
,
"2"
+
file
.
getName
(),
"multipart/form-data"
,
fileInputStream2
);
dataset
=
datasetService
.
addDatasetFile
(
dataset
,
mockMultipartFile2
);
assertThat
(
dataset
.
getRepositoryFiles
(),
is
(
notNullValue
()));
assertThat
(
dataset
.
getRepositoryFiles
().
size
(),
is
(
2
));
assertThat
(
dataset
.
getRepositoryFiles
().
get
(
0
).
getVersion
(),
is
(
1
));
datasetService
.
removeDataset
(
dataset
);
assertThat
(
repositoryFilePersistence
.
count
(),
is
(
0
l
));
}
@Test
public
void
testUpdateFile
()
throws
IOException
,
InvalidRepositoryFileDataException
,
NotFoundElement
,
InvalidRepositoryPathException
,
NoSuchRepositoryFileException
{
final
File
file
=
new
File
(
getClass
().
getResource
(
"/mcpd20177.csv"
).
getPath
());
...
...
@@ -544,6 +567,7 @@ public class DatasetServiceTest extends AbstractDatasetServiceTest {
assertThat
(
dataset
.
getRepositoryFiles
().
size
(),
is
(
0
));
assertThat
(
repositoryFilePersistence
.
findByUuid
(
input
.
getRepositoryFiles
().
get
(
0
).
getUuid
()),
nullValue
());
assertThat
(
repositoryFilePersistence
.
count
(),
is
(
0
l
));
}
@Test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment