Repository: incubator-unomi Updated Branches: refs/heads/master 35330b452 -> a027ad33d
UNOMI-137 : Fix migration code Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a027ad33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a027ad33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a027ad33 Branch: refs/heads/master Commit: a027ad33d8529bb1c0555e3034f4d67ba8326f5e Parents: 35330b4 Author: Abdelkader Midani <[email protected]> Authored: Wed Nov 8 12:23:44 2017 +0100 Committer: Abdelkader Midani <[email protected]> Committed: Wed Nov 8 12:23:50 2017 +0100 ---------------------------------------------------------------------- .../apache/unomi/shell/migration/impl/MigrationTo130.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a027ad33/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo130.java ---------------------------------------------------------------------- diff --git a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo130.java b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo130.java index a176f0f..b1d4cd4 100644 --- a/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo130.java +++ b/tools/shell-commands/src/main/java/org/apache/unomi/shell/migration/impl/MigrationTo130.java @@ -37,6 +37,7 @@ public class MigrationTo130 implements Migration { private CloseableHttpClient httpClient; private CommandSession session; private LinkedHashMap<String, List<String>> tagsStructurePriorTo130; + private List propsTaggedAsPersonalIdentifier = Arrays.asList("firstName", "lastName", "email", "phoneNumber", "address", "facebookId", "googleId", "linkedInId", "twitterId"); @Override public Version getFromVersion() { @@ -139,11 +140,17 @@ public class MigrationTo130 implements Migration { updatedHits.append("{\"update\":{\"_id\":\"").append(hitId).append("\"}}\n"); if (tagsOperation.equals("1")) { Set<String> tags = removeNamespaceOnTags(removeNamespaceOnSystemTags, tagsAfterMigration); + if (propsTaggedAsPersonalIdentifier.contains(hitId)) { + tags.add("personalIdentifierProperties"); + } updatedHits.append("{\"doc\":{\"metadata\":{\"tags\":").append(new JSONArray(tagsAfterMigration)) .append(",\"systemTags\":").append(new JSONArray(tags)).append("}}}\n"); } if (tagsOperation.equals("2")) { Set<String> tags = removeNamespaceOnTags(removeNamespaceOnSystemTags, tagsAfterMigration); + if (propsTaggedAsPersonalIdentifier.contains(hitId)) { + tags.add("personalIdentifierProperties"); + } updatedHits.append("{\"doc\":{\"metadata\":{\"systemTags\":").append(new JSONArray(tags)).append("}}}\n"); if (tagsInMetadata) { updatedHits.append("{\"update\":{\"_id\":\"").append(hitId).append("\"}}\n"); @@ -211,7 +218,6 @@ public class MigrationTo130 implements Migration { tagsStructurePriorTo130.put("socialProfileProperties", Arrays.asList("properties", "profileProperties")); tagsStructurePriorTo130.put("personalProfileProperties", Arrays.asList("properties", "profileProperties")); tagsStructurePriorTo130.put("workProfileProperties", Arrays.asList("properties", "profileProperties")); - tagsStructurePriorTo130.put("personalIdentifierProperties", Arrays.asList("properties", "profileProperties")); tagsStructurePriorTo130.put("sessionProperties", Collections.singletonList("properties")); tagsStructurePriorTo130.put("geographicSessionProperties", Arrays.asList("properties", "sessionProperties"));
