Merge pull request #1538 from mozzy11/develop

remove duplicate provider controller
I-TECH-UW · Feb 12, 2025 · fb99a5b · fb99a5b
2 parents 077704e + 9da6944
commit fb99a5b
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 70 deletions.
diff --git a/src/main/java/org/openelisglobal/provider/controller/ProviderController.java b/src/main/java/org/openelisglobal/provider/controller/ProviderController.java
diff --git a/src/main/java/org/openelisglobal/security/AjaxFilter.java b/src/main/java/org/openelisglobal/security/AjaxFilter.java
@@ -0,0 +1,44 @@
+package org.openelisglobal.security;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@Component
+public class AjaxFilter implements Filter {
+
+    private final Logger log = LoggerFactory.getLogger(AjaxFilter.class);
+
+    public AjaxFilter() {
+        log.info("AjaxFilter init");
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+        if (request instanceof HttpServletRequest) {
+            RequestContextHolder.setRequestAttributes(new ServletRequestAttributes((HttpServletRequest) request));
+        }
+        chain.doFilter(request, response);
+        RequestContextHolder.resetRequestAttributes(); // Clean up after request is done
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+}
diff --git a/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java b/src/main/java/org/openelisglobal/systemuser/service/UserServiceImpl.java
@@ -176,7 +176,8 @@ private void updateUserRoles(List<String> selectedRoles, SystemUser systemUser,
     @Override
     public List<IdValuePair> getUserTestSections(String systemUserId, String roleId) {
         Authentication authentication = null;
-        // TODO workaround for Security Context authentication is null
+        // see filter org.openelisglobal.security.AjaxFilter to handle
+        // RequestContextHolder for Ajax calls via servlets
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
 
         HttpServletRequest request = null;
@@ -198,25 +199,6 @@ public List<IdValuePair> getUserTestSections(String systemUserId, String roleId)
         if (authentication != null) {
             Object principal = authentication.getPrincipal();
             if (principal instanceof UserDetails) {
-                // List<String> userLabUnits = new ArrayList<>();
-                // UserLabUnitRoles userLabRoles = getUserLabUnitRoles(systemUserId);
-                // if (userLabRoles != null) {
-                // userLabRoles.getLabUnitRoleMap().forEach(roles -> {
-                // if (roles.getRoles().contains(roleId)) {
-                // userLabUnits.add(roles.getLabUnit());
-                // }
-                // });
-                // }
-                // List<IdValuePair> allTestSections = DisplayListService.getInstance()
-                // .getList(ListType.TEST_SECTION_ACTIVE);
-                // if (userLabUnits.contains(UnifiedSystemUserController.ALL_LAB_UNITS)) {
-                // return allTestSections;
-                // } else {
-                // List<IdValuePair> userTestSections = allTestSections.stream()
-                // .filter(testSection -> userLabUnits.contains(testSection.getId()))
-                // .collect(Collectors.toList());
-                // return userTestSections;
-                // }
                 List<IdValuePair> userTestSections = new ArrayList<>();
                 Boolean requireLabUnitAtLogin = ConfigurationProperties.getInstance()
                         .getPropertyValue(Property.REQUIRE_LAB_UNIT_AT_LOGIN).equals("true");

diff --git a/src/main/resources/static/scripts/ajaxCalls.js b/src/main/resources/static/scripts/ajaxCalls.js
@@ -32,7 +32,7 @@ function getProviderInfo( providerId, success, failure){
 		return;
 	}
 
-	new Ajax.Request('Provider/' + providerId,
+	new Ajax.Request('rest/Provider/raw/' + providerId,
 			{
 				method : 'get', 
 			    //indicator: 'throbbing',
@@ -53,7 +53,7 @@ function getProviderInfoByPersonId( personId, success, failure){
 		return;
 	}
 
-	new Ajax.Request('Provider/Person/' + personId,
+	new Ajax.Request('rest/Provider/Person/' + personId,
 			{
 				method : 'get', 
 			    //indicator: 'throbbing',

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -92,4 +92,12 @@
         </cookie-config>
     </session-config>
 
+    <filter>
+        <filter-name>ajaxFilter</filter-name>
+        <filter-class>org.openelisglobal.security.AjaxFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ajaxFilter</filter-name>
+        <url-pattern>/ajaxQueryXML</url-pattern>  
+    </filter-mapping>
 </web-app>
diff --git a/src/test/java/org/openelisglobal/address/PersonAddressServiceTest.java b/src/test/java/org/openelisglobal/address/PersonAddressServiceTest.java
@@ -9,7 +9,6 @@
 import org.openelisglobal.address.valueholder.AddressPK;
 import org.openelisglobal.address.valueholder.PersonAddress;
 import org.openelisglobal.person.service.PersonService;
-import org.openelisglobal.person.valueholder.Person;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class PersonAddressServiceTest extends BaseWebContextSensitiveTest {
@@ -28,14 +27,9 @@ public void init() throws Exception {
     @Test
     public void createPersonAddress_shouldCreatePersonAddress() throws Exception {
 
-        Person person = new Person();
-        person.setFirstName("john");
-        person.setLastName("Doe");
-        String personId = personService.insert(person);
-
         PersonAddress personAddress = new PersonAddress();
         personAddress.setAddressPartId("3");
-        personAddress.setPersonId(personId);
+        personAddress.setPersonId("3");
         personAddress.setType("D");
         personAddress.setValue("123");
 
@@ -71,14 +65,9 @@ public void deletePersonAddress_shouldDeletePersonAddress() throws Exception {
     @Test
     public void insert_shouldInsertPersonAdress() throws Exception {
 
-        Person person = new Person();
-        person.setFirstName("john");
-        person.setLastName("Doe");
-        String personId = personService.insert(person);
-
         PersonAddress personAddress = new PersonAddress();
         personAddress.setAddressPartId("5");
-        personAddress.setPersonId(personId);
+        personAddress.setPersonId("4");
         personAddress.setType("F");
         personAddress.setValue("123");
 

diff --git a/src/test/resources/testdata/personaddress.xml b/src/test/resources/testdata/personaddress.xml
@@ -30,6 +30,11 @@
 		country="USA" work_phone="10000002" home_phone="8000003"
 		cell_phone="0000001" primary_phone="10000002" fax="0002"
 		email="[email protected]" lastUpdated="2023-11-01 12:00:00" />
+	<person id="4" last_name="Kukkib" first_name="Faithb"
+		middle_name="Siannah" city="Dallas" state="Texas" zip_code="001"
+		country="USA" work_phone="10000002" home_phone="8000003"
+		cell_phone="0000001" primary_phone="10000002" fax="0002"
+		email="[email protected]" lastUpdated="2023-11-01 12:00:00" />
 
 	<person_address person_id="1" address_part_id="5"
 		type="P" value="12345678" />