Merge branch 'skynettrest' into 'master'

Skynettrest

Restore rest api for checking specific role

See merge request !183

code/moya-web/src/main/java/fi/codecrew/moya/rest/ReaderRestView.java

@@ -81,12 +81,12 @@ public class ReaderRestView {
 
 		return new ReaderEventRestRoot(ReaderEventRestPojo.parse(events));
 	}
-	
+
 	@GET
 	@Path("/createevent/{reader}/{code}/{hash}")
-	public Response createReaderEvent(@PathParam("reader") String readerName, @PathParam("code") String readerCode, @PathParam("hash") String hash ) {
+	public Response createReaderEvent(@PathParam("reader") String readerName, @PathParam("code") String readerCode, @PathParam("hash") String hash) {
 		readerbean.checkCode(readerName, readerCode);
-		
+
 		return Response.ok().build();
 	}
 
@@ -102,46 +102,48 @@ public class ReaderRestView {
 	//	public void createRfidEvent(@PathParam("reader") String reader, @PathParam("tagId") String tagId) {
 	//
 	//	}
-//
-//	// TBD: WTF! - Tarttis varmaan käydä ajatuksella läpi.. - Tuomari 2014-02-28
-//	@GET
-//	@Path("/EventRole/{reader}/{tagId}/{roleid}")
-//	public Response eventRole(@PathParam("reader") String reader, @PathParam("tagId") String tag, @PathParam("roleid") Integer roleId) {
-//		ReaderEvent ret = readerbean.checkTag(reader, tag);
-//		ResponseBuilder builder = null;
-//		if (roleId == null || roleId.equals(0))
-//		{
-//			builder = Response.status(Status.BAD_REQUEST);
-//			builder.entity("role ID is required!");
-//			builder.type(MediaType.TEXT_PLAIN);
-//
-//		}
-//		if (builder == null)
-//		{
-//			if (ret == null || ret.getPrintedCard() == null) {
-//				builder = Response.status(Status.NOT_ACCEPTABLE);
-//				builder.entity("No card found for uid.");
-//				builder.type(MediaType.TEXT_PLAIN);
-//			} else {
-//				EventUser user = ret.getPrintedCard().getUser();
-//				boolean found = userbean.isUserInRole(user, roleId);
-//				if (found) {
-//					builder = Response.status(Status.OK);
-//				} else {
-//					builder = Response.status(Status.FORBIDDEN);
-//				}
-//				builder.entity(new UserPermissionRestPojo(new EventUserRestPojo(user), found));
-//
-//			}
-//		}
-//
-//		return builder.build();
-//	}
-//
-//	@GET
-//	@Path("/EventCard/{reader}/{cardid}")
-//	public void eventCard(@PathParam("reader") String reader, @PathParam("cardid") String cardId) {
-//
-//	}
+
+	// Created for skynett port stuff. -  Tuomari ( Does user have permission to enter the event. )
+	@GET
+	@Path("/EventRole/{reader}/{tagId}/{roleid}")
+	public Response isTaguserInRole(
+			@PathParam("reader") String reader,
+			@PathParam("tagId") String tag,
+			@PathParam("roleid") Integer roleId
+			) {
+		ReaderEvent ret = readerbean.checkCode(reader, tag);
+		ResponseBuilder builder = null;
+		if (roleId == null || roleId.equals(0)) {
+			builder = Response.status(Status.BAD_REQUEST);
+			builder.entity("role ID is required!");
+			builder.type(MediaType.TEXT_PLAIN);
+
+		}
+		if (builder == null) {
+			if (ret == null || ret.getPrintedCard() == null) {
+				builder = Response.status(Status.NOT_ACCEPTABLE);
+				builder.entity("No card found for uid.");
+				builder.type(MediaType.TEXT_PLAIN);
+			} else {
+				EventUser user = ret.getPrintedCard().getUser();
+				boolean found = userbean.isUserInRole(user, roleId);
+				if (found) {
+					builder = Response.status(Status.OK);
+				} else {
+					builder = Response.status(Status.FORBIDDEN);
+				}
+				builder.entity(new UserPermissionRestPojo(new EventUserRestPojo(user), found));
+
+			}
+		}
+
+		return builder.build();
+	}
+	//
+	//	@GET
+	//	@Path("/EventCard/{reader}/{cardid}")
+	//	public void eventCard(@PathParam("reader") String reader, @PathParam("cardid") String cardId) {
+	//
+	//	}
 
 }