Merge pull request #18 from FIAP-3SOAT-G15/improve-coverage

Improve coverage
FIAP-3SOAT-G15 · May 20, 2024 · 2b3976e · 2b3976e
2 parents 31f1bc6 + ed68f64
commit 2b3976e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build, tag, and push docker image to Amazon ECR
-        #if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: ${{ vars.AWS_ECR_REPO_NAME }}

diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml
@@ -7,14 +7,12 @@ on:
     paths:
       - .github/workflows/provision.yml
       - 'terraform/**'
-      - 'src/**'
   pull_request:
     branches:
       - main
     paths:
       - .github/workflows/provision.yml
       - 'terraform/**'
-      - 'src/**'
   workflow_dispatch:
 
 jobs:
@@ -65,5 +63,5 @@ jobs:
         run: exit 1
 
       - name: Terraform Apply
-        #if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: terraform apply -auto-approve -input=false
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,10 @@
             **/com/fiap/stock/application/driver/web/MenuAPI*,
             **/com/fiap/stock/application/driver/web/ProductAPI*
         </sonar.exclusions>
-
+        <sonar.coverage.exclusions>
+            **/com/fiap/stock/application/**/config/**/*,
+            **/com/fiap/stock/application/driver/web/*API*.*,
+        </sonar.coverage.exclusions>
     </properties>
     <dependencies>
         <dependency>
@@ -377,20 +380,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.12</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/com/fiap/stock/application/driver/database/configuration/GatewayConfig.kt</exclude>
-                        <exclude>**/com/fiap/stock/application/config/JWTSecurityConfig.kt</exclude>
-                        <exclude>**/com/fiap/stock/application/config/RestTemplateConfig.kt</exclude>
-                        <exclude>**/com/fiap/stock/application/adapter/controller/configuration/ServiceConfig.kt</exclude>
-                        <exclude>**/com/fiap/stock/application/**/configuration/**</exclude>
-                        <exclude>**/com/fiap/stock/application/driver/web/*API</exclude>
-                        <exclude>**/com/fiap/stock/application/driver/web/ComponentAPI*</exclude>
-                        <exclude>**/com/fiap/stock/application/driver/web/ProductAPI*</exclude>
-                        <exclude>**/com/fiap/stock/application/driver/web/MenuAPI*</exclude>
-                        <exclude>**/com/fiap/stock/application/driver/web/StockAPI.kt</exclude>
-                    </excludes>
-                </configuration>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

diff --git a/...nfiguration/ControllerExceptionHandler.kt → ...ller/config/ControllerExceptionHandler.kt b/...nfiguration/ControllerExceptionHandler.kt → ...ller/config/ControllerExceptionHandler.kt
@@ -1,4 +1,4 @@
-package com.fiap.stock.application.adapter.controller.configuration
+package com.fiap.stock.application.adapter.controller.config
 
 import com.fiap.stock.application.domain.errors.ErrorType
 import com.fiap.stock.application.domain.errors.SelfOrderManagementException

diff --git a/...controller/configuration/ServiceConfig.kt → ...dapter/controller/config/ServiceConfig.kt b/...controller/configuration/ServiceConfig.kt → ...dapter/controller/config/ServiceConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.stock.application.adapter.controller.configuration
+package com.fiap.stock.application.adapter.controller.config
 
 import com.fiap.stock.application.StockApiApp
 import com.fiap.stock.application.adapter.gateway.ComponentGateway

diff --git a/...r/database/configuration/GatewayConfig.kt → ...n/driver/database/config/GatewayConfig.kt b/...r/database/configuration/GatewayConfig.kt → ...n/driver/database/config/GatewayConfig.kt
@@ -1,4 +1,4 @@
-package com.fiap.stock.application.driver.database.configuration
+package com.fiap.stock.application.driver.database.config
 
 import com.fiap.stock.application.StockApiApp
 import com.fiap.stock.application.adapter.gateway.ComponentGateway