Juho Juopperi · @jkj · Tuukka Kivilahti · Tuukka Kivilahti
--- a/code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java 0 → 100644
+++ b/code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java 0 → 100644
+    EventBeanLocal eventBean;
+    @EJB
+    PermissionBeanLocal permissionBean;
+    @EJB
+    UserBeanLocal userBean;
+    @Inject
+    PojoFactoryV2 pojoFactory;
+
+    @GET
+    @Path("/")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Find user", response = UserPojo.class)
+    public Response getEventUser(@QueryParam("email") @ApiParam("Email address") String email,
+                                 @QueryParam("login") @ApiParam("Username") String userName) {
+        try {
+            if (permissionBean.hasPermission(UserPermission.VIEW_ALL) == false) {
--- a/code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java 0 → 100644
+++ b/code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java 0 → 100644
+        }
+
+        try {
+            EventUser eventUser = new EventUser(new User(), eventBean.getCurrentEvent(), permissionBean.getCurrentUser());
+            eventUser.setNick(userPojo.nick);
+            eventUser.setLogin(userPojo.login);
+            eventUser.setFirstnames(userPojo.firstname);
+            eventUser.setLastname(userPojo.lastname);
+            eventUser.setBirthday(userPojo.birthday);
+            if (userPojo.gender == UserPojo.UserGender.MALE) {
+                eventUser.setGender(Gender.MALE);
+            } else if (userPojo.gender == UserPojo.UserGender.FEMALE) {
+                eventUser.setGender(Gender.FEMALE);
+            } else {
+                eventUser.setGender(Gender.UNDEFINED);
+            }