Update .woodpecker.yml

.woodpecker.yml

@@ -14,8 +14,8 @@ steps:
   clone-manual:
     image: woodpeckerci/plugin-git
     settings:
-      remote: http://gitea:3000/FA/FA_WEB.git
+      remote: http://gitea:3000/${CI_REPO}.git
-      branch: master
+      branch: ${CI_COMMIT_BRANCH}
       depth: 1
   restore:
     image: mcr.microsoft.com/dotnet/sdk:latest
@@ -23,7 +23,7 @@ steps:
       - |
         set -euf
         cd "${CI_WORKSPACE}"
-        echo "Aktualna ścieżka: $(pwd)"
+        echo "Aktualna ścieżka do pliku: $(pwd)"
         echo "=== Restore wszystkich projektów ==="
         find . -name "*.csproj" -type f -exec dotnet restore "{}" \;
   test:
@@ -78,6 +78,52 @@ steps:
         echo "=== Spakowane pakiety ==="
         ls -la nupkg/ || echo "Brak spakowanych pakietów!"
     depends_on: [test]
+  
+  publish-linux-local:
+    image: mcr.microsoft.com/dotnet/sdk:latest
+    commands:
+      - |
+        set -euf
+        cd "${CI_WORKSPACE}"
+        mkdir -p linux-apps
+
+        echo "=== Konfiguracja NuGet sources ==="
+        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 aplikacji LinuxLocal ==="
+        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" = "LinuxLocal" ]; then
+            PROJECT_NAME=$(basename "$csproj" .csproj)
+            echo "→ Publishing $PROJECT_NAME"
+        
+            dotnet publish "$csproj" \
+              --configuration Release \
+              --output "./linux-apps/$PROJECT_NAME" \
+              --runtime linux-x64 \
+              --self-contained false
+          fi
+        done
+        
+        echo ""
+        if [ -d "./linux-apps" ] && [ "$(ls -A ./linux-apps)" ]; then
+          echo "Opublikowane aplikacje:"
+          ls -la linux-apps/
+        else
+          echo "Brak aplikacji LinuxLocal do publikacji"
+        fi
+    depends_on: [restore]
+  
   publish-datamodels-to-baget:
     image: mcr.microsoft.com/dotnet/sdk:latest
     environment:
@@ -108,6 +154,7 @@ steps:
             --skip-duplicate
         done
     depends_on: [pack-datamodels]
+  
   select-projects-for-container:
     image: mcr.microsoft.com/dotnet/sdk:latest
     commands:
@@ -116,24 +163,30 @@ steps:
         cd "${CI_WORKSPACE}"
         > projects-to-build.txt
         
+        echo "=== Selekcja projektów do konteneryzacji ==="
         find . -name "*.csproj" -type f | while read csproj; do
+          PROJECT_NAME=$(basename "$csproj" .csproj)
           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
+          if [ "$PROJECT_TYPE" = "Linux" ] || [ "$PROJECT_TYPE" = "Api" ] || [ "$PROJECT_TYPE" = "ServerProcess" ] || [ "$PROJECT_TYPE" = "Blazor" ] || [ "$PROJECT_TYPE" = "LinuxLocal" ]; 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
           else
-            PROJECT_NAME=$(basename "$csproj" .csproj)
             echo "→ Pomijam $PROJECT_NAME (typ: $PROJECT_TYPE)"
           fi
         done
         
-        echo "=== Znaleziono projektow do budowy ==="
+        echo ""
-        cat projects-to-build.txt || echo "Brak projektów!"
+        if [ -s projects-to-build.txt ]; then
-        wc -l < projects-to-build.txt
+          echo "Znalezione projekty:"
+          cat projects-to-build.txt
+          echo "Łącznie: $(wc -l < projects-to-build.txt)"
+        else
+          echo "BRAK PROJEKTÓW DO BUDOWY!"
+        fi
     depends_on: [publish-datamodels-to-baget]
+  
   containerize-apps:
     image: docker:27-cli
     environment:
@@ -146,6 +199,12 @@ steps:
         set -euf
         cd "${CI_WORKSPACE}"
         
+        REGISTRY_ORG="fa"
+        
+        echo "=== DEBUG: Zawartość projects-to-build.txt ==="
+        cat projects-to-build.txt || echo "Plik nie istnieje!"
+        echo "=== DEBUG: REGISTRY_ORG = '$REGISTRY_ORG' ==="
+        
         echo "$GITEA_TOKEN" | docker login git.modwad.pl -u "$GITEA_USER" --password-stdin
         
         if [ ! -s projects-to-build.txt ]; then
@@ -169,16 +228,20 @@ steps:
         cat projects-to-build.txt | while IFS='|' read -r PDIR PNAME; do
           PDIR=$(echo "$PDIR" | xargs)
           PNAME=$(echo "$PNAME" | xargs)
-          
+        
+          echo "=== DEBUG: PDIR='$PDIR' PNAME='$PNAME' ==="
+        
           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 "=== DEBUG: Generated tag: $(cat /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
@@ -194,47 +257,109 @@ steps:
         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; }
+          docker push "$(cat /tmp/tag.txt):${CI_COMMIT_SHA}"
-          
+        
           echo "=== Pushing latest tag ==="
-          docker push "$(cat /tmp/tag.txt):latest" || { echo "PUSH LATEST FAILED"; exit 1; }
+          docker push "$(cat /tmp/tag.txt):latest"
-          
+        
           echo "=== SUCCESS: $(cat /tmp/tag.txt) ==="
-          
+        
           rm -f "Dockerfile.temp" "Dockerfile.final"
         done
         
         echo "=== WSZYSTKIE PROJEKTY ZAKONCZONE ==="
     depends_on: [select-projects-for-container]
+  
+  deploy-linux-local:
+    image: alpine:latest
+    commands:
+      - |
+        cd "${CI_WORKSPACE}"
+        
+        echo "=== Sprawdzanie aplikacji LinuxLocal ==="
+        if [ ! -d "./linux-apps" ]; then
+          echo "Folder ./linux-apps nie istnieje"
+          exit 0
+        fi
+        
+        echo "=== DEBUG: Zawartość ./linux-apps/ ==="
+        ls -la ./linux-apps/
+        
+        echo "=== Wdrażanie aplikacji LinuxLocal do /opt/fa-apps/ ==="
+        mkdir -p /opt/fa-apps
+        
+        cd ./linux-apps
+        
+        for app in *; do
+          echo "→ DEBUG: Sprawdzam $app"
+          
+          if [ ! -d "$app" ]; then
+            echo "  → $app nie jest folderem, pomijam"
+            continue
+          fi
+          
+          echo "  → Kopiuję $app"
+          echo "  → Zawartość:"
+          ls -la "$app/"
+          
+          rm -rf "/opt/fa-apps/$app"
+          cp -r "$app" "/opt/fa-apps/$app"
+          
+          find "/opt/fa-apps/$app" -type f -executable -exec chmod +x {} \;
+          
+          echo "  → Skopiowano!"
+        done
+        
+        cd "${CI_WORKSPACE}"
+        
+        echo ""
+        echo "=== Wdrożone aplikacje ==="
+        ls -laR /opt/fa-apps/
+    depends_on: [publish-linux-local, containerize-apps]
+  
   cleanup-docker:
     image: docker:27-cli
     commands:
       - |
-        echo "=== Czyszczenie starych obrazów ==="
+        echo "=== Status przed czyszczeniem ==="
-        docker image prune -af --filter "until=24h"
+        docker system df
-        echo "=== Czyszczenie nieużywanych kontenerów ==="
+        
+        echo ""
+        echo "=== Usuwanie dangling images ==="
+        docker image prune -f
+        
+        echo ""
+        echo "=== Usuwanie starych wersji aplikacji ==="
+        docker images --format "{{.Repository}}:{{.Tag}}" | grep "git.modwad.pl/" | grep -v ":latest" | grep -v ":${CI_COMMIT_SHA}" | while read img; do
+          echo "Usuwam: $img"
+          docker rmi "$img" || true
+        done
+        
+        echo ""
+        echo "=== Usuwanie kontenerów ==="
         docker container prune -f
