Add positions resource to the REST API

5 files changed, 63 insertions, 11 deletions

diff --git a/src/org/traccar/api/resource/PositionResource.java b/src/org/traccar/api/resource/PositionResource.java
new file mode 100644
index 000000000..b977b6b33
--- /dev/null
+++ b/src/org/traccar/api/resource/PositionResource.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.Device;
+import org.traccar.model.Position;
+import org.traccar.web.JsonConverter;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Date;
+
+@Path("positions")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class PositionResource extends BaseResource {
+
+    @GET
+    public Collection<Position> get(
+            @QueryParam("deviceId") long deviceId, @QueryParam("from") String from, @QueryParam("to") String to) {
+        try {
+            return Context.getDataManager().getPositions(
+                    deviceId, JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+        } catch (SQLException e) {
+            throw new WebApplicationException(e);
+        }
+    }
+
+}
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 978f08ef3..943dcb53c 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -355,7 +355,7 @@ public class DataManager implements IdentityManager {
         AsyncServlet.sessionRefreshUser(userId);
     }
 
-    public Collection<Position> getPositions(long userId, long deviceId, Date from, Date to) throws SQLException {
+    public Collection<Position> getPositions(long deviceId, Date from, Date to) throws SQLException {
         return QueryBuilder.create(dataSource, getQuery("database.selectPositions"))
                 .setLong("deviceId", deviceId)
                 .setDate("from", from)
diff --git a/src/org/traccar/web/PositionServlet.java b/src/org/traccar/web/PositionServlet.java
index 796d6a81f..150b1a27c 100644
--- a/src/org/traccar/web/PositionServlet.java
+++ b/src/org/traccar/web/PositionServlet.java
@@ -46,8 +46,7 @@ public class PositionServlet extends BaseServlet {
         long deviceId = Long.parseLong(req.getParameter("deviceId"));
         Context.getPermissionsManager().checkDevice(getUserId(req), deviceId);
         sendResponse(resp.getWriter(), JsonConverter.arrayToJson(
-                    Context.getDataManager().getPositions(
-                            getUserId(req), deviceId,
+                    Context.getDataManager().getPositions(deviceId,
                             JsonConverter.parseDate(req.getParameter("from")),
                             JsonConverter.parseDate(req.getParameter("to")))));
     }
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 9cfe06e0e..d172a5331 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -30,6 +30,7 @@ import org.traccar.Config;
 import org.traccar.api.CorsResponseFilter;
 import org.traccar.api.SecurityRequestFilter;
 import org.traccar.api.resource.DeviceResource;
+import org.traccar.api.resource.PositionResource;
 import org.traccar.api.resource.ServerResource;
 import org.traccar.api.resource.SessionResource;
 import org.traccar.api.resource.UserResource;
@@ -109,8 +110,8 @@ public class WebServer {
             ResourceConfig resourceConfig = new ResourceConfig();
             resourceConfig.register(SecurityRequestFilter.class);
             resourceConfig.register(CorsResponseFilter.class);
-            resourceConfig.registerClasses(
-                    ServerResource.class, SessionResource.class, DeviceResource.class, UserResource.class);
+            resourceConfig.registerClasses(ServerResource.class, SessionResource.class,
+                    DeviceResource.class, UserResource.class, PositionResource.class);
             servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*");
         }
         servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*");
diff --git a/web/app/store/Positions.js b/web/app/store/Positions.js
index 7de54a8d2..cfccd4f94 100644
--- a/web/app/store/Positions.js
+++ b/web/app/store/Positions.js
@@ -19,11 +19,7 @@ Ext.define('Traccar.store.Positions', {
     model: 'Traccar.model.Position',
 
     proxy: {
-        type: 'ajax',
-        url: '/api/position/get',
-        reader: {
-            type: 'json',
-            rootProperty: 'data'
-        }
+        type: 'rest',
+        url: '/api/rest/positions'
     }
 });