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/CalendarResource.java | 35 ++--------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

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

diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index d43a3b02e..9399c34a5 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -16,52 +16,21 @@
  */
 package org.traccar.api.resource;
 
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.Set;
-
 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 org.traccar.Context;
-import org.traccar.api.BaseObjectResource;
-import org.traccar.database.CalendarManager;
+import org.traccar.api.SimpleObjectResource;
 import org.traccar.model.Calendar;
 
 @Path("calendars")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class CalendarResource extends BaseObjectResource<Calendar> {
+public class CalendarResource extends SimpleObjectResource<Calendar> {
 
     public CalendarResource() {
         super(Calendar.class);
     }
 
-    @GET
-    public Collection<Calendar> get(
-            @QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
-
-        CalendarManager calendarManager = Context.getCalendarManager();
-        Set<Long> result = null;
-        if (all) {
-            if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                result = calendarManager.getAllItems();
-            } else {
-                Context.getPermissionsManager().checkManager(getUserId());
-                result = calendarManager.getManagedItems(getUserId());
-            }
-        } else {
-            if (userId == 0) {
-                userId = getUserId();
-            }
-            Context.getPermissionsManager().checkUser(getUserId(), userId);
-            result = calendarManager.getUserItems(userId);
-        }
-        return calendarManager.getItems(result);
-    }
-
 }
-- 
cgit v1.2.3