aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/GroupResource.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-28 20:01:19 +1200
committerGitHub <noreply@github.com>2017-07-28 20:01:19 +1200
commitb6694bf035aa3dd8595c9d24fa88a93abf7676d6 (patch)
tree1e3f55166e922ab43c0be495abed71e536fdc216 /src/org/traccar/api/resource/GroupResource.java
parentd3021c9ae11b177fe05b79e98f1e560e8c3cbaf5 (diff)
parent0da1f5da4e5e0e39259ab3333c1273ba5cb382a7 (diff)
downloadtrackermap-server-b6694bf035aa3dd8595c9d24fa88a93abf7676d6.tar.gz
trackermap-server-b6694bf035aa3dd8595c9d24fa88a93abf7676d6.tar.bz2
trackermap-server-b6694bf035aa3dd8595c9d24fa88a93abf7676d6.zip
Merge pull request #3399 from Abyss777/optimize_get
Combine some GET functions
Diffstat (limited to 'src/org/traccar/api/resource/GroupResource.java')
-rw-r--r--src/org/traccar/api/resource/GroupResource.java32
1 files changed, 2 insertions, 30 deletions
diff --git a/src/org/traccar/api/resource/GroupResource.java b/src/org/traccar/api/resource/GroupResource.java
index 2be4e6492..fcea15d0a 100644
--- a/src/org/traccar/api/resource/GroupResource.java
+++ b/src/org/traccar/api/resource/GroupResource.java
@@ -15,49 +15,21 @@
*/
package org.traccar.api.resource;
-import org.traccar.Context;
-import org.traccar.api.BaseObjectResource;
-import org.traccar.database.GroupsManager;
+import org.traccar.api.SimpleObjectResource;
import org.traccar.model.Group;
import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Set;
@Path("groups")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
-public class GroupResource extends BaseObjectResource<Group> {
+public class GroupResource extends SimpleObjectResource<Group> {
public GroupResource() {
super(Group.class);
}
- @GET
- public Collection<Group> get(
- @QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
- GroupsManager groupsManager = Context.getGroupsManager();
- Set<Long> result = null;
- if (all) {
- if (Context.getPermissionsManager().isAdmin(getUserId())) {
- result = groupsManager.getAllItems();
- } else {
- Context.getPermissionsManager().checkManager(getUserId());
- result = groupsManager.getManagedItems(getUserId());
- }
- } else {
- if (userId == 0) {
- userId = getUserId();
- }
- Context.getPermissionsManager().checkUser(getUserId(), userId);
- result = groupsManager.getUserItems(userId);
- }
- return groupsManager.getItems(result);
- }
}