-        echo "=== Czyszczenie build cache ==="
+        
-        docker builder prune -af --filter "until=24h"
+        echo ""
+        echo "=== Usuwanie build cache ==="
+        docker builder prune -af
+        
+        echo ""
         echo "=== Status po czyszczeniu ==="
         docker system df
-    depends_on: [containerize-apps]
+    depends_on: [deploy-linux-local]
     when:
-      status: [success, failure]
+      status: [success, failure]

SytelineSaAppEfDataModel/SytelineSaAppDbContext.cs

@@ -32,7 +32,7 @@ namespace SytelineSaAppEfDataModel
         public DbSet<VatCodeAssociation> VatCodeAssociations { get; set; }
         public DbSet<ItemCustPriceAll> ItemCustPriceAlls { get; set; }
         public DbSet<EdiLog> EdiLogs { get; set; }
-
+        
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             var configuration = new ConfigurationBuilder()
@@ -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.Cost).IsRequired(false).HasColumnName("cost");
-                entity.Property(e => e.Price).IsRequired(false).HasColumnName("price").HasColumnType("decimal(20, 8)");
+                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);
@@ -639,7 +639,7 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.Uf_FKR_EDI_ITEM_PalletCode).HasColumnName("Uf_FKR_EDI_ITEM_PalletCode").HasMaxLength(50).IsRequired(false);
                 entity.Property(e => e.Uf_FKR_EDI_ITEM_DocumentType).IsRequired(false).HasColumnName("Uf_FKR_EDI_ITEM_DocType").HasMaxLength(50);
             });
-
+            
             modelBuilder.Entity<UserName>(entity =>
             {
                 entity.ToTable("UserNames");
@@ -684,7 +684,7 @@ namespace SytelineSaAppEfDataModel
                 entity.Property(e => e.Uf_ZPL_EmpNum).HasColumnName("uf_ZPL_emp_num").HasMaxLength(7).IsRequired(false);
                 entity.Property(e => e.Uf_PLT_EmpNum).HasColumnName("uf_PLT_emp_num").HasMaxLength(14).IsRequired(false);
             });
-
+            
             modelBuilder.Entity<EdiUser>(entity =>
             {
                 entity.ToTable("edi_users");
@@ -708,7 +708,7 @@ namespace SytelineSaAppEfDataModel
 
                 entity.HasIndex(e => e.Login).IsUnique();
             });
-
+            
             modelBuilder.Entity<MaterialTransaction>(entity =>
             {
                 entity.ToTable("ZPL_InternalNum_Matltran");
@@ -887,7 +887,7 @@ namespace SytelineSaAppEfDataModel
                     .HasMaxLength(20)
                     .IsRequired(false);
             });
-
+            
             modelBuilder.Entity<WzHeader>(entity =>
             {
                 entity.ToTable("wz_header");
@@ -907,12 +907,12 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnName("CreatedDate")
                     .HasColumnType("DateTime")
                     .IsRowVersion();
-
+                
                 entity.Property(e => e.EmailAddresses)
                     .HasColumnName("EmailAddresses")
                     .HasMaxLength(1000)
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.WzNumbers)
                     .HasColumnName("WzNumbers")
                     .HasMaxLength(500)
@@ -924,7 +924,7 @@ namespace SytelineSaAppEfDataModel
                     .HasForeignKey(e => e.FK_Client)
                     .HasConstraintName("wz_header_wz_clients_ID_fk");
             });
-
+            
             modelBuilder.Entity<WzClient>(entity =>
             {
                 entity.ToTable("wz_clients");
@@ -949,22 +949,22 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnName("CreatedDate")
                     .HasColumnType("DateTime")
                     .IsRowVersion();
-
+                
                 entity.Property(e => e.Name)
                     .HasColumnName("Name")
                     .HasMaxLength(255)
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.ShortName)
                     .HasColumnName("ShortName")
                     .HasMaxLength(30)
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.Logo)
                     .HasColumnType("VARBINARY(MAX)")
                     .IsRequired(false);
             });
-
+            
             modelBuilder.Entity<WzRowMeyle>(entity =>
             {
                 entity.ToTable("wz_row_meyle");
@@ -1010,12 +1010,12 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnName("part_number")
                     .HasMaxLength(100)
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.TransactionNumber)
                     .HasColumnName("trans_num")
                     .HasColumnType("int")
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.FaIndex)
                     .HasColumnName("fa_index")
                     .HasMaxLength(100)
@@ -1025,14 +1025,14 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnName("part_number_sl")
                     .HasMaxLength(100)
                     .IsRequired(false);
-
+                
                 // Relationship
                 entity.HasOne(e => e.Header)
                     .WithMany()
                     .HasForeignKey(e => e.FK_Header)
                     .HasConstraintName("wz_rows_meyle_wz_header_ID_fk");
             });
-
+            
             modelBuilder.Entity<ItemCust>(entity =>
             {
                 entity.ToTable("itemcust");
@@ -1175,7 +1175,7 @@ namespace SytelineSaAppEfDataModel
                     .HasDatabaseName("IX_itemcust_RowPointer")
                     .IsUnique();
             });
-
+            
             modelBuilder.Entity<Lot>(entity =>
             {
                 entity.ToTable("lot");
@@ -1319,7 +1319,7 @@ namespace SytelineSaAppEfDataModel
                     .HasDatabaseName("IX_lot_RowPointer")
                     .IsUnique();
             });
-
+            
             modelBuilder.Entity<EdiCustomerOrderImport>(entity =>
             {
                 entity.ToTable("edi_co_import");
@@ -1553,7 +1553,7 @@ namespace SytelineSaAppEfDataModel
 
                 entity.HasIndex(e => e.RowPointer).HasDatabaseName("IX_customer_RowPointer").IsUnique();
             });
-
+            
             modelBuilder.Entity<CustomerTp>(entity =>
             {
                 entity.ToTable("cust_tp");
@@ -1742,7 +1742,7 @@ namespace SytelineSaAppEfDataModel
                     .HasDatabaseName("IX_cust_tp_RowPointer")
                     .IsUnique();
             });
-
+            
             modelBuilder.Entity<Item>(entity =>
             {
                 entity.ToTable("item");
@@ -2001,7 +2001,7 @@ namespace SytelineSaAppEfDataModel
                     .HasDatabaseName("IX_item_RowPointer")
                     .IsUnique();
             });
-
+            
             modelBuilder.Entity<VatCodeAssociation>(entity =>
             {
                 entity.ToTable("ZPL_VAT_CodesAssociations");
@@ -2311,7 +2311,7 @@ namespace SytelineSaAppEfDataModel
                     .HasMaxLength(200)
                     .IsRequired(false);
             });
-
+            
             modelBuilder.Entity<ItemCustPriceAll>(entity =>
             {
                 entity.ToTable("itemcustprice_all");
@@ -2344,7 +2344,6 @@ namespace SytelineSaAppEfDataModel
 
                 entity.Property(e => e.ContPrice)
                     .HasColumnName("cont_price")
-                    .HasColumnType("decimal(20, 8)")
                     .IsRequired(false);
 
                 entity.Property(e => e.BrkQty1)
@@ -2480,7 +2479,7 @@ namespace SytelineSaAppEfDataModel
                     .HasDatabaseName("IX_itemcustprice_all_RowPointer")
                     .IsUnique();
             });
-
+            
             modelBuilder.Entity<EdiLog>(entity =>
             {
                 entity.ToTable("edi_logs");
@@ -2517,7 +2516,7 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnType("datetime")
                     .IsRequired();
             });
-
+            
             modelBuilder.Entity<WzRowMarelli>(entity =>
             {
                 entity.ToTable("wz_row_mareli");
@@ -2568,12 +2567,12 @@ namespace SytelineSaAppEfDataModel
                     .HasColumnName("wz_number")
                     .HasMaxLength(50)
                     .IsRequired(false);
-
+                
                 entity.Property(e => e.FaIndex)
                     .HasColumnName("fa_index")
                     .HasMaxLength(30)
                     .IsRequired(false);
-
+        
                 entity.Property(e => e.TransactionNumber)
                     .HasColumnName("trans_num")
                     .HasColumnType("int")
@@ -2587,4 +2586,4 @@ namespace SytelineSaAppEfDataModel
             });
         }
     }
-}
+}