adding hash to user node on creation

maxdemarzi · Mar 24, 2017 · 864ac0e · 864ac0e
1 parent 8bcce8d
commit 864ac0e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/com/maxdemarzi/Properties.java b/src/main/java/com/maxdemarzi/Properties.java
@@ -7,6 +7,7 @@ private Properties() {
     }
 
     public static final String EMAIL = "email";
+    public static final String HASH = "hash";
     public static final String LIKES = "likes";
     public static final String NAME = "name";
     public static final String PASSWORD = "password";

diff --git a/src/main/java/com/maxdemarzi/users/Users.java b/src/main/java/com/maxdemarzi/users/Users.java
@@ -83,6 +83,7 @@ public Response createUser(String body, @Context GraphDatabaseService db) throws
                     user.setProperty(NAME, parameters.get(NAME));
                     user.setProperty(USERNAME, parameters.get(USERNAME));
                     user.setProperty(PASSWORD, parameters.get(PASSWORD));
+                    user.setProperty(HASH, new Md5Hash(((String)parameters.get(EMAIL)).toLowerCase()).toString());
                     results = user.getAllProperties();
                 } else {
                     throw UserExceptions.existingEmailParameter;
@@ -103,6 +104,7 @@ public Response getFollowers(@PathParam("username") final String username, @Cont
             Node user = findUser(username, db);
             for (Relationship r1: user.getRelationships(Direction.INCOMING, RelationshipTypes.FOLLOWS)) {
                 Map<String, Object> follower = r1.getStartNode().getAllProperties();
+                follower.remove(EMAIL);
                 follower.remove(PASSWORD);
                 results.add(follower);
             }
@@ -118,9 +120,10 @@ public Response getFollowing(@PathParam("username") final String username, @Cont
         try (Transaction tx = db.beginTx()) {
             Node user = findUser(username, db);
             for (Relationship r1: user.getRelationships(Direction.OUTGOING, RelationshipTypes.FOLLOWS)) {
-                Map<String, Object> follower = r1.getEndNode().getAllProperties();
-                follower.remove(PASSWORD);
-                results.add(follower);
+                Map<String, Object> following = r1.getEndNode().getAllProperties();
+                following.remove(EMAIL);
+                following.remove(PASSWORD);
+                results.add(following);
             }
             tx.success();
         }

diff --git a/src/test/java/com/maxdemarzi/users/CreateUserTest.java b/src/test/java/com/maxdemarzi/users/CreateUserTest.java
@@ -34,5 +34,6 @@ public void shouldCreateUser() {
         put("email", "maxdemarzi@hotmail.com");
         put("name", "Max De Marzi");
         put("password", "swordfish");
+        put("hash","58750f2179edbd650b471280aa66fee5");
     }};
 }
diff --git a/src/test/java/com/maxdemarzi/users/GetFollowersTest.java b/src/test/java/com/maxdemarzi/users/GetFollowersTest.java
@@ -37,7 +37,6 @@ public void shouldGetFollowers() {
     private static final ArrayList<HashMap<String, Object>> expected = new ArrayList<HashMap<String, Object>>() {{
         add(new HashMap<String, Object>() {{
                     put("username", "jexp");
-                    put("email", "michael@neo4j.com");
                     put("name", "Michael Hunger");
             }});
         }};

diff --git a/src/test/java/com/maxdemarzi/users/GetFollowingTest.java b/src/test/java/com/maxdemarzi/users/GetFollowingTest.java
@@ -37,7 +37,6 @@ public void shouldGetFollowing() {
     private static final ArrayList<HashMap<String, Object>> expected = new ArrayList<HashMap<String, Object>>() {{
         add(new HashMap<String, Object>() {{
             put("username", "jexp");
-            put("email", "michael@neo4j.com");
             put("name", "Michael Hunger");
         }});
     }};