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
12
Issues
12
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
aeb3084b
Commit
aeb3084b
authored
Oct 15, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Respect incoming Dataset#uuid when creating a new record
- Test that VocabularyTerms are deleted with Descriptor
parent
9111ee6e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
1 deletion
+24
-1
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
.../org/genesys/catalog/service/impl/DatasetServiceImpl.java
+1
-0
src/test/java/org/genesys/test/catalog/services/CatalogServiceTest.java
...org/genesys/test/catalog/services/CatalogServiceTest.java
+4
-0
src/test/java/org/genesys/test/catalog/services/DatasetServiceTest.java
...org/genesys/test/catalog/services/DatasetServiceTest.java
+2
-0
src/test/java/org/genesys/test/catalog/services/DescriptorServiceTest.java
.../genesys/test/catalog/services/DescriptorServiceTest.java
+17
-1
No files found.
src/main/java/org/genesys/catalog/service/impl/DatasetServiceImpl.java
View file @
aeb3084b
...
@@ -143,6 +143,7 @@ public class DatasetServiceImpl implements DatasetService {
...
@@ -143,6 +143,7 @@ public class DatasetServiceImpl implements DatasetService {
datasetVersionsRepository
.
save
(
datasetVersions
);
datasetVersionsRepository
.
save
(
datasetVersions
);
Dataset
dataset
=
new
Dataset
();
Dataset
dataset
=
new
Dataset
();
dataset
.
setUuid
(
source
.
getUuid
());
dataset
.
setVersions
(
datasetVersions
);
dataset
.
setVersions
(
datasetVersions
);
copyValues
(
dataset
,
source
);
copyValues
(
dataset
,
source
);
dataset
.
setOwner
(
source
.
getOwner
());
dataset
.
setOwner
(
source
.
getOwner
());
...
...
src/test/java/org/genesys/test/catalog/services/CatalogServiceTest.java
View file @
aeb3084b
...
@@ -28,6 +28,7 @@ import org.genesys.catalog.persistence.PartnerRepository;
...
@@ -28,6 +28,7 @@ import org.genesys.catalog.persistence.PartnerRepository;
import
org.genesys.catalog.persistence.ShortFilterRepository
;
import
org.genesys.catalog.persistence.ShortFilterRepository
;
import
org.genesys.catalog.persistence.traits.DescriptorListRepository
;
import
org.genesys.catalog.persistence.traits.DescriptorListRepository
;
import
org.genesys.catalog.persistence.traits.DescriptorRepository
;
import
org.genesys.catalog.persistence.traits.DescriptorRepository
;
import
org.genesys.catalog.persistence.vocab.VocabularyTermRepository
;
import
org.genesys.catalog.service.DescriptorListService
;
import
org.genesys.catalog.service.DescriptorListService
;
import
org.genesys.catalog.service.DescriptorService
;
import
org.genesys.catalog.service.DescriptorService
;
import
org.genesys.catalog.service.PartnerService
;
import
org.genesys.catalog.service.PartnerService
;
...
@@ -87,6 +88,9 @@ public abstract class CatalogServiceTest extends AbstractServiceTest {
...
@@ -87,6 +88,9 @@ public abstract class CatalogServiceTest extends AbstractServiceTest {
@Autowired
@Autowired
protected
VocabularyService
vocabularyService
;
protected
VocabularyService
vocabularyService
;
@Autowired
protected
VocabularyTermRepository
vocabularyTermRepository
;
@Autowired
@Autowired
protected
ShortFilterService
shortFilterService
;
protected
ShortFilterService
shortFilterService
;
...
...
src/test/java/org/genesys/test/catalog/services/DatasetServiceTest.java
View file @
aeb3084b
...
@@ -414,6 +414,8 @@ public class DatasetServiceTest extends AbstractDatasetServiceTest {
...
@@ -414,6 +414,8 @@ public class DatasetServiceTest extends AbstractDatasetServiceTest {
final
Dataset
dataset
=
buildAndSaveDataset
(
DATASET_TITLE_1
,
DATASET_DESCRIPTION_1
,
partner
,
PublishState
.
DRAFT
);
final
Dataset
dataset
=
buildAndSaveDataset
(
DATASET_TITLE_1
,
DATASET_DESCRIPTION_1
,
partner
,
PublishState
.
DRAFT
);
dataset
.
setDescriptors
(
Lists
.
newArrayList
(
descriptor1
));
dataset
.
setDescriptors
(
Lists
.
newArrayList
(
descriptor1
));
dataset
.
setUuid
(
null
);
// Clear UUID to create a copy
Dataset
savedDataset
=
datasetService
.
createDataset
(
dataset
);
Dataset
savedDataset
=
datasetService
.
createDataset
(
dataset
);
assertThat
(
savedDataset
.
getDescriptors
(),
contains
(
descriptor1
));
assertThat
(
savedDataset
.
getDescriptors
(),
contains
(
descriptor1
));
...
...
src/test/java/org/genesys/test/catalog/services/DescriptorServiceTest.java
View file @
aeb3084b
...
@@ -108,7 +108,8 @@ public class DescriptorServiceTest extends CatalogServiceTest {
...
@@ -108,7 +108,8 @@ public class DescriptorServiceTest extends CatalogServiceTest {
assertThat
(
result
,
not
(
nullValue
()));
assertThat
(
result
,
not
(
nullValue
()));
assertThat
(
result
.
getId
(),
not
(
nullValue
()));
assertThat
(
result
.
getId
(),
not
(
nullValue
()));
assertThat
(
result
.
getTerms
(),
not
(
hasSize
(
0
)));
assertThat
(
result
.
getTerms
(),
hasSize
(
2
));
assertThat
(
vocabularyTermRepository
.
count
(),
is
(
2
l
));
}
}
@Test
(
expected
=
NotFoundElement
.
class
)
@Test
(
expected
=
NotFoundElement
.
class
)
...
@@ -123,6 +124,21 @@ public class DescriptorServiceTest extends CatalogServiceTest {
...
@@ -123,6 +124,21 @@ public class DescriptorServiceTest extends CatalogServiceTest {
descriptorService
.
getDescriptor
(
result
.
getUuid
(),
result
.
getVersion
());
descriptorService
.
getDescriptor
(
result
.
getUuid
(),
result
.
getVersion
());
}
}
@Test
(
expected
=
NotFoundElement
.
class
)
public
void
testRemoveDescriptorWithTerms
()
{
final
UUID
uuid
=
UUID
.
randomUUID
();
final
Descriptor
input
=
setupDescriptor
(
uuid
,
DESCRIPTOR_TITLE_1
,
Category
.
PASSPORT
,
DataType
.
CODED
,
VERSION_1_0
,
PublishState
.
DRAFT
);
input
.
setTerms
(
Lists
.
newArrayList
(
VocabularyTerm
.
fromData
(
TERM_CODE_1
,
TERM_TITLE_1
),
VocabularyTerm
.
fromData
(
TERM_CODE_2
,
TERM_TITLE_2
)));
Descriptor
result
=
descriptorService
.
createDescriptor
(
input
);
assertThat
(
result
.
getTerms
(),
not
(
hasSize
(
0
)));
result
=
descriptorService
.
removeDescriptor
(
result
);
descriptorService
.
getDescriptor
(
result
.
getUuid
(),
result
.
getVersion
());
assertThat
(
vocabularyTermRepository
.
count
(),
is
(
0
l
));
}
@Test
@Test
public
void
testUnpublishDescriptorWithDescriptorList
()
{
public
void
testUnpublishDescriptorWithDescriptorList
()
{
// create descriptor
// create descriptor
...
...
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