Add a user read-side processor (#131)

Author: lakhina

build.sbt

@@ -156,14 +156,14 @@ lazy val transactionImpl = (project in file("transaction-impl"))
     tools,
     testkit % "test"
   ).settings(
-    version := "1.0-SNAPSHOT",
-    libraryDependencies ++= Seq(
-      lagomJavadslPersistenceCassandra,
-      lagomJavadslTestKit,
-      lagomJavadslKafkaBroker,
-      cassandraExtras
-    )
+  version := "1.0-SNAPSHOT",
+  libraryDependencies ++= Seq(
+    lagomJavadslPersistenceCassandra,
+    lagomJavadslTestKit,
+    lagomJavadslKafkaBroker,
+    cassandraExtras
   )
+)
 
 lazy val userApi = (project in file("user-api"))
   .settings(commonSettings: _*)
@@ -174,18 +174,21 @@ lazy val userApi = (project in file("user-api"))
       lombok
     )
   )
-  .dependsOn(security)
+  .dependsOn(security, tools)
 
 lazy val userImpl = (project in file("user-impl"))
   .settings(commonSettings: _*)
   .enablePlugins(LagomJava)
-  .dependsOn(userApi)
+  .dependsOn(userApi, tools,
+    testkit % "test"
+  )
   .settings(
     version := "1.0-SNAPSHOT",
     libraryDependencies ++= Seq(
       lagomJavadslPersistenceCassandra,
       lagomJavadslTestKit,
-      "de.svenkubiak" % "jBCrypt" % "0.4"
+      "de.svenkubiak" % "jBCrypt" % "0.4",
+      cassandraExtras
     )
   )
 

user-api/src/main/java/com/example/auction/user/api/User.java

@@ -1,24 +1,18 @@
 package com.example.auction.user.api;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 
-import java.util.Optional;
+import java.time.Instant;
 import java.util.UUID;
 
 @Value
 public final class User {
 
     private final UUID id;
+    private final Instant createdAt;
     private final String name;
     private final String email;
 
-    @JsonCreator
-    public User(@JsonProperty("id") UUID id, @JsonProperty("name") String name, @JsonProperty("email") String email) {
-        this.id = id;
-        this.name = name;
-        this.email = email;
-    }
+
 
 }

user-api/src/main/java/com/example/auction/user/api/UserRegistration.java

@@ -1,7 +1,5 @@
 package com.example.auction.user.api;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 
 @Value
@@ -11,11 +9,6 @@ public final class UserRegistration {
     private final String email;
     private final String password;
 
-    @JsonCreator
-    public UserRegistration( @JsonProperty("name") String name, @JsonProperty("email") String email, @JsonProperty("password") String password) {
-        this.name = name;
-        this.email = email;
-        this.password = password;
-    }
+
 
 }

user-api/src/main/java/com/example/auction/user/api/UserService.java

@@ -1,31 +1,35 @@
 package com.example.auction.user.api;
 
 import akka.NotUsed;
+import com.example.auction.pagination.PaginatedSequence;
 import com.lightbend.lagom.javadsl.api.Descriptor;
 import com.lightbend.lagom.javadsl.api.Service;
 import com.lightbend.lagom.javadsl.api.ServiceCall;
 import com.lightbend.lagom.javadsl.api.deser.PathParamSerializers;
-import org.pcollections.PSequence;
 
+import java.util.Optional;
 import java.util.UUID;
 
-import static com.lightbend.lagom.javadsl.api.Service.*;
+import static com.lightbend.lagom.javadsl.api.Service.named;
+import static com.lightbend.lagom.javadsl.api.Service.pathCall;
 
 public interface UserService extends Service {
 
     ServiceCall<UserRegistration, User> createUser();
 
     ServiceCall<NotUsed, User> getUser(UUID userId);
 
-    // Remove once we have a proper user service
-    ServiceCall<NotUsed, PSequence<User>> getUsers();
+    ServiceCall<NotUsed, PaginatedSequence<User>> getUsers(
+            Optional<Integer> pageNo, Optional<Integer> pageSize);
 
     @Override
     default Descriptor descriptor() {
         return named("user").withCalls(
                 pathCall("/api/user", this::createUser),
                 pathCall("/api/user/:id", this::getUser),
-                pathCall("/api/user", this::getUsers)
-        ).withPathParamSerializer(UUID.class, PathParamSerializers.required("UUID", UUID::fromString, UUID::toString));
+                pathCall("/api/user?pageNo&pageSize", this::getUsers)
+        ).withPathParamSerializer(
+                UUID.class, PathParamSerializers.required("UUID", UUID::fromString, UUID::toString)
+        );
     }
 }

user-impl/src/main/java/com/example/auction/user/impl/UserModule.java user-impl/src/main/java/Module.java

@@ -1,12 +1,13 @@
-package com.example.auction.user.impl;
-
 import com.example.auction.user.api.UserService;
+import com.example.auction.user.impl.UserRepository;
+import com.example.auction.user.impl.UserServiceImpl;
 import com.google.inject.AbstractModule;
 import com.lightbend.lagom.javadsl.server.ServiceGuiceSupport;
 
