Merge pull request '* Changed interval to 25' (#10) from Warehouses into master

Reviewed-on: #10

.woodpecker.yml

@@ -1,15 +1,17 @@
 skip_clone: true
+
 when:
   event: pull_request
   action:
     - merge
   branch: master
+
 steps:
   debug-location:
     image: alpine
     commands:
-      - pwd
-      - ls -la
+      - pwd                           # gdzie aktualnie jesteśmy
+      - ls -la                        # co jest w bieżącym katalogu
       - find /woodpecker -maxdepth 4 -type d 2>/dev/null
   clone-manual:
     image: woodpeckerci/plugin-git
@@ -17,6 +19,7 @@ steps:
       remote: http://gitea:3000/FA/FA_WEB.git
       branch: master
       depth: 1
+
   restore:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
@@ -26,6 +29,7 @@ steps:
         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:
@@ -35,6 +39,7 @@ steps:
         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:
@@ -49,11 +54,15 @@ steps:
           --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
+        
+        # Diagnostyka – sprawdź czy tag jest widoczny
         echo "=== Dostępne tagi ==="
         git tag -l
         echo "=== Aktualny commit i opis ==="
@@ -72,12 +81,13 @@ steps:
               /p:PackageVersion=$MINVER_VERSION
           else
             PROJECT_NAME=$(basename "$csproj" .csproj)
-            echo "→ Pomijam $PROJECT_NAME – brak <PackageId>"
+            echo "→ Pomijam $PROJECT_NAME – brak <PackageId> (nie jest to biblioteka NuGet)"
           fi
         done
-        echo "=== Spakowane pakiety ==="
+        echo "=== Spakowane pakiety (.nupkg) ==="
         ls -la nupkg/ || echo "Brak spakowanych pakietów!"
     depends_on: [test]
+
   publish-datamodels-to-baget:
     image: mcr.microsoft.com/dotnet/sdk:latest
     environment:
@@ -89,6 +99,7 @@ steps:
         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!"
+        # Tworzymy minimalny NuGet.Config tylko po to, żeby odblokować HTTP dla nazwanego źródła
         cat <<EOF > NuGet.Config
         <?xml version="1.0" encoding="utf-8"?>
         <configuration>
@@ -99,6 +110,8 @@ steps:
           </packageSources>
         </configuration>
         EOF
+        echo "=== Użyty NuGet.Config (tylko do odblokowania HTTP) ==="
+        cat NuGet.Config
         echo "=== Publikacja pakietów do BaGetter ==="
         find ./nupkg -name "*.nupkg" -type f | while read pkg; do
           echo "→ Push $(basename "$pkg")"
@@ -107,134 +120,35 @@ steps:
             --api-key "$BAGETTER_API_KEY" \
             --skip-duplicate
         done
+        echo "Wszystkie pakiety DataModel opublikowane w BaGetter!"
     depends_on: [pack-datamodels]
-  select-projects-for-container:
+
+  build-and-publish-apps:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
       - |
         set -euf
         cd "${CI_WORKSPACE}"
-        > projects-to-build.txt
-        
+        echo "=== Ponowny restore aplikacji (z najnowszymi pakietami z BaGetter) ==="
+        find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
+        echo "=== Publish aplikacji ==="
         find . -name "*.csproj" -type f | while read csproj; do
-          PROJECT_TYPE=$(dotnet msbuild "$csproj" -getProperty:ProjectType -noLogo 2>/dev/null || echo "Unknown")
-          
-          if [[ "$PROJECT_TYPE" == "Linux" || "$PROJECT_TYPE" == "Api" || "$PROJECT_TYPE" == "ServerProcess" || "$PROJECT_TYPE" == "Blazor" ]]; then
-            PROJECT_NAME=$(basename "$csproj" .csproj)
-            PROJECT_DIR=$(dirname "$csproj")
-            echo "→ Dodaję $PROJECT_NAME (typ: $PROJECT_TYPE)"
-            echo "$PROJECT_DIR|$PROJECT_NAME" >> projects-to-build.txt
+          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 "→ Publish $PROJECT_NAME ($csproj)"
+            dotnet publish "$csproj" --no-restore -c Release -o "./publish-$PROJECT_NAME"
+            # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←
+            # Tu wstaw swój kod deployu (rsync/ssh itp.)
+            # ←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←←
           else
-            PROJECT_NAME=$(basename "$csproj" .csproj)
-            echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)"
+            echo "Pomijam $PROJECT_NAME (nie jest to Api ani Blazor)"
           fi
         done
