Merge pull request 'Update .woodpecker.yml' (#21) from Warehouses into master

Reviewed-on: #21

.gitea/workflows/build-and-publish.yml

@@ -0,0 +1,192 @@
+name: Build, Test & Publish DataModels + Apps
+
+on:
+  push:
+    branches:
+      - master
+  create:          # nowe tagi
+    tags:
+      - 'v*'
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+  workflow_dispatch:   # ręczne uruchomienie
+
+jobs:
+  restore-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0     # potrzebne do MinVer i git describe
+          repository: FA/FA_WEB               # ← nazwa repozytorium (organizacja/repo)
+          ref: ${{ github.ref }}              # lub ${{ gitea.ref }} – w Gitea obie działają
+          # Najważniejsze – nadpisz domyślny URL
+          url: http://srv51.mikr.us:20120/git/FA/FA_WEB.git
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'   # zmień na swoją wersję jeśli inna
+
+      - name: Restore all projects
+        run: |
+          echo "=== Restore wszystkich projektów ==="
+          find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
+
+      - name: Run tests
+        run: |
+          echo "=== Uruchamianie testów ==="
+          dotnet test --no-restore --configuration Release --logger "trx"
+
+  pack-datamodels:
+    runs-on: ubuntu-latest
+    needs: restore-and-test
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Install MinVer CLI
+        run: dotnet tool install --global minver-cli
+
+      - name: Pack DataModel projects
+        env:
+          MINVER_AUTO_INCREMENT: patch
+          MINVER_MINIMUM_MAJOR_MINOR: 2.0
+          MINVER_DEFAULT_PRE_RELEASE_IDENTIFIERS: alpha.0
+        run: |
+          echo "=== Obliczona wersja przez MinVer ==="
+          MINVER_VERSION=$(minver --verbosity detailed)
+          echo "Wersja: $MINVER_VERSION"
+
+          mkdir -p nupkg
+
+          echo "=== Pełniejsze fetch git (tags) ==="
+          git fetch --prune --tags --force
+
+          echo "=== Dostępne tagi ==="
+          git tag -l
+
+          echo "=== Aktualny opis commitu ==="
+          git describe --tags --always --dirty || echo "Brak tagów"
+
+          echo "=== Pakowanie projektów z PackageId ==="
+          find . -name "*.csproj" -type f | while read -r csproj; do
+            if grep -q '<PackageId>' "$csproj"; then
+              PROJECT_NAME=$(basename "$csproj" .csproj)
+              echo "→ Pakuję $PROJECT_NAME"
+              dotnet pack "$csproj" \
+                --no-restore \
+                --configuration Release \
+                -o "./nupkg" \
+                /p:PackageVersion="$MINVER_VERSION"
+            else
+              echo "→ Pomijam $(basename "$csproj" .csproj) – brak PackageId"
+            fi
+          done
+
+          ls -la nupkg/ || echo "Brak wygenerowanych pakietów"
+
+      - name: Upload NuGet packages as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nuget-packages
+          path: nupkg/*.nupkg
+          retention-days: 3
+
+  publish-to-baget:
+    runs-on: ubuntu-latest
+    needs: pack-datamodels
+    steps:
+      - uses: actions/checkout@v4   # potrzebne tylko jeśli chcesz logować coś z repo
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Download built packages
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget-packages
+          path: nupkg/
+
+      - name: Create custom NuGet.config (allow HTTP)
+        run: |
+          cat > NuGet.Config <<EOF
+          <?xml version="1.0" encoding="utf-8"?>
+          <configuration>
+            <packageSources>
+              <clear />
+              <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+              <add key="BaGet" value="http://baget:80/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />
+            </packageSources>
+          </configuration>
+          EOF
+
+      - name: Publish packages to BaGet
+        env:
+          BAGET_API_KEY: ${{ secrets.BAGET_API_KEY }}
+        run: |
+          echo "=== Publikacja do BaGet ==="
+          find nupkg -name "*.nupkg" -type f | while read -r pkg; do
+            echo "→ Push $(basename "$pkg")"
+            dotnet nuget push "$pkg" \
+              --source "BaGet" \
+              --api-key "$BAGET_API_KEY" \
+              --skip-duplicate
+          done
+
+  build-and-publish-apps:
+    runs-on: ubuntu-latest
+    needs: publish-to-baget
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Restore (with latest DataModels)
+        run: |
+          echo "=== Restore z najnowszymi pakietami z BaGet ==="
+          dotnet restore
+
+      - name: Publish selected applications
+        run: |
+          echo "=== Publish aplikacji z DeployToCentral ==="
+          find . -name "*.csproj" -type f | while read -r csproj; do
+            PROJECT_NAME=$(basename "$csproj" .csproj)
+            PROJECT_DIR=$(dirname "$csproj")
+
+            if [[ "$PROJECT_NAME" == *"Api"* ]] || [[ "$PROJECT_NAME" == *"Blazor"* ]] || \
+               [[ "$PROJECT_DIR" == *"/Api/"* ]] || [[ "$PROJECT_DIR" == *"/Blazor/"* ]]; then
+
+              DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -nologo 2>/dev/null || echo "false")
+
+              if [ "$DEPLOY_TO_CENTRAL" != "true" ]; then
+                echo "Pomijam $PROJECT_NAME (DeployToCentral ≠ true)"
+                continue
+              fi
+
+              echo "→ Publishing $PROJECT_NAME"
+              dotnet publish "$csproj" \
+                --no-restore \
+                --configuration Release \
+                -o "./publish-$PROJECT_NAME"
+
+              # Tutaj możesz dodać deployment (np. rsync, scp, docker build+push itp.)
+              # Przykład (zakomentowany):
+              # rsync -avz --delete ./publish-$PROJECT_NAME/ user@server:/path/to/app/
+            else
+              echo "Pomijam $PROJECT_NAME (nie Api/Blazor)"
+            fi
+          done
+
+          echo "Pipeline zakończony"

.woodpecker.yml

@@ -0,0 +1,186 @@
+skip_clone: true
+when:
+  event: pull_request
+  action:
+    - merge
+  branch: master
+steps:
+  debug-location:
+    image: alpine
+    commands:
+      - pwd
+      - ls -la
+      - find /woodpecker -maxdepth 4 -type d 2>/dev/null
+
+  clone-manual:
+    image: woodpeckerci/plugin-git
+    settings:
+      remote: http://gitea:3000/FA/FA_WEB.git
+      branch: master
+      depth: 1
+
+  restore:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        echo "Aktualna ścieżka: $(pwd)"
+        echo "=== Restore wszystkich projektów ==="
+        find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
+
+  test:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        echo "=== Uruchamianie testów ==="
+        dotnet test --no-restore --configuration Release --logger "trx"
+    depends_on: [restore]
+
+  pack-datamodels:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        echo "=== Instalacja MinVer CLI ==="
+        dotnet tool install --tool-path /tmp/minver minver-cli
+        echo "=== Obliczona wersja przez MinVer ==="
+        MINVER_VERSION=$(/tmp/minver/minver \
+          --auto-increment patch \
+          --minimum-major-minor 2.0 \
+          --default-pre-release-identifiers alpha.0 \
+          --verbosity info)
+
+        echo "Wersja: $MINVER_VERSION"
+
+        mkdir -p nupkg
+        echo "=== Pełniejsze fetch git (unshallow + tags) ==="
+        git fetch --prune --unshallow || echo "Już full clone – OK"
+        git fetch --tags
+
+        echo "=== Dostępne tagi ==="
+        git tag -l
+        echo "=== Aktualny commit i opis ==="
+        git describe --tags --always --dirty
+        echo "=== Diagnostyka projektów ==="
+        find . -name "*.csproj" -type f | sort
+        mkdir -p nupkg
+        echo "=== Pakowanie projektów DataModel (wykrywane po obecności <PackageId>) ==="
+        find . -name "*.csproj" -type f | while read csproj; do
+          if grep -q '<PackageId>' "$csproj"; then
+            PROJECT_NAME=$(basename "$csproj" .csproj)
+            echo "→ Pakuję $PROJECT_NAME ($csproj)"
+            dotnet pack "$csproj" \
+              --configuration Release \
+              -o "./nupkg" \
+              /p:PackageVersion=$MINVER_VERSION
+          else
+            PROJECT_NAME=$(basename "$csproj" .csproj)
+            echo "→ Pomijam $PROJECT_NAME – brak <PackageId>"
+          fi
+        done
+        echo "=== Spakowane pakiety ==="
+        ls -la nupkg/ || echo "Brak spakowanych pakietów!"
+    depends_on: [test]
+
+  publish-datamodels-to-baget:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    environment:
+      BAGETTER_API_KEY:
+        from_secret: baget_api_key
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        echo "=== Test połączenia z BaGetter ==="
+        curl -f http://baget:80/v3/index.json || echo "Nie można połączyć się z BaGetter!"
+        cat <<EOF > NuGet.Config
+        <?xml version="1.0" encoding="utf-8"?>
+        <configuration>
+          <packageSources>
+            <clear />
+            <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+            <add key="BaGet" value="http://baget:80/v3/index.json" allowInsecureConnections="true" />
+          </packageSources>
+        </configuration>
+        EOF
+        echo "=== Publikacja pakietów do BaGetter ==="
+        find ./nupkg -name "*.nupkg" -type f | while read pkg; do
+          echo "→ Push $(basename "$pkg")"
+          dotnet nuget push "$pkg" \
+            --source "BaGet" \
+            --api-key "$BAGETTER_API_KEY" \
+            --skip-duplicate
+        done
+    depends_on: [pack-datamodels]
+
+  containerize-apps:
+    image: woodpeckerci/plugin-docker-buildx:latest
+    environment:
+      GITEA_USER:
+        from_secret: gitea_registry_user
+      GITEA_TOKEN:
+        from_secret: gitea_registry_token
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+
+        echo "DEBUG: Użytkownik = '$GITEA_USER'"
+        echo "DEBUG: Token (pierwsze 4 znaki) = $GITEA_TOKEN..."
+
+        echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
+
+        dotnet restore
+
+        find . -name "*.csproj" -type f | while read csproj; do
+          PROJECT_DIR=$(dirname "$csproj")
+          PROJECT_NAME=$(basename "$csproj" .csproj)
+
+          PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
+          DEPLOY_TO_CENTRAL=$(dotnet msbuild "$csproj" -getProperty:DeployToCentral -noLogo 2>/dev/null || echo "false")
+
+          if [ "$DEPLOY_TO_CENTRAL" != "true" ] || [[ "$PROJECT_TYPE" == "Unknown" || "$PROJECT_TYPE" == "DataModel" || "$PROJECT_TYPE" == "LinuxLocal" ]]; then
+            echo "Pomijam $PROJECT_NAME ($PROJECT_TYPE)"
+            continue
+          fi
+
+          IMAGE_NAME="trent/${PROJECT_NAME,,}"
+          FULL_IMAGE="git.modwad.pl/${IMAGE_NAME}"
+
+          cat > "${PROJECT_DIR}/Dockerfile.temp" <<-EOF
+              FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+              WORKDIR /app
+              EXPOSE 8080
+
+              FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+              WORKDIR /src
+              COPY . .
+              RUN dotnet restore "${PROJECT_NAME}.csproj"
+              RUN dotnet publish "${PROJECT_NAME}.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+              FROM base AS final
+              WORKDIR /app
+              COPY --from=build /app/publish .
+              ENV ASPNETCORE_URLS=http://+:8080
+              ENTRYPOINT ["dotnet", "${PROJECT_NAME}.dll"]
+          EOF
+
+          echo "Buduję → ${FULL_IMAGE}:${CI_COMMIT_SHA}"
+          docker buildx build --platform linux/amd64 \
+            -t "${FULL_IMAGE}:${CI_COMMIT_SHA}" \
+            -t "${FULL_IMAGE}:latest" \
+            -f "${PROJECT_DIR}/Dockerfile.temp" \
+            "${PROJECT_DIR}"
+
+          docker push "${FULL_IMAGE}:${CI_COMMIT_SHA}"
+          docker push "${FULL_IMAGE}:latest"
+
+          rm -f "${PROJECT_DIR}/Dockerfile.temp"
+
+          echo "Opublikowano: ${FULL_IMAGE}:latest"
+        done
+    depends_on: [publish-datamodels-to-baget]

FaKrosnoApi/Controllers/CustomerOrdersController.cs

@@ -56,6 +56,13 @@ namespace FaKrosnoApi.Controllers
             return customerOrder != null ? Ok(customerOrder) : NotFound();
         }
         
+        [HttpGet("by-po")]
+        public async Task<ActionResult<CustomerOrderDto?>> GetByPo([FromQuery] string poNumber)
+        {
+            CustomerOrderDto? customerOrder = await service.GetByPo(poNumber);
+            return customerOrder != null ? Ok(customerOrder) : NotFound();
+        }
+
         [HttpGet("list-by-customer-and-po")]
         public async Task<ActionResult<IList<CustomerOrderDto?>>> GetListByCustomerAndPo(
             [FromQuery] string customerNumber, [FromQuery] int customerSequence, [FromQuery] string poNumber)

FaKrosnoApi/FaKrosnoApi.csproj

@@ -2,12 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <ProjectType>Api</ProjectType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
+    <PackageReference Include="FaKrosnoEfDataModel" Version="2.0.1-alpha.0.65" />
     <PackageReference Include="Hangfire" Version="1.8.17" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.11" />
@@ -18,14 +20,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
     <PackageReference Include="NSwag.AspNetCore" Version="14.2.0" />
+    <PackageReference Include="OrdersManagementDataModel" Version="2.0.0-alpha.0" />
     <PackageReference Include="Syncfusion.XlsIO.Net.Core" Version="29.2.4" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FaKrosnoEfDataModel\FaKrosnoEfDataModel.csproj" />
-    <ProjectReference Include="..\OrdersManagementDataModel\OrdersManagementDataModel.csproj" />
-    <ProjectReference Include="..\SytelineSaAppEfDataModel\SytelineSaAppEfDataModel.csproj" />
+    <PackageReference Include="SytelineSaAppEfDataModel" Version="2.0.1-alpha.0.65" />
   </ItemGroup>
 
 </Project>

FaKrosnoEfDataModel/FaKrosnoEfDataModel.csproj

@@ -5,10 +5,12 @@
     <Authors>Piotr Kus</Authors>
     <Description>FaKrosno Entity Framework Data Model</Description>
     <TargetFramework>net8.0</TargetFramework>
+    <ProjectType>DataModel</ProjectType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <MinVerAutoIncrement>patch</MinVerAutoIncrement>
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>

OrdersManagement/OrdersManagement.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <ProjectType>Blazor</ProjectType>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -9,9 +10,11 @@
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Core" Version="1.6.0" />
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
+    <PackageReference Include="FaKrosnoEfDataModel" Version="2.0.1-alpha.0.65" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols" Version="8.6.1" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.1" />
+    <PackageReference Include="OrdersManagementDataModel" Version="2.0.0-alpha.0" />
     <PackageReference Include="Syncfusion.Blazor.Buttons" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Cards" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Core" Version="28.2.3" />
@@ -20,12 +23,7 @@
     <PackageReference Include="Syncfusion.Blazor.SplitButtons" Version="28.2.3" />
     <PackageReference Include="Syncfusion.Blazor.Themes" Version="28.2.3" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\FaKrosnoEfDataModel\FaKrosnoEfDataModel.csproj" />
-    <ProjectReference Include="..\OrdersManagementDataModel\OrdersManagementDataModel.csproj" />
-    <ProjectReference Include="..\SytelineSaAppEfDataModel\SytelineSaAppEfDataModel.csproj" />
+    <PackageReference Include="SytelineSaAppEfDataModel" Version="2.0.1-alpha.0.65" />
   </ItemGroup>
 
   <ItemGroup>

OrdersManagementDataModel/OrdersManagementDataModel.csproj

@@ -2,8 +2,16 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <ProjectType>DataModel</ProjectType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+
+        <PackageId>OrdersManagementDataModel</PackageId>
+        <Authors>Piotr Kus</Authors>
+        <Description>OrdersManagement Entity Framework Data Model</Description>
+        <MinVerAutoIncrement>patch</MinVerAutoIncrement>
+        <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>

SytelineSaAppEfDataModel/MappingProfile.cs

@@ -33,7 +33,7 @@ namespace SytelineSaAppEfDataModel
             CreateMap<VatCodeAssociation, VatCodeAssociationDto>().ReverseMap();
             CreateMap<ItemCustPriceAll, ItemCustPriceAllDto>().ReverseMap();
             CreateMap<EdiLog, EdiLogDto>().ReverseMap();
-            CreateMap<WzRowMarelli, WzRowMarelliDto>().ReverseMap();
+            CreateMap<WzRowMarelli, WzRowMarelliDto>();
         }
     }
 }

SytelineSaAppEfDataModel/Services/CustomerOrderService.cs

@@ -73,6 +73,13 @@ namespace SytelineSaAppEfDataModel.Services
                 .Select(x => mapper.Map<CustomerOrderDto>(x)).FirstOrDefaultAsync();
         }
         
+        public async Task<CustomerOrderDto?> GetByPo(string poNumber)
+        {
+            return await context.CustomerOrders.Where(x => x.CustPo == poNumber && x.Stat == "O")
+                .OrderByDescending(x => x.CreateDate).Select(x => mapper.Map<CustomerOrderDto>(x))
+                .FirstOrDefaultAsync();
+        }
+
         public async Task<IList<CustomerOrderDto>> GetListByCustomerAndPo(string customerNumber, int customerSequence,
             string poNumber)
         {

SytelineSaAppEfDataModel/Services/ICustomerOrderService.cs

@@ -17,6 +17,7 @@ namespace SytelineSaAppEfDataModel.Services
         Task<IList<CustomerOrderDto>> GetListByCustomerAndPo(string customerNumber, int customerSequence,
             string poNumber);
 
+        Task<CustomerOrderDto?> GetByPo(string poNumber);
         Task<List<CustomerOrderDto>> GetListByCustomer(string customerNumber, int customerSequence);
         Task<IEnumerable<CustomerOrderLineDto>?> GetLinesByCoNumber(string customerOrderNumber);
         Task<IEnumerable<CustomerOrderLineItemDto>?> GetItemsByCoNumber(string customerOrderNumber);

SytelineSaAppEfDataModel/SytelineSaAppEfDataModel.csproj

@@ -2,14 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <ProjectType>DataModel</ProjectType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
+    
     <PackageId>SytelineSaAppEfDataModel</PackageId>
     <Authors>Piotr Kus</Authors>
     <Description>Syteline Entity Framework Data Model</Description>
     <MinVerAutoIncrement>patch</MinVerAutoIncrement>
     <MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
   
   <ItemGroup>