feat(views): make views sortable, hidden and choose the default one

fix gravitee-io/issues#892
gravitee-io-community · Dec 4, 2017 · c9ddd4f · c9ddd4f
1 parent c926515
commit c9ddd4f
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,8 +32,8 @@
     <name>Gravitee.io APIM - Repository - AWS DynamoDB</name>
 
     <properties>
-        <gravitee-repository.version>1.11.0</gravitee-repository.version>
-        <gravitee-repository-test.version>1.11.0</gravitee-repository-test.version>
+        <gravitee-repository.version>1.12.0-SNAPSHOT</gravitee-repository.version>
+        <gravitee-repository-test.version>1.12.0-SNAPSHOT</gravitee-repository-test.version>
         <maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
         <aws-java-sdk-bom.version>1.11.123</aws-java-sdk-bom.version>
     </properties>

diff --git a/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java b/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java
@@ -31,6 +31,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -118,6 +119,11 @@ private View convert(final DynamoDBView dynamoDBView) {
         view.setId(dynamoDBView.getId());
         view.setName(dynamoDBView.getName());
         view.setDescription(dynamoDBView.getDescription());
+        view.setDefaultView(dynamoDBView.isDefaultView());
+        view.setHidden(dynamoDBView.isHidden());
+        view.setOrder(dynamoDBView.getOrder());
+        view.setUpdatedAt(new Date(dynamoDBView.getUpdatedAt()));
+        view.setCreatedAt(new Date(dynamoDBView.getCreatedAt()));
         return view;
     }
 
@@ -129,6 +135,11 @@ private DynamoDBView convert(final View view) {
         dynamoDBView.setId(view.getId());
         dynamoDBView.setName(view.getName());
         dynamoDBView.setDescription(view.getDescription());
+        dynamoDBView.setDefaultView(view.isDefaultView());
+        dynamoDBView.setHidden(view.isHidden());
+        dynamoDBView.setOrder(view.getOrder());
+        dynamoDBView.setUpdatedAt(view.getUpdatedAt().getTime());
+        dynamoDBView.setCreatedAt(view.getCreatedAt().getTime());
         return dynamoDBView;
     }
 }
diff --git a/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java b/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java
@@ -18,9 +18,12 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped;
 
 import java.util.Objects;
 
+import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType.BOOL;
+
 /**
  * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) 
  * @author GraviteeSource Team
@@ -34,6 +37,16 @@ public class DynamoDBView {
     private String name;
     @DynamoDBAttribute
     private String description;
+    @DynamoDBTyped(BOOL)
+    private boolean defaultView;
+    @DynamoDBTyped(BOOL)
+    private boolean hidden;
+    @DynamoDBAttribute
+    private int order;
+    @DynamoDBAttribute
+    private long createdAt;
+    @DynamoDBAttribute
+    private long updatedAt;
 
     public String getId() {
         return id;
@@ -56,6 +69,41 @@ public void setDescription(String description) {
         this.description = description;
     }
 
+    public boolean isDefaultView() {
+        return defaultView;
+    }
+    public void setDefaultView(boolean defaultView) {
+        this.defaultView = defaultView;
+    }
+
+    public boolean isHidden() {
+        return hidden;
+    }
+    public void setHidden(boolean hidden) {
+        this.hidden = hidden;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public long getCreatedAt() {
+        return createdAt;
+    }
+    public void setCreatedAt(long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public long getUpdatedAt() {
+        return updatedAt;
+    }
+    public void setUpdatedAt(long updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;