From eeef1df43785b25a5c07a06538cea86fb3c64072 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 18 Oct 2023 10:17:16 +0200 Subject: [PATCH] updated model classes --- .../model/community/CommunityDetails.java | 2 ++ .../model/community/CommunitySummary.java | 18 ++++++++++++++++-- .../community/CommunityWritableProperties.java | 11 +++++++++++ .../exporter/model/community/SubCommunity.java | 13 +++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java index a55ef2f6..919fc03a 100644 --- a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java @@ -159,6 +159,8 @@ public class CommunityDetails extends CommunitySummary { .append(zenodoCommunity) .append(",\n\tsuggestedAcknowledgements = ") .append(suggestedAcknowledgements) + .append(",\n\tplan = ") + .append(plan) .append("\n]"); return builder.toString(); } diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunitySummary.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunitySummary.java index 57b52c4b..2d17ad35 100644 --- a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunitySummary.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunitySummary.java @@ -48,6 +48,9 @@ public class CommunitySummary { @Schema(description = "Zenodo community associated to this community") protected String zenodoCommunity; + @Schema(description = "community plan") + protected String plan; + public CommunitySummary() {} public CommunitySummary( @@ -61,7 +64,8 @@ public class CommunitySummary { final String description, final String logoUrl, final CommunityStatus status, - final String zenodoCommunity) { + final String zenodoCommunity, + final String plan) { this.id = id; this.queryId = queryId; this.type = type; @@ -73,6 +77,7 @@ public class CommunitySummary { this.logoUrl = logoUrl; this.status = status; this.zenodoCommunity = zenodoCommunity; + this.plan = plan; } public CommunitySummary(final CommunitySummary summary) { @@ -86,7 +91,8 @@ public class CommunitySummary { summary.getDescription(), summary.getLogoUrl(), summary.getStatus(), - summary.getZenodoCommunity()); + summary.getZenodoCommunity(), + summary.getPlan()); } public String getId() { @@ -193,4 +199,12 @@ public class CommunitySummary { this.zenodoCommunity = zenodoCommunity; } + public String getPlan() { + return plan; + } + + public void setPlan(final String plan) { + this.plan = plan; + } + } diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityWritableProperties.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityWritableProperties.java index 244dab3e..6db6d0fa 100644 --- a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityWritableProperties.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityWritableProperties.java @@ -55,6 +55,9 @@ public class CommunityWritableProperties { @Schema(description = "type of supported claim") private CommunityClaimType claim; + @Schema(description = "community plan") + private String plan; + public List getFos() { return fos; } @@ -174,4 +177,12 @@ public class CommunityWritableProperties { public void setOtherZenodoCommunities(final List otherZenodoCommunities) { this.otherZenodoCommunities = otherZenodoCommunities; } + + public String getPlan() { + return plan; + } + + public void setPlan(final String plan) { + this.plan = plan; + } } diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/SubCommunity.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/SubCommunity.java index 56836f26..2b2a7510 100644 --- a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/SubCommunity.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/SubCommunity.java @@ -32,6 +32,9 @@ public class SubCommunity { @Schema(description = "it supports the claims", required = true) private boolean claim = false; + @Schema(description = "it is browsable", required = true) + private boolean browsable = false; + public String getSubCommunityId() { return subCommunityId; } @@ -88,6 +91,14 @@ public class SubCommunity { this.claim = claim; } + public boolean isBrowsable() { + return browsable; + } + + public void setBrowsable(final boolean browsable) { + this.browsable = browsable; + } + @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -105,6 +116,8 @@ public class SubCommunity { .append(params) .append(",\n\tclaim = ") .append(claim) + .append(",\n\tbrowsable = ") + .append(browsable) .append("\n]"); return builder.toString(); }