Forum (final edition, hopefully..:P)

AgentDiscoveries-Backend/pom.xml

@@ -203,8 +203,22 @@
             <artifactId>guava</artifactId>
             <version>24.0-jre</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>2.26</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>2.26</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>2.26</version>
+        </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>

AgentDiscoveries-Backend/src/main/java/org/softwire/training/AgentDiscoveriesApplication.java

@@ -44,6 +44,7 @@ public class AgentDiscoveriesApplication implements Runnable {
     @Inject MessageProcessorRoutes messageProcessorRoutes;
     @Inject ExternalReportRoutes externalReportRoutes;
     @Inject PictureRoutes pictureRoutes;
+    @Inject ForumMessageRoutes forumMessageRoutes;
 
     @Override
     public void run() {
@@ -55,15 +56,15 @@ public void run() {
 
         // Serve the static assets from the frontend project
         staticFileLocation("/frontend");
-
         // Setup of all the routes
         path("/v1", () -> {
             // Endpoint used to get an authorisation token
             post("/token", tokenRoutes::createToken, responseTransformer);
             path("/api", () -> {
 
                 before("/*", tokenRoutes::validateToken);
-                get("/checktoken", (req, res) -> "Token is valid");
+
+                get("/checktoken", (req, res) -> "Token is valid", responseTransformer);
 
                 path("/legacy", () -> {
                     before("/*", (request, response) -> response.type("text/plain"));
@@ -75,6 +76,7 @@ public void run() {
                 path("/reports/locationstatuses", () -> reportsRouteGroup(locationStatusReportsRoutes));
                 path("/reports/regionsummaries", () -> reportsRouteGroup(regionSummaryReportsRoutes));
                 path("/external", this::externalRouteGroup);
+                path("/forum", this::forumRouteGroup);
 
                 setupBasicEntityCrudRoutes("/locations", locationsRoutes);
                 get("/locations", locationsRoutes::readEntities, responseTransformer);
@@ -83,6 +85,8 @@ public void run() {
                 post("/decodemessage", messageProcessorRoutes::decodeMessage, responseTransformer);
                 post("/encodemessage", messageProcessorRoutes::encodeMessage, responseTransformer);
 
+                get("/mostwanted", (req, res) -> agentsRoutes.mostWanted(req, res), responseTransformer);
+
                 // API endpoint to initiate shutdown
                 put("/operations/shutdown", this::shutdown);
             });
@@ -103,6 +107,12 @@ public void run() {
         get("/healthcheck", (req, res) -> "Server started okay!");
     }
 
+    private void forumRouteGroup() {
+        get("", (req, res) -> forumMessageRoutes.readForum(req, res), responseTransformer );
+        post("/add", (req, res) -> forumMessageRoutes.createForumMessage(req, res), responseTransformer);
+
+    }
+
     private void executivesSummaryGroup() {
         post("/generate", executiveSummaryRoutes::readExecutiveSummary);
     }
@@ -118,6 +128,7 @@ private void agentsRouteGroup() {
         get("/:id", (req, res) -> agentsRoutes.readAgent(req, res, idParamAsInt(req)), responseTransformer);
         put("/:id", (req, res) -> agentsRoutes.updateAgent(req, res, idParamAsInt(req)), responseTransformer);
         put("/editcallsign/:id", (req, res) -> agentsRoutes.editCallSign(req, res, idParamAsInt(req)), responseTransformer);
+        put("/mostwanted/:id", (req, res) -> agentsRoutes.editCallSign(req, res, idParamAsInt(req)), responseTransformer);
         delete("/:id", (req, res) -> agentsRoutes.deleteAgent(req, res, idParamAsInt(req)), responseTransformer);
         get("", (req, res) -> agentsRoutes.readAgents(req, res), responseTransformer);
     }
@@ -133,6 +144,7 @@ private void regionsRouteGroup() {
     private void reportsRouteGroup(ReportsRoutesBase<?, ?> reportsRoutes) {
         post("", reportsRoutes::createReport, responseTransformer);
         get("/:id", (req, res) -> reportsRoutes.readReport(req, res, idParamAsInt(req)), responseTransformer);
+        put("/:id", (req, res) -> reportsRoutes.updateReport(req, res, idParamAsInt(req)), responseTransformer);
         delete("/:id", (req, res) -> reportsRoutes.deleteReport(req, res, idParamAsInt(req)), responseTransformer);
         get("", reportsRoutes::searchReports, responseTransformer);
     }

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/core/CustomisedGsonBuilder.java

@@ -7,9 +7,11 @@
 import org.softwire.training.api.models.UserApiModel;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.util.TimeZone;
 
 public class CustomisedGsonBuilder {
 
@@ -73,6 +75,7 @@ private static class ZonedDateTimeAdapter extends TypeAdapter<ZonedDateTime> {
 
         @Override
         public void write(JsonWriter jsonWriter, ZonedDateTime localDateTime) throws IOException {
+
             if (localDateTime == null) {
                 jsonWriter.nullValue();
             } else {

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/core/PermissionsVerifier.java

@@ -28,9 +28,14 @@ public void verifyIsAdminOrRelevantUser(Request req, int relevantUserId) {
     }
 
     public void verifyIsAdminOrRelevantAgent(Request req, int relevantAgentId) {
+
         verifyUser(req, user -> user.isAdmin() || (user.getAgentId() != null && user.getAgentId() == relevantAgentId));
     }
 
+    public void verifyisAgentorAdmin(Request req) {
+        verifyUser(req, user -> user.isAdmin() || (user.getAgentId() != null));
+    }
+
     public void verifyIsAgent(Request req) {
         verifyUser(req, user -> user.getAgentId() != null);
     }

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/models/LocationStatusReportApiModel.java

@@ -18,7 +18,6 @@ public void setReportTitle(String reportTitle) {
         this.reportTitle = reportTitle;
     }
 
-
     public int getLocationId() {
         return locationId;
     }

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/models/MostWantedApiModel.java

@@ -0,0 +1,22 @@
+package org.softwire.training.api.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MostWantedApiModel {
+    String title;
+    String description;
+    MostWantedSuspectImage[] images;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public MostWantedSuspectImage[] getImages() {
+        return images;
+    }
+}

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/models/MostWantedSuspectImage.java

@@ -0,0 +1,12 @@
+package org.softwire.training.api.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MostWantedSuspectImage {
+    String original;
+
+    public String getOriginal() {
+        return original;
+    }
+}

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/models/MostWantedWrapper.java

@@ -0,0 +1,7 @@
+package org.softwire.training.api.models;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MostWantedWrapper {
+    public MostWantedApiModel[] items;
+}

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/models/ReportApiModelBase.java

@@ -5,7 +5,7 @@
 public class ReportApiModelBase {
 
     private int reportId;
-    private byte status;
+    private int status;
     private ZonedDateTime reportTime;
     private String reportBody;
     private int agentId;
@@ -18,11 +18,11 @@ public void setReportId(int reportId) {
         this.reportId = reportId;
     }
 
-    public byte getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(byte status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/routes/v1/AgentsRoutes.java

@@ -1,20 +1,20 @@
 package org.softwire.training.api.routes.v1;
 
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
 import org.apache.commons.lang3.StringUtils;
+import org.glassfish.jersey.jackson.JacksonFeature;
 import org.softwire.training.api.core.JsonRequestUtils;
 import org.softwire.training.api.core.PermissionsVerifier;
-import org.softwire.training.api.models.ErrorCode;
-import org.softwire.training.api.models.FailedRequestException;
+import org.softwire.training.api.models.*;
 import org.softwire.training.db.daos.AgentsDao;
 import org.softwire.training.models.Agent;
 import spark.Request;
 import spark.Response;
-
 import javax.inject.Inject;
+import javax.ws.rs.core.MediaType;
 import java.util.List;
-import java.time.LocalDate;
 import java.util.NoSuchElementException;
-import java.util.Optional;
 
 public class AgentsRoutes {
 
@@ -54,11 +54,27 @@ public List<Agent> readAgents(Request req, Response res) {
     public Agent updateAgent(Request req, Response res, int id) {
         permissionsVerifier.verifyIsAdminOrRelevantAgent(req, id);
 
+        try{
+            Agent agent = JsonRequestUtils.readBodyAsType(req, Agent.class);
+        } catch (Exception e){
+            throw new FailedRequestException(ErrorCode.INVALID_INPUT, "Rank is too high (max 11 digits).");
+        }
+
         Agent agent = JsonRequestUtils.readBodyAsType(req, Agent.class);
+
+        if (agent.getFirstName().length() > 20){
+            throw new FailedRequestException(ErrorCode.INVALID_INPUT, "first name too long (max 20 characters)");
+        }
+
+        if (agent.getLastName().length() > 20){
+            throw new FailedRequestException(ErrorCode.INVALID_INPUT, "Last name too long (max 20 characters)");
+        }
+
         agent.setAgentId(id);
         agentsDao.updateAgent(agent);
 
         return agent;
+
     }
 
     public Object deleteAgent(Request req, Response res, int id) {
@@ -82,4 +98,14 @@ public Agent editCallSign (Request req, Response res, int agentID) {
         agentsDao.updateAgent(agent);
         return agent;
     }
+
+    public MostWantedApiModel[] mostWanted (Request req, Response res) {
+        Client client = ClientBuilder.newBuilder().register(JacksonFeature.class).hostnameVerifier((s1, s2) -> true).build();
+        MostWantedWrapper mostwanted = client
+                .target("https://api.fbi.gov/@wanted?pageSize=10&page=1&sort_on=modified&sort_order=desc&person_classification=main&status=na")
+                .request(MediaType.APPLICATION_JSON_TYPE)
+                .get(MostWantedWrapper.class);
+
+        return mostwanted.items;
+    }
 }

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/routes/v1/ForumMessageRoutes.java

@@ -0,0 +1,55 @@
+package org.softwire.training.api.routes.v1;
+
+import org.softwire.training.api.core.JsonRequestUtils;
+import org.softwire.training.api.core.PermissionsVerifier;
+import org.softwire.training.api.models.ErrorCode;
+import org.softwire.training.api.models.FailedRequestException;
+import org.softwire.training.db.daos.ForumMessageDao;
+import org.softwire.training.models.ForumMessage;
+import org.softwire.training.models.User;
+import spark.Request;
+import spark.Response;
+
+import javax.inject.Inject;
+import java.util.List;
+
+public class ForumMessageRoutes {
+
+    private final ForumMessageDao forumMessageDao;
+    private final PermissionsVerifier permissionsVerifier;
+
+    @Inject
+    public ForumMessageRoutes(ForumMessageDao forumMessageDao, PermissionsVerifier permissionsVerifier) {
+        this.forumMessageDao = forumMessageDao;
+        this.permissionsVerifier = permissionsVerifier;
+    }
+
+    public List<ForumMessage> readForum(Request req, Response res) {
+        permissionsVerifier.verifyisAgentorAdmin(req);
+        return forumMessageDao.getForumMessages();
+    }
+
+    public ForumMessage createForumMessage(Request req, Response res) {
+        ForumMessage forumMessageModel = JsonRequestUtils.readBodyAsType(req, ForumMessage.class);
+        permissionsVerifier.verifyisAgentorAdmin(req);
+
+        User user = new User();
+        user.setUserId(req.attribute("user_id"));
+        forumMessageModel.setUser(user);
+
+        int MessageId = forumMessageDao.createForum(forumMessageModel);
+        forumMessageModel.setMessageId(MessageId);
+
+        // Create requests should return 201
+        res.status(201);
+
+        return forumMessageModel;
+    }
+
+    public ForumMessage readForum(Request req, Response res, int id) {
+        permissionsVerifier.verifyisAgentorAdmin(req);
+        return forumMessageDao.getForumMessage(id)
+                .orElseThrow(() -> new FailedRequestException(ErrorCode.NOT_FOUND, "Forum not found"));
+    }
+
+}

AgentDiscoveries-Backend/src/main/java/org/softwire/training/api/routes/v1/LocationStatusReportsRoutes.java

@@ -44,9 +44,14 @@ protected LocationStatusReport validateThenMap(LocationStatusReportApiModel apiM
         LocalDateTime reportTimeUtc = LocalDateTime.now(ZoneOffset.UTC);
 
         LocationStatusReport model = new LocationStatusReport();
+        model.setStatus(apiModel.getStatus());
+
+        if (model.getStatus() > 100 || model.getStatus() <= 0){
+            throw new FailedRequestException(ErrorCode.UNKNOWN_ERROR, "Status code must be between 1 and 100.");
+        }
+
         model.setAgentId(apiModel.getAgentId());
         model.setLocationId(apiModel.getLocationId());
-        model.setStatus(apiModel.getStatus());
         model.setReportTime(reportTimeUtc);
         model.setReportBody(apiModel.getReportBody());
         model.setReportTitle(apiModel.getReportTitle());
@@ -105,6 +110,9 @@ protected List<ReportSearchCriterion> parseSearchCriteria(Request req) {
             searchCriteria.add(new ToTimeSearchCriterion(ZonedDateTime.parse(queryMap.get("toTime").value())));
         }
 
+        if (!isNullOrEmpty(queryMap.get("agentId").value())) {
+            searchCriteria.add(new AgentIdSearchCriterion(queryMap.get("agentId").integerValue()));
+        }
         return searchCriteria;
     }
 }