From c8a8edbbc7afb62e5d0725acd0b31e3cbcca83cb Mon Sep 17 00:00:00 2001
From: Nathan Cannon <nathan.cannon@edf-energy.com>
Date: Wed, 19 Sep 2018 14:28:38 +0100
Subject: [PATCH] Can now add Sites and Tutors via resources.

---
 .../Observations/ObservationsApplication.java |  4 +-
 .../uk/co/neviyn/Observations/core/Tutor.java |  2 +
 .../Observations/resources/SiteResource.java  | 12 ++++--
 .../Observations/resources/TutorResource.java | 41 +++++++++++++------
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java b/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java
index 74fc2b3..f0dd893 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java
+++ b/backend/src/main/java/uk/co/neviyn/Observations/ObservationsApplication.java
@@ -14,8 +14,8 @@ import uk.co.neviyn.Observations.dao.ObservationDao;
 import uk.co.neviyn.Observations.dao.SiteDao;
 import uk.co.neviyn.Observations.dao.TutorDao;
 import uk.co.neviyn.Observations.resources.ObservationResource;
-import uk.co.neviyn.Observations.resources.TutorResource;
 import uk.co.neviyn.Observations.resources.SiteResource;
+import uk.co.neviyn.Observations.resources.TutorResource;
 
 public class ObservationsApplication extends Application<ObservationsConfiguration> {
 
@@ -48,7 +48,7 @@ public class ObservationsApplication extends Application<ObservationsConfigurati
     TutorDao tutorDao = new TutorDao(hibernate.getSessionFactory());
     SiteDao siteDao = new SiteDao(hibernate.getSessionFactory());
     ObservationDao observationDao = new ObservationDao(hibernate.getSessionFactory());
-    final TutorResource tutorResource = new TutorResource(tutorDao);
+    final TutorResource tutorResource = new TutorResource(tutorDao, siteDao);
     jersey.register(tutorResource);
     final ObservationResource observationResource = new ObservationResource(observationDao, tutorDao, siteDao);
     jersey.register(observationResource);
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java b/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java
index 4f6e396..d768655 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java
+++ b/backend/src/main/java/uk/co/neviyn/Observations/core/Tutor.java
@@ -13,6 +13,8 @@ import java.util.Set;
 @Table(name = "TUTOR")
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class Tutor extends BaseEntity implements Serializable {
 
   @NonNull
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java b/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java
index 0f32df5..61da092 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java
+++ b/backend/src/main/java/uk/co/neviyn/Observations/resources/SiteResource.java
@@ -3,13 +3,11 @@ package uk.co.neviyn.Observations.resources;
 import io.dropwizard.hibernate.UnitOfWork;
 import lombok.RequiredArgsConstructor;
 import uk.co.neviyn.Observations.api.SelectOption;
+import uk.co.neviyn.Observations.core.Site;
 import uk.co.neviyn.Observations.core.Tutor;
 import uk.co.neviyn.Observations.dao.SiteDao;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 import java.util.Set;
@@ -22,6 +20,12 @@ public class SiteResource {
 
   private final SiteDao dao;
 
+  @POST
+  @UnitOfWork
+  public Site add(String name) {
+    return dao.persist(new Site(name));
+  }
+
   @Path("/all")
   @GET
   @UnitOfWork
diff --git a/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java b/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java
index 148c268..6f051f4 100644
--- a/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java
+++ b/backend/src/main/java/uk/co/neviyn/Observations/resources/TutorResource.java
@@ -1,20 +1,18 @@
 package uk.co.neviyn.Observations.resources;
 
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.dropwizard.hibernate.UnitOfWork;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import uk.co.neviyn.Observations.core.Site;
+import uk.co.neviyn.Observations.core.Tutor;
+import uk.co.neviyn.Observations.dao.SiteDao;
+import uk.co.neviyn.Observations.dao.TutorDao;
+
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
-import io.dropwizard.hibernate.UnitOfWork;
-import lombok.RequiredArgsConstructor;
-import uk.co.neviyn.Observations.api.SelectOption;
-import uk.co.neviyn.Observations.core.Tutor;
-import uk.co.neviyn.Observations.dao.TutorDao;
+import java.util.List;
 
 @RequiredArgsConstructor
 @Produces(MediaType.APPLICATION_JSON)
@@ -22,6 +20,15 @@ import uk.co.neviyn.Observations.dao.TutorDao;
 public class TutorResource {
 
   private final TutorDao dao;
+  private final SiteDao siteDao;
+
+  @POST
+  @UnitOfWork
+  public Tutor add(NewTutor newTutor) {
+    final Site site = siteDao.get(newTutor.siteId);
+    final Tutor tutor = Tutor.builder().name(newTutor.name).site(site).build();
+    return dao.persist(tutor);
+  }
 
   @Path("/all")
   @GET
@@ -32,4 +39,12 @@ public class TutorResource {
       return tutors;
     throw new WebApplicationException("No tutors found!", Response.Status.NOT_FOUND);
   }
+
+  @AllArgsConstructor
+  private class NewTutor {
+    @JsonProperty
+    final long siteId;
+    @JsonProperty
+    final String name;
+  }
 }