WIP Issue #99 (again?)

Author: derjust

src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheNDynamoDBMarshaller.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/spring-data-dynamodb/spring-data-dynamodb)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.socialsignin.spring.data.dynamodb.marshaller;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter;
+
+import java.time.Instant;
+
+public class Instant2EpocheNDynamoDBMarshaller implements DynamoDBTypeConverter<Long, Instant> {
+
+	@Override
+	public Long convert(Instant getterReturnResult) {
+		if (getterReturnResult == null) {
+			return null;
+		} else {
+			return getterReturnResult.toEpochMilli();
+		}
+	}
+
+	@Override
+	public Instant unconvert(Long obj) {
+		if (obj == null) {
+			return null;
+		} else {
+			return Instant.ofEpochMilli(obj);
+		}
+	}
+
+}

src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/User.java

@@ -15,9 +15,17 @@
  */
 package org.socialsignin.spring.data.dynamodb.domain.sample;
 
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshalling;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped;
+import org.socialsignin.spring.data.dynamodb.marshaller.Instant2EpocheNDynamoDBMarshaller;
 import org.socialsignin.spring.data.dynamodb.marshaller.Instant2IsoDynamoDBMarshaller;
 
 import java.time.Instant;
@@ -26,6 +34,7 @@
 
 @DynamoDBTable(tableName = "user")
 public class User {
+	public static final String TENANT_ID_INDEX_NAME = "TENANT_ID_INDEX_NAME";
 
 	private String id;
 
@@ -43,6 +52,8 @@ public class User {
 	private String postCode;
 
 	private Set<String> testSet;
+	private String tenantId;
+	private Instant creationTimestamp;
 
 	public Set<String> getTestSet() {
 		return testSet;
@@ -87,13 +98,36 @@ public void setPostCode(String postCode) {
 	}
 
 	@DynamoDBHashKey(attributeName = "Id")
+	@DynamoDBAutoGeneratedKey
 	public String getId() {
 		return id;
 	}
 
 	public void setId(String id) {
 		this.id = id;
 	}
+
+	@DynamoDBAttribute
+	@DynamoDBIndexHashKey(globalSecondaryIndexName = TENANT_ID_INDEX_NAME)
+	public String getTenantId() {
+		return this.tenantId;
+	}
+	
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	@DynamoDBAttribute
+	@DynamoDBTyped(DynamoDBMapperFieldModel.DynamoDBAttributeType.N)
+	@DynamoDBTypeConverted(converter = Instant2EpocheNDynamoDBMarshaller.class)
+	@DynamoDBIndexRangeKey(globalSecondaryIndexNames = TENANT_ID_INDEX_NAME)
+	public Instant getCreationTimestamp() {
+		return this.creationTimestamp;
+	}
+
+	public void setCreationTimestamp(Instant creationTimestamp) {
+		this.creationTimestamp = creationTimestamp;
+	}
 
 	public String getName() {
 		return name;