feat: US 4 Ranque de escolas

.dockerignore

@@ -0,0 +1,4 @@
+.idea/
+.git/
+.github/
+publish/

.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# CS8618: Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+dotnet_diagnostic.CS8618.severity = none

.github/workflows/ci.yml

@@ -1,55 +1,79 @@
-name: Deploy AWS
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
-
-    - name: Install dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-
-    - name: Test
-      run: dotnet test --no-restore --verbosity normal
-
-    - name: Publish
-      run: dotnet publish -c Release -o '${{ github.workspace }}/out'
-
-    - name: Create email service .env
-      run: |
-        echo 'EMAIL_SERVICE_ADDRESS=${{ secrets.EMAIL_SERVICE_ADDRESS }}' > '${{ github.workspace }}/out/.env'
-        echo 'EMAIL_SERVICE_PASSWORD=${{ secrets.EMAIL_SERVICE_PASSWORD }}' >> '${{ github.workspace }}/out/.env'
-
-    - name: Zip Package
-      run: |
-        cd ${{ github.workspace }}/out 
-        zip -r ${{ github.workspace }}/out.zip * .env
-
-    - name: Deploy to EB
-      uses: einaregilsson/beanstalk-deploy@v21
-      with:
-        aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        application_name: back-dnit-usuario
-        environment_name: back-dnit-usuario-env
-        region: us-east-1
-        version_label: ${{ github.run_id }}
-        version_description: ${{ github.sha }}
-        deployment_package: ${{ github.workspace }}/out.zip
+name: CI
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  ci-windows:
+    name: Build, test and analyze Windows
+    runs-on: windows-latest
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin' 
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache SonarCloud scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v3
+        with:
+          path: .\.sonar\scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+      - name: Install SonarCloud scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          New-Item -Path .\.sonar\scanner -ItemType Directory
+          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+      - name: Install dotnet-coverage
+        shell: powershell
+        run: dotnet tool install --global dotnet-coverage
+      - name: Clone trx2sonar
+        uses: actions/checkout@v3
+        with:
+          repository: gmarokov/dotnet-trx2sonar
+          path: dotnet-trx2sonar
+      - name: Setup trx2sonar
+        shell: powershell
+        run: |
+          dotnet restore dotnet-trx2sonar
+          dotnet build dotnet-trx2sonar --configuration Release
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: powershell
+        run: |
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"fga-eps-mds_2023.2-Dnit-UsuarioService" /o:"fga-eps-mds-1" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml /d:sonar.testExecutionReportPaths=results.xml
+          dotnet build
+          dotnet-coverage collect "dotnet test" -f xml -o "coverage.xml"
+          dotnet test --logger "trx;LogFileName=results.trx" --results-directory ./TestResults/results.xml
+          ./dotnet-trx2sonar/TrxToSonar/bin/Release/net6.0/TrxToSonar -d ./TestResults -o results.xml
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+  ci-linux:
+    name: Build and test Linux
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal

.github/workflows/release.yml

@@ -12,25 +12,27 @@ jobs:
     steps:
       - name: Get file name
         id: name
-        run: echo "::set-output name=file_name::fga-eps-mds-2023.1-Dnit-UsuarioService-$(TZ='America/Sao_Paulo' date +'%m-%d-%Y-%H-%M-%S')-${{github.ref_name}}"
+        run: echo "::set-output name=file_name::fga-eps-mds_2023.2-Dnit-UsuarioService-$(TZ='America/Sao_Paulo' date +'%m-%d-%Y-%H-%M-%S')-${{github.ref_name}}"
 
-      - name: Copy repository
+      - name: Copy repository and download metrics
         uses: actions/checkout@v2
       - run: wget $METRICS_URL -O ${{ steps.name.outputs.file_name }}.json
         env:
           METRICS_URL: ${{ secrets.METRICS_URL }}
-      - uses: actions/upload-artifact@v2
+
+      - name: Uploads file
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.name.outputs.file_name }}.json
           path: ${{ steps.name.outputs.file_name }}.json
 
       - name: Send metrics to doc repo
         uses: dmnemec/[email protected]
         env:
-          API_TOKEN_GITHUB: ${{ secrets.TOKEN_GITHUB }}
+          API_TOKEN_GITHUB: ${{ secrets.GIT_TOKEN }}
         with:
           source_file: ${{ steps.name.outputs.file_name }}.json
-          destination_repo: 'fga-eps-mds/2023.1-Dnit-DOC'
+          destination_repo: 'fga-eps-mds/2023.2-Dnit-DOC'
           destination_folder: 'analytics-raw-data'
           user_email: ${{ secrets.GIT_EMAIL}}
           user_name: ${{ secrets.GIT_USER }}

.gitignore

