WIP

derjust · Feb 2, 2018 · 2433068 · 2433068
1 parent 4748ee5
commit 2433068
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 7 deletions.
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/HashRangeKeyIT.java
@@ -21,6 +21,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -37,20 +38,28 @@
 public class HashRangeKeyIT {
 
 	@Autowired
-	PlaylistRepository playlistRepository;
+	private PlaylistRepository playlistRepository;
 
-	@Test
-	public void runCrudOperations() {
-		final String displayName = "displayName" + UUID.randomUUID().toString();
+	private Playlist generatePlaylist(String genre, String displayName) {
 		final String userName = "userName-" + UUID.randomUUID().toString();
 		final String playlistName = "playlistName-" + UUID.randomUUID().toString();
 		PlaylistId id = new PlaylistId(userName, playlistName);
 
-		Optional<Playlist> actual = playlistRepository.findById(id);
-		assertFalse(actual.isPresent());
-
 		Playlist playlist = new Playlist(id);
 		playlist.setDisplayName(displayName);
+		playlist.setGenre(genre);
+
+		return playlist;
+	}
+
+	@Test
+	public void runCrudOperations() {
+		String displayName = "displayName" + UUID.randomUUID().toString();
+		Playlist playlist = generatePlaylist("genre-" + UUID.randomUUID().toString(), displayName);
+		PlaylistId id = playlist.getId();
+
+		Optional<Playlist> actual = playlistRepository.findById(id);
+		assertFalse(actual.isPresent());
 
 		playlistRepository.save(playlist);
 
@@ -60,4 +69,16 @@ public void runCrudOperations() {
 		assertEquals(id.getPlaylistName(), actual.get().getPlaylistName());
 		assertEquals(id.getUserName(), actual.get().getUserName());
 	}
+
+	@Test
+	public void testGsiSharedRange() {
+		final String GENRE = "GENRE";
+		playlistRepository.save(generatePlaylist(GENRE, "1"));
+		playlistRepository.save(generatePlaylist(GENRE, "2"));
+		playlistRepository.save(generatePlaylist(GENRE, "3"));
+
+		List<Playlist> actual = playlistRepository.findByGenreAndPlaylistNameBetween(GENRE, "2", "3");
+
+		assertEquals(2, actual.size());
+	}
 }
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/Playlist.java
@@ -17,6 +17,9 @@
 
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey;
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
 import org.springframework.data.annotation.Id;
@@ -27,13 +30,19 @@ public class Playlist {
 	@Id
 	private PlaylistId playlistId;
 	private String displayName;
+	private String genre;
 
 	public Playlist() {
 	}
 
 	public Playlist(PlaylistId playlistId) {
 		this.playlistId = playlistId;
 	}
+
+	@DynamoDBIgnore
+	public PlaylistId getId() {
+		return this.playlistId;
+	}
 
 	@DynamoDBAttribute(attributeName="DisplayName")
 	public String getDisplayName() {
@@ -57,6 +66,7 @@ public void setUserName(String userName) {
 	}
 
 	@DynamoDBRangeKey(attributeName = "PlaylistName")
+	@DynamoDBIndexRangeKey(attributeName = "PlaylistName", globalSecondaryIndexName="Genre-PlaylistName-index")
 	public String getPlaylistName() {
 		return playlistId != null ? playlistId.getPlaylistName() : null;
 	}
@@ -67,4 +77,13 @@ public void setPlaylistName(String playlistName) {
 		}
 		playlistId.setPlaylistName(playlistName);
 	}
+
+	@DynamoDBIndexHashKey(attributeName = "Genre", globalSecondaryIndexName="Genre-PlaylistName-index")
+	public String getGenre() {
+		return this.genre;
+	}
+
+	public void setGenre(String genre) {
+		this.genre = genre;
+	}
 }
diff --git a/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java b/src/test/java/org/socialsignin/spring/data/dynamodb/domain/sample/PlaylistRepository.java
@@ -15,8 +15,12 @@
  */
 package org.socialsignin.spring.data.dynamodb.domain.sample;
 
+import java.util.List;
+
 import org.springframework.data.repository.CrudRepository;
 
 public interface PlaylistRepository extends CrudRepository<Playlist, PlaylistId> {
 
+	List<Playlist> findByGenreAndPlaylistNameBetween(String genre, String startPlaylistName, String endPlaylistName);
+
 }
diff --git a/src/test/resources/playlist_table.json b/src/test/resources/playlist_table.json
@@ -9,6 +9,29 @@
       "AttributeType": "S"
     }
    ],
+   "GlobalSecondaryIndexes": [ 
+     { 
+        "IndexName": "Genre-PlaylistName-index",
+        "KeySchema": [ 
+           { 
+              "AttributeName": "Genre",
+              "KeyType": "HASH"
+            },
+            {
+               "AttributeName": "PlaylistName",
+               "KeyType": "RANGE"
+            }
+         ],
+         "Projection": { 
+            "NonKeyAttributes": [],
+            "ProjectionType": "ALL"
+         },
+         "ProvisionedThroughput": { 
+            "ReadCapacityUnits": "10",
+            "WriteCapacityUnits": "10"
+         }
+      }
+   ],
   "KeySchema": [
     {
       "AttributeName": "UserName",