Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions src/main/java/io/autoinvestor/domain/events/Event.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package io.autoinvestor.domain.events;

import io.autoinvestor.domain.Id;
import lombok.Getter;

import java.util.Date;

@Getter
public abstract class Event<P extends EventPayload> {
private final EventId id;
private final Id aggregateId;
Expand Down Expand Up @@ -33,28 +35,4 @@ protected Event(EventId id, Id aggregateId, String type, P payload, Date occurre
this.occurredAt = occurredAt;
this.version = version;
}

public EventId getId() {
return id;
}

public Id getAggregateId() {
return aggregateId;
}

public String getType() {
return type;
}

public P getPayload() {
return payload;
}

public Date getOccurredAt() {
return occurredAt;
}

public int getVersion() {
return version;
}
}
3 changes: 3 additions & 0 deletions src/main/java/io/autoinvestor/domain/model/Decision.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ protected void when(Event<?> e) {
}

private void whenDecisionTaken(DecisionTakenEvent event) {
if (this.state == null) {
this.state = DecisionState.empty();
}
this.state = this.state.withDecisionTaken(event);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ final class EventMessageMapper {
PubsubMessage toMessage(Event<?> event) {
try {
Map<String, Object> envelope = new HashMap<>();
envelope.put("payload", event.getPayload().asMap());
envelope.put("eventId", event.getId().value());
envelope.put("type", event.getType());
envelope.put("payload", event.getPayload().asMap());
envelope.put("eventId", event.getId().value());
envelope.put("type", event.getType());
envelope.put("aggregateId", event.getAggregateId().value());
envelope.put("occurredAt",
Instant.ofEpochMilli(event.getOccurredAt().getTime()).toString());
envelope.put("version", event.getVersion());
envelope.put("version", event.getVersion());

String json = objectMapper.writeValueAsString(envelope);
return PubsubMessage.newBuilder()
.setData(ByteString.copyFromUtf8(json))
.build();

} catch (JsonProcessingException ex) {
throw new InternalErrorException("Failed to serialise domain event");
}
Expand Down