Merge branch 'jsf-locale-from-rest' into 'master'

Change LocaleRestViewV3 to change also the jsf session locale

See merge request !423

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

@@ -3,15 +3,19 @@ package fi.codecrew.moya.rest.v3;
 
 
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.handler.SessionHandler;
+import fi.codecrew.moya.handler.SessionStore;
 import fi.codecrew.moya.rest.v3.pojo.LocalePojoV3;
 import fi.codecrew.moya.rest.v3.pojo.LocalePojoV3;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
 import io.swagger.v3.oas.annotations.info.Info;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
 import javax.ws.rs.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response;
+import java.util.Locale;
 
 
 @RequestScoped
 @RequestScoped
 @Path("/v3/locale")
 @Path("/v3/locale")
@@ -27,6 +31,9 @@ public class LocaleRestViewV3 {
 	@EJB
 	@EJB
 	private EventBeanLocal eventBean;
 	private EventBeanLocal eventBean;
 
 
+	@Inject
+	private SessionStore sessionStore;
+
 	@GET
 	@GET
 	@Path("/")
 	@Path("/")
 	public Response getCurrentLocale() {
 	public Response getCurrentLocale() {
@@ -36,11 +43,22 @@ public class LocaleRestViewV3 {
 
 
 	@POST
 	@POST
 	@Path("/")
 	@Path("/")
-	public Response setCurrentLocale(LocalePojoV3 locale) {
-		if(userBean.setUsersLocale(locale.userLocale)) {
+	public Response setCurrentLocale(LocalePojoV3 localePojo) {
+		Locale locale = Locale.forLanguageTag(localePojo.userLocale);
+
+		if(userBean.setUsersLocale(localePojo.userLocale)) {
+			sessionStore.setLocale(locale);
 			return Response.ok().build();
 			return Response.ok().build();
 		}
 		}
 
 
 		return Response.status(420).build();
 		return Response.status(420).build();
 	}
 	}
+
+	public SessionStore getSessionStore() {
+		return sessionStore;
+	}
+
+	public void setSessionStore(SessionStore sessionStore) {
+		this.sessionStore = sessionStore;
+	}
 }
 }