From 71d3ed7ceeebe32ab983ddf5ed6a20f892eaab03 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 14 Jun 2023 13:53:59 +0200 Subject: [PATCH] renaming of some classes --- .../community/db/CommunityService.java | 51 ++++++++++++------- .../community/db/ConvertionUtils.java | 25 +++++++++ .../{Community.java => DbCommunity.java} | 2 +- ...unityDatasource.java => DbDatasource.java} | 8 +-- ...yDatasourcePK.java => DbDatasourcePK.java} | 6 +-- ...{CommunityOrg.java => DbOrganization.java} | 8 +-- ...munityOrgPK.java => DbOrganizationPK.java} | 6 +-- .../{CommunityProject.java => DbProject.java} | 8 +-- ...mmunityProjectPK.java => DbProjectPK.java} | 13 +++-- ...unitySupportOrg.java => DbSupportOrg.java} | 4 +- ...ySupportOrgPK.java => DbSupportOrgPK.java} | 6 +-- .../CommunityDatasourceRepository.java | 11 ---- .../db/repository/CommunityOrgRepository.java | 12 ----- .../CommunitySupportOrgRepository.java | 12 ----- ...sitory.java => DbCommunityRepository.java} | 4 +- .../db/repository/DbDatasourceRepository.java | 15 ++++++ .../repository/DbOrganizationRepository.java | 16 ++++++ ...pository.java => DbProjectRepository.java} | 10 ++-- .../db/repository/DbSupportOrgRepository.java | 16 ++++++ 19 files changed, 147 insertions(+), 86 deletions(-) create mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{Community.java => DbCommunity.java} (99%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityDatasource.java => DbDatasource.java} (81%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityDatasourcePK.java => DbDatasourcePK.java} (81%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityOrg.java => DbOrganization.java} (80%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityOrgPK.java => DbOrganizationPK.java} (83%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityProject.java => DbProject.java} (87%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunityProjectPK.java => DbProjectPK.java} (74%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunitySupportOrg.java => DbSupportOrg.java} (92%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/{CommunitySupportOrgPK.java => DbSupportOrgPK.java} (82%) delete mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityDatasourceRepository.java delete mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityOrgRepository.java delete mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunitySupportOrgRepository.java rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/{CommunityRepository.java => DbCommunityRepository.java} (67%) create mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java create mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/{CommunityProjectRepository.java => DbProjectRepository.java} (51%) create mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java index 9486a20b..92d8f7af 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java @@ -1,16 +1,18 @@ package eu.dnetlib.openaire.community.db; import java.util.List; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import eu.dnetlib.openaire.community.db.repository.CommunityDatasourceRepository; -import eu.dnetlib.openaire.community.db.repository.CommunityOrgRepository; -import eu.dnetlib.openaire.community.db.repository.CommunityProjectRepository; -import eu.dnetlib.openaire.community.db.repository.CommunityRepository; -import eu.dnetlib.openaire.community.db.repository.CommunitySupportOrgRepository; +import eu.dnetlib.openaire.community.db.model.DbProject; +import eu.dnetlib.openaire.community.db.repository.DbCommunityRepository; +import eu.dnetlib.openaire.community.db.repository.DbDatasourceRepository; +import eu.dnetlib.openaire.community.db.repository.DbOrganizationRepository; +import eu.dnetlib.openaire.community.db.repository.DbProjectRepository; +import eu.dnetlib.openaire.community.db.repository.DbSupportOrgRepository; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.exceptions.ResourceNotFoundException; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; @@ -28,19 +30,21 @@ import eu.dnetlib.openaire.exporter.model.community.selectioncriteria.SelectionC public class CommunityService { @Autowired - private CommunityRepository communityRepository; + private DbCommunityRepository dbCommunityRepository; @Autowired - private CommunityProjectRepository communityProjectRepository; + private DbProjectRepository dbProjectRepository; @Autowired - private CommunityDatasourceRepository communityDatasourceRepository; + private DbDatasourceRepository dbDatasourceRepository; @Autowired - private CommunityOrgRepository communityOrgRepository; + private DbOrganizationRepository dbOrganizationRepository; @Autowired - private CommunitySupportOrgRepository communitySupportOrgRepository; + private DbSupportOrgRepository dbSupportOrgRepository; public List listCommunities() throws CommunityException { - // TODO Auto-generated method stub - return null; + return dbCommunityRepository.findAll() + .stream() + .map(ConvertionUtils::toSummary) + .collect(Collectors.toList()); } public CommunityDetails getCommunity(final String id) throws CommunityException, ResourceNotFoundException { @@ -53,23 +57,32 @@ public class CommunityService { } public List getCommunityProjects(final String id) throws CommunityException, ResourceNotFoundException { - // TODO Auto-generated method stub - return null; + return dbProjectRepository.findByCommunity(id) + .stream() + .map(ConvertionUtils::toCommunityProject) + .collect(Collectors.toList()); } public CommunityProject addCommunityProject(final String id, final CommunityProject project) throws CommunityException, ResourceNotFoundException { - // TODO Auto-generated method stub - return null; + final DbProject p = ConvertionUtils.toDbProject(id, project); + dbProjectRepository.save(p); + return project; } public List addCommunityProjectList(final String id, final List projectList) throws CommunityException, ResourceNotFoundException { - // TODO Auto-generated method stub - return null; + + final List list = projectList.stream() + .map(p -> ConvertionUtils.toDbProject(id, p)) + .collect(Collectors.toList()); + + dbProjectRepository.saveAll(list); + + return projectList; } public void removeCommunityProject(final String id, final Integer projectId) throws CommunityException, ResourceNotFoundException { - // TODO Auto-generated method stub + // dbProjectRepository.deleteById(new DbProjectPK(id, projectId)); } public void removeCommunityProjectList(final String id, final List projectIdList) throws CommunityException, ResourceNotFoundException { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java new file mode 100644 index 00000000..5dd3b015 --- /dev/null +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java @@ -0,0 +1,25 @@ +package eu.dnetlib.openaire.community.db; + +import eu.dnetlib.openaire.community.db.model.DbCommunity; +import eu.dnetlib.openaire.community.db.model.DbProject; +import eu.dnetlib.openaire.exporter.model.community.CommunityProject; +import eu.dnetlib.openaire.exporter.model.community.CommunitySummary; + +public class ConvertionUtils { + + public static CommunitySummary toSummary(final DbCommunity dbEntry) { + // TODO + return null; + } + + public static CommunityProject toCommunityProject(final DbProject dbEntry) { + // TODO + return null; + } + + public static DbProject toDbProject(final String id, final CommunityProject project) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java similarity index 99% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java index dff15706..f78f73c3 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/Community.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java @@ -35,7 +35,7 @@ import eu.dnetlib.openaire.community.db.enums.CommunityType; @TypeDef(name = "json", typeClass = JsonStringType.class), @TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) }) -public class Community implements Serializable { +public class DbCommunity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasource.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java similarity index 81% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasource.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java index 8623cde8..39c1c003 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasource.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java @@ -10,8 +10,8 @@ import javax.persistence.Table; @Entity @Table(name = "community_datasources") -@IdClass(CommunityDatasourcePK.class) -public class CommunityDatasource implements Serializable { +@IdClass(DbDatasourcePK.class) +public class DbDatasource implements Serializable { private static final long serialVersionUID = 1L; @@ -26,9 +26,9 @@ public class CommunityDatasource implements Serializable { @Column(name = "ds_name") private String dsName; - public CommunityDatasource() {} + public DbDatasource() {} - public CommunityDatasource(final String community, final String dsId, final String dsName) { + public DbDatasource(final String community, final String dsId, final String dsName) { this.community = community; this.dsId = dsId; this.dsName = dsName; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasourcePK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java similarity index 81% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasourcePK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java index 848017db..ea857a97 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityDatasourcePK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java @@ -3,7 +3,7 @@ package eu.dnetlib.openaire.community.db.model; import java.io.Serializable; import java.util.Objects; -public class CommunityDatasourcePK implements Serializable { +public class DbDatasourcePK implements Serializable { private static final long serialVersionUID = 1L; @@ -35,8 +35,8 @@ public class CommunityDatasourcePK implements Serializable { @Override public boolean equals(final Object obj) { if (this == obj) { return true; } - if (!(obj instanceof CommunityDatasourcePK)) { return false; } - final CommunityDatasourcePK other = (CommunityDatasourcePK) obj; + if (!(obj instanceof DbDatasourcePK)) { return false; } + final DbDatasourcePK other = (DbDatasourcePK) obj; return Objects.equals(community, other.community) && Objects.equals(dsId, other.dsId); } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrg.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java similarity index 80% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrg.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java index 43569acf..bfe972ef 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrg.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java @@ -10,8 +10,8 @@ import javax.persistence.Table; @Entity @Table(name = "community_orgs") -@IdClass(CommunityOrgPK.class) -public class CommunityOrg implements Serializable { +@IdClass(DbOrganizationPK.class) +public class DbOrganization implements Serializable { private static final long serialVersionUID = 1L; @@ -23,9 +23,9 @@ public class CommunityOrg implements Serializable { @Column(name = "org_id") private String orgId; - public CommunityOrg() {} + public DbOrganization() {} - public CommunityOrg(final String community, final String orgId) { + public DbOrganization(final String community, final String orgId) { this.community = community; this.orgId = orgId; } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrgPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java similarity index 83% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrgPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java index aee8f753..91da15dd 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityOrgPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java @@ -3,7 +3,7 @@ package eu.dnetlib.openaire.community.db.model; import java.io.Serializable; import java.util.Objects; -public class CommunityOrgPK implements Serializable { +public class DbOrganizationPK implements Serializable { private static final long serialVersionUID = 1L; @@ -35,8 +35,8 @@ public class CommunityOrgPK implements Serializable { @Override public boolean equals(final Object obj) { if (this == obj) { return true; } - if (!(obj instanceof CommunityDatasourcePK)) { return false; } - final CommunityOrgPK other = (CommunityOrgPK) obj; + if (!(obj instanceof DbDatasourcePK)) { return false; } + final DbOrganizationPK other = (DbOrganizationPK) obj; return Objects.equals(community, other.community) && Objects.equals(orgId, other.orgId); } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProject.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java similarity index 87% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProject.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java index 39322124..98b19b1e 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProject.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java @@ -10,8 +10,8 @@ import javax.persistence.Table; @Entity @Table(name = "community_projects") -@IdClass(CommunityProjectPK.class) -public class CommunityProject implements Serializable { +@IdClass(DbProjectPK.class) +public class DbProject implements Serializable { private static final long serialVersionUID = 1L; @@ -35,9 +35,9 @@ public class CommunityProject implements Serializable { @Column(name = "project_funder") private String projectFunder; - public CommunityProject() {} + public DbProject() {} - public CommunityProject(final String community, final String projectId, final String projectCode, final String projectName, final String projectAcronym, + public DbProject(final String community, final String projectId, final String projectCode, final String projectName, final String projectAcronym, final String projectFunder) { this.community = community; this.projectId = projectId; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProjectPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java similarity index 74% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProjectPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java index d12bb489..09f62ef6 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunityProjectPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java @@ -3,7 +3,7 @@ package eu.dnetlib.openaire.community.db.model; import java.io.Serializable; import java.util.Objects; -public class CommunityProjectPK implements Serializable { +public class DbProjectPK implements Serializable { private static final long serialVersionUID = 1L; @@ -11,6 +11,13 @@ public class CommunityProjectPK implements Serializable { private String projectId; + public DbProjectPK() {} + + public DbProjectPK(final String community, final String projectId) { + this.community = community; + this.projectId = projectId; + } + public String getCommunity() { return community; } @@ -35,8 +42,8 @@ public class CommunityProjectPK implements Serializable { @Override public boolean equals(final Object obj) { if (this == obj) { return true; } - if (!(obj instanceof CommunityProjectPK)) { return false; } - final CommunityProjectPK other = (CommunityProjectPK) obj; + if (!(obj instanceof DbProjectPK)) { return false; } + final DbProjectPK other = (DbProjectPK) obj; return Objects.equals(community, other.community) && Objects.equals(projectId, other.projectId); } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrg.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java similarity index 92% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrg.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java index 06d508e2..d1f2c603 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrg.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java @@ -10,8 +10,8 @@ import javax.persistence.Table; @Entity @Table(name = "community_support_orgs") -@IdClass(CommunitySupportOrgPK.class) -public class CommunitySupportOrg implements Serializable { +@IdClass(DbSupportOrgPK.class) +public class DbSupportOrg implements Serializable { private static final long serialVersionUID = 1L; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrgPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java similarity index 82% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrgPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java index 78557fbf..00463739 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/CommunitySupportOrgPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java @@ -3,7 +3,7 @@ package eu.dnetlib.openaire.community.db.model; import java.io.Serializable; import java.util.Objects; -public class CommunitySupportOrgPK implements Serializable { +public class DbSupportOrgPK implements Serializable { private static final long serialVersionUID = 1L; @@ -35,8 +35,8 @@ public class CommunitySupportOrgPK implements Serializable { @Override public boolean equals(final Object obj) { if (this == obj) { return true; } - if (!(obj instanceof CommunitySupportOrgPK)) { return false; } - final CommunitySupportOrgPK other = (CommunitySupportOrgPK) obj; + if (!(obj instanceof DbSupportOrgPK)) { return false; } + final DbSupportOrgPK other = (DbSupportOrgPK) obj; return Objects.equals(community, other.community) && Objects.equals(orgName, other.orgName); } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityDatasourceRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityDatasourceRepository.java deleted file mode 100644 index 444a9afb..00000000 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityDatasourceRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package eu.dnetlib.openaire.community.db.repository; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.data.jpa.repository.JpaRepository; - -import eu.dnetlib.openaire.community.db.model.Community; - -@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") -public interface CommunityDatasourceRepository extends JpaRepository { - -} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityOrgRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityOrgRepository.java deleted file mode 100644 index 8184d85f..00000000 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityOrgRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package eu.dnetlib.openaire.community.db.repository; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.data.jpa.repository.JpaRepository; - -import eu.dnetlib.openaire.community.db.model.CommunityOrg; -import eu.dnetlib.openaire.community.db.model.CommunityOrgPK; - -@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") -public interface CommunityOrgRepository extends JpaRepository { - -} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunitySupportOrgRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunitySupportOrgRepository.java deleted file mode 100644 index 0036e35e..00000000 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunitySupportOrgRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package eu.dnetlib.openaire.community.db.repository; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.data.jpa.repository.JpaRepository; - -import eu.dnetlib.openaire.community.db.model.CommunitySupportOrg; -import eu.dnetlib.openaire.community.db.model.CommunitySupportOrgPK; - -@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") -public interface CommunitySupportOrgRepository extends JpaRepository { - -} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java similarity index 67% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java index f84795bf..bb1ec760 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java @@ -3,9 +3,9 @@ package eu.dnetlib.openaire.community.db.repository; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.Community; +import eu.dnetlib.openaire.community.db.model.DbCommunity; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") -public interface CommunityRepository extends JpaRepository { +public interface DbCommunityRepository extends JpaRepository { } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java new file mode 100644 index 00000000..cd6edeee --- /dev/null +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java @@ -0,0 +1,15 @@ +package eu.dnetlib.openaire.community.db.repository; + +import java.util.List; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.JpaRepository; + +import eu.dnetlib.openaire.community.db.model.DbDatasource; +import eu.dnetlib.openaire.community.db.model.DbDatasourcePK; + +@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") +public interface DbDatasourceRepository extends JpaRepository { + + List findByCommunity(String community); +} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java new file mode 100644 index 00000000..79f1a734 --- /dev/null +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java @@ -0,0 +1,16 @@ +package eu.dnetlib.openaire.community.db.repository; + +import java.util.List; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.JpaRepository; + +import eu.dnetlib.openaire.community.db.model.DbOrganization; +import eu.dnetlib.openaire.community.db.model.DbOrganizationPK; + +@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") +public interface DbOrganizationRepository extends JpaRepository { + + List findByCommunity(String community); + +} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityProjectRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java similarity index 51% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityProjectRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java index 725903ae..1c7e59ba 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/CommunityProjectRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java @@ -1,12 +1,16 @@ package eu.dnetlib.openaire.community.db.repository; +import java.util.List; + import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.CommunityProject; -import eu.dnetlib.openaire.community.db.model.CommunityProjectPK; +import eu.dnetlib.openaire.community.db.model.DbProject; +import eu.dnetlib.openaire.community.db.model.DbProjectPK; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") -public interface CommunityProjectRepository extends JpaRepository { +public interface DbProjectRepository extends JpaRepository { + + List findByCommunity(String community); } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java new file mode 100644 index 00000000..04f07398 --- /dev/null +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java @@ -0,0 +1,16 @@ +package eu.dnetlib.openaire.community.db.repository; + +import java.util.List; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.JpaRepository; + +import eu.dnetlib.openaire.community.db.model.DbSupportOrg; +import eu.dnetlib.openaire.community.db.model.DbSupportOrgPK; + +@ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") +public interface DbSupportOrgRepository extends JpaRepository { + + List findByCommunity(String community); + +}