Skip to content
This repository was archived by the owner on May 9, 2019. It is now read-only.

Commit 4f338dc

Browse files
committed
Remove Kafka publishing events
1 parent 805e94d commit 4f338dc

File tree

4 files changed

+8
-31
lines changed

4 files changed

+8
-31
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public interface UserService extends Service {
2020

2121
ServiceCall<NotUsed, User> getUser(UUID userId);
2222

23-
Topic<UserEvent> userEvents();
2423

2524
ServiceCall<NotUsed, PaginatedSequence<User>> getUsers(
2625
Optional<Integer> pageNo, Optional<Integer> pageSize);

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

+1-22
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public UserServiceImpl(PersistentEntityRegistry registry, UserRepository userRep
4040
public ServiceCall<UserRegistration, User> createUser() {
4141
return user -> {
4242
UUID uuid = UUID.randomUUID();
43-
Instant createdAt = Instant.now();
43+
4444
String password = PUserCommand.hashPassword(user.getPassword());
4545
PUser createdUser = new PUser(uuid, user.getName(), user.getEmail(), password);
4646
return entityRef(uuid)
@@ -63,27 +63,6 @@ public ServiceCall<NotUsed, User> getUser(UUID userId) {
6363
});
6464

6565
}
66-
@Override
67-
public Topic<UserEvent> userEvents() {
68-
return TopicProducer.taggedStreamWithOffset(PUserEvent.TAG.allTags(), this::streamForTag);
69-
}
70-
71-
private Source<Pair<UserEvent, Offset>, ?> streamForTag(AggregateEventTag<PUserEvent> tag, Offset offset) {
72-
return registry.eventStream(tag, offset).filter(eventOffset ->
73-
eventOffset.first() instanceof PUserEvent.PUserCreated
74-
).mapAsync(1, eventOffset -> {
75-
76-
PUserEvent.PUserCreated userCreated = (PUserEvent.PUserCreated) eventOffset.first();
77-
return CompletableFuture.completedFuture(Pair.create(
78-
new UserEvent.PUserCreated(convertUser(userCreated.getUser())),
79-
eventOffset.second()
80-
));
81-
82-
});
83-
}
84-
private User convertUser(com.example.auction.user.impl.PUser user) {
85-
return new User(user.getId(),user.getCreatedAt(),user.getName(),user.getEmail());
86-
}
8766

8867
@Override
8968
public ServiceCall<NotUsed, PaginatedSequence<User>> getUsers(Optional<Integer> pageNo, Optional<Integer> pageSize) {

web-gateway/src/main/java/controllers/ItemController.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import play.mvc.Result;
1818
import views.html.editItem;
1919

20-
import play.Configuration;
21-
import views.html.item;
2220

2321
import javax.inject.Inject;
2422
import java.time.Duration;
@@ -27,7 +25,7 @@
2725
import java.util.*;
2826
import java.util.concurrent.CompletableFuture;
2927
import java.util.concurrent.CompletionStage;
30-
import java.util.concurrent.ExecutionException;
28+
3129

3230
import static com.example.auction.security.ClientSecurity.*;
3331

@@ -185,9 +183,10 @@ private CompletionStage<Result> doGetItem(Http.Context ctx, String itemId, Form<
185183
.handleRequestHeader(authenticate(user)).invoke();
186184
CompletionStage<PaginatedSequence<User>> users =userService.getUsers(Optional.of(0),Optional.of(10))
187185
.handleRequestHeader(authenticate(user)).invoke();
186+
users.thenCombineAsync(u, (userPaginatedSequence, user1) -> {
187+
188+
return itemFuture.thenCombineAsync(bidHistoryFuture, (item, bidHistory) -> {
188189

189-
itemFuture.thenCombineAsync(bidHistoryFuture, (item, bidHistory) -> {
190-
return users.thenCombineAsync(u, (userPaginatedSequence, user1) -> {
191190
if (item.getStatus() == ItemStatus.CREATED && !item.getCreator().equals(user1.getId())) {
192191
return forbidden();
193192
}
@@ -236,9 +235,9 @@ private CompletionStage<Result> doGetItem(Http.Context ctx, String itemId, Form<
236235

237236
return ok(views.html.item.render(showInlineInstruction, item, bidForm, anonymizeBids(user, currency, bidHistory), user, currency, seller, winner, currentBidMaximum, bidResult, nav));
238237
});
239-
return null;
238+
240239
}, ec.current());
241-
return null;
240+
return null;
242241
}, ec.current()));
243242
}
244243

web-gateway/src/main/java/controllers/TransactionController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public CompletionStage<Result> getTransaction(String id) {
110110
return ok(views.html.transaction.render(showInlineInstruction, Optional.empty(),user, Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(msg), nav));
111111
}
112112
});
113-
return null;
113+
return null;
114114
}
115115
, ec.current())
116116
);

0 commit comments

Comments
 (0)