after refactor cleanup

.gitea/workflows/build.yml

@@ -1,85 +1,57 @@
-name: BuildApp
+name: Build Docker Images
 
 on:
-  workflow_dispatch: {}
   push:
     branches:
-      - main
+      - ddd-refactor
+  workflow_dispatch: {}
 
 concurrency:
   group: build-${{ github.ref }}
   cancel-in-progress: false
 
 jobs:
-  build-frontend:
+  test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: https://github.com/actions/checkout@v4
 
-      - name: Use Node.js 20
+      - name: Setup .NET 10
-        uses: https://github.com/actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install Angular CLI
-        run: npm install -g @angular/cli
-
-      - name: Install PNPM
-        run: npm install -g pnpm
-
-      - name: Install dependencies
-        working-directory: src/Frontend
-        run: pnpm install
-
-      - name: Build Angular
-        working-directory: src/Frontend
-        run: ng build --configuration=production
-
-      - name: Upload artifact (frontend)
-        uses: https://github.com/actions/upload-artifact@v3
-        with:
-          name: frontend
-          path: src/Frontend/dist
-          if-no-files-found: error
-          retention-days: 7
-
-  build-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Setup .NET 8
         uses: https://github.com/actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
 
       - name: Restore dependencies
         working-directory: src/Backend
-        run: dotnet restore DiunaBI.sln
+        run: |
+          dotnet restore DiunaBI.API/DiunaBI.API.csproj
+          dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj
+          dotnet restore DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj
+          dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj
 
       - name: Build solution and prepare plugins
         working-directory: src/Backend
         run: |
           set -e
-          dotnet build DiunaBI.sln --configuration Release
+          # Build only required projects — skip DiunaBI.UI.Mobile
+          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release
+          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release
           dotnet build DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj --configuration Release
-          mkdir -p DiunaBI.Tests/bin/Release/net8.0/Plugins
+
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          mkdir -p DiunaBI.Tests/bin/Release/net10.0/Plugins
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Core.dll DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          cp DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-          ls -la DiunaBI.Tests/bin/Release/net8.0/Plugins/
+          ls -la DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
 
       - name: Run Tests
         working-directory: src/Backend
         run: |
-          dotnet add DiunaBI.Tests/DiunaBI.Tests.csproj package coverlet.collector
           dotnet test DiunaBI.Tests/DiunaBI.Tests.csproj \
             --configuration Release \
             --no-restore \
             --logger "trx;LogFileName=test-results.trx" \
             --collect:"XPlat Code Coverage" \
-            --filter "Category!=LocalOnly"
+            --filter "Category!=LocalOnly" || true
 
       - name: Publish Test Results
         uses: https://github.com/actions/upload-artifact@v3
@@ -91,29 +63,68 @@ jobs:
             src/Backend/DiunaBI.Tests/TestResults/**/coverage.cobertura.xml
           retention-days: 7
 
-      - name: Publish WebAPI
+  build-and-push:
-        if: success()
+    runs-on: ubuntu-latest
+    needs: test
+    if: success() || failure()
+    
+    steps:
+      - name: Debug secrets
+        run: |
+          echo "User length: ${#REGISTRY_USER}"
+          echo "Token length: ${#REGISTRY_TOKEN}"
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        
+      - name: Checkout code
+        uses: https://github.com/actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: https://github.com/docker/setup-buildx-action@v3
+
+      - name: Log in to Gitea Container Registry
+        run: |
+          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
+
+      - name: Build and push API image
         working-directory: src/Backend
         run: |
-          dotnet publish DiunaBI.WebAPI/DiunaBI.WebAPI.csproj \
+          docker buildx build \
-            --configuration Release \
+            --platform linux/amd64 \
-            --framework net8.0 \
+            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-            --self-contained false \
+            -f DiunaBI.API/Dockerfile \
-            --output ../../build/webapi
+            -t code.bim-it.pl/mz/diunabi-api:latest \
-          mkdir -p ../../build/webapi/Plugins
+            -t code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }} \
-          cp DiunaBI.Plugins.Morska/bin/Release/net8.0/DiunaBI.Plugins.Morska.dll ../../build/webapi/Plugins/
+            --push \
-          ls -la ../../build/webapi/Plugins/
+            .
 
-      - name: Clean up sensitive files
+      - name: Build and push UI image
-        working-directory: build/webapi
+        working-directory: src/Backend
         run: |
-          rm -f appsettings.Development.json || true
+          docker buildx build \
-          rm -f client_secrets.Development.json || true
+            --platform linux/amd64 \
+            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
+            -f DiunaBI.UI.Web/Dockerfile \
+            -t code.bim-it.pl/mz/diunabi-ui:latest \
+            -t code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }} \
+            --push \
+            .
 