-        
-        echo "=== Znaleziono projektow do budowy ==="
-        cat projects-to-build.txt || echo "Brak projektów!"
-        wc -l < projects-to-build.txt
+        echo "Pipeline zakończony pomyślnie!"
     depends_on: [publish-datamodels-to-baget]
-  containerize-apps:
-    image: docker:27-cli
-    environment:
-      GITEA_USER:
-        from_secret: gitea_registry_user
-      GITEA_TOKEN:
-        from_secret: gitea_registry_token
-    commands:
-      - |
-        set -euf
-        cd "${CI_WORKSPACE}"
-        
-        echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
-        
-        if [ ! -s projects-to-build.txt ]; then
-          echo "Brak projektow"
-          exit 0
-        fi
-        
-        rm -f NuGet.Config
-        
-        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://127.0.0.1:8080/v3/index.json" />
-          </packageSources>
-        </configuration>
-        EOF
-        
-        cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do
-          PDIR=$(echo "$PDIR" | xargs)
-          PNAME=$(echo "$PNAME" | xargs)
-          
-          test -z "$PNAME" && continue
-          test ! -d "$PDIR" && continue
-          
-          echo -n "git.modwad.pl/fa/" > /tmp/tag.txt
-          echo "$PNAME" | tr 'A-Z' 'a-z' | tr -d '\n' >> /tmp/tag.txt
-          
-          echo "$PNAME" > /tmp/pname.txt
-          echo "$PDIR" | sed 's|^\./||' > /tmp/pdir.txt
-          
-          cat > "Dockerfile.temp" <<'ENDOFDOCKERFILE'
-        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 "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj"
-        RUN dotnet publish "%%PROJECTDIR%%/%%PROJECTNAME%%.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
-        FROM base AS final
-        WORKDIR /app
-        COPY --from=build /app/publish .
-        ENV ASPNETCORE_URLS=http://+:8080
-        ENTRYPOINT ["dotnet", "%%PROJECTNAME%%.dll"]
-        ENDOFDOCKERFILE
-          
-          REAL_PNAME=$(cat /tmp/pname.txt)
-          REAL_PDIR=$(cat /tmp/pdir.txt)
-          sed "s|%%PROJECTNAME%%|$REAL_PNAME|g; s|%%PROJECTDIR%%|$REAL_PDIR|g" "Dockerfile.temp" > "Dockerfile.final"
-          
-          echo "=== Budowanie obrazu ==="
-          DOCKER_BUILDKIT=0 docker build \
-            --network=host \
-            -t "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" \
-            -t "$(cat /tmp/tag.txt):latest" \
-            -f "Dockerfile.final" \
-            . || { echo "BUILD FAILED"; exit 1; }
-          
-          echo "=== Obraz zbudowany, sprawdzam ==="
-          docker images | grep "$(cat /tmp/tag.txt | sed 's|git.modwad.pl/||')" || echo "Obraz nie znaleziony w docker images"
-          
-          echo "=== Pushing SHA tag ==="
-          docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}" || { echo "PUSH SHA FAILED"; exit 1; }
-          
-          echo "=== Pushing latest tag ==="
-          docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; }
-          
-          echo "=== SUCCESS: $(cat /tmp/tag.txt) ==="
-          
-          rm -f "Dockerfile.temp" "Dockerfile.final"
-        done
-        
-        echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ==="
-    depends_on: [select-projects-for-container]
-  cleanup-docker:
-    image: docker:27-cli
-    commands:
-      - |
-        echo "=== Czyszczenie starych obrazów ==="
-        docker image prune -af --filter "until=24h"
-        echo "=== Czyszczenie nieużywanych kontenerów ==="
-        docker container prune -f
-        echo "=== Czyszczenie build cache ==="
-        docker builder prune -af --filter "until=24h"
-        echo "=== Status po czyszczeniu ==="
-        docker system df
-    depends_on: [containerize-apps]
-    when:
-      status: [success, failure]

FaKrosnoApi/appsettings.json

@@ -27,6 +27,6 @@
     "UseSsl": false
   },
   "JobSettings": {
-    "QueryIntervalMinutes": 30
+    "QueryIntervalMinutes": 25
   }
 }

SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs

@@ -161,13 +161,13 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.BlanketQty).IsRequired(false).HasColumnName("blanket_qty");
                 entity.Property(e => e.EffectiveDate).HasColumnName("eff_date");
                 entity.Property(e => e.ExpirationDate).HasColumnName("exp_date");
-                entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price").HasColumnType("decimal(20, 8)");
+                entity.Property(e => e.ContPrice).IsRequired(false).HasColumnName("cont_price");
                 entity.Property(e => e.Status).IsRequired(false).HasColumnName("stat").HasMaxLength(1);
                 entity.Property(e => e.PromiseDate).HasColumnName("promise_date");
                 entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3);
                 entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3);
                 entity.Property(e => e.BlanketQtyReleased).IsRequired(false).HasColumnName("blanket_qty_conv");
