@@ -34,5 +34,6 @@ Require-Bundle: org.junit,

  net.bluemind.authentication.service;bundle-version="4.1.0",

  org.mockito.mockito-core,

  org.objenesis,

- net.bluemind.core.validator

+ net.bluemind.core.validator,

+ net.bluemind.core.sanitizer

 Automatic-Module-Name: net.bluemind.addressbook.service.tests

@@ -19,11 +19,13 @@

 package net.bluemind.addressbook.service;

 import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNull;

 import static org.junit.Assert.fail;

 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.List;

+import java.util.Optional;

 import org.junit.Test;

@@ -35,6 +37,7 @@ import net.bluemind.addressbook.api.VCard.Communications.Tel;

 import net.bluemind.addressbook.api.VCard.DeliveryAddressing;

 import net.bluemind.addressbook.api.VCard.DeliveryAddressing.Address;

 import net.bluemind.addressbook.api.VCard.Explanatory.Url;

+import net.bluemind.addressbook.api.VCard.Organizational.Member;

 import net.bluemind.addressbook.api.VCard.Parameter;

 import net.bluemind.addressbook.service.internal.VCardSanitizer;

 import net.bluemind.core.api.fault.ServerFault;

@@ -49,7 +52,7 @@ public class BasicVCardSanitizerTest {

 		card.organizational.org.company = null;

 		try {

-			getSanitizer().sanitize(card);

+			getSanitizer().sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

@@ -67,7 +70,7 @@ public class BasicVCardSanitizerTest {

 		card.organizational.org.company = company;

 		try {

-			getSanitizer().sanitize(card);

+			getSanitizer().sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

@@ -89,7 +92,7 @@ public class BasicVCardSanitizerTest {

 		card.communications.emails = emails;

 		try {

-			getSanitizer().sanitize(card);

+			getSanitizer().sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

@@ -100,6 +103,54 @@ public class BasicVCardSanitizerTest {

 	}

 	@Test

+	public void testSanitizerShouldInsertMissingContainerUid() {

+		String email = "test@test.com";

+		VCard card = defaultVCard();

+		card.identification.name.givenNames = null;

+		card.identification.name.familyNames = null;

+		card.organizational.org.company = null;

+		card.organizational.member = new ArrayList<VCard.Organizational.Member>();

+		VCard.Organizational.Member m = new VCard.Organizational.Member();

+		m.commonName = "air conditioning";

+		m.mailto = "killmy@planet.org";

+		m.itemUid = "1234";

+		VCard.Organizational.Member m2 = new VCard.Organizational.Member();

+		m2.commonName = "wind";

+		m2.mailto = "wind@ofchange.org";

+		m2.itemUid = "4321";

+		m2.containerUid = "alreadythere";

+		VCard.Organizational.Member m3 = new VCard.Organizational.Member();

+		m2.commonName = "ext";

+		m2.mailto = "ext@ofchange.org";

+		card.organizational.member.add(m);

+		card.organizational.member.add(m2);

+		card.organizational.member.add(m3);

+

+		List<Email> emails = new ArrayList<>();

+		emails.add(Email.create(email));

+		card.communications.emails = emails;

+

+		try {

+			getSanitizer().sanitize(card, Optional.of("mycontainer"));

+		} catch (ServerFault e) {

+			e.printStackTrace();

+			fail(e.getMessage());

+		}

+

+		assertEquals(3, card.organizational.member.size());

+

+		for (Member member : card.organizational.member) {

+			if (member.itemUid == null) {

+				assertNull(member.containerUid);

+			} else if (member.itemUid.equals("1234")) {

+				assertEquals("mycontainer", member.containerUid);

+			} else if (member.itemUid.equals("4321")) {

+				assertEquals("alreadythere", member.containerUid);

+			}

+		}

+	}

+

+	@Test

 	public void testSanitizerShouldRemoveEmptyBasicAttributes() {

 		VCard card = defaultVCard();

 		card.identification.formatedName.parameters = getEmptyAttributeTestList();

@@ -133,7 +184,7 @@ public class BasicVCardSanitizerTest {

 		card.communications.langs = Arrays.asList(lang1, lang2);

 		try {

-			getSanitizer().sanitize(card);

+			getSanitizer().sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

@@ -232,7 +283,7 @@ public class BasicVCardSanitizerTest {

 		card.communications.langs = Arrays.asList(lang1, lang2);

 		try {

-			getSanitizer().sanitize(card);

+			getSanitizer().sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

@@ -24,6 +24,7 @@ import static org.junit.Assert.fail;

 import java.sql.SQLException;

 import java.util.Arrays;

+import java.util.Optional;

 import java.util.UUID;

 import org.junit.Before;

@@ -117,16 +118,17 @@ public class VCardSanitizerTests extends AbstractServiceTests {

 				VCard.Organizational.Member.create(book1.uid, uid1, "fakeName", "fakemailto@fake.com"),

 				VCard.Organizational.Member.create(book2.uid, uid2, "fakeName", "fakemailto@fake.com"),

 				VCard.Organizational.Member.create(book2.uid, uid3, "fakeName", "fakemailto@fake.com"),

-				VCard.Organizational.Member.create("fakeUid", "fakeUid", "dontchange", "immutable@freeze.com"));

+				VCard.Organizational.Member.create("fakeUid", "fakeUid", "dontchange", "immutable@freeze.com"),

+				VCard.Organizational.Member.create(null, "fakeUid2", "fakeuid2", "fakeuid2@freeze.com"));

 		try {

-			new VCardSanitizer(testContext).sanitize(testCard);

+			new VCardSanitizer(testContext).sanitize(testCard, Optional.of("bookUid"));

 		} catch (ServerFault e) {

 			e.printStackTrace();

 			fail(e.getMessage());

 		}

-		assertEquals(4, testCard.organizational.member.size());

+		assertEquals(5, testCard.organizational.member.size());

 		VCard.Organizational.Member m = testCard.organizational.member.get(0);

 		// check info of user1 was updated from container item

@@ -149,6 +151,10 @@ public class VCardSanitizerTests extends AbstractServiceTests {

 		assertEquals("dontchange", m.commonName);

 		assertEquals("immutable@freeze.com", m.mailto);

 		assertNull(m.containerUid);

+

+		m = testCard.organizational.member.get(4);

+		assertEquals("fakeuid2", m.commonName);

+		assertEquals("bookUid", m.containerUid);

 	}

 	@Test

@@ -157,7 +163,7 @@ public class VCardSanitizerTests extends AbstractServiceTests {

 		card.identification.name = VCard.Identification.Name.create("familyNames  ", "givenNames  ",

 				" additionnalNames  ", " prefix ", "suffix ", Arrays.<VCard.Parameter>asList());

 		try {

-			new VCardSanitizer(testContext).sanitize(card);

+			new VCardSanitizer(testContext).sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			fail(e.getMessage());

 		}

@@ -175,7 +181,7 @@ public class VCardSanitizerTests extends AbstractServiceTests {

 		VCard card = defaultVCard();

 		card.communications.emails = Arrays.asList(VCard.Communications.Email.create("  this.is.calendar@bm.lan    "));

 		try {

-			new VCardSanitizer(testContext).sanitize(card);

+			new VCardSanitizer(testContext).sanitize(card, Optional.empty());

 		} catch (ServerFault e) {

 			fail(e.getMessage());

 		}

@@ -21,6 +21,7 @@ package net.bluemind.addressbook.service.internal;

 import java.sql.SQLException;

 import java.util.ArrayList;

 import java.util.Collection;

+import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 import java.util.function.Consumer;

@@ -147,9 +148,14 @@ public class AddressBookService implements IInCoreAddressBook {

 		return Ack.create(version);

 	}

+	@SuppressWarnings("serial")

 	private long doCreate(String uid, Long internalId, VCard card, byte[] photo) throws ServerFault {

 		// ext point sanitizer

-		extSanitizer.create(card);

+		extSanitizer.create(card, new HashMap<String, String>() {

+			{

+				put("containerUid", container.uid);

+			}

+		});

 		extValidator.create(card, ImmutableMap.of("containerUid", container.uid));

@@ -240,6 +246,7 @@ public class AddressBookService implements IInCoreAddressBook {

 	 * @return

 	 * @throws ServerFault

 	 */

+	@SuppressWarnings("serial")

 	private Updated doUpdate(String givenUid, Long itemId, VCard card, byte[] photo) throws ServerFault {

 		ItemValue<VCard> previousItemValue = itemId == null ? storeService.get(givenUid, null)

@@ -256,8 +263,11 @@ public class AddressBookService implements IInCoreAddressBook {

 				: getDisplayName(card).equals(getDisplayName(previousItemValue.value));

 		boolean directoryValueChanged = !displayNameEquals || !emailEquals;

-		// ext point sanitizer

-		extSanitizer.update(previousItemValue.value, card);

+		extSanitizer.update(previousItemValue.value, card, new HashMap<String, String>() {

+			{

+				put("containerUid", container.uid);

+			}

+		});

 		extValidator.update(previousItemValue.value, card, ImmutableMap.of("containerUid", container.uid));

@@ -21,6 +21,8 @@ package net.bluemind.addressbook.service.internal;

 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.List;

+import java.util.Map;

+import java.util.Optional;

 import java.util.stream.Collectors;

 import org.apache.commons.lang.StringUtils;

@@ -62,15 +64,26 @@ public class VCardSanitizer implements ISanitizer<VCard> {

 		this.tagsSanitizer = new TagsSanitizer(context);

 	}

-	public void sanitize(VCard card) throws ServerFault {

+	public void sanitize(VCard card, Optional<String> containerUid) throws ServerFault {

 		sanitizeDefault(card);

 		sanitizeFormattedName(card);

 		sanitizeCnAndMailto(card);

 		sanitizeParameterValues(card);

 		sanitizeEmails(card);

+		sanitizeMembers(card, containerUid);

 		tagsSanitizer.sanitize(card.explanatory.categories);

 	}

+	private void sanitizeMembers(VCard card, Optional<String> containerUid) {

+		containerUid.ifPresent(container -> {

+			card.organizational.member.forEach(member -> {

+				if (member.itemUid != null && member.containerUid == null) {

+					member.containerUid = container;

+				}

+			});

+		});

+	}

+

 	private void sanitizeEmails(VCard card) {

 		card.communications.emails = card.communications.emails.stream().filter(e -> e.value != null).map(e -> {

 			e.value = e.value.toLowerCase().trim();

@@ -251,11 +264,22 @@ public class VCardSanitizer implements ISanitizer<VCard> {

 	@Override

 	public void create(VCard obj) throws ServerFault {

-		sanitize(obj);

+		create(obj, Collections.emptyMap());

 	}

 	@Override

 	public void update(VCard current, VCard obj) throws ServerFault {

-		sanitize(obj);

+		update(current, obj, Collections.emptyMap());

+	}

+

+	@Override

+	public void create(VCard entity, Map<String, String> params) {

+		sanitize(entity, Optional.ofNullable(params.get("containerUid")));

 	}

+

+	@Override

+	public void update(VCard current, VCard entity, Map<String, String> params) {

+		sanitize(entity, Optional.ofNullable(params.get("containerUid")));

+	}

+

 }