-      - name: Upload artifact (webapi)
+      - name: Output build info
-        uses: https://github.com/actions/upload-artifact@v3
+        run: |
-        with:
+          echo "## 🐳 Docker Images Built" >> $GITHUB_STEP_SUMMARY
-          name: webapi
+          echo "" >> $GITHUB_STEP_SUMMARY
-          path: build/webapi
+          echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          if-no-files-found: error
+          echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          retention-days: 7
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### Images pushed:" >> $GITHUB_STEP_SUMMARY
+          echo '```bash' >> $GITHUB_STEP_SUMMARY
+          echo "# Latest (for release)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-api:latest" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-ui:latest" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "# Specific build (for rollback)" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo "docker pull code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo '```' >> $GITHUB_STEP_SUMMARY

.gitea/workflows/buildContainers.yml

@@ -1,130 +0,0 @@
-name: Build Docker Images
-
-on:
-  push:
-    branches:
-      - ddd-refactor
-  workflow_dispatch: {}
-
-concurrency:
-  group: build-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Setup .NET 10
-        uses: https://github.com/actions/setup-dotnet@v4
-        with:
-          dotnet-version: 10.0.x
-
-      - name: Restore dependencies
-        working-directory: src/Backend
-        run: |
-          dotnet restore DiunaBI.API/DiunaBI.API.csproj
-          dotnet restore DiunaBI.UI.Web/DiunaBI.UI.Web.csproj
-          dotnet restore DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj
-          dotnet restore DiunaBI.Tests/DiunaBI.Tests.csproj
-
-      - name: Build solution and prepare plugins
-        working-directory: src/Backend
-        run: |
-          set -e
-          # Build only required projects — skip DiunaBI.UI.Mobile
-          dotnet build DiunaBI.API/DiunaBI.API.csproj --configuration Release
-          dotnet build DiunaBI.UI.Web/DiunaBI.UI.Web.csproj --configuration Release
-          dotnet build DiunaBI.Plugins.Morska/DiunaBI.Plugins.Morska.csproj --configuration Release
-
-          mkdir -p DiunaBI.Tests/bin/Release/net10.0/Plugins
-          cp DiunaBI.Plugins.Morska/bin/Release/net10.0/DiunaBI.Plugins.Morska.dll DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-          ls -la DiunaBI.Tests/bin/Release/net10.0/Plugins/ || true
-
-      - name: Run Tests
-        working-directory: src/Backend
-        run: |
-          dotnet test DiunaBI.Tests/DiunaBI.Tests.csproj \
-            --configuration Release \
-            --no-restore \
-            --logger "trx;LogFileName=test-results.trx" \
-            --collect:"XPlat Code Coverage" \
-            --filter "Category!=LocalOnly" || true
-
-      - name: Publish Test Results
-        uses: https://github.com/actions/upload-artifact@v3
-        if: success() || failure()
-        with:
-          name: test-results
-          path: |
-            src/Backend/DiunaBI.Tests/TestResults/*.trx
-            src/Backend/DiunaBI.Tests/TestResults/**/coverage.cobertura.xml
-          retention-days: 7
-
-  build-and-push:
-    runs-on: ubuntu-latest
-    needs: test
-    if: success() || failure()
-    
-    steps:
-      - name: Debug secrets
-        run: |
-          echo "User length: ${#REGISTRY_USER}"
-          echo "Token length: ${#REGISTRY_TOKEN}"
-        env:
-          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
-        
-      - name: Checkout code
-        uses: https://github.com/actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: https://github.com/docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        run: |
-          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-
-      - name: Build and push API image
-        working-directory: src/Backend
-        run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-            -f DiunaBI.API/Dockerfile \
-            -t code.bim-it.pl/mz/diunabi-api:latest \
-            -t code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }} \
-            --push \
-            .
-
-      - name: Build and push UI image
-        working-directory: src/Backend
-        run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --label "org.opencontainers.image.source=https://code.bim-it.pl/mz/DiunaBI" \
-            -f DiunaBI.UI.Web/Dockerfile \
-            -t code.bim-it.pl/mz/diunabi-ui:latest \
-            -t code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }} \
-            --push \
-            .
-
-      - name: Output build info
-        run: |
-          echo "## 🐳 Docker Images Built" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Images pushed:" >> $GITHUB_STEP_SUMMARY
-          echo '```bash' >> $GITHUB_STEP_SUMMARY
-          echo "# Latest (for release)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-api:latest" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-ui:latest" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# Specific build (for rollback)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-api:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull code.bim-it.pl/mz/diunabi-ui:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY