Skip to content

Support for existsBy projection #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2017
Merged

Support for existsBy projection #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6cec8d
Support for existsBy projection
Sep 21, 2017
adb3a96
Add unit test. Remove unnecessary branch (limits in expressions are
Sep 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...in/java/org/socialsignin/spring/data/dynamodb/repository/query/AbstractDynamoDBQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ else if (method.isSliceQuery() && !isSingleEntityResultsRestriction()) {
protected abstract Query<T> doCreateQuery(Object[] values);
protected abstract Query<Long> doCreateCountQuery(Object[] values,boolean pageQuery);
protected abstract boolean isCountQuery();
protected abstract boolean isExistsQuery();

protected abstract Integer getResultsRestrictionIfApplicable();
protected abstract boolean isSingleEntityResultsRestriction();
Expand Down Expand Up @@ -250,10 +251,17 @@ public Object execute(AbstractDynamoDBQuery<T, ID> dynamoDBQuery, Object[] value
{
return dynamoDBQuery.doCreateCountQueryWithPermissions(values,false).getSingleResult();
}
else
{
return dynamoDBQuery.doCreateQueryWithPermissions(values).getSingleResult();
}
else
{
if (isExistsQuery())
{
return !dynamoDBQuery.doCreateQueryWithPermissions(values).getResultList().isEmpty();
}
else
{
return dynamoDBQuery.doCreateQueryWithPermissions(values).getSingleResult();
}
}

}
}
Expand Down
13 changes: 9 additions & 4 deletions ...in/java/org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,15 @@ public Query<Long> doCreateCountQuery(Object[] values,boolean pageQuery) {

}

@Override
protected boolean isCountQuery() {
return tree.isCountProjection();
}
@Override
protected boolean isCountQuery() {
return tree.isCountProjection();
}

@Override
protected boolean isExistsQuery() {
return tree.isExistsProjection();
}

@Override
protected Integer getResultsRestrictionIfApplicable() {
Expand Down
274 changes: 274 additions & 0 deletions ...org/socialsignin/spring/data/dynamodb/repository/query/PartTreeDynamoDBQueryUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3653,4 +3653,278 @@ public void testExecute_WhenFinderMethodIsFindingEntityList_WithSingleStringPara
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testExecute_WhenExistsQueryFindsNoEntity() {
setupCommonMocksForThisRepositoryMethod(mockUserEntityMetadata, mockDynamoDBUserQueryMethod, User.class,
"existsByName", 1, "id", null);
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("name")).thenReturn("Name");

// Mock out specific DynamoDBOperations behavior expected by this method
ArgumentCaptor<DynamoDBScanExpression> scanCaptor = ArgumentCaptor.forClass(DynamoDBScanExpression.class);
ArgumentCaptor<Class> classCaptor = ArgumentCaptor.forClass(Class.class);
Mockito.when(mockUserScanResults.size()).thenReturn(0);
Mockito.when(mockUserScanResults.isEmpty()).thenReturn(true);
Mockito.when(mockDynamoDBOperations.scan(classCaptor.capture(), scanCaptor.capture())).thenReturn(
mockUserScanResults);

// Execute the query
Object[] parameters = new Object[] { "someName" };
Object o = partTreeDynamoDBQuery.execute(parameters);

// Assert that we obtain the expected single result
assertEquals(false, o);

// Assert that we scanned DynamoDB for the correct class
assertEquals(User.class, classCaptor.getValue());

// Assert that we have only one filter condition, for the name of the
// property
Map<String, Condition> filterConditions = scanCaptor.getValue().getScanFilter();
assertEquals(1, filterConditions.size());
Condition filterCondition = filterConditions.get("Name");
assertNotNull(filterCondition);

assertEquals(ComparisonOperator.EQ.name(), filterCondition.getComparisonOperator());

// Assert we only have one attribute value for this filter condition
assertEquals(1, filterCondition.getAttributeValueList().size());

// Assert that there the attribute value type for this attribute value
// is String,
// and its value is the parameter expected
assertEquals("someName", filterCondition.getAttributeValueList().get(0).getS());

// Assert that all other attribute value types other than String type
// are null
assertNull(filterCondition.getAttributeValueList().get(0).getSS());
assertNull(filterCondition.getAttributeValueList().get(0).getN());
assertNull(filterCondition.getAttributeValueList().get(0).getNS());
assertNull(filterCondition.getAttributeValueList().get(0).getB());
assertNull(filterCondition.getAttributeValueList().get(0).getBS());

// Verify that the expected DynamoDBOperations method was called
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testExecute_WhenExistsQueryFindsOneEntity() {
setupCommonMocksForThisRepositoryMethod(mockUserEntityMetadata, mockDynamoDBUserQueryMethod, User.class,
"existsByName", 1, "id", null);
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("name")).thenReturn("Name");

// Mock out specific DynamoDBOperations behavior expected by this method
ArgumentCaptor<DynamoDBScanExpression> scanCaptor = ArgumentCaptor.forClass(DynamoDBScanExpression.class);
ArgumentCaptor<Class> classCaptor = ArgumentCaptor.forClass(Class.class);
Mockito.when(mockUserScanResults.get(0)).thenReturn(mockUser);
Mockito.when(mockUserScanResults.size()).thenReturn(1);
Mockito.when(mockUserScanResults.isEmpty()).thenReturn(false);
Mockito.when(mockDynamoDBOperations.scan(classCaptor.capture(), scanCaptor.capture())).thenReturn(
mockUserScanResults);

// Execute the query
Object[] parameters = new Object[] { "someName" };
Object o = partTreeDynamoDBQuery.execute(parameters);

// Assert that we obtain the expected single result
assertEquals(true, o);

// Assert that we scanned DynamoDB for the correct class
assertEquals(classCaptor.getValue(), User.class);

// Assert that we have only one filter condition, for the name of the
// property
Map<String, Condition> filterConditions = scanCaptor.getValue().getScanFilter();
assertEquals(1, filterConditions.size());
Condition filterCondition = filterConditions.get("Name");
assertNotNull(filterCondition);

assertEquals(ComparisonOperator.EQ.name(), filterCondition.getComparisonOperator());

// Assert we only have one attribute value for this filter condition
assertEquals(1, filterCondition.getAttributeValueList().size());

// Assert that there the attribute value type for this attribute value
// is String,
// and its value is the parameter expected
assertEquals("someName", filterCondition.getAttributeValueList().get(0).getS());

// Assert that all other attribute value types other than String type
// are null
assertNull(filterCondition.getAttributeValueList().get(0).getSS());
assertNull(filterCondition.getAttributeValueList().get(0).getN());
assertNull(filterCondition.getAttributeValueList().get(0).getNS());
assertNull(filterCondition.getAttributeValueList().get(0).getB());
assertNull(filterCondition.getAttributeValueList().get(0).getBS());

// Verify that the expected DynamoDBOperations method was called
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}


@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testExecute_WhenExistsQueryFindsMultipleEntities() {
setupCommonMocksForThisRepositoryMethod(mockUserEntityMetadata, mockDynamoDBUserQueryMethod, User.class,
"existsByName", 1, "id", null);
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("name")).thenReturn("Name");

// Mock out specific DynamoDBOperations behavior expected by this method
ArgumentCaptor<DynamoDBScanExpression> scanCaptor = ArgumentCaptor.forClass(DynamoDBScanExpression.class);
ArgumentCaptor<Class> classCaptor = ArgumentCaptor.forClass(Class.class);
Mockito.when(mockUserScanResults.get(0)).thenReturn(mockUser);
Mockito.when(mockUserScanResults.get(1)).thenReturn(mockUser);
Mockito.when(mockUserScanResults.size()).thenReturn(2);
Mockito.when(mockUserScanResults.isEmpty()).thenReturn(false);
Mockito.when(mockDynamoDBOperations.scan(classCaptor.capture(), scanCaptor.capture())).thenReturn(
mockUserScanResults);

// Execute the query
Object[] parameters = new Object[] { "someName" };
Object o = partTreeDynamoDBQuery.execute(parameters);

// Assert that we obtain the expected single result
assertEquals(true, o);

// Assert that we scanned DynamoDB for the correct class
assertEquals(classCaptor.getValue(), User.class);

// Assert that we have only one filter condition, for the name of the
// property
Map<String, Condition> filterConditions = scanCaptor.getValue().getScanFilter();
assertEquals(1, filterConditions.size());
Condition filterCondition = filterConditions.get("Name");
assertNotNull(filterCondition);

assertEquals(ComparisonOperator.EQ.name(), filterCondition.getComparisonOperator());

// Assert we only have one attribute value for this filter condition
assertEquals(1, filterCondition.getAttributeValueList().size());

// Assert that there the attribute value type for this attribute value
// is String,
// and its value is the parameter expected
assertEquals("someName", filterCondition.getAttributeValueList().get(0).getS());

// Assert that all other attribute value types other than String type
// are null
assertNull(filterCondition.getAttributeValueList().get(0).getSS());
assertNull(filterCondition.getAttributeValueList().get(0).getN());
assertNull(filterCondition.getAttributeValueList().get(0).getNS());
assertNull(filterCondition.getAttributeValueList().get(0).getB());
assertNull(filterCondition.getAttributeValueList().get(0).getBS());

// Verify that the expected DynamoDBOperations method was called
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testExecute_WhenExistsWithLimitQueryFindsNoEntity() {
setupCommonMocksForThisRepositoryMethod(mockUserEntityMetadata, mockDynamoDBUserQueryMethod, User.class,
"existsTop1ByName", 1, "id", null);
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("name")).thenReturn("Name");

// Mock out specific DynamoDBOperations behavior expected by this method
ArgumentCaptor<DynamoDBScanExpression> scanCaptor = ArgumentCaptor.forClass(DynamoDBScanExpression.class);
ArgumentCaptor<Class> classCaptor = ArgumentCaptor.forClass(Class.class);
Mockito.when(mockUserScanResults.size()).thenReturn(0);
Mockito.when(mockUserScanResults.isEmpty()).thenReturn(true);
Mockito.when(mockDynamoDBOperations.scan(classCaptor.capture(), scanCaptor.capture())).thenReturn(
mockUserScanResults);

// Execute the query
Object[] parameters = new Object[] { "someName" };
Object o = partTreeDynamoDBQuery.execute(parameters);

// Assert that we obtain the expected single result
assertEquals(false, o);

// Assert that we scanned DynamoDB for the correct class
assertEquals(User.class, classCaptor.getValue());

// Assert that we have only one filter condition, for the name of the
// property
Map<String, Condition> filterConditions = scanCaptor.getValue().getScanFilter();
assertEquals(1, filterConditions.size());
Condition filterCondition = filterConditions.get("Name");
assertNotNull(filterCondition);

assertEquals(ComparisonOperator.EQ.name(), filterCondition.getComparisonOperator());

// Assert we only have one attribute value for this filter condition
assertEquals(1, filterCondition.getAttributeValueList().size());

// Assert that there the attribute value type for this attribute value
// is String,
// and its value is the parameter expected
assertEquals("someName", filterCondition.getAttributeValueList().get(0).getS());

// Assert that all other attribute value types other than String type
// are null
assertNull(filterCondition.getAttributeValueList().get(0).getSS());
assertNull(filterCondition.getAttributeValueList().get(0).getN());
assertNull(filterCondition.getAttributeValueList().get(0).getNS());
assertNull(filterCondition.getAttributeValueList().get(0).getB());
assertNull(filterCondition.getAttributeValueList().get(0).getBS());

// Verify that the expected DynamoDBOperations method was called
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testExecute_WhenExistsWithLimitQueryFindsOneEntity() {
setupCommonMocksForThisRepositoryMethod(mockUserEntityMetadata, mockDynamoDBUserQueryMethod, User.class,
"existsTop1ByName", 1, "id", null);
Mockito.when(mockUserEntityMetadata.getOverriddenAttributeName("name")).thenReturn("Name");

// Mock out specific DynamoDBOperations behavior expected by this method
ArgumentCaptor<DynamoDBScanExpression> scanCaptor = ArgumentCaptor.forClass(DynamoDBScanExpression.class);
ArgumentCaptor<Class> classCaptor = ArgumentCaptor.forClass(Class.class);
Mockito.when(mockUserScanResults.get(0)).thenReturn(mockUser);
Mockito.when(mockUserScanResults.size()).thenReturn(1);
Mockito.when(mockUserScanResults.isEmpty()).thenReturn(false);
Mockito.when(mockDynamoDBOperations.scan(classCaptor.capture(), scanCaptor.capture())).thenReturn(
mockUserScanResults);

// Execute the query
Object[] parameters = new Object[] { "someName" };
Object o = partTreeDynamoDBQuery.execute(parameters);

// Assert that we obtain the expected single result
assertEquals(true, o);

// Assert that we scanned DynamoDB for the correct class
assertEquals(classCaptor.getValue(), User.class);

// Assert that we have only one filter condition, for the name of the
// property
Map<String, Condition> filterConditions = scanCaptor.getValue().getScanFilter();
assertEquals(1, filterConditions.size());
Condition filterCondition = filterConditions.get("Name");
assertNotNull(filterCondition);

assertEquals(ComparisonOperator.EQ.name(), filterCondition.getComparisonOperator());

// Assert we only have one attribute value for this filter condition
assertEquals(1, filterCondition.getAttributeValueList().size());

// Assert that there the attribute value type for this attribute value
// is String,
// and its value is the parameter expected
assertEquals("someName", filterCondition.getAttributeValueList().get(0).getS());

// Assert that all other attribute value types other than String type
// are null
assertNull(filterCondition.getAttributeValueList().get(0).getSS());
assertNull(filterCondition.getAttributeValueList().get(0).getN());
assertNull(filterCondition.getAttributeValueList().get(0).getNS());
assertNull(filterCondition.getAttributeValueList().get(0).getB());
assertNull(filterCondition.getAttributeValueList().get(0).getBS());

// Verify that the expected DynamoDBOperations method was called
Mockito.verify(mockDynamoDBOperations).scan(classCaptor.getValue(), scanCaptor.getValue());
}
}