Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

add categories

Browse Source
This commit is contained in:
Athou
2013-03-31 08:17:28 +02:00
parent 5a4d11c4de
commit 89c7a00ebf
8 changed files with 137 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/rest/RESTApplication.java
View File

@@ -7,6 +7,7 @@ import javax.ws.rs.core.Application;
import com.commafeed.frontend.rest.resources.AdminUsersREST;
import com.commafeed.frontend.rest.resources.EntriesREST;
import com.commafeed.frontend.rest.resources.SessionREST;
import com.commafeed.frontend.rest.resources.SettingsREST;
import com.commafeed.frontend.rest.resources.SubscriptionsREST;
import com.google.common.collect.Sets;
@@ -23,6 +24,7 @@ public class RESTApplication extends Application {
set.add(EntriesREST.class);
set.add(SettingsREST.class);
set.add(AdminUsersREST.class);
set.add(SessionREST.class);
return set;
}
}

2
src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
View File

@@ -26,7 +26,7 @@ import com.google.common.collect.Maps;
@Path("entries")
public class EntriesREST extends AbstractREST {
private static final String ALL = "all";
public static final String ALL = "all";
public enum Type {
category, feed, entry;

29
src/main/java/com/commafeed/frontend/rest/resources/SessionREST.java Normal file
View File

@@ -0,0 +1,29 @@
package com.commafeed.frontend.rest.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.frontend.model.UserModel;
@Path("session")
public class SessionREST extends AbstractREST {
@Path("get")
@GET
public UserModel get() {
User user = getUser();
UserModel userModel = new UserModel();
userModel.setId(user.getId());
userModel.setName(user.getName());
userModel.setEnabled(!user.isDisabled());
for (UserRole role : userRoleService.findAll(user)) {
if (role.getRole() == Role.ADMIN) {
userModel.setAdmin(true);
}
}
return userModel;
}
}

24
src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
View File

@@ -91,6 +91,30 @@ public class SubscriptionsREST extends AbstractREST {
return Response.ok(Status.OK).build();
}
@Path("addCategory")
@GET
public Response addCategory(@QueryParam("name") String name,
@QueryParam("parentId") String parentId) {
Preconditions.checkNotNull(name);
FeedCategory cat = new FeedCategory();
cat.setName(name);
cat.setUser(getUser());
if (parentId != null && !EntriesREST.ALL.equals(parentId)) {
FeedCategory parent = new FeedCategory();
parent.setId(Long.valueOf(parentId));
cat.setParent(parent);
}
feedCategoryService.save(cat);
return Response.ok().build();
}
@GET
@Path("deleteCategory")
public Response deleteCategory(@QueryParam("id") Long id) {
return Response.ok().build();
}
@POST
@Path("import")
@Consumes(MediaType.MULTIPART_FORM_DATA)