@@ -33,6 +33,8 @@ bld/
 [Ll]og/
 [Ll]ogs/
 
+.vscode
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
@@ -355,10 +357,18 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
-
+ 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /dominio/UsuarioDNIT.cs
+
+.idea/
+
+cov.sh
+coveragereport/
+
+report/
+.vscode/

Dockerfile

@@ -2,29 +2,6 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 
 WORKDIR /app
 
-COPY UsuarioService.sln ./
-COPY app/app.csproj ./app/
-COPY dominio/dominio.csproj ./dominio/
-COPY repositorio/repositorio.csproj ./repositorio/
-COPY service/service.csproj ./service/
-COPY test/test.csproj ./test/
+COPY . .
 
-RUN dotnet restore
-
-COPY . ./
-
-RUN dotnet build -c Release
-
-RUN dotnet publish app/app.csproj -c Release -o /app/out
-RUN dotnet publish service/service.csproj -c Release -o /app/out
-RUN dotnet publish repositorio/repositorio.csproj -c Release -o /app/out
-RUN dotnet publish dominio/dominio.csproj -c Release -o /app/out
-RUN dotnet publish test/test.csproj -c Release -o /app/out
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
-
-WORKDIR /app
-
-COPY --from=build /app/out .
-
-ENTRYPOINT ["dotnet", "app.dll"]
+CMD dotnet watch --project app

UsuarioService.sln

@@ -3,42 +3,41 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app", "app\app.csproj", "{A553D130-F52F-4C65-9EFA-DE58FAC021FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "api", "api\api.csproj", "{9B9F5E33-2CDA-4F75-8338-801798AD293E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dominio", "dominio\dominio.csproj", "{91F2F3EB-3054-4187-8E04-0E04EC55ED08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app", "app\app.csproj", "{08942609-AAE1-4D23-B71D-E39D1A7CF566}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "service", "service\service.csproj", "{7F390C74-6B61-4479-8840-E57D6B9E56C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{1D4F20EE-9463-4E06-805F-F4CADF503164}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "repositorio", "repositorio\repositorio.csproj", "{456103BA-9130-4604-8AF7-49632FBAB6BB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8B004C85-9684-409C-B8C8-01BD3A8F6DFA}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj", "{4D6B0EB8-A866-4742-AF0F-30706B1D282F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "auth", "auth\auth.csproj", "{1C2F7ED1-31B7-4274-BD2A-388700259656}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A553D130-F52F-4C65-9EFA-DE58FAC021FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A553D130-F52F-4C65-9EFA-DE58FAC021FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A553D130-F52F-4C65-9EFA-DE58FAC021FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A553D130-F52F-4C65-9EFA-DE58FAC021FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91F2F3EB-3054-4187-8E04-0E04EC55ED08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91F2F3EB-3054-4187-8E04-0E04EC55ED08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91F2F3EB-3054-4187-8E04-0E04EC55ED08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91F2F3EB-3054-4187-8E04-0E04EC55ED08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F390C74-6B61-4479-8840-E57D6B9E56C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F390C74-6B61-4479-8840-E57D6B9E56C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F390C74-6B61-4479-8840-E57D6B9E56C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F390C74-6B61-4479-8840-E57D6B9E56C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{456103BA-9130-4604-8AF7-49632FBAB6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{456103BA-9130-4604-8AF7-49632FBAB6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{456103BA-9130-4604-8AF7-49632FBAB6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{456103BA-9130-4604-8AF7-49632FBAB6BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D6B0EB8-A866-4742-AF0F-30706B1D282F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D6B0EB8-A866-4742-AF0F-30706B1D282F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D6B0EB8-A866-4742-AF0F-30706B1D282F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D6B0EB8-A866-4742-AF0F-30706B1D282F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B9F5E33-2CDA-4F75-8338-801798AD293E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B9F5E33-2CDA-4F75-8338-801798AD293E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B9F5E33-2CDA-4F75-8338-801798AD293E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B9F5E33-2CDA-4F75-8338-801798AD293E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08942609-AAE1-4D23-B71D-E39D1A7CF566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08942609-AAE1-4D23-B71D-E39D1A7CF566}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08942609-AAE1-4D23-B71D-E39D1A7CF566}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08942609-AAE1-4D23-B71D-E39D1A7CF566}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D4F20EE-9463-4E06-805F-F4CADF503164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D4F20EE-9463-4E06-805F-F4CADF503164}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D4F20EE-9463-4E06-805F-F4CADF503164}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D4F20EE-9463-4E06-805F-F4CADF503164}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C2F7ED1-31B7-4274-BD2A-388700259656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C2F7ED1-31B7-4274-BD2A-388700259656}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C2F7ED1-31B7-4274-BD2A-388700259656}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C2F7ED1-31B7-4274-BD2A-388700259656}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE