Merge pull request #181 from derjust/Issue_180

Issue #179: Test for filter + pagination

Author: derjust

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

@@ -17,6 +17,8 @@
 
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.document.Expected;
+
+import org.junit.Before;
 import org.junit.Rule;
 
 import org.junit.Test;
@@ -29,6 +31,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -39,6 +44,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.function.Supplier;
 
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.junit.Assert.assertEquals;
@@ -64,6 +70,14 @@ public static class TestAppConfig {
 
 	@Autowired
 	private UserRepository userRepository;
+	@Autowired
+	private UserPaginationRepository userPaginationRepository;
+
+	@Before
+	public void setUp() {
+		userRepository.deleteAll();
+		userPaginationRepository.deleteAll();
+	}
 
 	@Test
 	public void testProjection() {
@@ -172,6 +186,42 @@ public void testDeleteNonExistent() {
 		userRepository.deleteById("non-existent");
 	}
 
+	@Test
+	public void testFilterAndPagination() {
+
+		Supplier<User> userSupplier = () -> {
+			User u = new User();
+			u.setName("test");
+			return u;
+		};
+
+		for (int i = 0; i < 22; i++) {
+			User u = userSupplier.get();
+			userPaginationRepository.save(u);
+		}
+		User u = userSupplier.get();
+		u.setName("not-test");
+		userPaginationRepository.save(u);
+
+		List<User> allUsers = userPaginationRepository.findAll();
+		assertEquals(23, allUsers.size());
+
+		List<User> allTestUsers = userPaginationRepository.findAllByName("test");
+		assertEquals(22, allTestUsers.size());
+
+		Pageable firstPage = PageRequest.of(0, 10);
+		Page<User> firstResults = userPaginationRepository.findAllByName("test", firstPage);
+		assertEquals(10, firstResults.getNumberOfElements());
+
+		Pageable secondPage = PageRequest.of(1, 10);
+		Page<User> secondResults = userPaginationRepository.findAllByName("test", secondPage);
+		assertEquals(10, secondResults.getNumberOfElements());
+
+		Pageable thirdPage = PageRequest.of(2, 10);
+		Page<User> thirdResults = userPaginationRepository.findAllByName("test", thirdPage);
+		assertEquals(2, thirdResults.getNumberOfElements());
+	}
+
 	@Test
 	public void testDeleteNonExistentIdWithCondition() {
 		// Delete conditional

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

@@ -15,6 +15,8 @@
  */
 package org.socialsignin.spring.data.dynamodb.domain.sample;
 
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedDefault;
+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;
@@ -91,6 +93,7 @@ public void setPostCode(String postCode) {
 	}
 
 	@DynamoDBHashKey(attributeName = "Id")
+	@DynamoDBAutoGeneratedKey
 	public String getId() {
 		return id;
 	}

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

@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2018 spring-data-dynamodb (https://github.com/derjust/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.domain.sample;
+
+import java.util.List;
+
+import org.socialsignin.spring.data.dynamodb.repository.EnableScan;
+import org.socialsignin.spring.data.dynamodb.repository.EnableScanCount;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface UserPaginationRepository extends PagingAndSortingRepository<User, String> {
+
+	@EnableScan
+	@EnableScanCount
+	Page<User> findAllByName(String name, Pageable pageable);
+
+	@EnableScan
+	List<User> findAllByName(String name);
+
+	@EnableScan
+	List<User> findAll();
+
+	@EnableScan
+	void deleteAll();
+}

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

@@ -55,4 +55,7 @@ public interface UserRepository extends CrudRepository<User, String> {
 	User findByNameAndLeaveDate(String name, Instant leaveDate);
 
 	void deleteByPostCodeAndNumberOfPlaylists(String postCode, Integer numberOfPlaylists);
+
+	@EnableScan
+	void deleteAll();
 }