-public class UserModule extends AbstractModule implements ServiceGuiceSupport {
+public class Module extends AbstractModule implements ServiceGuiceSupport {
     @Override
     protected void configure() {
         bindService(UserService.class, UserServiceImpl.class);
+        bind(UserRepository.class);
     }
 }

user-impl/src/main/java/com/example/auction/user/impl/Mappers.java

@@ -2,16 +2,16 @@
 
 import com.example.auction.user.api.User;
 
-/**
- *
- */
+import java.util.Optional;
+
 public class Mappers {
 
-    public static User toApi(PUser user) {
+    public static User toApi(Optional<PUser> user) {
         return new User(
-                user.getId(),
-                user.getName(),
-                user.getEmail()
+                user.get().getId(),
+                user.get().getCreatedAt(),
+                user.get().getName(),
+                user.get().getEmail()
         );
     }
 

user-impl/src/main/java/com/example/auction/user/impl/PUser.java

@@ -3,14 +3,16 @@
 import com.lightbend.lagom.serialization.Jsonable;
 import lombok.Value;
 
+import java.time.Instant;
 import java.util.UUID;
 
 @Value
 public final class PUser implements Jsonable {
 
     private final UUID id;
+    private final Instant createdAt;
     private final String name;
-    private  final String email;
+    private final String email;
     private final String passwordHash;
 
 

user-impl/src/main/java/com/example/auction/user/impl/PUserCommand.java

@@ -1,6 +1,5 @@
 package com.example.auction.user.impl;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.lightbend.lagom.javadsl.persistence.PersistentEntity;
 import com.lightbend.lagom.serialization.Jsonable;
 import lombok.Value;
@@ -10,28 +9,29 @@
 
 public interface PUserCommand extends Jsonable {
     @Value
-    final class CreatePUser implements PUserCommand, PersistentEntity.ReplyType<PUser> {
+    final class CreatePUser implements PUserCommand, PersistentEntity.ReplyType<Optional<PUser>> {
         private final String name;
         private final String email;
         private final String passwordHash;
     }
-        public static String hashPassword(String password_plaintext) {
-            String salt = BCrypt.gensalt(12);
-            String hashed_password = BCrypt.hashpw(password_plaintext, salt);
 
-            return (hashed_password);
-        }
+    public static String hashPassword(String password_plaintext) {
+        String salt = BCrypt.gensalt(12);
+        String hashed_password = BCrypt.hashpw(password_plaintext, salt);
 
-        public static boolean checkPassword(String password_plaintext, String stored_hash) {
-            boolean password_verified = false;
+        return (hashed_password);
+    }
+
+    public static boolean checkPassword(String password_plaintext, String stored_hash) {
+        boolean password_verified = false;
 
-            if (null == stored_hash)
-                throw new java.lang.IllegalArgumentException("Invalid hash provided for comparison");
+        if (null == stored_hash)
+            throw new java.lang.IllegalArgumentException("Invalid hash provided for comparison");
 
-            password_verified = BCrypt.checkpw(password_plaintext, stored_hash);
+        password_verified = BCrypt.checkpw(password_plaintext, stored_hash);
 
-            return (password_verified);
-        }
+        return (password_verified);
+    }
 
 
     enum GetPUser implements PUserCommand, PersistentEntity.ReplyType<Optional<PUser>> {

user-impl/src/main/java/com/example/auction/user/impl/PUserEntity.java

@@ -1,10 +1,11 @@
 package com.example.auction.user.impl;
 
-import com.example.auction.user.api.UserRegistration;
+import com.example.auction.user.impl.PUserCommand.CreatePUser;
+import com.example.auction.user.impl.PUserCommand.GetPUser;
+import com.example.auction.user.impl.PUserEvent.PUserCreated;
 import com.lightbend.lagom.javadsl.persistence.PersistentEntity;
-import com.example.auction.user.impl.PUserCommand.*;
-import com.example.auction.user.impl.PUserEvent.*;
 
+import java.time.Instant;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
@@ -30,7 +31,7 @@ private Behavior created(PUser user) {
         );
 
         b.setReadOnlyCommandHandler(CreatePUser.class, (create, ctx) ->
-            ctx.invalidCommand("User already exists.")
+                ctx.invalidCommand("User already exists.")
         );
 
         return b.build();
@@ -45,8 +46,8 @@ private Behavior notCreated() {
 
         b.setCommandHandler(CreatePUser.class, (create, ctx) -> {
 
-            PUser user = new PUser(UUID.fromString(entityId()), create.getName(), create.getEmail(), create.getPasswordHash());
-            return ctx.thenPersist(new PUserCreated(user), (e) -> ctx.reply(user));
+            PUser user = new PUser(UUID.fromString(entityId()), Instant.now(), create.getName(), create.getEmail(), create.getPasswordHash());
+            return ctx.thenPersist(new PUserCreated(user), (e) -> ctx.reply(Optional.ofNullable(user)));
         });
 
         b.setEventHandlerChangingBehavior(PUserCreated.class, user -> created(user.getUser()));

user-impl/src/main/java/com/example/auction/user/impl/PUserEvent.java

@@ -1,19 +1,24 @@
 package com.example.auction.user.impl;
 
 import com.lightbend.lagom.javadsl.persistence.AggregateEvent;
+import com.lightbend.lagom.javadsl.persistence.AggregateEventShards;
 import com.lightbend.lagom.javadsl.persistence.AggregateEventTag;
+import com.lightbend.lagom.javadsl.persistence.AggregateEventTagger;
 import com.lightbend.lagom.serialization.Jsonable;
 import lombok.Value;
 
 public interface PUserEvent extends Jsonable, AggregateEvent<PUserEvent> {
 
+    int NUM_SHARDS = 4;
+    AggregateEventShards<PUserEvent> TAG = AggregateEventTag.sharded(PUserEvent.class, NUM_SHARDS);
+
     @Value
     final class PUserCreated implements PUserEvent {
         private final PUser user;
     }
 
     @Override
-    default AggregateEventTag<PUserEvent> aggregateTag() {
-        return AggregateEventTag.of(PUserEvent.class);
+    default AggregateEventTagger<PUserEvent> aggregateTag() {
+        return TAG;
     }
 }