From 2a831b0ae315a97f7efb81248011ec0c10569a88 Mon Sep 17 00:00:00 2001
From: Pablo Urquijo <pablo.urquijo.martinez@cern.ch>
Date: Fri, 11 Apr 2025 17:17:09 +0200
Subject: [PATCH] [EAM-4375] Accept params BOO autocomplete employee

---
 .../autocomplete/AutocompleteBOOEmployee.java | 61 +++++++++----------
 .../autocomplete/AutocompletePUAsset.java     |  1 +
 pom.xml                                       |  2 +-
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/activity/autocomplete/AutocompleteBOOEmployee.java b/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/activity/autocomplete/AutocompleteBOOEmployee.java
index b89d4e93..414da11e 100644
--- a/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/activity/autocomplete/AutocompleteBOOEmployee.java
+++ b/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/activity/autocomplete/AutocompleteBOOEmployee.java
@@ -1,46 +1,41 @@
 package ch.cern.cmms.eamlightweb.workorders.activity.autocomplete;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.RequestScoped;
-import javax.interceptor.Interceptors;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-
 import ch.cern.cmms.eamlightweb.tools.EAMLightController;
 import ch.cern.cmms.eamlightweb.tools.interceptors.RESTLoggingInterceptor;
 import ch.cern.eam.wshub.core.services.grids.entities.GridRequest;
 import ch.cern.eam.wshub.core.services.grids.entities.GridRequestFilter;
 
+import javax.enterprise.context.ApplicationScoped;
+import javax.interceptor.Interceptors;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
 @Path("/autocomplete")
 @ApplicationScoped
-@Interceptors({ RESTLoggingInterceptor.class })
+@Interceptors({RESTLoggingInterceptor.class})
 public class AutocompleteBOOEmployee extends EAMLightController {
 
-	@GET
-	@Path("/boo/employee/{code}")
-	@Produces("application/json")
-	@Consumes("application/json")
-	public Response complete(@PathParam("code") String code) {
-		GridRequest gridRequest = new GridRequest("146", "LVEMP", "151");
-		gridRequest.setGridType(GridRequest.GRIDTYPE.LOV);
-		gridRequest.addParam("param.date", null);
-		gridRequest.addParam("parameter.per_type", null);
-		gridRequest.addParam("param.trade", "KPL");
-		gridRequest.addParam("param.act", "5");
-		gridRequest.addParam("param.booplan", "true");
-		gridRequest.addParam("param.event", "555555");
-		gridRequest.addParam("param.octype", "N");
-
-		gridRequest.getGridRequestFilters().add(new GridRequestFilter("personcode", code.toUpperCase(), "BEGINS", GridRequestFilter.JOINER.OR ));
-		gridRequest.getGridRequestFilters().add(new GridRequestFilter("description", code.toUpperCase(), "CONTAINS" ));
-
-		gridRequest.sortBy("description");
-
-		return getPairListResponse(gridRequest, "personcode", "description");
-	}
+    @GET
+    @Path("/boo/event/{event}/activity/{act}/trade/{trade}/octype/{octype}/employee/{code}")
+    @Produces("application/json")
+    @Consumes("application/json")
+    public Response complete(@PathParam("event") String event, @PathParam("act") String act, @PathParam("trade") String trade, @PathParam("octype") String octype, @PathParam("code") String code) {
+        GridRequest gridRequest = new GridRequest("146", "LVEMP", "151");
+        gridRequest.setGridType(GridRequest.GRIDTYPE.LOV);
+        gridRequest.addParam("param.date", null);
+        gridRequest.addParam("parameter.per_type", null);
+        gridRequest.addParam("param.trade", trade);
+        gridRequest.addParam("param.act", act);
+        gridRequest.addParam("param.booplan", "true");
+        gridRequest.addParam("param.event", event);
+        gridRequest.addParam("param.octype", octype);
+
+        gridRequest.getGridRequestFilters().add(new GridRequestFilter("personcode", code.toUpperCase(), "BEGINS", GridRequestFilter.JOINER.OR));
+        gridRequest.getGridRequestFilters().add(new GridRequestFilter("description", code.toUpperCase(), "CONTAINS"));
+
+        gridRequest.sortBy("description");
+
+        return getPairListResponse(gridRequest, "personcode", "description");
+    }
 
 }
diff --git a/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/partusage/autocomplete/AutocompletePUAsset.java b/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/partusage/autocomplete/AutocompletePUAsset.java
index 94ced78f..6c6a1b10 100644
--- a/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/partusage/autocomplete/AutocompletePUAsset.java
+++ b/eam-light-backendweb/src/main/java/ch/cern/cmms/eamlightweb/workorders/partusage/autocomplete/AutocompletePUAsset.java
@@ -34,6 +34,7 @@ public Response complete(@QueryParam("transaction") String transaction, @QueryPa
 							 @QueryParam("part") String part, @QueryParam("code") String code) {
 
 		GridRequest gridRequest = new GridRequest("OSOBJA", GridRequest.GRIDTYPE.LIST, ApplicationData.AUTOCOMPLETE_RESULT_SIZE);
+		gridRequest.setUserFunctionName("OSOBJA");
 		gridRequest.addFilter("equipmentno", code.toUpperCase(), "CONTAINS", GridRequestFilter.JOINER.AND);
 
 		if (!part.isEmpty()) {
diff --git a/pom.xml b/pom.xml
index 175d5320..14fb8f64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 
 	<properties>
 		<artifact.filename>${project.build.finalName}-${project.version}</artifact.filename>
-		<ch.cern.eam.eam-wshub-core.version>12.1.4-8</ch.cern.eam.eam-wshub-core.version>
+		<ch.cern.eam.eam-wshub-core.version>12.1.6-8</ch.cern.eam.eam-wshub-core.version>
 		<ch.cern.cmms.eamtools.version>2.4.0</ch.cern.cmms.eamtools.version>
 		<ch.cern.cmms.ldaptools.version>0.3.1</ch.cern.cmms.ldaptools.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>