Skip to content
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

Jump to bottom

Fix update in case of a nested $elemMatch #376

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix update in case of a nested $elemMatch #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e9856
Failed to handle positional update for entire element
mincong-h Mar 29, 2020
5c2ec04
Fix nested when postPath is empty
mincong-h Mar 29, 2020
6ba3d7c
Rename tests
mincong-h Mar 29, 2020
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
6 changes: 5 additions & 1 deletion src/main/java/com/github/fakemongo/impl/UpdateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ public void handlePositionalUpdate(final String updateKey, Object object, List v
} else {
//this is kind of a waste
DBObject o = ExpressionParser.isDbObject(listItem) ? ExpressionParser.toDbObject(listItem) : new BasicDBObject(prePath, listItem);
if (filter.apply(o)) {
BasicDBList listWithSingleItem = new BasicDBList();
listWithSingleItem.add(listItem);
if (filter.apply(o) ||
//Case of a nested $elemMatch
filter.apply(new BasicDBObject(prePath, listWithSingleItem))) {
BasicDBList newList = new BasicDBList();
newList.addAll(valueList);
//do not put any data on ownerObj, because the prePath can be composed of different parts
Expand Down
28 changes: 24 additions & 4 deletions src/test/java/com/github/fakemongo/impl/UpdateEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ public void testPositionalOperator() {
}

@Test
public void testPositionalOperatorWithElemMatch() {
public void testPositionalOperatorWithElemMatchWithPostPath() {
String random1 = UUID.randomUUID().toString();
String random2 = UUID.randomUUID().toString();

DBObject object = (DBObject) FongoJSON.parse("{ \"name\" : \"Tenant 1\", \"appAllocations\" : [ { \"appId\" : \""
+ random1 + "\" , \"maxUser\" : 4} , { \"appId\""
+ ": \"" + random2 + "\" , \"maxUser\" : 42}]}");
Expand All @@ -431,12 +431,32 @@ public void testPositionalOperatorWithElemMatch() {
assertEquals(expected.toString(),
updateEngine.doUpdate(object, update, query, false).toString());
}


@Test
public void testPositionalOperatorWithElemMatchWithoutPostPath() {
String random1 = UUID.randomUUID().toString();
String random2 = UUID.randomUUID().toString();

DBObject object = (DBObject) FongoJSON.parse("{ \"name\" : \"Tenant 1\", \"appAllocations\" : [ { \"appId\" : \""
+ random1 + "\" , \"maxUser\" : 4} , { \"appId\""
+ ": \"" + random2 + "\" , \"maxUser\" : 42}]}");
DBObject query = (DBObject) FongoJSON.parse("{ \"appAllocations\" : { \"$elemMatch\" : { \"appId\" : \"" + random1 + "\"}}}");
DBObject update = (DBObject) FongoJSON.parse("{ \"$set\" : { \"appAllocations.$\" : { \"appId\" : \"" + random1 + "\", \"maxUser\" : 9 }}}");

DBObject expected = (DBObject) FongoJSON.parse("{ \"name\" : \"Tenant 1\", \"appAllocations\" : [ { \"appId\" : \""
+ random1 + "\" , \"maxUser\" : 9} , { \"appId\""
+ ": \"" + random2 + "\" , \"maxUser\" : 42}]}");
UpdateEngine updateEngine = new UpdateEngine();

assertEquals(expected.toString(),
updateEngine.doUpdate(object, update, query, false).toString());
}

@Test
public void testAddOrReplaceElementMustWorkWithDollarOperator() {
String random1 = UUID.randomUUID().toString();
String random2 = UUID.randomUUID().toString();

DBObject object = (DBObject) FongoJSON.parse("{ \"_id\" : \"1234\" , \"var1\" : \"val1\" , \"parentObject\" : { \"var2\" : \"val21\" , \"subObject\" : [ { \"_id\" : \"" + random1 + "\" , \"var3\" : \"val31\"}, { \"_id\" : \"" + random2 + "\" , \"var3\" : \"val32\"}]}}");
DBObject update = (DBObject) FongoJSON.parse("{ \"$set\" : { \"parentObject.subObject.$\" : { \"_id\" : \"" + random1 + "\" , \"var3\" : \"val33\"}}}");
DBObject query = (DBObject) FongoJSON.parse("{ \"_id\" : \"1234\" , \"parentObject.subObject._id\" : \"" + random1 + "\"}");
Expand Down