-                entity.Property(e => e.ContPriceReleased).HasColumnType("decimal(20, 8)").IsRequired(false).HasColumnName("cont_price_conv");
+                entity.Property(e => e.ContPriceReleased).IsRequired(false).HasColumnName("cont_price_conv");
                 entity.Property(e => e.QtySent).IsRequired(false).HasColumnName("qty_bco");
                 entity.Property(e => e.SentCode).IsRequired(false).HasColumnName("bco_code").HasMaxLength(1);
                 entity.Property(e => e.NonAppliedData).IsRequired(false).HasColumnName("non_appl_data").HasMaxLength(75);
@@ -216,8 +216,8 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.QtyShipped).IsRequired(false).HasColumnName("qty_shipped");
                 entity.Property(e => e.QtyPacked).IsRequired(false).HasColumnName("qty_packed");
                 entity.Property(e => e.Discount).IsRequired(false).HasColumnName("disc");
-                entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost").HasColumnType("decimal(20, 8)");
-                entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasColumnType("decimal(20, 8)");
+                entity.Property(e => e.Cost).IsRequired(false).HasColumnName("cost");
+                entity.Property(e => e.Price).IsRequired(false).HasColumnName("price");
                 entity.Property(e => e.RefType).IsRequired(false).HasColumnName("ref_type").HasMaxLength(1);
                 entity.Property(e => e.RefNumber).IsRequired(false).HasColumnName("ref_num").HasMaxLength(10);
                 entity.Property(e => e.RefLineSuf).IsRequired(false).HasColumnName("ref_line_suf");
@@ -261,7 +261,7 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.PriceCode).IsRequired(false).HasColumnName("pricecode").HasMaxLength(3);
                 entity.Property(e => e.Uom).IsRequired(false).HasColumnName("u_m").HasMaxLength(3);
                 entity.Property(e => e.QtyOrderedReleased).IsRequired(false).HasColumnName("qty_ordered_conv");
-                entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv").HasColumnType("decimal(20, 8)");
+                entity.Property(e => e.PriceReleased).IsRequired(false).HasColumnName("price_conv");
                 entity.Property(e => e.CustomerOrderCustomerNumber).IsRequired(false).HasColumnName("co_cust_num").HasMaxLength(7);
                 entity.Property(e => e.Packed).IsRequired(false).HasColumnName("packed");
                 entity.Property(e => e.Bol).IsRequired(false).HasColumnName("bol");
@@ -474,7 +474,7 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.BlanketQty).HasColumnName("blanket_qty");
                 entity.Property(e => e.EffDate).HasColumnName("eff_date").IsRequired(false);
                 entity.Property(e => e.ExpDate).HasColumnName("exp_date").IsRequired(false);
-                entity.Property(e => e.ContPrice).HasColumnName("cont_price").HasColumnType("decimal(20, 8)").IsRequired(false);
+                entity.Property(e => e.ContPrice).HasColumnName("cont_price").IsRequired(false);
                 entity.Property(e => e.Stat).HasColumnName("stat").HasMaxLength(2).IsRequired(false);
                 entity.Property(e => e.PromiseDate).HasColumnName("promise_date").IsRequired(false);
                 entity.Property(e => e.Pricecode).HasColumnName("pricecode").HasMaxLength(6).IsRequired(false);
@@ -918,6 +918,7 @@ namespace SytelineSaAppEfDataModel
                     .HasMaxLength(500)
                     .IsRequired(false);
 
+                // Relationship
                 entity.HasOne(e => e.Client)
                     .WithMany()
                     .HasForeignKey(e => e.FK_Client)
@@ -1025,6 +1026,7 @@ namespace SytelineSaAppEfDataModel
                     .HasMaxLength(100)
                     .IsRequired(false);
                 
+                // Relationship
                 entity.HasOne(e => e.Header)
                     .WithMany()
                     .HasForeignKey(e => e.FK_Header)
@@ -2342,7 +2344,6 @@ namespace SytelineSaAppEfDataModel
 
                 entity.Property(e => e.ContPrice)
                     .HasColumnName("cont_price")
-                    .HasColumnType("decimal(20, 8)")
                     .IsRequired(false);
 
                 entity.Property(e => e.BrkQty1)
@@ -2577,6 +2578,7 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnType("int")
                     .IsRequired(false);
 
+                // Foreign Key
                 entity.HasOne(e => e.Header)
                     .WithMany()
                     .HasForeignKey(e => e.FKHeader)