Hide FAQ menu option if not set in application.properties (fix #79)

Author: arteymix

src/main/java/ubc/pavlab/rdp/controllers/UserController.java

@@ -24,6 +24,7 @@
 import ubc.pavlab.rdp.model.enums.PrivacyLevelType;
 import ubc.pavlab.rdp.model.enums.TierType;
 import ubc.pavlab.rdp.services.*;
+import ubc.pavlab.rdp.settings.ApplicationSettings;
 
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
@@ -58,6 +59,9 @@ public class UserController {
     @Autowired
     private ApplicationEventPublisher eventPublisher;
 
+    @Autowired
+    private ApplicationSettings applicationSettings;
+
     @GetMapping(value = { "/user/home" })
     public ModelAndView userHome() {
         ModelAndView modelAndView = new ModelAndView( "user/home" );
@@ -123,8 +127,13 @@ public ModelAndView documentation() {
     @GetMapping(value = { "/user/faq" })
     public ModelAndView faq() {
         ModelAndView modelAndView = new ModelAndView( "user/faq" );
-        User user = userService.findCurrentUser();
-        modelAndView.addObject( "user", user );
+        if ( applicationSettings.getFaqFile() == null ) {
+            modelAndView.setStatus( HttpStatus.NOT_FOUND );
+            modelAndView.setViewName( "error/404" );
+        } else {
+            User user = userService.findCurrentUser();
+            modelAndView.addObject( "user", user );
+        }
         return modelAndView;
     }
 

src/main/resources/templates/layouts/common.html

@@ -68,7 +68,7 @@
                 <li class="nav-item">
                     <a class="nav-link" th:href="@{/user/documentation}" href="/user/documentation">Documentation</a>
                 </li>
-                <li class="nav-item">
+                <li th:if="${@applicationSettings.faqFile}" class="nav-item">
                     <a class="nav-link" th:href="@{/user/faq}" href="/user/faq">FAQ</a>
                 </li>
                 <li class="nav-item">

src/test/java/ubc/pavlab/rdp/controllers/UserControllerTest.java

@@ -16,6 +16,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -178,6 +179,7 @@ public void getTermsGenesForTaxon_thenReturnSuccess() throws Exception {
     public void getUserStaticEndpoints_thenReturnSuccess() throws Exception {
         User user = createUser( 1 );
         when( userService.findCurrentUser() ).thenReturn( user );
+        when( applicationSettings.getFaqFile() ).thenReturn( new ClassPathResource( "faq.properties" ) );
         mvc.perform( get( "/user/home" ) )
                 .andExpect( status().isOk() )
                 .andExpect( view().name( "user/home" ) );
@@ -189,6 +191,15 @@ public void getUserStaticEndpoints_thenReturnSuccess() throws Exception {
                 .andExpect( view().name( "user/faq" ) );
     }
 
+    @Test
+    @WithMockUser
+    public void getUserFaq_whenFaqIsDisabled_thenReturn404() throws Exception {
+        when( applicationSettings.getFaqFile() ).thenReturn( null );
+        mvc.perform( get( "/user/faq" ) )
+                .andExpect( status().isNotFound() )
+                .andExpect( view().name( "error/404" ) );
+    }
+
     @Test
     @WithMockUser
     public void contactSupport_thenReturnSuccess() throws Exception {