165 Commits

Author SHA1 Message Date
8d626356c7 * Changed interval to 30
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:45:02 +01:00
9fd026ce71 * Changed interval to 25
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:42:34 +01:00
0a81374164 test webhook
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:34:58 +01:00
c586e2875a test webhook 2026-01-11 13:34:58 +01:00
638d7faf56 test webhook 2026-01-11 13:34:58 +01:00
792283f8e2 test webhook 2026-01-11 13:34:58 +01:00
8eda96003f test webhook 2026-01-11 13:34:58 +01:00
639a3547b2 test webhook 2026-01-11 13:34:58 +01:00
7a55775562 test webhook 2026-01-11 13:34:58 +01:00
a4b5bced79 test webhook 2026-01-11 13:34:58 +01:00
c6dadb2d61 Update .woodpecker.yml 2026-01-11 13:34:58 +01:00
9ef085b582 test webhook 2026-01-11 13:34:58 +01:00
815165b496 test webhook 2026-01-11 13:34:58 +01:00
9b4b075b0c test webhook 2026-01-11 13:34:58 +01:00
41c9c69eb1 test webhook 2026-01-11 13:34:58 +01:00
42f5ef38c8 * Changed query interval to 30
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:26:04 +01:00
ed93202fd4 * Changed query interval to 25
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:22:09 +01:00
7842696a34 test webhook 2026-01-11 13:22:09 +01:00
fe49432d0c test webhook 2026-01-11 13:22:09 +01:00
865211131e test webhook 2026-01-11 13:22:09 +01:00
ad2268d642 test webhook 2026-01-11 13:22:09 +01:00
f2686188e0 * Changed QueryInterval back
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 13:14:49 +01:00
048a2097c3 * Changed query interval
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-11 12:49:48 +01:00
2fd327e3b8 Merge branch 'master' into Warehouses 2026-01-11 11:43:47 +00:00
cb71d6abed * Fixed references 2026-01-11 12:42:41 +01:00
9cedf4402e * Changed nugets for API 2026-01-10 22:23:02 +01:00
94c5c8c436 Merge pull request 'Warehouses' (#3) from Warehouses into master
Reviewed-on: http://git.modwad.pl/FA/FA_WEB/pulls/3
2026-01-10 21:16:09 +00:00
8cc1981305 Update .woodpecker.yml 2026-01-10 21:15:43 +00:00
8e9a2a0975 * Added removing generating package on build
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2026-01-10 22:06:04 +01:00
51a96f6c6a Change .woodpecker.yml 2026-01-10 21:59:06 +01:00
7d37b7744c * Added missing info to OrderManagementDataModel.csproj 2026-01-10 21:53:38 +01:00
a26a52b078 force pipeline detection - dodanie cache buster w .woodpecker.yml 2026-01-10 21:53:38 +01:00
2f80dbc13c test webhook 2026-01-10 21:53:38 +01:00
929e41e312 test webhook 2026-01-10 21:53:38 +01:00
1e7c6a6694 test webhook 2026-01-10 21:53:38 +01:00
6297ae92eb test webhook 2026-01-10 21:53:38 +01:00
14b83bf9d2 Update .gitea/workflows/build-and-publish.yml 2026-01-10 21:53:38 +01:00
8ea4a4139e Merge pull request 'force pipeline detection - dodanie cache buster w .woodpecker.yml' (#2) from Warehouses into master
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: http://git.modwad.pl/FA/FA_WEB/pulls/2
2026-01-10 20:41:51 +00:00
d04e2ec56d force pipeline detection - dodanie cache buster w .woodpecker.yml
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline failed
ci/woodpecker/pull_request_closed/woodpecker Pipeline was successful
2026-01-10 21:39:37 +01:00
f9ffdb7126 Merge pull request 'Warehouses' (#1) from Warehouses into master
Some checks failed
ci/woodpecker/manual/woodpecker Pipeline failed
Reviewed-on: http://git.modwad.pl/FA/FA_WEB/pulls/1
2026-01-10 20:24:17 +00:00
c50560566c test webhook 2026-01-09 22:49:35 +01:00
cf0428dd53 test webhook 2026-01-09 22:44:47 +01:00
2da07b6da9 test webhook 2026-01-09 22:37:45 +01:00
55f2c1b862 test webhook 2026-01-09 22:31:05 +01:00
fffbd811ce Update .gitea/workflows/build-and-publish.yml 2026-01-09 12:01:48 +00:00
30b3eb6450 Add Gitea Actions workflow for build & publish 2026-01-09 12:53:26 +01:00
2c97c5054e Add Gitea Actions workflow for build & publish 2026-01-09 12:50:12 +01:00
dfc5c52003 * Test change 2026-01-09 12:17:04 +01:00
6fed42ee64 * Test change 2026-01-09 12:16:26 +01:00
64390c5430 * Test change 2026-01-09 12:12:22 +01:00
794e30154b * Test change 2026-01-09 12:04:04 +01:00
1321c88a31 * Test change 2026-01-09 12:03:19 +01:00
2b3e36f9b9 * Test 2026-01-08 22:41:19 +01:00
38ff2c1673 * Test change 2026-01-08 22:40:27 +01:00
c6468122fd * Change 2026-01-08 22:33:10 +01:00
b29ff1f1a1 * Change 2026-01-08 22:32:10 +01:00
070b538cb2 * Another change 2026-01-08 22:31:11 +01:00
00ba9700e9 * Another test 2026-01-08 22:29:05 +01:00
b4a9d52fcd * Another change 2026-01-08 22:26:57 +01:00
d832f1b960 * Another change 2026-01-08 22:26:16 +01:00
d33f68f0cd * Another test 2026-01-08 22:23:44 +01:00
db03b35292 * Another test 2026-01-08 22:23:14 +01:00
a674a7300e * Bring back change 2026-01-08 22:15:37 +01:00
6f9b94a97c * Bring back change 2026-01-08 22:14:30 +01:00
c4a99e3c35 * Test change 2026-01-08 22:08:44 +01:00
1e796e2c13 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
26d00213d2 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
03b28eed6e Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
0baee2be8b Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
a49efec313 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
96bfccdd55 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
1f3a29b293 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
49f685f109 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
2c196c68d7 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
f0c4fef3cb Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
2b3bc03049 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
913a1ce49d Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
eb8dc3cd4f Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
4368129802 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
5d64abace3 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
1f9ae3998c Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
3c62579a49 Update .woodpecker.yml 2026-01-08 22:08:25 +01:00
e4f62fff86 * Test change 2026-01-08 22:08:06 +01:00
3a26eaa335 * Bring back change 2026-01-08 21:57:46 +01:00
c0fdf241eb * Test change 2026-01-08 21:57:46 +01:00
9f0f0d703e Merge remote-tracking branch 'origin/Warehouses' into Warehouses 2026-01-08 21:56:52 +01:00
dae2a08390 * Test change 2026-01-08 21:56:42 +01:00
7110678c7d Merge branch 'master' into Warehouses 2026-01-08 20:47:07 +00:00
0649c85e76 * Bring back change 2026-01-08 21:46:22 +01:00
4f40f33666 * Bring back change 2026-01-08 21:39:26 +01:00
724fba4177 Update .woodpecker.yml 2026-01-08 20:30:39 +00:00
bb44162bd6 Update .woodpecker.yml 2026-01-08 20:25:53 +00:00
f1d2ec2083 Update .woodpecker.yml 2026-01-08 20:23:50 +00:00
6fe6625892 Update .woodpecker.yml 2026-01-08 16:27:31 +00:00
61ba728f35 Update .woodpecker.yml 2026-01-08 16:25:23 +00:00
df6b0d56b7 Update .woodpecker.yml 2026-01-08 16:24:44 +00:00
22779715b9 Update .woodpecker.yml 2026-01-08 16:16:52 +00:00
e96d6fc2f9 Update .woodpecker.yml 2026-01-08 16:10:24 +00:00
55edcd2a2d Update .woodpecker.yml 2026-01-08 13:05:39 +00:00
606de33d41 Update .woodpecker.yml 2026-01-08 13:04:29 +00:00
41bd905bd2 Update .woodpecker.yml 2026-01-08 12:59:32 +00:00
bb4be4885d Update .woodpecker.yml 2026-01-08 12:53:08 +00:00
e8f0871230 Update .woodpecker.yml 2026-01-08 12:51:37 +00:00
09d131b89b Update .woodpecker.yml 2026-01-08 12:51:10 +00:00
9aa427aef8 Update .woodpecker.yml 2026-01-08 12:49:58 +00:00
397e13d865 Update .woodpecker.yml 2026-01-08 12:40:22 +00:00
ac565e7703 Update .woodpecker.yml 2026-01-08 12:37:04 +00:00
2167003ffd Merge pull request 'Warehouses' (#1) from Warehouses into master
Reviewed-on: http://srv51.mikr.us/git/FA/FA_WEB/pulls/1
2026-01-08 12:36:17 +00:00
7d6c3d9fd6 Merge branch 'master' into Warehouses 2026-01-08 12:36:09 +00:00
0407205b5d Update .woodpecker.yml 2026-01-08 12:35:46 +00:00
212a1feafc Merge remote-tracking branch 'origin/Warehouses' into Warehouses 2026-01-08 13:32:41 +01:00
c8b300336e * Test change to check pipeline 2026-01-08 13:32:31 +01:00
653ab748e7 Add .woodpecker.yml 2026-01-08 12:29:09 +00:00
e354881309 * Changed references to nuggets 2026-01-02 23:09:37 +01:00
107f5b173c * Changed references to nuggets 2026-01-02 23:07:45 +01:00
4788830d72 Merge branch 'master' into Warehouses 2026-01-02 22:05:07 +01:00
aa1bd5167e * Added project types 2026-01-02 22:04:39 +01:00
398e0d5796 Update .woodpecker.yml 2026-01-02 22:02:39 +01:00
21d6c76f37 Update .woodpecker.yml 2026-01-02 21:58:07 +01:00
21336e8dc6 Update .woodpecker.yml 2026-01-02 21:56:52 +01:00
b87b574b7d Update .woodpecker.yml 2026-01-02 21:50:12 +01:00
cfbaaf85ac Update .woodpecker.yml 2026-01-02 21:47:38 +01:00
ac8213ff04 Update .woodpecker.yml 2026-01-02 21:44:51 +01:00
b290ff47f2 Update .woodpecker.yml 2026-01-02 21:42:50 +01:00
bc968a1a0f Update .woodpecker.yml 2026-01-02 21:30:13 +01:00
fc72354331 Merge pull request 'Warehouses' (#2) from Warehouses into master
Reviewed-on: http://srv51.mikr.us/git/FA/FA_WEB/pulls/2
2026-01-02 21:28:02 +01:00
8defd33651 Merge remote-tracking branch 'origin/Warehouses' into Warehouses 2026-01-02 21:26:22 +01:00
dfeecd59d8 * Changed .csproj 2026-01-02 21:26:07 +01:00
ae982f59e3 * Updated ProjectType 2026-01-02 21:25:00 +01:00
be8102c777 trigger pipeline test 2026-01-02 21:25:00 +01:00
c9217867df * Updated ProjectType 2026-01-02 21:14:33 +01:00
e7e5e7fbb0 Update .woodpecker.yml 2026-01-02 21:13:19 +01:00
568d2d3918 Update .woodpecker.yml 2026-01-02 14:26:40 +01:00
a301ca1ecc Update .woodpecker.yml 2026-01-02 14:16:54 +01:00
4c3397f5c5 Update .woodpecker.yml 2026-01-02 14:15:55 +01:00
f3977428ef Update .woodpecker.yml 2026-01-02 14:14:57 +01:00
e04f133b49 Update .woodpecker.yml 2026-01-02 14:13:40 +01:00
6770e41a6e Update .woodpecker.yml 2026-01-02 14:11:52 +01:00
04a43d6f04 trigger pipeline test 2026-01-02 14:08:43 +01:00
b336dfe483 Update .woodpecker.yml 2026-01-02 14:07:09 +01:00
4e94cccc88 Update .woodpecker.yml 2026-01-02 13:20:39 +01:00
06491eea1f Merge pull request 'Warehouses' (#1) from Warehouses into master
Reviewed-on: http://srv51.mikr.us/git/FA/FA_WEB/pulls/1
2026-01-01 21:54:07 +01:00
ea018f2da3 Merge branch 'master' into Warehouses 2026-01-01 21:53:56 +01:00
c17387acde * Test change 2026-01-01 21:53:04 +01:00
9a4fb30d07 Add .woodpecker.yml 2026-01-01 21:52:41 +01:00
9294b538da * Test change 2025-12-31 11:35:22 +01:00
e844cbfb02 * Test change 2025-12-31 11:33:00 +01:00
d40caafce2 * Revert changes 2025-12-30 21:57:41 +01:00
890ab7a67f * Test Commit 2025-12-30 21:52:58 +01:00
a50e202786 * Test commit 2025-12-30 21:45:47 +01:00
9cc874322a * Test commit 2025-12-30 21:44:24 +01:00
8d8099f9e2 * Test commit 2025-12-30 21:33:29 +01:00
1d8c709910 * Test commit 2025-12-30 21:32:07 +01:00
d62212d3ed * Test change 2025-12-30 21:24:16 +01:00
df9ec74142 * Revert changes 2025-12-30 21:14:09 +01:00
96a61f306f * Another testing removal 2025-12-30 21:11:59 +01:00
c35060f4d3 * Removed ReverseMap for testing 2025-12-30 21:10:04 +01:00
1e889f6e9a * Removed ReverseMap from one mapping profile 2025-12-30 20:59:55 +01:00
e9a3e91082 * Extended CustomerOrdersController and CustomerOrderService 2025-12-23 12:00:28 +01:00
c4b1561cbc * Changed Database 2025-12-22 13:06:16 +01:00
6f477ee174 * Added MinVer package 2025-12-22 13:03:50 +01:00
be26bf9b6e * Database change 2025-12-22 12:58:09 +01:00
e57713fabc * Added MinVer 2025-12-22 12:54:00 +01:00
166eec9181 * Added MinVer 2025-12-22 12:52:55 +01:00
edc4aef0db Merge pull request #1 from trencik91/Syncfusion_changes
Syncfusion changes
2025-04-15 20:12:45 +02:00
11 changed files with 401 additions and 20 deletions

View File

@@ -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"

154
.woodpecker.yml Normal file
View File

@@ -0,0 +1,154 @@
skip_clone: true
when:
event: pull_request
action:
- merge
branch: master
steps:
debug-location:
image: alpine
commands:
- 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
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
# Diagnostyka sprawdź czy tag jest widoczny
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> (nie jest to biblioteka NuGet)"
fi
done
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:
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!"
# 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>
<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 "=== 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")"
dotnet nuget push "$pkg" \
--source "BaGet" \
--api-key "$BAGETTER_API_KEY" \
--skip-duplicate
done
echo "Wszystkie pakiety DataModel opublikowane w BaGetter!"
depends_on: [pack-datamodels]
build-and-publish-apps:
image: mcr.microsoft.com/dotnet/sdk:latest
commands:
- |
set -euf
cd "${CI_WORKSPACE}"
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_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
echo "Pomijam $PROJECT_NAME (nie jest to Api ani Blazor)"
fi
done
echo "Pipeline zakończony pomyślnie!"
depends_on: [publish-datamodels-to-baget]

View File

@@ -55,6 +55,13 @@ namespace FaKrosnoApi.Controllers
await service.GetByCustomerAndPo(customerNumber, customerSequence, poNumber);
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(

View File

@@ -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>

View File

@@ -1,9 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>FaKrosnoEfDataModel</PackageId>
<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>
@@ -20,6 +27,10 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageReference Include="MinVer" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>();
}
}
}

View File

@@ -72,6 +72,13 @@ namespace SytelineSaAppEfDataModel.Services
.Where(x => x.CustNum == customerNumber && x.CustSeq == customerSequence && x.CustPo == poNumber)
.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)

View File

@@ -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);

View File

@@ -2,18 +2,19 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ProjectType>DataModel</ProjectType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>SytelineSaAppEfDataModel</PackageId>
<Version>1.1.2</Version>
<Authors>PK</Authors>
<Description>Data Manager for SYTELINE_SA_APP database</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\NuGet</PackageOutputPath>
<Authors>Piotr Kus</Authors>
<Description>Syteline Entity Framework Data Model</Description>
<MinVerAutoIncrement>patch</MinVerAutoIncrement>
<MinVerMinimumMajorMinor>1.0</MinVerMinimumMajorMinor>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
@@ -28,6 +29,10 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageReference Include="MinVer" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>