[ogm/hiking] Get list of hikes in trip details

Author: emmanuelbernard

hibernate-ogm/hiking-demo/src/main/java/org/hibernate/ogm/hiking/rest/TripResource.java

@@ -16,6 +16,7 @@
 import org.hibernate.ogm.hiking.model.Trip;
 import org.hibernate.ogm.hiking.repository.TripRepository;
 import org.hibernate.ogm.hiking.rest.model.ExternalTrip;
+import org.hibernate.ogm.hiking.rest.model.ExternalTripWithHikes;
 
 @Path("/trips")
 @Stateless
@@ -44,9 +45,9 @@ public List<ExternalTrip> getAllTrips() {
 	@GET
 	@Path("/{id}")
 	@Produces("application/json")
-	public ExternalTrip getTripById(@PathParam("id") long tripId) {
+	public ExternalTripWithHikes getTripById(@PathParam("id") long tripId) {
 		// full load
-		return new ExternalTrip( tripRepository.getTripById( tripId ), true );
+		return new ExternalTripWithHikes( tripRepository.getTripById( tripId ) );
 	}
 
 	@POST

hibernate-ogm/hiking-demo/src/main/java/org/hibernate/ogm/hiking/rest/model/ExternalHikeSummary.java

@@ -0,0 +1,52 @@
+package org.hibernate.ogm.hiking.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.ogm.hiking.model.Hike;
+import org.hibernate.ogm.hiking.model.Section;
+
+public class ExternalHikeSummary {
+
+	private long id;
+	private String from;
+	private String to;
+
+	public ExternalHikeSummary() {
+	}
+
+	public ExternalHikeSummary(Hike hike) {
+		this.id = hike.id;
+		this.from = hike.start;
+		this.to = hike.destination;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getFrom() {
+		return from;
+	}
+
+	public void setFrom(String from) {
+		this.from = from;
+	}
+
+	public String getTo() {
+		return to;
+	}
+
+	public void setTo(String to) {
+		this.to = to;
+	}
+
+	@Override
+	public String toString() {
+		return "ExternalHikeSummary [id=" + id + ", from=" + from + ", to=" + to + "]";
+	}
+}

hibernate-ogm/hiking-demo/src/main/java/org/hibernate/ogm/hiking/rest/model/ExternalTripWithHikes.java

@@ -0,0 +1,98 @@
+package org.hibernate.ogm.hiking.rest.model;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hibernate.ogm.hiking.model.Hike;
+import org.hibernate.ogm.hiking.model.Person;
+import org.hibernate.ogm.hiking.model.Trip;
+
+public class ExternalTripWithHikes {
+
+	private long id;
+	private String name;
+	private Date startDate;
+	private Date endDate;
+	private double price;
+	private Person organizer;
+	private Set<ExternalHikeSummary> availableHikes;
+
+	public ExternalTripWithHikes() {
+	}
+
+	public ExternalTripWithHikes(Trip trip) {
+		this.id = trip.id;
+		this.name = trip.name;
+		this.startDate = trip.startDate;
+		this.endDate = trip.endDate;
+		this.price = trip.price;
+		this.organizer = trip.organizer;
+		this.availableHikes = new HashSet<>( trip.availableHikes.size() );
+		for ( Hike hike : trip.availableHikes ) {
+			this.availableHikes.add( new ExternalHikeSummary( hike ) );
+		}
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public double getPrice() {
+		return price;
+	}
+
+	public void setPrice(double price) {
+		this.price = price;
+	}
+
+	public Person getOrganizer() {
+		return organizer;
+	}
+
+	public void setOrganizer(Person organizer) {
+		this.organizer = organizer;
+	}
+
+	public Set<ExternalHikeSummary> getAvailableHikes() {
+		return availableHikes;
+	}
+
+	public void setAvailableHikes(Set<ExternalHikeSummary> availableHikes) {
+		this.availableHikes = availableHikes;
+	}
+
+	@Override
+	public String toString() {
+		return "TripDescription [id=" + id + ", name=" + name + "]";
+	}
+
+}

hibernate-ogm/hiking-demo/src/main/webapp/trips-detail.html

@@ -57,26 +57,15 @@
 
   <!-- Hikes -->
   <div class="form-group">
-    <label class="col-sm-2 control-label">Sections</label>
+    <label class="col-sm-2 control-label">Available hikes</label>
     <div class="col-md-6">
-      <div ng-repeat="section in hike.sections">
+      <div ng-repeat="hike in trip.availableHikes">
         <div class="form-group row">
-          <div class="col-md-4">
-            <input class="form-control" id="inputKey" placeholder="From"
-              ng-model="section.from" type="text">
-          </div>
-          <div class="col-md-4">
-            <input class="form-control" id="inputValue" placeholder="To"
-              ng-model="section.to" type="text">
-          </div>
-          <div style="padding-top:6px">
-            <a href ng-click="hike.sections.splice($index, 1)">Remove</a>
+          <div class="col-md-8">
+            Hike from <a href="#/edit/{{hike.id}}">{{hike.from}} to {{hike.to}}</a>
           </div>
         </div>
       </div>
-      <div style="padding-top:6px">
-        <a href ng-click="hike.sections.push({})">Add...</a>
-      </div>
     </div>
   </div>