Commit f6566b54 authored by Matija Obreza's avatar Matija Obreza

DescriptorLists: include descriptor.terms in the descriptorList.descriptors list

parent f48d6c40
...@@ -98,7 +98,7 @@ public class DescriptorList extends UuidModel implements Publishable, SelfCleani ...@@ -98,7 +98,7 @@ public class DescriptorList extends UuidModel implements Publishable, SelfCleani
@JoinTable(name = "descriptorlist_descriptor", joinColumns = @JoinColumn(name = "descriptorListId", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "descriptorId", referencedColumnName = "id")) @JoinTable(name = "descriptorlist_descriptor", joinColumns = @JoinColumn(name = "descriptorListId", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "descriptorId", referencedColumnName = "id"))
@OrderColumn(name = "position") @OrderColumn(name = "position")
@JsonView({ JsonViews.Public.class }) @JsonView({ JsonViews.Public.class })
@JsonIgnoreProperties(value = { "descriptorLists", "datasets", "owner", "vocabulary", "terms" }) @JsonIgnoreProperties(value = { "descriptorLists", "datasets", "owner", "vocabulary" })
@Field(type = FieldType.Nested) @Field(type = FieldType.Nested)
List<Descriptor> descriptors; List<Descriptor> descriptors;
......
...@@ -239,6 +239,7 @@ public class DescriptorListServiceImpl implements DescriptorListService { ...@@ -239,6 +239,7 @@ public class DescriptorListServiceImpl implements DescriptorListService {
if (descriptorList.getDescriptors() != null) { if (descriptorList.getDescriptors() != null) {
descriptorList.getDescriptors().size(); descriptorList.getDescriptors().size();
descriptorList.getDescriptors().forEach(descriptor -> descriptor.getTerms().size());
} }
if (descriptorList.getOwner() != null) { if (descriptorList.getOwner() != null) {
descriptorList.getOwner().getId(); descriptorList.getOwner().getId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment