feat(pages): set a page as an api homepage

fix gravitee-io/issues#467
gravitee-io · Mar 27, 2017 · 5d1f878 · 5d1f878
1 parent 9a34ce7
commit 5d1f878
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,10 +33,10 @@
 
 	<properties>
 		<jedis.version>2.9.0</jedis.version>
-		<gravitee-repository.version>1.4.0</gravitee-repository.version>
+		<gravitee-repository.version>1.5.0-SNAPSHOT</gravitee-repository.version>
 		<spring-data-redis.version>1.7.4.RELEASE</spring-data-redis.version>
 
-		<gravitee-repository-test.version>1.4.0</gravitee-repository-test.version>
+		<gravitee-repository-test.version>1.5.0-SNAPSHOT</gravitee-repository-test.version>
 		<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
 	</properties>
 

diff --git a/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java b/src/main/java/io/gravitee/repository/redis/management/RedisPageRepository.java
@@ -42,16 +42,16 @@ public class RedisPageRepository implements PageRepository {
     private PageRedisRepository pageRedisRepository;
 
     @Override
-    public Collection<Page> findByApi(String apiId) throws TechnicalException {
+    public Collection<Page> findApiPageByApiId(String apiId) throws TechnicalException {
         return pageRedisRepository.findByApi(apiId)
                 .stream()
                 .map(this::convert)
                 .collect(Collectors.toSet());
     }
 
     @Override
-    public Integer findMaxPageOrderByApi(String apiId) throws TechnicalException {
-        return findByApi(apiId).stream().mapToInt(Page::getOrder).max().orElse(0);
+    public Integer findMaxApiPageOrderByApiId(String apiId) throws TechnicalException {
+        return findApiPageByApiId(apiId).stream().mapToInt(Page::getOrder).max().orElse(0);
     }
 
     @Override
@@ -68,6 +68,14 @@ public Page create(Page page) throws TechnicalException {
 
     @Override
     public Page update(Page page) throws TechnicalException {
+        if(page == null){
+            throw new IllegalArgumentException("Page must not be null");
+        }
+
+        RedisPage oldRedisPage = pageRedisRepository.find(page.getId());
+        if(oldRedisPage == null){
+            throw new IllegalArgumentException(String.format("No page found with id [%s]", page.getId()));
+        }
         RedisPage redisPage = pageRedisRepository.saveOrUpdate(convert(page));
         return convert(redisPage);
     }
@@ -77,6 +85,12 @@ public void delete(String pageId) throws TechnicalException {
         pageRedisRepository.delete(pageId);
     }
 
+    @Override
+    public Collection<Page> findApiPageByApiIdAndHomepage(String apiId, boolean isHomepage) throws TechnicalException {
+        Collection<Page> pages = findApiPageByApiId(apiId);
+        return pages.stream().filter(page -> page.isHomepage() == isHomepage).collect(Collectors.toList());
+    }
+
     private Page convert(RedisPage redisPage) {
         if (redisPage == null) {
             return null;
@@ -93,6 +107,7 @@ private Page convert(RedisPage redisPage) {
         page.setOrder(redisPage.getOrder());
         page.setPublished(redisPage.isPublished());
         page.setType(PageType.valueOf(redisPage.getType()));
+        page.setHomepage(redisPage.isHomepage());
 
         if (redisPage.getSourceType() != null) {
             PageSource pageSource = new PageSource();
@@ -121,6 +136,7 @@ private RedisPage convert(Page page) {
         redisPage.setOrder(page.getOrder());
         redisPage.setPublished(page.isPublished());
         redisPage.setType(page.getType().name());
+        redisPage.setHomepage(page.isHomepage());
 
         if (page.getSource() != null) {
             redisPage.setSourceType(page.getSource().getType());

diff --git a/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java b/src/main/java/io/gravitee/repository/redis/management/model/RedisPage.java
@@ -37,6 +37,7 @@ public class RedisPage {
     private String sourceConfiguration;
     private boolean configurationTryIt;
     private String configurationTryItURL;
+    private boolean homepage;
 
     public String getApi() {
         return api;
@@ -150,6 +151,14 @@ public void setConfigurationTryItURL(String configurationTryItURL) {
         this.configurationTryItURL = configurationTryItURL;
     }
 
+    public boolean isHomepage() {
+        return homepage;
+    }
+
+    public void setHomepage(boolean homepage) {
+        this.homepage = homepage;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;