Update branch

.github/workflows/main_churchmanager.yml

@@ -1,57 +1,122 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: Build and deploy ASP.Net Core app to Azure Web App - churchmanager
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+name: CI churchManager
 
 on:
   push:
-    branches:
-      - main
-  workflow_dispatch:
+    branches: [ "main", "master", "ci" ]
+  pull_request:
+    branches: [ "main", "master", "ci" ]
+
+env:
+  IMAGE_NAME: rodolfojesus/church-manager
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '7.x'
-          include-prerelease: true
-
-      - name: Build with dotnet
-        run: dotnet build ./Registration/src/Application/Registration.API/Registration.API.csproj --configuration Release
-
-      - name: dotnet publish
-        run: dotnet publish ./Registration/src/Application/Registration.API/Registration.API.csproj -c Release -o ${{env.DOTNET_ROOT}}/myapp
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v3
-        with:
-          name: .net-app
-          path: ${{env.DOTNET_ROOT}}/myapp
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'Production'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v3
-        with:
-          name: .net-app
-
-      - name: Deploy to Azure Web App
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
-        with:
-          app-name: 'churchmanager'
-          slot-name: 'Production'
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_7F53C6FD785745CAADB6C1E603A085F5 }}
-          package: .
+    tests:
+        name: Tests
+        runs-on: ubuntu-latest
+
+        permissions:
+          id-token: write
+          contents: read
+          packages: write
+          actions: read
+          checks: read
+          pull-requests: read
+
+        steps:
+        - uses: actions/checkout@v4
+
+        - name: Setup .NET
+          uses: actions/setup-dotnet@v4
+          with:
+            dotnet-version: 8.0.x
+
+        - name: Restore API
+          run: dotnet restore ./Registration/src/Application/Registration.API/Registration.API.csproj
+        - name: Restore DI
+          run: dotnet restore ./Registration/src/Service/Registration.DependencyInjection/Registration.DependencyInjection.csproj
+        - name: Restore Package
+          run: dotnet restore ./Registration/src/Domain/Registration.CentralPackages/Registration.CentralPackages.csproj
+        - name: Restore DomainCore
+          run: dotnet restore ./Registration/src/Domain/Registration.DomainCore/Registration.DomainCore.csproj
+        - name: Restore DomainBase
+          run: dotnet restore ./Registration/src/Domain/Registration.DomainBase/Registration.DomainBase.csproj
+        - name: Restore Handlers
+          run: dotnet restore ./Registration/src/Service/Registration.Handlers/Registration.Handlers.csproj
+        - name: Restore Repository
+          run: dotnet restore ./Registration/src/Repository/Registration.Repository/Registration.Repository.csproj
+        - name: Restore Resources
+          run: dotnet restore ./Registration/src/Infrastructure/Registration.Resources/Registration.Resources.csproj
+        - name: Restore Mapper
+          run: dotnet restore ./Registration/src/Service/Registration.Mapper/Registration.Mapper.csproj
+        - name: Restore MessageBroker  
+          run: dotnet restore ./Registration/src/Service/MessageBroker/MessageBroker.csproj
+        - name: Restore Infrastructure
+          run: dotnet restore ./Registration/src/Infrastructure/Registration.Infrastructure/Registration.Infrastructure.csproj
+        - name: Restore CloudServices
+          run: dotnet restore ./Registration/src/Service/CloudServices/CloudServices.csproj
+
+        - name: Build API
+          run: dotnet build ./Registration/src/Application/Registration.API/Registration.API.csproj --configuration Release
+        - name: Build DependencyInjection
+          run: dotnet build ./Registration/src/Service/Registration.DependencyInjection/Registration.DependencyInjection.csproj --configuration Release
+        - name: Build CentralPackages
+          run: dotnet build ./Registration/src/Domain/Registration.CentralPackages/Registration.CentralPackages.csproj --configuration Release
+        - name: Build DomainCore
+          run: dotnet build ./Registration/src/Domain/Registration.DomainCore/Registration.DomainCore.csproj --configuration Release
+        - name: Build DomainBase
+          run: dotnet build ./Registration/src/Domain/Registration.DomainBase/Registration.DomainBase.csproj --configuration Release
+        - name: Build Handlers
+          run: dotnet build ./Registration/src/Service/Registration.Handlers/Registration.Handlers.csproj --configuration Release
+        - name: Build Repository
+          run: dotnet build ./Registration/src/Repository/Registration.Repository/Registration.Repository.csproj --configuration Release
+        - name: Build Resources
+          run: dotnet build ./Registration/src/Infrastructure/Registration.Resources/Registration.Resources.csproj --configuration Release
+        - name: Build Mapper
+          run: dotnet build ./Registration/src/Service/Registration.Mapper/Registration.Mapper.csproj --configuration Release
+        - name: Build MessageBroker
+          run: dotnet build ./Registration/src/Service/MessageBroker/MessageBroker.csproj --configuration Release
+        - name: Build Infrastructure
+          run: dotnet build ./Registration/src/Infrastructure/Registration.Infrastructure/Registration.Infrastructure.csproj --configuration Release
+        - name: Build CloudServices
+          run: dotnet build ./Registration/src/Service/CloudServices/CloudServices.csproj --configuration Release
+
+        - name: Test
+          run: dotnet test ./Registration/src/Test/HandlerTest/HandlersTest.csproj
+
+    build:
+        name: Build and publish image
+        runs-on: ubuntu-latest
+        needs: tests
+        steps:
+        - uses: actions/checkout@v4
+
+        - name: Setup .NET
+          uses: actions/setup-dotnet@v4
+          with:
+            dotnet-version: 8.0.x
+
+        - name: Set BUILD_TAG
+          run: |
+            echo BUILD_TAG=$(echo ${{ github.head_ref || github.ref_name }} | sed "s,/,_,g")-${{ github.run_number }} >> $GITHUB_ENV
+
+        - name: Print BUILD_TAG defined
+          run: |
+              echo "Branch     ---> ${{ github.head_ref || github.ref_name }}"
+              echo "Run number ---> ${{ github.run_number }}"
+              echo "Tag        ---> ${{ env.BUILD_TAG }}"
+
+        - name: Log in to DockerHub
+          uses: docker/login-action@v3
+          with:
+            username: ${{ secrets.DOCKERHUBUSERNAME }}
+            password: ${{ secrets.DOCKERHUBTOKEN }}
+
+        - name: Build and push Docker images
+          uses: docker/build-push-action@v6
+          with:
+            context: ./Registration
+            file: ./Registration/Dockerfile
+            push: true
+            tags: ${{ env.IMAGE_NAME }}:${{ env.BUILD_TAG }},${{ env.IMAGE_NAME }}:latest

