Merge pull request #128 from ssylver93/feature/WFPREV-34_3

Post to Slack channel on quality gate failure
bcgov · Oct 2, 2024 · b3e964d · b3e964d
2 parents 71a1a4d + 40fd533
commit b3e964d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 27 deletions.
diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml
@@ -81,7 +81,7 @@ jobs:
             echo "quality_gate_failed=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Notify Slack on Failure
+      - name: Notify Slack on Failure 
         if: failure() || steps.sonarcloud_quality_gate.outputs.quality_gate_failed == 'true'
         uses: ravsamhq/[email protected]
         with:

diff --git a/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/SecurityConfig.java b/server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/SecurityConfig.java
@@ -83,18 +83,16 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
         http.csrf().disable();
 
-        http.authorizeHttpRequests().anyRequest().permitAll();
-
-        // http
-        //         .oauth2ResourceServer(oauth2 -> oauth2
-        //         .authenticationManagerResolver(authenticationManagerResolver())
-        //         )
-        //         .httpBasic().and()
-        //         .authorizeHttpRequests((authorize) -> authorize
-        //         .anyRequest().authenticated()
-        //         )
-        //         .exceptionHandling()
-        //         .authenticationEntryPoint(authenticationEntryPoint());
+        http
+                .oauth2ResourceServer(oauth2 -> oauth2
+                .authenticationManagerResolver(authenticationManagerResolver())
+                )
+                .httpBasic().and()
+                .authorizeHttpRequests((authorize) -> authorize
+                .anyRequest().authenticated()
+                )
+                .exceptionHandling()
+                .authenticationEntryPoint(authenticationEntryPoint());
 
         return http.build();
     }

diff --git a/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ExampleControllerTest.java b/server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ExampleControllerTest.java
@@ -6,38 +6,35 @@
 
 import org.junit.jupiter.api.Test;
 import static org.mockito.ArgumentMatchers.eq;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import static org.mockito.Mockito.when;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
+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.hateoas.CollectionModel;
 import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.servlet.MockMvc;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import ca.bc.gov.nrs.wfprev.controllers.ExampleController;
+import ca.bc.gov.nrs.wfprev.data.resources.ExampleCodeModel;
 import ca.bc.gov.nrs.wfprev.data.resources.ExampleModel;
 import ca.bc.gov.nrs.wfprev.services.ExampleService;
 
-@Import(TestcontainersConfiguration.class)
-@SpringBootTest
-@AutoConfigureMockMvc
+@WebMvcTest(ExampleController.class)
+@Import({SecurityConfig.class, TestcontainersConfiguration.class})
 class ExampleControllerTest {
 
-    @Mock
+    @MockBean
     private ExampleService exampleService;
 
-    @InjectMocks
-    private ExampleController exampleController;
-
     @Autowired
     private MockMvc mockMvc;
 
     @Test
+    @WithMockUser
     void testGetAllExamples() throws Exception {
         String exampleId1 = UUID.randomUUID().toString();
         String exampleId2 = UUID.randomUUID().toString();
@@ -59,6 +56,7 @@ void testGetAllExamples() throws Exception {
     }
 
     @Test
+    @WithMockUser
     void testGetExampleById() throws Exception {
         String exampleId = UUID.randomUUID().toString();
         ExampleModel exampleModel = new ExampleModel();
@@ -72,6 +70,7 @@ void testGetExampleById() throws Exception {
     }
 
     @Test
+    @WithMockUser
     void testGetExampleByIdNotFound() throws Exception {
         String exampleId = null;
         ExampleModel exampleModel = new ExampleModel();
@@ -84,12 +83,27 @@ void testGetExampleByIdNotFound() throws Exception {
     }
 
     @Test
-    void getExampleCodeById() throws Exception {
+    @WithMockUser
+    void getUserNotFoundCodeById() throws Exception {
         String exampleCodeId = "INVALID_CODE";
+
         when(exampleService.getExampleCodeById(eq(exampleCodeId))).thenReturn(null);
 
         mockMvc.perform(get("/wfprev/exampleCodes/{id}", exampleCodeId))
-                .andExpect(status().isOk());
+                .andExpect(status().isNotFound());
     }
 
-}
+    @Test
+    @WithMockUser
+    void getExampleCodeById() throws Exception {
+        String exampleCodeId = "VALID_CODE";
+        ExampleCodeModel exampleCodeModel = new ExampleCodeModel();
+        exampleCodeModel.setExampleCode(exampleCodeId);
+
+        when(exampleService.getExampleCodeById(eq(exampleCodeId))).thenReturn(exampleCodeModel);
+
+        mockMvc.perform(get("/wfprev/exampleCodes/{id}", exampleCodeId))
+                .andExpect(status().isOk());
+
+    }
+}
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -12,4 +12,5 @@ sonar.test.inclusions=**/Test*.java,**/*Tests.java,**/*Test.java,**/*.spec.ts,**
 sonar.java.binaries=server/wfprev-api/target/classes
 sonar.java.test.binaries=server/wfprev-api/target/test-classes
 sonar.java.coveragePlugin=jacoco
+sonar.qualitygate.wait=true