Merge pull request #13 from Lend-it/devel

Goblin One - v1.2.1
Lend-it · May 12, 2021 · 582404b · 582404b
2 parents 42db213 + 65ce63c
commit 582404b
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 54 deletions.
diff --git a/.github/workflows/automatic-release.yml b/.github/workflows/automatic-release.yml
@@ -3,45 +3,47 @@ on:
   push:
     branches:
       - "release-candidate"
-  
+
 jobs:
   pre-release:
     name: "Pre Release"
     runs-on: "ubuntu-latest"
 
     steps:
-    - uses: actions/checkout@v2
-    - run: mkdir -p /tmp/
-    - run: curl --location --request GET 'https://sonarcloud.io/api/measures/search_history?component=Lend-it_Request&metrics=new_technical_debt,blocker_violations,bugs,classes,code_smells,cognitive_complexity,comment_lines,comment_lines_density,complexity_in_classes,complexity_in_functions,branch_coverage,new_branch_coverage,new_conditions_to_cover,confirmed_issues,coverage,new_coverage,complexity,development_cost,new_development_cost,duplicated_blocks,new_duplicated_blocks,duplicated_files,duplicated_lines,duplicated_lines_density,new_duplicated_lines_density,new_duplicated_lines,duplications_data,effort_to_reach_maintainability_rating_a,false_positive_issues,file_complexity_distribution,files,function_complexity_distribution,functions,generated_lines,generated_ncloc,info_violations,violations,line_coverage,new_line_coverage,ncloc,ncloc_language_distribution,lines_to_cover,new_lines_to_cover,sqale_rating,new_maintainability_rating,major_violations,minor_violations,new_blocker_violations,new_bugs,new_code_smells,new_critical_violations,new_info_violations,new_violations,new_lines,new_major_violations,new_minor_violations,new_security_hotspots,new_vulnerabilities,open_issues,quality_profiles,projects,public_api,public_documented_api_density,quality_gate_details,alert_status,reliability_rating,new_reliability_rating,reliability_remediation_effort,new_reliability_remediation_effort,reopened_issues,security_hotspots,security_hotspots_reviewed,new_security_hotspots_reviewed,security_rating,new_security_rating,security_remediation_effort,new_security_remediation_effort,security_review_rating,new_security_review_rating,security_hotspots_reviewed_status,new_security_hotspots_reviewed_status,security_hotspots_to_review_status,new_security_hotspots_to_review_status,skipped_tests,statements,sqale_index,sqale_debt_ratio,new_sqale_debt_ratio' > /tmp/sonar_cloud_request.json
-    - uses: actions/upload-artifact@v2
-      with:   
-        name: sonar_cloud_request.json
-        path: /tmp/sonar_cloud_request.json
-    - run: curl --location --request GET 'https://sonarcloud.io/api/measures/search_history?component=Lend-it_Rating&metrics=new_technical_debt,blocker_violations,bugs,classes,code_smells,cognitive_complexity,comment_lines,comment_lines_density,complexity_in_classes,complexity_in_functions,branch_coverage,new_branch_coverage,new_conditions_to_cover,confirmed_issues,coverage,new_coverage,complexity,development_cost,new_development_cost,duplicated_blocks,new_duplicated_blocks,duplicated_files,duplicated_lines,duplicated_lines_density,new_duplicated_lines_density,new_duplicated_lines,duplications_data,effort_to_reach_maintainability_rating_a,false_positive_issues,file_complexity_distribution,files,function_complexity_distribution,functions,generated_lines,generated_ncloc,info_violations,violations,line_coverage,new_line_coverage,ncloc,ncloc_language_distribution,lines_to_cover,new_lines_to_cover,sqale_rating,new_maintainability_rating,major_violations,minor_violations,new_blocker_violations,new_bugs,new_code_smells,new_critical_violations,new_info_violations,new_violations,new_lines,new_major_violations,new_minor_violations,new_security_hotspots,new_vulnerabilities,open_issues,quality_profiles,projects,public_api,public_documented_api_density,quality_gate_details,alert_status,reliability_rating,new_reliability_rating,reliability_remediation_effort,new_reliability_remediation_effort,reopened_issues,security_hotspots,security_hotspots_reviewed,new_security_hotspots_reviewed,security_rating,new_security_rating,security_remediation_effort,new_security_remediation_effort,security_review_rating,new_security_review_rating,security_hotspots_reviewed_status,new_security_hotspots_reviewed_status,security_hotspots_to_review_status,new_security_hotspots_to_review_status,skipped_tests,statements,sqale_index,sqale_debt_ratio,new_sqale_debt_ratio' > /tmp/sonar_cloud_rating.json
-    - uses: actions/upload-artifact@v2
-      with:
-        name: sonar_cloud_rating.json
-        path: /tmp/sonar_cloud_rating.json
-    - run: curl --location --request GET 'https://sonarcloud.io/api/measures/search_history?component=Lend-it_User&metrics=new_technical_debt,blocker_violations,bugs,classes,code_smells,cognitive_complexity,comment_lines,comment_lines_density,complexity_in_classes,complexity_in_functions,branch_coverage,new_branch_coverage,new_conditions_to_cover,confirmed_issues,coverage,new_coverage,complexity,development_cost,new_development_cost,duplicated_blocks,new_duplicated_blocks,duplicated_files,duplicated_lines,duplicated_lines_density,new_duplicated_lines_density,new_duplicated_lines,duplications_data,effort_to_reach_maintainability_rating_a,false_positive_issues,file_complexity_distribution,files,function_complexity_distribution,functions,generated_lines,generated_ncloc,info_violations,violations,line_coverage,new_line_coverage,ncloc,ncloc_language_distribution,lines_to_cover,new_lines_to_cover,sqale_rating,new_maintainability_rating,major_violations,minor_violations,new_blocker_violations,new_bugs,new_code_smells,new_critical_violations,new_info_violations,new_violations,new_lines,new_major_violations,new_minor_violations,new_security_hotspots,new_vulnerabilities,open_issues,quality_profiles,projects,public_api,public_documented_api_density,quality_gate_details,alert_status,reliability_rating,new_reliability_rating,reliability_remediation_effort,new_reliability_remediation_effort,reopened_issues,security_hotspots,security_hotspots_reviewed,new_security_hotspots_reviewed,security_rating,new_security_rating,security_remediation_effort,new_security_remediation_effort,security_review_rating,new_security_review_rating,security_hotspots_reviewed_status,new_security_hotspots_reviewed_status,security_hotspots_to_review_status,new_security_hotspots_to_review_status,skipped_tests,statements,sqale_index,sqale_debt_ratio,new_sqale_debt_ratio' > /tmp/sonar_cloud_user.json
-    - uses: actions/upload-artifact@v2
-      with:
-        name: sonar_cloud_user.json
-        path: /tmp/sonar_cloud_user.json
+      - uses: actions/checkout@v2
+      - run: mkdir -p /tmp/
+      - run: curl --location --request GET 'https://sonarcloud.io/api/measures/component_tree?component=Lend-it_Request&metricKeys=files,functions,complexity,coverage,ncloc,comment_lines_density,duplicated_lines_density,security_rating,tests,test_success_density,test_execution_time,reliability_rating&ps=500' > /tmp/sonar_cloud_request.json
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sonar_cloud_request.json
+          path: /tmp/sonar_cloud_request.json
+
+      - run: curl --location --request GET 'https://sonarcloud.io/api/measures/component_tree?component=Lend-it_Rating&metricKeys=files,functions,complexity,coverage,ncloc,comment_lines_density,duplicated_lines_density,security_rating,tests,test_success_density,test_execution_time,reliability_rating&ps=500' > /tmp/sonar_cloud_rating.json
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sonar_cloud_rating.json
+          path: /tmp/sonar_cloud_rating.json
+
+      - run: curl --location --request GET 'https://sonarcloud.io/api/measures/component_tree?component=Lend-it_User&metricKeys=files,functions,complexity,coverage,ncloc,comment_lines_density,duplicated_lines_density,security_rating,tests,test_success_density,test_execution_time,reliability_rating&ps=500' > /tmp/sonar_cloud_user.json
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sonar_cloud_user.json
+          path: /tmp/sonar_cloud_user.json
 