README.md

@@ -1,2 +1,20 @@
-# church-cash-flow
-Aplicação para caixa de igreja e filiais
+
+# Church - Tesouraria e Secretaria (em desenvolvimento)
+
+Uma breve descrição sobre o que esse projeto faz e para quem ele éUma breve descrição sobre o que esse projeto faz e para quem ele é Uma breve descrição sobre o que esse projeto faz e para quem ele é Uma breve descrição sobre o que esse projeto faz e para quem ele é Uma breve descrição sobre o que esse projeto faz e para quem ele é.
+
+
+## Demonstração
+
+https://seibert.group/blog/en/wp-content/uploads/sites/2/2023/01/AWS.jpeg
+
+
+## Documentação
+
+[Documentação](https://link-da-documentação)
+
+
+## Autores
+
+- [Rodolfo Jesus](https://www.linkedin.com/in/rodolfojesus/)
+

Registration/Registration.sln

@@ -17,7 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Registration.API", "Registr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Itens de Solução", "Itens de Solução", "{6595EA70-E381-4A77-89BE-D0D32C357217}"
 	ProjectSection(SolutionItems) = preProject
+		docker-compose.dev.yml = docker-compose.dev.yml
+		docker-compose.uat.yml = docker-compose.uat.yml
+		Dockerfile = Dockerfile
 		initialScript.sql = initialScript.sql
+		..\.github\workflows\main_churchmanager.yml = ..\.github\workflows\main_churchmanager.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Registration.API", "src\Application\Registration.API\Registration.API.csproj", "{3527C8A1-9F2D-4CC0-B239-04E191B7456A}"
@@ -46,7 +50,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{097130F7-5
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandlersTest", "src\Test\HandlerTest\HandlersTest.csproj", "{E622D748-4C21-44B7-8382-F07448215A56}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudServices", "src\Service\CloudServices\CloudServices.csproj", "{1F0998E2-1DB3-4F27-B69C-BCDA2899C832}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudServices", "src\Service\CloudServices\CloudServices.csproj", "{1F0998E2-1DB3-4F27-B69C-BCDA2899C832}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Registration/docker-compose.dev.yml

@@ -8,10 +8,53 @@ services:
       dockerfile: Dockerfile
     command: dotnet run
     ports:
-      - 7171:8181
+      - 7272:8181
     environment:
-      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_ENVIRONMENT=dev
+      - KEYUSERCREATED=AAECAwQFBgcICQoUAT0ODw==
+      - PASSEMAIL=#senhaforte123
+      - AWS_ACCESS_KEY_ID=YOUR-KEY
+      - AWS_SECRET_ACCESS_KEY=YOUR-SECRET
+      - AWS_SESSION_TOKEN=your_session_token
+    depends_on:
+      - churchmanagerdb
+      - rabbitDocker-dev
+    networks:
+      - netchurchmanager
 
+  churchmanagerdb:
+    container_name: churchmanagerdb-dev
+    hostname: churchmanagerdb
+    image: mysql
+    ports:
+      - 3308:3306
+    environment:
+      - MYSQL_ROOT_PASSWORD=sinqia123
+      - MYSQL_DATABASE=ChurchCashFlow
+    networks:
+      - netchurchmanager
+
+  rabbitDocker-dev:
+    container_name: rabbitDocker-dev
+    image: rabbitmq:3-management
+    ports:
+      - 5674:5672
+      - 15674:15672
+    environment:
+      - RABBITMQ_DEFAULT_USER=sinqia
+      - RABBITMQ_DEFAULT_PASS=sinqia123
+    networks:
+      - netchurchmanager
+
+  redis:
+    image: redis:latest
+    container_name: redis-UAT
+    ports:
+      - "6379:6379"
+    environment:
+      - REDIS_PASSWORD=sinqia123
+    command: redis-server --save 20 1 --loglevel warning --requirepass sinqia123
+    restart: unless-stopped
     networks:
       - netchurchmanager
 

Registration/src/Application/Registration.API/Controllers/Operations/ReportsController.cs

@@ -1,7 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Registration.DomainBase.Entities.Operations.RequestsControllers;
 using Registration.DomainCore.ViewModelAbstraction;
 using Registration.Handlers.Handlers.Operations;
+using Registration.Mapper.DTOs.Registration.MonthWork;
 
 namespace Registration.API.Controllers.Operations;
 
@@ -16,7 +18,7 @@ public ReportsController(CViewModel? viewModel, ReportsHandlers handler)
         _handler = handler!;
     }
 
-
+    [Authorize(Roles = "M-TRS, L-TRS")]
     [HttpGet("/api/v1/tithers")]
     public async Task<IActionResult> Tithers([FromBody] TithersRequest tithers)
     {
@@ -26,6 +28,7 @@ public async Task<IActionResult> Tithers([FromBody] TithersRequest tithers)
 
     }
 
+    [Authorize(Roles = "M-TRS, L-TRS")]
     [HttpGet("/api/v1/offers")]
     public async Task<IActionResult> Offers([FromBody] OfferingRequest offering)
     {
@@ -35,6 +38,7 @@ public async Task<IActionResult> Offers([FromBody] OfferingRequest offering)
 
     }
 
+    [Authorize(Roles = "M-TRS, L-TRS")]
     [HttpGet("/api/v1/fruiters")]
     public async Task<IActionResult> Fruiters([FromBody] FirstFruitsRequest offering)
     {
@@ -43,4 +47,14 @@ public async Task<IActionResult> Fruiters([FromBody] FirstFruitsRequest offering
         return StatusCode(_handler.GetStatusCode(), resultViewModel);
 
     }
+
+    [Authorize(Roles = "M-TRS, L-TRS")]
+    [HttpGet("/api/v1/monthly-closing")]
+    public async Task<IActionResult> MonthlyClosing([FromBody] EditMonthWorkDto dto)
+    {
+        var resultViewModel = await _handler.MonthlyClosingReportAsync(dto);
+
+        return StatusCode(_handler.GetStatusCode(), resultViewModel);
+
+    }
 }

Registration/src/Application/Registration.API/Controllers/Registrations/FirstFruitsController.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Registration.Handlers.Handlers.Registrations;
 using Registration.Mapper.DTOs.Registration.FirstFruits;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace Registration.API.Controllers.Registrations;
 
@@ -73,7 +74,7 @@ public async Task<IActionResult> Create([FromBody] EditFirstFruitsDto firstFruit
             return BadRequest(_viewModel);
         }
 
-        var resultViewModel = await _handler.CreateAsyn(firstFruitsDto);
+        var resultViewModel = await _handler.CreateAsync(firstFruitsDto);
 
         return StatusCode(_handler.GetStatusCode(), resultViewModel);
     }