From 2d43429d5f6f48c51f299ec55beabf4d8a4eb32b Mon Sep 17 00:00:00 2001 From: Lam-Pui Chan Date: Tue, 10 Apr 2018 17:09:58 -0400 Subject: [PATCH] Modified event handler to save invoice --- libs/trip-management-common-1.0.jar | Bin 17049 -> 17234 bytes .../eventhandlers/TripEventHandler.java | 15 +++++++++++---- .../query/domain/models/Trip.java | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/libs/trip-management-common-1.0.jar b/libs/trip-management-common-1.0.jar index adf5055904af6c643a743bfa444d961c4ac8cb2d..79e93c3472fe66d3635b9fabc064407272caf92a 100644 GIT binary patch delta 2628 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ଥ+z9ays~EZ~Sp+z_ZZjMB;LH?`LE+1icqo zM&LUnAFenrwO=>yVjCCIZ19k7yIdSq*4~n{VUfMAS&>7((&qX@^#N+)SPRST5pGKq zaauyYv_0qUlRXst{id_MXnGbCv%B9fL$5q`u4Aru+g$w0?^}nJs*@!tXVxR8$po{x zE2yR$T^9CJX*pJxPsd)`P=ae=Z8)?yl|tM)DyiE#zz$dpKhWc(j!kdbXBGnFh3eUji7YAkTF53X`XxueZ&=u+`miXes!FTkMH| z_X`EjpQf9pp%=-Mivjb24RUoolimw1JGsT|r%&O`i`K2%&k*?m8gegR_4)~3S;8;; zSf0fIxy|q774p1dq2W4Qg=F0va-?%!He7!VY2E%y&yHQZdXvyo`G}+C4bw)S*-HqGmyrPjQzrgl`;0)bW-RA{XTe4nRw!f$C0;2 zK1}$@c7OJE@G0p=c1#I2HtmJMEso0-81}o=Uy+VKZ>scEx9qQlwD`3Cgup#fsVzgt z(XkJn6?P!K+Q5i)c3L@(9(GCyo{-n>^+|^5LyZ`uM~BfPgH)-zmdgJi!E)@34L@eL zTHqTl7(R$8?)J9^GA-ZXYQ6_)*V2<}B?i zv-JL=N3Haxye$IUUv3^?Pay>sk>_V4(<-%2L62*KfmZx?y zYvrph?OMVp%?@P6C{Xx%yA8tkXzkF(Ua!W69f_^EsAvqAvX}|*3*=UOruq8(`N5^( zYL?=M=HOTGn=;i#!-lYG>|jc27w(XRc}h^KF)1+B9B6-PVhs&A4N%;gO@7-Z$HrVVa~KY~~%UJI)7i=7suc*{mqoVWo-a>VhB_?WA$-jTIqN*v6SI$#4?9B z5(|#7+Vp)1_TpIyLEP;@n3cC!G;LKurq$|ipw;TUc*TBa6zbRR55C(OrXgN(NqN{? z1p$CBFaV$c|BQlYSOb9#nvY(wqKJyMTv~oAajj8xML@B^<;4(k#}`i{Zs%z15?CwkV148 z-|Yrb6*4QD*nmq!?Vs0&x?@01E7R2?XV@ZF&;6yy|DOsFU83}F^EwpS2?AAs{r%%g W+ocL+D1jubI!M@smMY&N-u7Q|TO8d0 diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java index 4d4f5ab..6351cc8 100644 --- a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java +++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/eventhandlers/TripEventHandler.java @@ -22,7 +22,7 @@ public TripEventHandler() {} public void on(TripCreatedEvent event) { LOG.trace("Creating trip: {}", event.getId()); tripRepository.save(new Trip(event.getId(), event.getUserId(), - event.getOriginAddress(), event.getDestinationAddress(), TripStatus.CREATED)); + event.getOriginAddress(), event.getDestinationAddress(), event.getTripInvoice(), TripStatus.CREATED)); LOG.info("Trip created: {}", event.getId()); } @@ -55,12 +55,19 @@ public void on(TripCompletedEvent event) { @EventHandler public void on(TripUpdatedEvent event) { - LOG.trace("Completing trip: {}", event.getId()); + LOG.trace("Updating trip: {}", event.getId()); Trip trip = tripRepository.findOne(event.getId()); - trip.setStatus(TripStatus.COMPLETED); + if(!trip.getOriginAddress().equals(event.getOriginAddress())) { + LOG.info("Origin address updated: {}", event.getOriginAddress()); + } + if(!trip.getDestinationAddress().equals(event.getDestinationAddress())) { + LOG.info("Destination address updated: {}", event.getDestinationAddress()); + } + trip.setStatus(TripStatus.UPDATED); trip.setOriginAddress(event.getOriginAddress()); trip.setDestinationAddress(event.getDestinationAddress()); + trip.setTripInvoice(event.getTripInvoice()); tripRepository.save(trip); - LOG.info("Trip completed: {}", event.getId()); + LOG.info("Trip updated: {}", event.getId()); } } diff --git a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java index a7c5d85..2b81aa6 100644 --- a/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java +++ b/src/main/java/org/aitesting/microservices/tripmanagement/query/domain/models/Trip.java @@ -3,6 +3,7 @@ import java.util.UUID; import javax.validation.constraints.NotNull; import org.aitesting.microservices.tripmanagement.common.events.TripStatus; +import org.aitesting.microservices.tripmanagement.common.models.TripInvoice; public class Trip { @NotNull @@ -10,14 +11,15 @@ public class Trip { private UUID userId; private String originAddress; private String destinationAddress; - + private TripInvoice tripInvoice; private TripStatus status; - public Trip(UUID id, UUID userId, String originAddress, String destinationAddress, TripStatus status) { + public Trip(UUID id, UUID userId, String originAddress, String destinationAddress, TripInvoice tripInvoice, TripStatus status) { this.id = id; this.userId = userId; this.originAddress = originAddress; this.destinationAddress = destinationAddress; + this.tripInvoice = tripInvoice; this.status = status; } @@ -52,4 +54,6 @@ public void setDestinationAddress(String destinationAddress) { public void setStatus(TripStatus status) { this.status = status; } + + public void setTripInvoice(TripInvoice tripInvoice) { this.tripInvoice = tripInvoice; } }