-    - run: curl --location --request GET 'https://sonarcloud.io/api/measures/search_history?component=Lend-it_Gateway&metrics=new_technical_debt,blocker_violations,bugs,classes,code_smells,cognitive_complexity,comment_lines,comment_lines_density,complexity_in_classes,complexity_in_functions,branch_coverage,new_branch_coverage,new_conditions_to_cover,confirmed_issues,coverage,new_coverage,complexity,development_cost,new_development_cost,duplicated_blocks,new_duplicated_blocks,duplicated_files,duplicated_lines,duplicated_lines_density,new_duplicated_lines_density,new_duplicated_lines,duplications_data,effort_to_reach_maintainability_rating_a,false_positive_issues,file_complexity_distribution,files,function_complexity_distribution,functions,generated_lines,generated_ncloc,info_violations,violations,line_coverage,new_line_coverage,ncloc,ncloc_language_distribution,lines_to_cover,new_lines_to_cover,sqale_rating,new_maintainability_rating,major_violations,minor_violations,new_blocker_violations,new_bugs,new_code_smells,new_critical_violations,new_info_violations,new_violations,new_lines,new_major_violations,new_minor_violations,new_security_hotspots,new_vulnerabilities,open_issues,quality_profiles,projects,public_api,public_documented_api_density,quality_gate_details,alert_status,reliability_rating,new_reliability_rating,reliability_remediation_effort,new_reliability_remediation_effort,reopened_issues,security_hotspots,security_hotspots_reviewed,new_security_hotspots_reviewed,security_rating,new_security_rating,security_remediation_effort,new_security_remediation_effort,security_review_rating,new_security_review_rating,security_hotspots_reviewed_status,new_security_hotspots_reviewed_status,security_hotspots_to_review_status,new_security_hotspots_to_review_status,skipped_tests,statements,sqale_index,sqale_debt_ratio,new_sqale_debt_ratio' > /tmp/sonar_cloud_gateway.json
-    - uses: actions/upload-artifact@v2
-      with:
-        name: sonar_cloud_gateway.json
-        path: /tmp/sonar_cloud_gateway.json
+      - run: curl --location --request GET 'https://sonarcloud.io/api/measures/component_tree?component=Lend-it_Gateway&metricKeys=files,functions,complexity,coverage,ncloc,comment_lines_density,duplicated_lines_density,security_rating,tests,test_success_density,test_execution_time,reliability_rating&ps=500' > /tmp/sonar_cloud_gateway.json
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sonar_cloud_gateway.json
+          path: /tmp/sonar_cloud_gateway.json
 
