From 0da1f5da4e5e0e39259ab3333c1273ba5cb382a7 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 28 Jul 2017 10:43:21 +0500
Subject: Combine some GET functions

---
 src/org/traccar/api/resource/GroupResource.java | 32 ++-----------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/org/traccar/api/resource/GroupResource.java')

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);
-    }
 }
-- 
cgit v1.2.3