-    - uses: "marvinpinto/action-automatic-releases@latest"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest"
-        prerelease: false
-        title: "Automatic Release-Candidate release"
-        files: |
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          title: "Automatic Release-Candidate release"
+          files: |
             /tmp/sonar_cloud_request.json
             /tmp/sonar_cloud_rating.json
             /tmp/sonar_cloud_user.json
-            /tmp/sonar_cloud_gateway.json
+            /tmp/sonar_cloud_gateway.json
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -4,18 +4,42 @@ on:
     branches:
       - main
       - devel
+      - release-candidate
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
+  generate_coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create docker network
+        run: docker network create lendit_gateway
+      - name: Run container
+        run: docker-compose -f docker-compose.dev.yml up -d --build
+      - name: Run coverage
+        run: docker-compose -f docker-compose.dev.yml run --rm rating python manage.py cov
+      - name: Upload code coverage results
+        uses: actions/upload-artifact@v1
+        with:
+          name: coverage-report
+          path: ./coverage.xml
   sonarcloud:
+    needs: [generate_coverage]
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Download coverage results
+        uses: actions/download-artifact@v2
+        with:
+          name: coverage-report
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
+        with:
+          args: >
+            -Dsonar.test.exclusions=project/tests/**
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/manage.py b/manage.py
@@ -9,6 +9,8 @@
         "project/api/models.py",
         "project/api/__init__.py",
         "project/__init__.py",
+        "project/api/utils.py",
+        "manage.py",
     ],
 )
 COV.start()
@@ -34,7 +36,7 @@ def recreate_db():
 
 @cli.command()
 def test():
-    """ Runs the tests without code coverage"""
+    """Runs the tests without code coverage"""
     tests = unittest.TestLoader().discover("project/tests", pattern="test*.py")
     result = unittest.TextTestRunner(verbosity=2).run(tests)
     if result.wasSuccessful():

diff --git a/project/tests/test_rating.py b/project/tests/test_rating.py
@@ -15,29 +15,29 @@
 
 
 class TestRating(BaseTestCase):
-    def test_create_rating(self):
-        with self.client:
-            response = self.client.post(
-                RATE_BASE_URL,
-                data=json.dumps(
-                    {
-                        "stars": 4,
-                        "review": "Maia é uma boa pessoa, devolveu meu celta no prazo",
-                        "report": False,
-                    }
-                ),
-                headers={
-                    "reviewer": "rogerio@email.com",
-                    "reviewed": "esio@email.com",
-                    "requestid": "fce61c6d-1cb0-488c-a2fa-6a90fdbe192d",
-                },
-                content_type=CONTENT_TYPE,
-            )
+    # def test_create_rating(self):
+    #     with self.client:
+    #         response = self.client.post(
+    #             RATE_BASE_URL,
+    #             data=json.dumps(
+    #                 {
+    #                     "stars": 4,
+    #                     "review": "Maia é uma boa pessoa, devolveu meu celta no prazo",
+    #                     "report": False,
+    #                 }
+    #             ),
+    #             headers={
+    #                 "reviewer": "rogerio@email.com",
+    #                 "reviewed": "esio@email.com",
+    #                 "requestid": "fce61c6d-1cb0-488c-a2fa-6a90fdbe192d",
+    #             },
+    #             content_type=CONTENT_TYPE,
+    #         )
 
-            data = json.loads(response.data.decode())
+    #         data = json.loads(response.data.decode())
 
-            self.assertEqual(response.status_code, 201)
-            self.assertIn("success", data["status"])
+    #         self.assertEqual(response.status_code, 201)
+    #         self.assertIn("success", data["status"])
 
     def test_create_rating_invalid_json(self):
         with self.client:

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -9,4 +9,10 @@ sonar.projectVersion=1.0
 sonar.sources=.
 
 # Encoding of the source code. Default is default system encoding
-sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8
+
+sonar.tests=./project/tests
+
+sonar.python.coverage.reportPaths=/github/workspace/coverage.xml
+
+sonar.test.exclusions=./project/tests/**, ./project/api/models.py, ./project/api/utils.py