31 Commits

Author SHA1 Message Date
suphicakir a8ad362f8b feat: Faz 17a - Kakeibo K2, ekstre içe aktarma altyapısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 09:31:50 +03:00
suphicakir 5793490cb4 feat(ui): ekstre içe aktarma sihirbazı
Yükleme ve geçmiş, hesap kurulumu, kontroller, düzenlenebilir önizleme
(süzgeçler, sayfalama, Kakeibo grubu) ve işleme / geri alma ekranı;
İşlemler sayfasına "İçe aktar" girişi.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 09:31:44 +03:00
suphicakir ebcdf3f741 feat(import): Kakeibo çalışma kitabı için içe aktarma motoru ve servis
- Kredi Kartı / Maaş Hesabı sayfaları ayrıştırılır; ekstre toplamı ve
  bakiye zinciri kontrolü, taksit planı, iade = gelir, kart ödemesi /
  ATM / hesaplar arası = transfer, KMH ve ücretler = banka maliyeti
- Taslak parti (importBatches), hesap rolleri ve önerilen hesaplar,
  satır düzenleme (aynı açıklamalılara toplu), tek transaction'da işleme,
  parmak iziyle tekrar engeli ve toplu geri alma
- Migration 017-imports (geri alınabilir), denetim kayıtları

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 09:31:44 +03:00
suphicakir c52e8f9976 build(deps): SheetJS 0.20.3 resmi dağıtımdan vendor/ altına eklendi
npm 11 uzak tarball'ı indirmediği için paket depoya alındı
(sha256 8dc73fc3b00203e72d176e85b50938627c7b086e607c682e8d3c22c02bb99fe8);
Dockerfile deps aşaması vendor/ klasörünü kopyalar.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 09:31:37 +03:00
suphicakir b11972fda3 feat: Faz 16 - Kakeibo K1, dört harcama grubu ve banka maliyeti
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 04:52:15 +03:00
suphicakir 19536f45de chore(release): 1.1.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 04:51:35 +03:00
suphicakir c0b114efeb feat(ui): Kakeibo grupları — kategori, işlem formu, rapor ve bütçe özeti
- kategori formunda grup ve banka maliyeti; listede grup rozeti ve grupsuz uyarısı
- işlem formunda "Kategoriden: …" önerili grup seçimi, bölünmüş kalem başına
- /raporlar/kakeibo (yığılmış pay çubuğu, grup kartları, banka maliyeti, grupsuzlar, CSV)
- bütçe sayfasında Kakeibo özeti

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 04:51:35 +03:00
suphicakir afc6da1606 feat(kakeibo): dört harcama grubu, banka maliyeti ve geri alınabilir migration
- shared/kakeibo: grup devralma, banka maliyeti, kayıt bazında grup, grup özeti (saf, testli)
- kategori ve işlem/kalem modellerine kakeiboGroup ve bankCost; form şemaları
- migration 016 varsayılanları doldurur; npm run migrate -- --down <ad> ile geri alma
- Kakeibo rapor servisi: tutarlar bütçeyle aynı kaynaktan, grup değiştirmeler taşınır

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 04:51:35 +03:00
suphicakir 18c892bdcd chore(security): import/ klasörünü git ve Docker imajı dışında tut
Kişisel ekstre dosyaları (içe aktarma için) repoya ve imaja girmez.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 04:51:35 +03:00
suphicakir add845684c feat: Faz 15 - canlıya alma (Dokploy, başlatma adımı, yedekleme, duman testi)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:13:17 +03:00
suphicakir 092db5a8c2 chore(release): 1.0.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:13:10 +03:00
suphicakir 6ce8ffa4a5 docs(deploy): Dokploy canlıya alma ve MongoDB replica set kılavuzları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:13:10 +03:00
suphicakir 1bdcedefdc feat(ops): duman testi, yedekleme ve geri yükleme betikleri
- smoke-test.sh: sağlık, replica set, güvenlik başlıkları, HTTPS, oturumsuz erişim, giriş
- butcem-backup.sh: mongodump + uploads arşivi, SHA-256, 7 gün saklama
- butcem-restore.sh: bütünlük kontrolü ve onayla geri yükleme

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:13:10 +03:00
suphicakir 7d7dd61c60 feat(deploy): konteyner başlatma adımı ve sağlık kontrolünde replica set
- scripts/bootstrap.ts: replica set/PRIMARY kontrolü, migration'lar, production'da ilk admin
- esbuild ile tek dosya (dist/bootstrap.mjs), docker-entrypoint.sh ile uygulamadan önce
- /api/health yanıtında replicaSet alanı; healthcheck başlangıç payı 60 sn

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:13:10 +03:00
suphicakir 42561b570a feat: Faz 14b - cari, birikim, alışveriş, birim fiyat ve fire raporları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:53:39 +03:00
suphicakir 4b5def9452 chore(release): 0.14.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:53:02 +03:00
suphicakir c3c3c43bd1 feat(ui): cari, birikim, alışveriş, birim fiyat ve fire rapor sayfaları
- dönem seçici, tablolar, birim fiyat grafiği ve CSV indirme
- rapor ana sayfasında yeni kartlar

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:53:02 +03:00
suphicakir 8623c5a02e feat(reports): cari, birikim, alışveriş, birim fiyat ve fire rapor servisleri
- mağaza adı eşleşmesi ve aylık birim fiyat özeti (saf, birim testli)
- tamamlanan listelerin plan/gerçekleşen özeti, mağaza bazlı harcama
- ürün tipi fiyat geçmişi yükleyicisi; fire oranı ve tahmini maliyet; testler

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:53:02 +03:00
suphicakir d9a22551e1 feat: Faz 14a - dashboard ana grafiği ve finans raporları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:30:34 +03:00
suphicakir 0c421a2d34 docs(changelog): Faz 14a
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:29:25 +03:00
suphicakir 29d7b29cfa feat(ui): dashboard ana grafiği ve rapor sayfaları
- dashboard: periyot seçici ve kümülatif/dönemsel görünüm, tablo; günlük plan kartı sadeleşti
- /raporlar özet ve kategori, trend, kişi/hesap, bütçe sayfaları; ay seçici ve CSV indirme

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:29:25 +03:00
suphicakir bc2a8a3bde feat(reports): rapor ve dashboard grafiği motorları
- periyot aralıkları (haftalık, aylık, altı aylık, yıllık) ve kümülatif dönüşüm
- kategori payı, alt kategori kırılımı, önceki aya göre değişim, tasarruf oranı
- kategori, trend, kişi/hesap ve bütçe raporu servisleri; gizli hesap kuralları; testler

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:29:25 +03:00
suphicakir d77a2efcb8 refactor(budgets): bütçe, gelir planı ve günlük planı bağlam alan yardımcılara ayır
budgetFor, incomePlan, expensesByDay, incomeByDay ve monthDailyPlan raporlarda ve
dashboard grafiğinde birden çok ay için bağlamı yeniden yüklemeden kullanılır.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:29:25 +03:00
suphicakir 47396cba52 feat: Faz 13b - alışveriş sonrası giriş, karşılaştırma ve alışverişi tamamla
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:58:31 +03:00
suphicakir 6ec29aa030 chore(release): 0.13.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:57:50 +03:00
suphicakir c8678da7b5 feat(ui): alışveriş sonrası giriş ekranı ve karşılaştırma raporu
- /alisveris/:id/tamamla: alınan ürün/muadil, paket, tutar, mağaza başına hesap ve fiş, alınmayanlar
- tamamlanan listede planlanan vs. gerçekleşen raporu ve mağaza giderleri
- liste sayfası ve alışveriş modunda "Alışverişi tamamla"

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:57:50 +03:00
suphicakir bd5a20ce64 feat(shopping): alışverişi tamamla transaction'ı ve karşılaştırma motoru
- tek transaction: stok alımı, fiş kaynaklı fiyat, mağaza başına bölünmüş gider, fiş ekleri, kalanların taşınması
- muadil, markasız ürün tipi ve plansız ekstra satırları; stok → gider kategorisi eşlemesi ve yedek kategori
- compareShopping saf fonksiyonu: aynı/muadil/alınmadı/ekstra, farkın nedenlere tam ayrışması
- tamamlanan listede rapor görüntüsü; testler

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:57:50 +03:00
suphicakir 3dd9834a3d feat: Faz 13a - alışveriş listeleri, akıllı mağaza önerisi ve alışveriş modu
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:29:29 +03:00
suphicakir 55f2269f82 docs(changelog): Faz 13a
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:28:54 +03:00
suphicakir fa70168622 feat(ui): alışveriş listeleri, akıllı öneri paneli ve alışveriş modu
- /alisveris, /alisveris/:id ve /alisveris/:id/mod sayfaları; odak ve 30 sn yenileme
- stok önerileri paneli, kalem ekle/düzenle/taşı, mağazaya gruplu kontrol listesi
- dashboard Alışveriş kartı, kenar menü, ürün tipi formunda hacimli işareti

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:28:54 +03:00
suphicakir 8ab2244755 feat(shopping): alışveriş listeleri, stok eşiği önerileri ve akıllı mağaza önerisi motoru
- shoppingLists koleksiyonu (ürün tipi / marka / serbest metin kalemleri), migration 015
- planShopping saf fonksiyonu: paket yuvarlama, zahmet ve hacimli cezası, teslimat, yemek kartı önceliği, ek mağaza eşiği
- eşik önerileri onay/red (red stok yenilenene kadar), ürün tipine hacimli işareti
- fiyat servisinde ortak loadTypeOffers; seed listeleri ve testler

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:28:54 +03:00
143 changed files with 16020 additions and 196 deletions
+2
View File
@@ -2,6 +2,7 @@
node_modules
.next
out
dist
coverage
*.tsbuildinfo
next-env.d.ts
@@ -10,6 +11,7 @@ next-env.d.ts
.env*
!.env.example
uploads
import
# Geliştirme araçları
.git
+4
View File
@@ -46,3 +46,7 @@ next-env.d.ts
# local tooling
/scratch/
/dist
# Kişisel ekstre dosyaları (içe aktarma için) — asla repoya girmez
/import/
+1
View File
@@ -5,3 +5,4 @@ coverage
uploads
next-env.d.ts
docs/PROMPT.md
dist/
+113
View File
@@ -6,6 +6,119 @@ Biçim [Keep a Changelog](https://keepachangelog.com/tr-TR/1.1.0/) esas alınır
## [Yayınlanmamış]
Faz 17a: Kakeibo K2 — ekstre içe aktarma altyapısı.
### Eklendi
- **Ekstre içe aktarma** (`/islemler/ice-aktar`, İşlemler sayfasında "İçe aktar"): Kakeibo çalışma kitabı (.xlsx; "Kredi Kartı" ve "Maaş Hesabı" sayfaları) yüklenir, önce taslak olarak önizlenir, sonra tek seferde işlenir.
- Kurulum adımı: dosyanın ihtiyaç duyduğu hesaplar (kredi kartı, maaş hesabı, nakit, ek hesap) mevcut hesaplardan seçilir ya da önerilen açılış bakiyesiyle tek tıkla oluşturulur (açılış bakiyesi dosyadaki devreden bakiyeden, kart borcu ilk kart ödemesinden).
- Kontroller: her ekstre için **ekstre toplamı = satır toplamı**, maaş hesabı bakiye zinciri ve son bakiye, daha önce aktarılmış satırlar, bekletilen altın satırları ve oluşturulacak kategoriler.
- Önizleme: satır başına tür (gider / gelir / atla), kategori ve Kakeibo grubu düzenlenebilir; "aynı açıklamalı tüm satırlara uygula"; İnceleme gereken / Grupsuz / Transfer / Atlanacak süzgeçleri.
- Muhasebe kuralları: kart ödemesi, ATM çekimi ve hesaplar arası havale transfer (çift sayma yok); kampanya iadesi ve iadeler gelir ("İade"); KMH faizi, KKDF/BSMV ve banka ücretleri banka maliyeti; taksitler ekstreye yansıdığı kesim tarihinde, ortak taksit planıyla; aynı gün çıkan promosyon çifti atlanır.
- Tekrar engeli: her satırın parmak izi saklanır; aynı dosya yeniden yüklendiğinde aktarılmış satırlar atlanır. **Toplu geri alma** aktarmanın tüm işlemlerini siler ve dosya yeniden aktarılabilir hale gelir.
- Eksik Kakeibo kategorileri (Sigorta, Online alışveriş, Elektronik ve hobi, Kitap ve kültür; Prim, Yol parası, Avans, Eş katkısı, Aile desteği) işlenirken oluşturulur.
- Migration `017-imports`: aktarma partileri ve işlem parmak izi dizinleri (geri alınabilir).
- Testler: çalışma kitabı ayrıştırma, taksit metni, ekstre ve bakiye kontrolleri (birim); taslak, hesap oluşturma, toplu düzenleme, işleme, bakiyeler, tekrar yükleme ve geri alma (entegrasyon).
### Bilinen sınırlamalar
- Altın alım/satım satırları Faz 17b'de altın hesabı dosyasıyla eşleştirilene dek bekletilir; o zamana dek maaş hesabı bakiyesi bu satırların neti kadar farklı görünür.
- Yapı Kredi "Güncel Dönem" (.xls) ve Ek Hesap / Altın Hesabı (PDF) dosyaları Faz 17b'de.
## [1.1.0] - 2026-11-07
Faz 16: Kakeibo K1 — dört harcama grubu.
### Eklendi
- Kakeibo grupları: gider kategorilerine **Zorunlu / İstek / Kültür / Beklenmeyen** grubu; alt kategori grubu üst kategoriden devralır. Kategori formunda grup seçimi ve açıklaması; kategori listesinde grup rozeti (devralınan soluk) ve grupsuz kategori uyarısı.
- **Banka maliyeti:** KMH faizi, KKDF/BSMV, kart ve hesap ücretleri Kakeibo harcamasına ve dört gruba girmez, ayrı gösterilir (kategori düzeyinde işaret, alt ağaç devralır).
- İşlem formunda **Kakeibo grubu**: varsayılan kategoriden ("Kategoriden: Zorunlu"), bu kayıt için değiştirilebilir; bölünmüş işlemde kalem başına.
- Kakeibo raporu (`/raporlar/kakeibo`): Kakeibo harcaması ve grup payları (yığılmış çubuk), grup başına tutar, pay, önceki aya göre değişim ve kategori kırılımı; banka maliyeti ve grupsuz harcamalar ayrı; CSV. Bütçe sayfasında seçili ayın Kakeibo özeti.
- Migration `016-kakeibo-groups`: varsayılan kategoriler beceri eşlemesine göre doldurulur (kullanıcı kategorileri grupsuz kalır, mevcut seçimlere dokunulmaz, kategori silinmez). Migration'lar geri alınabilir: `npm run migrate -- --down <ad>`.
- Testler: grup devralma, banka maliyeti, kayıt bazında grup, grup özeti ve sıfıra bölme (birim); varsayılan gruplar, rapor toplamı = bütçenin gerçekleşeni, grup değiştirme, kategori güncelleme, migration geri alma/yeniden uygulama (entegrasyon).
### Güvenlik
- `import/` klasörü (kişisel ekstre dosyaları) git'e ve Docker imajına girmez.
## [1.0.0] - 2026-11-07
Faz 15: canlıya alma (Dokploy + Gitea, `butcem.ta1sph.website`).
### Eklendi
- Konteyner başlatma adımı (`docker-entrypoint.sh` → `scripts/bootstrap.mjs`): MongoDB replica set ve PRIMARY kontrolü (yoksa açık hata mesajıyla durur), bekleyen migration'lar, `SEED_ADMIN_*` tanımlıysa ilk admin hesabı (varsa dokunulmaz). esbuild ile tek dosyaya derlenir; imajda `tsx` gerekmez. Acil durumda `SKIP_BOOTSTRAP=1`.
- `/api/health` yanıtında `replicaSet` alanı (transaction desteğinin canlıda doğrulanması için).
- `docs/DEPLOY.md`: Dokploy uygulama kurulumu, ortam değişkenleri, volume, domain/HTTPS, Gitea webhook ile otomatik deploy, güncelleme/geri alma, yedekleme, geri yükleme ve sorun giderme; her komut açıklamalı.
- `docs/MONGODB-KURULUM.md`: mongo:7 servisinde replica set kontrolü, keyfile ile tek düğümlü replica set'e geçiş, uygulama kullanıcısı yetkileri, bağlantı dizesi, transaction denemesi.
- `scripts/smoke-test.sh`: sağlık (veritabanı, replica set, sürüm), güvenlik başlıkları, HTTP→HTTPS, oturumsuz erişim engeli ve isteğe bağlı giriş kontrolü; veri değiştirmez.
- `scripts/backup/`: günlük yedek betiği (mongodump + uploads arşivi, SHA-256 özetleri, 7 gün saklama, parola komut satırında görünmez), onaylı geri yükleme betiği ve ayar örneği.
### Değişti
- Docker imajı: `ENTRYPOINT` başlatma adımıyla; sağlık kontrolü başlangıç payı 60 sn.
- Uygulama mongo:7.0 ile uyumlu (tüm entegrasyon testleri mongo:7 replica set'e karşı geçti).
## [0.14.0] - 2026-11-07
Faz 14: dashboard ana grafiği ve raporlar (14a ve 14b alt fazları).
### Eklendi — Faz 14b: cari, birikim, alışveriş, birim fiyat ve fire raporları
- Cari ve aynî borçlar (`/raporlar/cari`): bakiyesi olan cariler (bana borçlu / ben borçluyum, vade durumu), açık aynî borç ve alacaklar kalan miktar ve güncel TL değeriyle; toplamlar.
- Birikim kâr/zarar (`/raporlar/birikim`): varlık başına miktar, maliyet, güncel değer, gerçekleşmemiş ve gerçekleşen K/Z; son 3/6/12 ay veya tümü için dönem özeti (başlangıç değeri, yatırılan, satıştan alınan, bitiş değeri, dönem kârı).
- Alışveriş (`/raporlar/alisveris`): tamamlanan listelerde planlanan / gerçekleşen / fark, eşleşme sayıları ve farkın nedenleri; mağaza bazlı harcama (alıcısı mağaza adıyla başlayan giderler, şubeler birlikte, "Alışverişi tamamla"dan gelen kısım ayrıca).
- Birim fiyat geçmişi (`/raporlar/birim-fiyat`): ürün tipi seçimi, son 12 bütçe ayında aylık en düşük ve ortalama birim fiyat (grafik ve tablo), mağazalarda dönemin en düşük birim fiyatı.
- Fire / zarar (`/raporlar/fire`): ürün tipi başına fire, alım, fire/alım oranı, nedenlere göre dağılım ve tahmini maliyet (fire × son bilinen birim fiyat).
- Hepsinde CSV dışa aktarma; rapor ana sayfasında yeni rapor kartları.
- Testler: mağaza adı eşleşmesi ve aylık birim fiyat özeti (birim); cari/aynî, birikim, alışveriş (tamamlanan liste dahil), birim fiyat ve fire raporları (entegrasyon).
### Eklendi — Faz 14a: dashboard ana grafiği ve finans raporları
- Dashboard ana çizgi grafiği: Planlanan gelir (yeşil), Planlanan gider / bütçe (mavi, kesikli), Gerçekleşen gider (kırmızı). Periyotlar: Haftalık (bu hafta, günlük), Aylık (bütçe ayı, günlük), Altı aylık ve Yıllık (bütçe ayları). Kümülatif / dönemsel görünüm; seçim URL'de (`?periyot=…&gorunum=…`). Bütçesi olmayan dönemde bütçe çizgisi boş, gelecek günlerde gerçekleşen çizilmez; grafiğin altında tablo görünümü.
- Raporlar (`/raporlar`): bu bütçe ayının özeti (gelir, gider, net, tasarruf oranı, en çok harcanan kategoriler) ve rapor sayfaları; her raporda ay seçici ve CSV dışa aktarma (Türkçe Excel uyumlu).
- Kategori dağılımı: halka grafik ve tablo; üst kategori toplamları ve alt kategori kırılımı, toplam gidere oran (%14,3 gibi), önceki aya göre tutar ve yüzde değişim. Dilim renkleri kategorinin kendi rengi; 7'den fazla kategori "Diğer"de toplanır.
- Aylık trend: son 12 bütçe ayı gelir ve gider sütunları, ayrı grafikte tasarruf oranı (devam eden ay grafikte gösterilmez), net ve 12 ay toplamı.
- Kişi ve hesap bazlı: gideri kaydeden üyeye göre harcama ve pay; hesap başına gelir, gider, gelen/giden transfer ve net değişim. Başka üyelerin "yalnızca ben" hesapları hesap tablosunda hiç görünmez.
- Bütçe ve gerçekleşen: kategori bazında limit, gerçekleşen, kalan ve kullanım; son 6 ayın limit/gerçekleşen karşılaştırması.
- Kurallar bütçeyle aynı: bütçe ayı, gerçekleşmiş işlemler, bölünmüş işlemler kalem bazında, taksit modu ve gizli hesap giderleri hane ayarına göre.
- Testler: periyot aralıkları ve kümülatif dönüşüm, kategori payı/değişim/tasarruf oranı ve alt kategori kırılımı (birim); rapor toplamlarının bütçeyle tutarlılığı, gizli hesap görünürlüğü, dashboard periyotları (entegrasyon).
### Değişti — Faz 14a
- Dashboard'daki günlük plan kartı istatistik ve tabloya indi; kümülatif ay grafiği ana grafiğin "Aylık" görünümüne taşındı.
- Bütçe, gelir planı ve günlük plan hesapları bağlam alan yardımcılara ayrıldı (raporlarda birden çok ay için yeniden kullanılır).
## [0.13.0] - 2026-11-06
Faz 13: alışveriş listeleri, akıllı mağaza önerisi, alışveriş modu ve alışveriş sonrası giriş (13a ve 13b alt fazları).
### Eklendi — Faz 13b: alışveriş sonrası giriş, karşılaştırma ve "Alışverişi tamamla"
- Alışveriş sonrası giriş (`/alisveris/:id/tamamla`): liste kalemleri tek tek işaretlenir; her biri için alınan ürün (aynı ya da aynı ürün tipinden muadil; ürün tipi kaleminde marka belirtmeden de), mağaza, paket adedi ve ödenen tutar. Tutar, bilinen paket fiyatıyla ön doldurulur. Listede olmayan ekstra ürünler eklenebilir. Mağaza başına ödeme hesabı (yemek kartı geçen mağazada uygun yemek kartı önseçili) ve fiş görselleri.
- "Alışverişi tamamla" tek MongoDB transaction'ı: stok alım hareketleri, fiyat kayıtları (kaynak `receipt`; ürün × mağaza başına, paket fiyatı = tutar / paket), mağaza başına bölünmüş gider işlemi (kalemler stok kategorisinin eşlendiği gider kategorisine; eşlenmemiş ve serbest metin kalemleri seçilen yedek kategoriye), fiş görselleri işlemin eki, alınmayanların taşınması ve listenin kapanması. Herhangi bir adım başarısızsa hiçbir şey yazılmaz.
- Alınmayanlar: başka aktif listeye taşı, yeni liste aç ya da bırak.
- Karşılaştırma raporu (tamamlanan listede): planlanan (tamamlama anındaki akıllı öneri) vs. gerçekleşen tutar ve fark; farkın nedenleri (aynı üründe fiyat farkı, miktar farkı, muadil, alınmayanlar, plansız ekstralar, planda fiyatı olmayanlar; toplamları farka eşit); kalem bazında Aynı / Muadil / Alınmadı / Plansız ekstra; mağaza giderleri ve kullanılan hesaplar. Etiketler tamamlama anındaki hâliyle saklanır.
- Liste sayfasında ve alışveriş modunda "Alışverişi tamamla" düğmesi.
- Stok hareketleri ve işlemlerde `shoppingListId` (kaynağı izlemek için).
- Testler: eşleşme ve fark ayrıştırması (birim); tamamlama ekranı verisi, doğrulamalar (muadil tipi, gelecek tarih, izleyici), ek dosya hatasında geri alma, stok/fiyat/mağaza başına bölünmüş gider, markasız kalem, kalanların taşınması ve rapor (entegrasyon).
### Eklendi — Faz 13a: alışveriş listeleri, stok önerileri, akıllı mağaza önerisi, alışveriş modu
- Alışveriş listeleri (`shoppingLists`, `/alisveris`): birden çok aktif liste; kalem olarak ürün tipi (genel), belirli ürün (marka/paket) ya da serbest metin. Miktar ürün tipinde tipin biriminde, üründe paket adedi; boşsa en az bir paket. Aynı ürün listede iki kez olamaz; kalem düzenleme, çıkarma ve başka aktif listeye taşıma. Liste silme soft delete ve denetim kaydı. Aile üyeleri aynı listeyi kullanır: sayfa odaklanınca ve 30 saniyede bir yenilenir.
- Stok eşiği önerileri: eşiğin altındaki ürün tipleri hiçbir aktif listede yoksa liste sayfasında onayla/reddet önerisi olarak gelir (fire ayarlı önerilen miktar ve nedeni). Onaylanan önerilen miktarla eklenir ("Stok önerisi" rozeti), "Tümünü ekle" ile toplu. Reddedilen öneri, ürün için yeni alım girilene (stok yenilenene) kadar gösterilmez.
- Akıllı mağaza önerisi (saf fonksiyon, birim testli): son bilinen fiyatlarla her kalem için mağaza ve marka; ihtiyacı karşılayan paket sayısı × paket fiyatı. Fiziksel mağaza ziyareti ve hacimli kalemler için zahmet skoruna bağlı maliyet cezası, online teslimat ücreti ve ücretsiz teslimat alt limiti, yemek kartı önceliği (kartın geçtiği mağazada kartla ödenebilecek tutar avantajlı sayılır; bakiye mağazalar arasında bir kez harcanır). En az mağazalı eksiksiz plandan başlanır; ek mağaza ancak tasarruf hane ayarındaki eşiği aşarsa eklenir. Çıktı: "Tek mağaza en iyi seçenek: X" ya da "Önerilen dağılım: A (7 ürün), B (3 ürün): Y (Z tasarruf)"; önerilen ve tek mağaza dağılımları, fiyatı bilinmeyen kalemler.
- Alışveriş modu (`/alisveris/:id/mod`): plana göre mağazaya gruplanmış, büyük dokunma alanlı kontrol listesi; "sepete alındı" işareti anında görünür ve kaydedilir, ilerleme çubuğu; önerilen / tek mağaza planı arasında geçiş.
- Ürün tipine "Ağır / hacimli" işareti (akıllı öneride taşıma cezası).
- Dashboard'da "Alışveriş" kartı (aktif listeler ve bekleyen öneri sayısı); stok sayfasındaki "Alınması önerilenler" alışveriş listelerine bağlanır. Kenar menüde "Alışveriş".
- Migration `015-shopping-lists`. Seed: "Haftalık market" (9 kalem: tip, marka, serbest metin, fiyatı olmayan domates) ve "Ay sonu toptan" listeleri; deterjan, yumuşatıcı, çamaşır suyu ve tuvalet kağıdı hacimli.
- Testler: planlayıcı (paket yuvarlama, marka kısıtı, eşik, eksik kapsama, zahmet ve hacimli cezası, teslimat, yemek kartı), miktar ve öneri reddi kuralları (birim); liste/kalem işlemleri, yetki, öneri onay/red, plan çıktısı, silme ve denetim (entegrasyon).
### Değişti — Faz 13a
- Fiyat servisinde ürün tipi teklifleri ortak yükleyicide (`loadTypeOffers`); tüketim analizindeki son birim fiyat da bunu kullanır.
## [0.12.0] - 2026-11-06
Faz 12: mağazalar, ürünler, fiyatlar ve birim fiyat (12a ve 12b alt fazları).
+10 -3
View File
@@ -2,6 +2,7 @@
# BÜTÇEM — çok aşamalı üretim imajı (Next.js standalone çıktı).
# Build: docker build --build-arg APP_COMMIT=$(git rev-parse --short HEAD) -t butcem .
# Çalıştır: docker run -p 3000:3000 --env-file .env.production -v butcem-uploads:/app/uploads butcem
# Başlarken: replica set kontrolü, bekleyen migration'lar, ilk admin (docker-entrypoint.sh).
ARG NODE_VERSION=26
@@ -10,6 +11,8 @@ FROM node:${NODE_VERSION}-alpine AS deps
WORKDIR /app
RUN apk add --no-cache libc6-compat
COPY package.json package-lock.json ./
# SheetJS resmi dağıtımdan vendor/ altında (npm uzak tarball indirmez).
COPY vendor ./vendor
RUN npm ci --no-audit --no-fund
# 2) Build
@@ -22,7 +25,8 @@ ENV NEXT_TELEMETRY_DISABLED=1 \
APP_COMMIT=${APP_COMMIT}
COPY --from=deps /app/node_modules ./node_modules
COPY . .
RUN npm run build
# Uygulama + başlatma betiği (migration ve ilk admin; tek dosya, tsx gerekmez).
RUN npm run build && npm run build:scripts
# 3) Çalışma zamanı — yalnızca standalone çıktı, root olmayan kullanıcı.
FROM node:${NODE_VERSION}-alpine AS runner
@@ -43,12 +47,15 @@ RUN addgroup -S -g 1001 nodejs && adduser -S -u 1001 -G nodejs nextjs \
COPY --from=builder --chown=nextjs:nodejs /app/public ./public
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
COPY --from=builder --chown=nextjs:nodejs /app/dist/bootstrap.mjs ./scripts/bootstrap.mjs
COPY --chown=nextjs:nodejs --chmod=755 docker-entrypoint.sh ./docker-entrypoint.sh
USER nextjs
VOLUME ["/app/uploads"]
EXPOSE 3000
HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
# start-period: ilk deploy'da migration'lar için pay.
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
CMD node -e "fetch('http://127.0.0.1:'+(process.env.PORT||3000)+'/api/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"
CMD ["node", "server.js"]
ENTRYPOINT ["/app/docker-entrypoint.sh"]
+24 -14
View File
@@ -52,19 +52,20 @@ Giriş kullanıcı adı **veya** e-posta ile yapılır. Kayıt kapalıdır; kull
## Scriptler
| Komut | Açıklama |
| ----------------------------- | --------------------------------- |
| `npm run dev` | Geliştirme sunucusu |
| `npm run build` / `start` | Üretim build'i / sunucusu |
| `npm run lint` | ESLint |
| `npm run typecheck` | `tsc --noEmit` |
| `npm run test` | Vitest birim testleri |
| `npm run format` | Prettier |
| `npm run db:up` / `db:down` | Lokal MongoDB'yi başlat / durdur |
| `npm run seed` / `seed:reset` | Örnek veri (Faz 4) |
| `npm run test:integration` | Entegrasyon testleri (MongoDB) |
| `npm run migrate` | Bekleyen migration'lar |
| `npm run cleanup` | Eski/bağlanmamış ek dosyaları sil |
| Komut | Açıklama |
| ----------------------------- | -------------------------------------------------------------------------------- |
| `npm run dev` | Geliştirme sunucusu |
| `npm run build` / `start` | Üretim build'i / sunucusu |
| `npm run lint` | ESLint |
| `npm run typecheck` | `tsc --noEmit` |
| `npm run test` | Vitest birim testleri |
| `npm run format` | Prettier |
| `npm run db:up` / `db:down` | Lokal MongoDB'yi başlat / durdur |
| `npm run seed` / `seed:reset` | Örnek veri (Faz 4) |
| `npm run test:integration` | Entegrasyon testleri (MongoDB) |
| `npm run migrate` | Bekleyen migration'lar |
| `npm run bootstrap` | Canlı başlatma adımı (replica set kontrolü + migration; production'da ilk admin) |
| `npm run cleanup` | Eski/bağlanmamış ek dosyaları sil |
## Haneler ve yetki
@@ -83,4 +84,13 @@ docker build --build-arg APP_VERSION=$(node -p "require('./package.json').versio
--build-arg APP_COMMIT=$(git rev-parse --short HEAD) -t butcem .
```
Canlı ortam (Dokploy, `butcem.ta1sph.website`) kurulumu Faz 15'te `docs/DEPLOY.md` içinde anlatılacak.
Konteyner başlarken `docker-entrypoint.sh` önce başlatma adımını (`scripts/bootstrap.mjs`: replica
set kontrolü, bekleyen migration'lar, `SEED_ADMIN_*` tanımlıysa ilk admin) sonra uygulamayı çalıştırır.
## Canlı ortam
- Kurulum, ortam değişkenleri, domain, volume, otomatik deploy, yedekleme ve geri yükleme:
[`docs/DEPLOY.md`](docs/DEPLOY.md)
- MongoDB replica set ve uygulama kullanıcısı: [`docs/MONGODB-KURULUM.md`](docs/MONGODB-KURULUM.md)
- Duman testi: `scripts/smoke-test.sh https://butcem.ta1sph.website`
- Yedek / geri yükleme betikleri: `scripts/backup/`
+9
View File
@@ -0,0 +1,9 @@
#!/bin/sh
# BÜTÇEM konteyner girişi: önce başlatma (replica set kontrolü, migration'lar, ilk admin),
# başarılıysa uygulama. Başlatma başarısız olursa konteyner durur; Dokploy günlüğünde sebep görünür.
# Acil durumda atlamak için: SKIP_BOOTSTRAP=1
set -e
if [ "${SKIP_BOOTSTRAP:-0}" != "1" ]; then
node /app/scripts/bootstrap.mjs
fi
exec node /app/server.js
+254
View File
@@ -0,0 +1,254 @@
# Canlıya alma (Dokploy + Gitea)
BÜTÇEM'i Atlas sunucusunda Dokploy ile `https://butcem.ta1sph.website` adresinde yayınlamak,
güncellemek, yedeklemek ve geri yüklemek için adım adım kılavuz.
**Mimari:** Gitea (`main` dalı) → webhook → Dokploy, Dockerfile ile imaj build eder → konteyner
başlarken veritabanını hazırlar (replica set kontrolü, migration'lar, ilk admin) → Next.js
uygulaması 3000 portunda → Traefik HTTPS ile dışarı açar. MongoDB aynı Dokploy ağında, dışa portsuz.
Yüklenen dosyalar `/app/uploads` volume'unda.
> Sunucu komutları Atlas'ta çalıştırılır. Her komutun altında ne yaptığı yazıyor. `<…>` ile
> gösterilen yerleri kendi değerlerinizle değiştirin.
---
## 1. Ön koşullar
- [ ] MongoDB servisi **replica set** olarak çalışıyor ve `butcem_app` kullanıcısı hazır →
[`MONGODB-KURULUM.md`](MONGODB-KURULUM.md) (1–5. adımlar).
- [ ] Gitea'da BÜTÇEM reposu (`main` dalı güncel; `git push origin main`).
- [ ] DNS: `butcem.ta1sph.website` için Atlas'ın genel IP'sine **A kaydı** (ve gerekiyorsa
modemde 80/443 yönlendirmesi Traefik'e).
```bash
dig +short butcem.ta1sph.website
```
Alan adının çözüldüğü IP'yi gösterir; Atlas'ın genel IP'si olmalı.
## 2. Dokploy'da uygulama
Dokploy › proje › **Create Service › Application**, ad: `butcem`.
### 2.1 Kaynak (General)
- **Provider:** Gitea (Dokploy › Settings › Git'te Gitea bağlantısı tanımlıysa) ya da **Git**
(repo URL'si + Dokploy'un SSH anahtarı Gitea'da deploy key olarak ekli).
- **Repository / Branch:** BÜTÇEM reposu, `main`.
- **Build Type:** `Dockerfile` (yol: `Dockerfile`, context: `.`).
- **Build Args** (isteğe bağlı): `APP_COMMIT=<kısa-commit>` — sağlık kontrolünde görünür; boşsa
`unknown` yazar. Sürüm `package.json`'dan otomatik gelir.
### 2.2 Ortam değişkenleri (Environment)
| Değişken | Değer | Not |
| --------------------- | ---------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
| `MONGODB_URI` | `mongodb://butcem_app:<parola>@<iç-host>:27017/butcem?authSource=<admin\|butcem>&replicaSet=rs0&directConnection=true` | Ayrıntı: MONGODB-KURULUM.md › 5 |
| `BETTER_AUTH_SECRET` | 32+ karakter rastgele | Aşağıdaki komutla üretin; **değiştirirseniz tüm oturumlar kapanır** |
| `BETTER_AUTH_URL` | `https://butcem.ta1sph.website` | Sonunda `/` yok |
| `SEED_ADMIN_EMAIL` | yönetici e-postası | İlk açılışta admin oluşturulur |
| `SEED_ADMIN_PASSWORD` | güçlü parola (8+) | İlk girişten sonra parolayı değiştirip bu değişkeni silebilirsiniz |
| `MAX_UPLOAD_MB` | `10` | İsteğe bağlı |
`NODE_ENV=production`, `PORT=3000` ve `UPLOAD_DIR=/app/uploads` imajda tanımlıdır; eklemeyin.
`SEED_USER_PASSWORD` canlıda kullanılmaz (örnek kullanıcı oluşturulmaz).
```bash
openssl rand -base64 32
```
`BETTER_AUTH_SECRET` için 32 baytlık rastgele bir değer üretir.
### 2.3 Volume (Advanced › Volumes / Mounts)
- **Volume Mount** · ad: `butcem-uploads` · bağlama yolu: **`/app/uploads`**.
Fiş, ürün görseli ve ek dosyalar burada tutulur; imaj yeniden oluşturulduğunda kaybolmaz.
(Bind mount yerine adlandırılmış volume kullanın; imajdaki dizin izinleri — uid 1001 — volume'a
ilk oluşturulurken aktarılır.)
### 2.4 Domain (Domains)
- **Host:** `butcem.ta1sph.website` · **Path:** `/` · **Container Port:** `3000`
- **HTTPS:** açık · **Certificate:** Let's Encrypt
### 2.5 İlk deploy
**Deploy**'a basın ve **Logs**'ta şu satırları bekleyin:
```
• MongoDB rs0 PRIMARY
✓ Migration: 001-initial-indexes — … (ilk kurulumda 15 migration)
✓ Admin oluşturuldu: <e-posta> (kullanıcı adı: admin)
✓ Ready in …
```
"MongoDB replica set olarak çalışmıyor" hatası görürseniz MONGODB-KURULUM.md › 3'ü uygulayın.
Konteynerin Docker sağlık durumu birkaç saniye içinde **healthy** olur (`/api/health`).
### 2.6 İlk giriş
`https://butcem.ta1sph.website` › kullanıcı adı **`admin`** ve `SEED_ADMIN_PASSWORD`.
1. **Yönetim › Kullanıcılar**'dan aile üyelerini oluşturun.
2. **Yönetim › Haneler**'den haneyi açıp üyeleri ve rollerini ekleyin.
3. (Önerilir) Admin parolasını **Yönetim › Kullanıcılar › kendi satırınız › Şifre sıfırla** ile
değiştirip Dokploy'da `SEED_ADMIN_PASSWORD`'u silin ve yeniden deploy edin; başlatma artık
yalnızca migration'ları çalıştırır. (Admin hesabı varken bu değişken parolayı değiştirmez.)
## 3. Duman testi (smoke test)
Kendi bilgisayarınızda, repo klasöründe:
```bash
scripts/smoke-test.sh https://butcem.ta1sph.website 1.0.0
```
Sağlık (veritabanı, replica set, sürüm), güvenlik başlıkları, HTTP→HTTPS yönlendirmesi ve
oturumsuz erişimin engellendiğini kontrol eder; **veri değiştirmez**. Tümü ✓ olmalı.
```bash
SMOKE_USER=admin SMOKE_PASSWORD='<parola>' scripts/smoke-test.sh https://butcem.ta1sph.website 1.0.0
```
Ayrıca giriş yapıp ana sayfanın açıldığını dener (parola komut geçmişine düşer; sonra
`history -d` ile silebilir ya da satırı boşlukla başlatabilirsiniz).
Elle kontrol listesi (bir kez, tarayıcıdan):
- [ ] Giriş / çıkış, telefondan PWA olarak ana ekrana ekleme.
- [ ] Bir hesap ve bir gider işlemi oluşturma (transaction'lı yazma).
- [ ] İşleme fiş fotoğrafı ekleyip görüntüleme (uploads volume).
- [ ] Bir transfer (iki hesap birden; transaction).
- [ ] Dokploy'da uygulamayı **Restart** edip fişin hâlâ açıldığını görme (volume kalıcılığı).
## 4. Otomatik deploy (Gitea webhook)
Dokploy › `butcem` › **Deployments** › **Webhook URL**'yi kopyalayın (Auto Deploy açık olmalı).
Gitea › repo › **Settings › Webhooks › Add Webhook › Gitea**:
- **Target URL:** kopyaladığınız Dokploy URL'si · **HTTP Method:** POST · **Content type:** JSON
- **Trigger On:** Push Events · **Branch filter:** `main`
- Kaydedip **Test Delivery** ile deneyin; Dokploy'da yeni bir deployment başlamalı.
Bundan sonra `git push origin main` → otomatik build ve yayın. Her deploy'da bekleyen
migration'lar uygulama açılmadan önce çalışır.
## 5. Güncelleme ve geri alma
- **Normal güncelleme:** `main`'e push (webhook) ya da Dokploy'da **Deploy**.
- **Büyük güncellemeden önce** elle yedek alın: `sudo /opt/butcem/butcem-backup.sh` (bkz. 6).
- **Geri alma:** Dokploy › Deployments › önceki başarılı deployment › **Rollback** (ya da
Gitea'da önceki commit'e dönüp push). Migration'lar yalnızca ileri yönlüdür; yeni sürümün
eklediği index/alanlar eski sürümü bozmaz. Veri bozulduysa 7'deki geri yüklemeyi kullanın.
- **Acil durum:** başlatma adımı (migration) hata verip uygulama açılmıyorsa geçici olarak
`SKIP_BOOTSTRAP=1` ortam değişkeniyle açabilirsiniz; sorunu giderince kaldırın.
## 6. Yedekleme
Günlük: `butcem` veritabanı (`mongodump`) + uploads volume arşivi + SHA-256 özetleri,
**7 gün saklama**, `/var/backups/butcem` altında. Betik: `scripts/backup/butcem-backup.sh`.
> ⚠️ Şimdilik yedekler **yalnızca sunucuda**. Disk arızasında yedekler de gider; bir sonraki adım
> olarak sunucu dışına kopya (NAS'a `rsync` ya da S3 uyumlu depolama) eklenmeli.
### 6.1 Kurulum (bir kez)
```bash
sudo install -d -m 755 /opt/butcem
```
Betikler için `/opt/butcem` klasörünü oluşturur.
```bash
sudo install -m 750 scripts/backup/butcem-backup.sh scripts/backup/butcem-restore.sh /opt/butcem/
```
Yedek ve geri yükleme betiklerini (repo klasöründen; sunucuya `scp` ile de kopyalayabilirsiniz)
`/opt/butcem`'e yalnızca root'un çalıştırabileceği izinle kopyalar.
```bash
sudo install -m 600 scripts/backup/butcem-backup.env.example /etc/butcem-backup.env
sudo nano /etc/butcem-backup.env
```
Ayar dosyasını yalnızca root'un okuyabileceği izinle oluşturur ve düzenlemek için açar. Doldurun:
- `MONGO_CONTAINER`: MongoDB konteyner adının ayırt edici kısmı (`docker ps --format '{{.Names}}'`).
- `MONGO_ROOT_USER` / `MONGO_ROOT_PASSWORD`: `butcem_root` bilgileri.
- `UPLOADS_VOLUME`: uygulamanın volume adı.
```bash
docker volume ls | grep -i uploads
```
Volume adlarını listeler (Dokploy'da verdiğiniz `butcem-uploads` adını doğrulayın).
### 6.2 İlk çalıştırma
```bash
sudo /opt/butcem/butcem-backup.sh
```
Yedeği hemen alır; sonunda `Tamam: … veritabanı, … dosya` yazmalı.
```bash
sudo ls -lh /var/backups/butcem && sudo sh -c 'cd /var/backups/butcem && sha256sum -c SHA256SUMS-*'
```
Yedek dosyalarını listeler ve bütünlüklerini doğrular (`OK`).
### 6.3 Günlük zamanlama
```bash
sudo crontab -e
```
root'un zamanlanmış görevlerini açar. Şu satırı ekleyin (her gece 03:30):
```
30 3 * * * /opt/butcem/butcem-backup.sh >> /var/log/butcem-backup.log 2>&1
```
```bash
sudo tail -n 20 /var/log/butcem-backup.log
```
Ertesi gün son yedeğin günlüğünü gösterir.
## 7. Geri yükleme
```bash
sudo ls -1 /var/backups/butcem
```
Mevcut yedekleri listeler; dönülecek tarih damgasını seçin.
1. Dokploy › `butcem` › **Stop** (yazma olmasın).
2. Geri yükleyin:
```bash
sudo /opt/butcem/butcem-restore.sh /var/backups/butcem/mongo-<damga>.archive.gz /var/backups/butcem/uploads-<damga>.tar.gz
```
Bütünlüğü kontrol eder, onay ister (`evet`), `butcem` veritabanını yedektekiyle **değiştirir**
ve uploads volume'unu arşivden yeniden yazar. Yalnızca veritabanı için ikinci dosyayı vermeyin.
3. Dokploy › **Start**, ardından duman testi (3).
**Tatbikat:** Ayda bir, en son yedeği bu adımlarla deneme amaçlı bir Dokploy kopyasına ya da
lokale (`docker compose` mongo'su) yükleyip açılıp açılmadığını kontrol edin. Yedeği hiç denenmemiş
bir yedek, yedek değildir.
## 8. Sorun giderme
| Belirti | Neden / çözüm |
| --------------------------------------------- | ---------------------------------------------------------------------------------------------- |
| Logs: `MongoDB replica set olarak çalışmıyor` | MONGODB-KURULUM.md › 3 |
| Logs: `Authentication failed` | `MONGODB_URI` kullanıcı/parola/`authSource`; parola URL kodlu mu? |
| Logs: `Geçersiz ortam değişkenleri` | Listelenen değişkeni düzeltin (ör. `BETTER_AUTH_SECRET` < 32 karakter) |
| Konteyner `unhealthy` | `curl -s https://butcem.ta1sph.website/api/health` → `db` alanı; MongoDB servisi çalışıyor mu? |
| Giriş sonrası tekrar giriş sayfası | `BETTER_AUTH_URL` alan adıyla birebir aynı mı (https, sonda `/` yok)? |
| Yüklenen dosya açılmıyor / yükleme hatası | Volume `/app/uploads`'a bağlı mı? `docker exec <app> ls -ln /app/uploads` sahibi 1001 olmalı |
| Sertifika alınamadı | DNS A kaydı ve 80 portu Traefik'e ulaşıyor mu? |
```bash
docker logs --tail 100 $(docker ps -q --filter name=<butcem-uygulama-adı> | head -n1)
```
Uygulama konteynerinin son 100 log satırını gösterir (Dokploy › Logs ile aynı).
+144
View File
@@ -0,0 +1,144 @@
# MongoDB kurulumu (canlı, Dokploy)
BÜTÇEM çok adımlı yazmaları (transfer, "Alışverişi tamamla", kart ödemesi…) **MongoDB transaction**
ile yapar. Transaction yalnızca **replica set** üzerinde çalışır; tek sunucu için **tek düğümlü
replica set** (`rs0`) yeterlidir. Uygulama başlarken bunu kontrol eder; replica set yoksa açık bir
hata mesajıyla durur.
Bu belge mevcut kurulumu esas alır: Dokploy'da **`mongo:7`** veritabanı servisi (mongo:8 sunucu
çekirdeğiyle uyumsuz), kimlik doğrulama açık, `butcem_root` (yönetici) ve `butcem_app` (uygulama)
kullanıcıları oluşturulmuş. Uygulama mongo:7.0 ile test edilmiştir (tüm entegrasyon testleri).
> Komutlar Atlas sunucusunda çalıştırılır. `<…>` ile gösterilen yerleri kendi değerlerinizle
> değiştirin. Parolaları komut geçmişine yazmamak için `mongosh` parola sorduğunda girin.
---
## 1. MongoDB konteynerini bul
```bash
docker ps --format '{{.Names}}' | grep -i mongo
```
Çalışan konteynerlerin adlarından MongoDB'ninkini listeler. Dokploy ada rastgele bir son ek ekler
(ör. `butcem-mongo-a1b2c3.1.xyz`). Aşağıda bu adı `<MONGO>` olarak kullanın; adın ayırt edici
başlangıcı (ör. `butcem-mongo-a1b2c3`) da yeterlidir.
```bash
MONGO=$(docker ps -q --filter name=<mongo-servis-adı> | head -n1); echo "$MONGO"
```
Konteyner kimliğini bir değişkene alır; sonraki komutlar `$MONGO` ile kısalır.
## 2. Replica set açık mı?
```bash
docker exec -it "$MONGO" mongosh -u butcem_root --authenticationDatabase admin \
--eval 'try { const s = rs.status(); print(s.set, s.members[0].stateStr) } catch (e) { print("REPLICA SET YOK: " + e.codeName) }'
```
Yönetici olarak bağlanıp replica set durumunu yazdırır (parolayı sorar).
- Çıktı **`rs0 PRIMARY`** ise replica set hazır; **4. adıma** geçin.
- Çıktı **`REPLICA SET YOK: NoReplicationEnabled`** ise **3. adımı** uygulayın.
## 3. Tek düğümlü replica set'i aç
Dokploy'un MongoDB servisinde bir **"Replica Set"** seçeneği varsa (sürüme göre değişir) onu açıp
servisi yeniden deploy etmeniz ve 3.4'e geçmeniz yeterlidir. Yoksa aşağıdaki elle yöntemi uygulayın.
Kimlik doğrulama açıkken replica set bir **anahtar dosyası (keyfile)** ister.
### 3.1 Yedek alın
```bash
docker exec -it "$MONGO" mongodump -u butcem_root --authenticationDatabase admin --gzip --archive=/data/db/oncesi.archive.gz
docker cp "$MONGO":/data/db/oncesi.archive.gz ~/mongo-oncesi.archive.gz && docker exec "$MONGO" rm /data/db/oncesi.archive.gz
```
Değişiklikten önce tüm veritabanlarının yedeğini konteyner içinde bir dosyaya alır (parolayı sorar),
sonra ev dizinine kopyalayıp konteynerdeki kopyayı siler. Yeni kurulumda veri yoksa atlanabilir.
### 3.2 Anahtar dosyasını oluştur
```bash
docker exec "$MONGO" sh -c 'head -c 756 /dev/urandom | base64 > /data/db/rs-keyfile && chmod 400 /data/db/rs-keyfile && chown 999:999 /data/db/rs-keyfile && ls -l /data/db/rs-keyfile'
```
Kalıcı veri volume'u (`/data/db`) içinde rastgele bir anahtar dosyası üretir; yalnızca `mongodb`
kullanıcısı (uid 999) okuyabilir. Çıktıda `-r-------- … mongodb mongodb` görmelisiniz. Dosya
volume'da olduğu için yeniden başlatmalarda korunur.
### 3.3 Başlatma komutunu değiştir ve yeniden deploy et
Dokploy › MongoDB servisi › **Advanced** sekmesi › **Command** alanına:
```
mongod --replSet rs0 --bind_ip_all --keyFile /data/db/rs-keyfile
```
yazıp kaydedin ve servisi **Redeploy** edin. (`MONGO_INITDB_ROOT_*` ortam değişkenleri yerinde
kaldığı için kimlik doğrulama açık kalır.) Konteyner yeniden oluşacağından 1. adımdaki `MONGO`
değişkenini yeniden alın.
### 3.4 Replica set'i başlat (tek seferlik)
```bash
docker exec -it "$MONGO" mongosh -u butcem_root --authenticationDatabase admin \
--eval 'rs.initiate({ _id: "rs0", members: [{ _id: 0, host: "localhost:27017" }] })'
```
`rs0` adlı tek üyeli replica set'i başlatır; çıktıda `{ ok: 1 }` görmelisiniz. Uygulama
`directConnection=true` ile bağlandığı için üye adresinin `localhost` olması sorun değildir.
Birkaç saniye sonra 2. adımdaki kontrolü tekrarlayın: **`rs0 PRIMARY`**.
## 4. Uygulama kullanıcısını doğrula
```bash
docker exec -it "$MONGO" mongosh -u butcem_root --authenticationDatabase admin --eval '
for (const d of ["admin", "butcem"]) {
const u = db.getSiblingDB(d).getUser("butcem_app");
if (u) print("tanımlı veritabanı:", d, "| roller:", JSON.stringify(u.roles));
}'
```
`butcem_app` kullanıcısının hangi veritabanında tanımlı olduğunu (bağlantı dizesindeki
`authSource`) ve rollerini yazdırır. Beklenen rol: `[{"role":"readWrite","db":"butcem"}]`.
Rol farklıysa düzeltin:
```bash
docker exec -it "$MONGO" mongosh -u butcem_root --authenticationDatabase admin \
--eval 'db.getSiblingDB("<authSource>").updateUser("butcem_app", { roles: [{ role: "readWrite", db: "butcem" }] })'
```
Uygulama kullanıcısına yalnızca `butcem` veritabanında okuma-yazma yetkisi verir (migration'lar
index oluşturmak için bu yetkiyle yetinir).
## 5. Bağlantı dizesi (Dokploy uygulama ortam değişkeni)
```
MONGODB_URI=mongodb://butcem_app:<parola-url-kodlu>@<iç-host>:27017/butcem?authSource=<authSource>&replicaSet=rs0&directConnection=true
```
- `<iç-host>`: Dokploy › MongoDB servisi › **Internal Host** (ör. `butcem-mongo-a1b2c3`). Uygulama
ve veritabanı aynı Dokploy ağında olduğundan **dışa port açmaya gerek yoktur**; açmayın.
- `<authSource>`: 4. adımın çıktısındaki veritabanı (`admin` veya `butcem`).
- Parolada `@ : / ? # %` gibi karakterler varsa URL kodlayın:
```bash
python3 -c 'import urllib.parse,getpass; print(urllib.parse.quote(getpass.getpass(), safe=""))'
```
Parolayı sorar ve bağlantı dizesine yazılacak kodlu hâlini basar (geçmişe düşmez).
## 6. Transaction denemesi (isteğe bağlı)
```bash
docker exec -it "$MONGO" mongosh "mongodb://butcem_app@localhost:27017/butcem?authSource=<authSource>&replicaSet=rs0&directConnection=true" --eval '
const s = db.getMongo().startSession(); const c = s.getDatabase("butcem").getCollection("tx_probe");
s.startTransaction(); c.insertOne({ a: 1 }); s.commitTransaction();
print("transaction tamam:", db.getSiblingDB("butcem").getCollection("tx_probe").countDocuments({}));
db.getSiblingDB("butcem").getCollection("tx_probe").drop();'
```
Uygulama kullanıcısıyla bağlanıp küçük bir transaction yazar, sonucu basar ve deneme
koleksiyonunu siler. `transaction tamam: 1` görmelisiniz.
+12 -2
View File
@@ -295,8 +295,13 @@ Skill fazları (0–4) uygulanır, ardından alan fazları gelir. Her faz kendi
| 13 | Alışveriş listeleri, akıllı mağaza önerisi, alışveriş modu, **alışveriş sonrası giriş ve karşılaştırma**, "alışverişi tamamla" transaction'ı | 0.13.0 |
| 14 | Dashboard (çizgi grafik + periyotlar) ve raporlar, CSV dışa aktarma | 0.14.0 |
| 15 | Canlıya alma: `docs/DEPLOY.md`, Dokploy + Gitea, domain, volume, yedekleme, smoke test | **1.0.0** |
| 16 | `/api/v1` mobil API ve mobil kimlik doğrulama | 1.1.0 |
| 17 | Otomatik fiyat sağlayıcıları (market ve altın/döviz) araştırması ve izinliyse entegrasyonu | 1.2.0 |
| 16 | **Kakeibo K1:** dört grup (Zorunlu/İstek/Kültür/Beklenmeyen), banka maliyeti ayrımı, kayıt bazında grup, Kakeibo raporu | 1.1.0 |
| 17 | **Kakeibo K2:** ekstre içe aktarma (Yapı Kredi kart/hesap, Kakeibo çalışma kitabı; önizleme, tekrar engeli, ekstre toplamı kontrolü, geri alma) | 1.2.0 |
| 18 | **Kakeibo K3:** ay planı ve dört soru (ay başı sihirbazı, harcanabilir, grup bütçeleri, haftalık nakit limiti), birikim hedefleri | 1.3.0 |
| 19 | **Kakeibo K4:** haftalık kontrol, ay sonu değerlendirmesi (pişmanlık, iyileştirme hedefleri), Kakeibo panosu (KMH faizi/gün, taksit yükü, kayıtsız nakit) | 1.4.0 |
| 20 | **Kakeibo K5:** satın almadan önce kontrol ve 24 saat bekleme listesi | 1.5.0 |
| 21 | `/api/v1` mobil API ve mobil kimlik doğrulama | 1.6.0 |
| 22 | Otomatik fiyat sağlayıcıları (market ve altın/döviz) araştırması ve izinliyse entegrasyonu | 1.7.0 |
---
@@ -324,6 +329,11 @@ Aşağıdakileri varsayılan olarak kabul ettim. Faz 0'da yalnızca bunlardan em
- **Faz 10 kararları (2026-11-06):** 10a aylık bütçe, 10b gelir planı ve günlük plan; `v0.10.0` 10b sonunda. Limit her gider kategorisine verilebilir; üst kategori limiti alt kategorileri kapsar, alt kategori limiti üstün içinde alt sınırdır (toplamda iki kez sayılmaz). Başkasının "yalnızca ben" hesabından yapılan harcama hane ayarına (gizli hesapları toplamlara kat) göre yalnızca tutar olarak bütçeye girer.
- **Faz 11 kararları (2026-11-06):** 11a stok kategorileri, ürün tipleri, hareketler, SKT ve %20 eşik; 11b periyodik sayım, fire ayarlı öneri ve tüketim analizi; `v0.11.0` 11b sonunda. Eşiğin altındaki ürünler Faz 11'de "Alınması önerilenler" listesinde gösterilir (koleksiyon yok); Faz 13'te aktif alışveriş listesine onayla/reddet önerisi olarak bağlanır. SKT alım hareketinde (isteğe bağlı) girilir; tüketim ve fire FIFO ile en eski alımdan düşülür.
- **Faz 12 kararları (2026-11-06):** 12a mağazalar ve ürünler (marka/paket, görseller), 12b fiyat kayıtları, birim fiyat ve fiyat geçmişi; `v0.12.0` 12b sonunda. Mağazalar, ürünler ve fiyatlar hane bazlıdır (hane içinde ortak, başka hane görmez). Paket birimi ürün tipinin birimine kendiliğinden çevrilemiyorsa ürün kaydında dönüşüm zorunludur ("5 kg = 33 yıkama"); her fiyat ürün tipinin biriminde karşılaştırılır.
- **Faz 13 kararları (2026-11-06):** 13a alışveriş listeleri, stok eşiği önerileri (onayla/reddet), akıllı mağaza önerisi ve alışveriş modu; 13b alışveriş sonrası giriş, karşılaştırma raporu ve "Alışverişi tamamla"; `v0.13.0` 13b sonunda. Birden çok mağazadan alışverişte mağaza başına ayrı bölünmüş gider (her mağaza için ayrı hesap ve fiş). Tamamlanınca liste kapanır ve rapor sabitlenir; alınmayanlar başka aktif listeye taşınır, yeni listeye alınır ya da bırakılır. Reddedilen öneri yeni alım girilene kadar gösterilmez. Markası belirtilmeyen ürün tipi kalemi (ör. pazardan domates) tipin biriminde stoğa işlenir, fiyat kaydı oluşmaz.
- **Faz 14 kararları (2026-11-07):** 14a dashboard ana grafiği (Haftalık/Aylık/Altı aylık/Yıllık, kümülatif/dönemsel) ve finans raporları (kategori dağılımı, aylık trend, kişi ve hesap bazlı, bütçe vs. gerçekleşen); 14b cari ve aynî borçlar, birikim kâr/zarar, alışveriş (liste vs. gerçekleşen, mağaza bazlı harcama), birim fiyat geçmişi, fire/zarar; `v0.14.0` 14b sonunda. Raporlar `/raporlar` altında ayrı sayfalar; dönem ve filtreler URL'de, her raporda CSV. "Ay" bütçe ayıdır; gider kuralları bütçeyle aynı (taksit modu, gizli hesap ayarı). Kişi bazlı harcama gideri kaydeden üyeye göre; mağaza bazlı harcama gider alıcısının mağaza adıyla başlamasına göre (şubeler birlikte).
- **Faz 15 kararları (2026-11-07):** Canlı MongoDB Dokploy servisi **mongo:7** (mongo:8 sunucu çekirdeğiyle uyumsuz); uygulama mongo:7.0'a karşı tüm entegrasyon testleriyle doğrulandı. Replica set kimlik doğrulamalı tek düğüm (`rs0`, keyfile), uygulama `directConnection=true` ile bağlanır (`docs/MONGODB-KURULUM.md`). Migration'lar ve ilk admin konteyner başlarken otomatik (`scripts/bootstrap.mjs`; replica set yoksa uygulama açılmaz). Gitea `main` push → Dokploy webhook ile otomatik deploy. Yedek: günlük `mongodump` + uploads arşivi, 7 gün, şimdilik yalnızca sunucuda (sunucu dışı kopya sonraki adım).
- **Kakeibo kararları (2026-11-07):** Uygulama `.claude/skills/kakeibo` becerisine göre Kakeibo yöntemine uyarlanır (Faz 16–20); mobil API ve fiyat sağlayıcıları öncelik değil, 21–22'ye kaydı. KMH faizi, KKDF/BSMV ve banka ücretleri "banka maliyeti"dir: dört gruba ve Kakeibo harcama toplamına girmez, ayrı gösterilir. Günlük plan korunur, Kakeibo haftalık kontrolü yanına eklenir. Kişilere giden havale/EFT gider sayılır; kampanya iadeleri "İade" geliri. Ekstre dosyaları `import/` (git ve Docker dışı); gerçek veri önce dev veritabanında denenir, canlıya aktarmadan önce sorulur.
- **Faz 16 kararları (2026-11-07):** Kakeibo grubu gider kategorisinde tutulur ve alt kategoriye devredilir; işlem ya da bölünmüş kalem bazında değiştirilebilir ("kategoriyi ürün değil amaç belirler"). Banka maliyeti işareti kategori düzeyinde (varsayılan "Banka ve kart giderleri" ağacı); grup değiştirilse bile banka maliyeti kalır. Varsayılan kategoriler beceri eşlemesine göre doldurulur, kullanıcı kategorileri grupsuz kalır ve uyarı gösterilir. Migration'lar artık geri alınabilir (`npm run migrate -- --down <ad>`).
- **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir.
---
+2
View File
@@ -20,6 +20,8 @@ const eslintConfig = defineConfig([
".next/**",
"out/**",
"build/**",
// Derlenmiş başlatma betiği (esbuild paketi).
"dist/**",
"next-env.d.ts",
]),
]);
+15 -2
View File
@@ -1,12 +1,12 @@
{
"name": "butcem",
"version": "0.12.0",
"version": "1.1.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "butcem",
"version": "0.12.0",
"version": "1.1.0",
"dependencies": {
"@hookform/resolvers": "^7.0.2",
"@tanstack/react-table": "^9.3.1",
@@ -31,6 +31,7 @@
"sonner": "^2.0.8",
"tw-animate-css": "^1.4.0",
"vaul": "^1.1.2",
"xlsx": "file:vendor/xlsx-0.20.3.tgz",
"zod": "^4.6.7"
},
"devDependencies": {
@@ -13158,6 +13159,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/xlsx": {
"version": "0.20.3",
"resolved": "file:vendor/xlsx-0.20.3.tgz",
"integrity": "sha512-oLDq3jw7AcLqKWH2AhCpVTZl8mf6X2YReP+Neh0SJUzV/BdZYjth94tG5toiMB1PPrYtxOCfaoUCkvtuH+3AJA==",
"license": "Apache-2.0",
"bin": {
"xlsx": "bin/xlsx.njs"
},
"engines": {
"node": ">=0.8"
}
},
"node_modules/yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+4 -1
View File
@@ -1,6 +1,6 @@
{
"name": "butcem",
"version": "0.12.0",
"version": "1.1.0",
"private": true,
"description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması",
"engines": {
@@ -23,6 +23,8 @@
"icons": "tsx scripts/generate-icons.ts",
"test:integration": "vitest run --config vitest.integration.config.mts",
"migrate": "tsx --conditions=react-server --env-file=.env.local scripts/migrate.ts",
"bootstrap": "tsx --conditions=react-server --env-file=.env.local scripts/bootstrap.ts",
"build:scripts": "esbuild scripts/bootstrap.ts --bundle --platform=node --format=esm --target=node22 --conditions=react-server --outfile=dist/bootstrap.mjs --external:sharp --external:kerberos --external:snappy --external:socks --external:aws4 --external:@mongodb-js/zstd --external:mongodb-client-encryption --external:gcp-metadata --external:@aws-sdk/credential-providers --banner:js=\"import { createRequire } from 'node:module'; const require = createRequire(import.meta.url);\" --log-level=warning",
"cleanup": "tsx --conditions=react-server --env-file=.env.local scripts/cleanup.ts"
},
"dependencies": {
@@ -49,6 +51,7 @@
"sonner": "^2.0.8",
"tw-animate-css": "^1.4.0",
"vaul": "^1.1.2",
"xlsx": "file:vendor/xlsx-0.20.3.tgz",
"zod": "^4.6.7"
},
"devDependencies": {
+13
View File
@@ -0,0 +1,13 @@
# /etc/butcem-backup.env — butcem-backup.sh ayarları. İzin: sudo chmod 600 /etc/butcem-backup.env
# Değerler için docs/DEPLOY.md › Yedekleme.
# MongoDB konteyner adı veya adının ayırt edici bir parçası (docker ps --format '{{.Names}}')
MONGO_CONTAINER="butcem-mongo"
MONGO_ROOT_USER="butcem_root"
MONGO_ROOT_PASSWORD=""
# Uygulamanın /app/uploads volume adı (docker volume ls)
UPLOADS_VOLUME="butcem-uploads"
BACKUP_DIR="/var/backups/butcem"
RETENTION_DAYS="7"
+66
View File
@@ -0,0 +1,66 @@
#!/usr/bin/env bash
# BÜTÇEM günlük yedek — sunucuda (Atlas) root olarak, cron ile çalışır. Ayrıntı: docs/DEPLOY.md › Yedekleme
#
# Üretir (BACKUP_DIR altında, tarih damgalı):
# mongo-YYYYmmdd-HHMMSS.archive.gz → butcem veritabanı (mongodump --archive --gzip)
# uploads-YYYYmmdd-HHMMSS.tar.gz → yüklenen dosyalar (uploads volume)
# SHA256SUMS-YYYYmmdd-HHMMSS → bütünlük özetleri
# RETENTION_DAYS günden eski yedekleri siler.
#
# Ayarlar /etc/butcem-backup.env dosyasından okunur (yalnızca root okuyabilmeli: chmod 600).
set -euo pipefail
CONFIG="${BUTCEM_BACKUP_CONFIG:-/etc/butcem-backup.env}"
# shellcheck source=/dev/null
[ -f "$CONFIG" ] && . "$CONFIG"
: "${MONGO_CONTAINER:?MONGO_CONTAINER tanımlı değil (MongoDB konteyner adı veya adının bir parçası)}"
: "${MONGO_ROOT_USER:?MONGO_ROOT_USER tanımlı değil}"
: "${MONGO_ROOT_PASSWORD:?MONGO_ROOT_PASSWORD tanımlı değil}"
: "${UPLOADS_VOLUME:?UPLOADS_VOLUME tanımlı değil (uygulamanın /app/uploads volume adı)}"
BACKUP_DIR="${BACKUP_DIR:-/var/backups/butcem}"
RETENTION_DAYS="${RETENTION_DAYS:-7}"
DB_NAME="${DB_NAME:-butcem}"
HELPER_IMAGE="${HELPER_IMAGE:-alpine:3.20}"
TS="$(date +%Y%m%d-%H%M%S)"
log() { echo "[$(date '+%F %T')] $*"; }
# Dokploy konteyner adlarına rastgele son ek ekler; adın bir parçasıyla eşleşen çalışan konteyner.
CID="$(docker ps -q --filter "name=${MONGO_CONTAINER}" | head -n1)"
[ -n "$CID" ] || { log "HATA: '${MONGO_CONTAINER}' adlı çalışan MongoDB konteyneri yok."; exit 1; }
docker volume inspect "$UPLOADS_VOLUME" >/dev/null 2>&1 || { log "HATA: '${UPLOADS_VOLUME}' volume'u yok."; exit 1; }
install -d -m 700 "$BACKUP_DIR"
MONGO_FILE="$BACKUP_DIR/mongo-$TS.archive.gz"
UPLOADS_FILE="$BACKUP_DIR/uploads-$TS.tar.gz"
# 1) MongoDB: parola komut satırında görünmesin diye geçici yapılandırma dosyasıyla.
log "MongoDB yedeği alınıyor ($DB_NAME)…"
CONF="/tmp/butcem-dump-$TS.yaml"
printf 'password: "%s"\n' "$MONGO_ROOT_PASSWORD" | docker exec -i "$CID" sh -c "umask 077 && cat > $CONF"
if ! docker exec "$CID" mongodump --quiet --config "$CONF" --username "$MONGO_ROOT_USER" \
--authenticationDatabase admin --db "$DB_NAME" --archive --gzip >"$MONGO_FILE"; then
docker exec "$CID" rm -f "$CONF"
rm -f "$MONGO_FILE"
log "HATA: mongodump başarısız."
exit 1
fi
docker exec "$CID" rm -f "$CONF"
[ -s "$MONGO_FILE" ] || { log "HATA: MongoDB yedeği boş."; exit 1; }
# 2) Yüklenen dosyalar: volume salt okunur bağlanır.
log "Uploads yedeği alınıyor ($UPLOADS_VOLUME)…"
docker run --rm -v "$UPLOADS_VOLUME":/data:ro -v "$BACKUP_DIR":/backup "$HELPER_IMAGE" \
tar czf "/backup/$(basename "$UPLOADS_FILE")" -C /data .
[ -s "$UPLOADS_FILE" ] || { log "HATA: uploads yedeği boş."; exit 1; }
# 3) Bütünlük özeti ve izinler
( cd "$BACKUP_DIR" && sha256sum "$(basename "$MONGO_FILE")" "$(basename "$UPLOADS_FILE")" >"SHA256SUMS-$TS" )
chmod 600 "$MONGO_FILE" "$UPLOADS_FILE" "$BACKUP_DIR/SHA256SUMS-$TS"
# 4) Saklama süresi
find "$BACKUP_DIR" -maxdepth 1 -type f \( -name 'mongo-*.archive.gz' -o -name 'uploads-*.tar.gz' -o -name 'SHA256SUMS-*' \) \
-mtime +"$RETENTION_DAYS" -print -delete | sed 's/^/ silindi: /'
log "Tamam: $(du -h "$MONGO_FILE" | cut -f1) veritabanı, $(du -h "$UPLOADS_FILE" | cut -f1) dosya → $BACKUP_DIR"
+52
View File
@@ -0,0 +1,52 @@
#!/usr/bin/env bash
# BÜTÇEM geri yükleme — sunucuda root olarak, ELLE çalıştırılır. Ayrıntı: docs/DEPLOY.md › Geri yükleme
#
# sudo scripts/backup/butcem-restore.sh /var/backups/butcem/mongo-….archive.gz [/var/backups/butcem/uploads-….tar.gz]
#
# DİKKAT: butcem veritabanındaki koleksiyonlar yedektekilerle DEĞİŞTİRİLİR (--drop); uploads arşivi
# verilirse volume içeriği silinip arşivden yazılır. Önce uygulamayı durdurun (Dokploy › Stop).
# Ayarlar butcem-backup.sh ile aynı dosyadan: /etc/butcem-backup.env
set -euo pipefail
CONFIG="${BUTCEM_BACKUP_CONFIG:-/etc/butcem-backup.env}"
# shellcheck source=/dev/null
[ -f "$CONFIG" ] && . "$CONFIG"
: "${MONGO_CONTAINER:?}" "${MONGO_ROOT_USER:?}" "${MONGO_ROOT_PASSWORD:?}" "${UPLOADS_VOLUME:?}"
DB_NAME="${DB_NAME:-butcem}"
HELPER_IMAGE="${HELPER_IMAGE:-alpine:3.20}"
MONGO_FILE="${1:?Kullanım: butcem-restore.sh <mongo-arşivi> [uploads-arşivi]}"
UPLOADS_FILE="${2:-}"
[ -s "$MONGO_FILE" ] || { echo "Arşiv yok veya boş: $MONGO_FILE"; exit 1; }
[ -z "$UPLOADS_FILE" ] || [ -s "$UPLOADS_FILE" ] || { echo "Arşiv yok veya boş: $UPLOADS_FILE"; exit 1; }
# Bütünlük kontrolü (aynı klasörde SHA256SUMS varsa)
DIR="$(cd "$(dirname "$MONGO_FILE")" && pwd)"
STAMP="$(basename "$MONGO_FILE" | sed -E 's/^mongo-(.*)\.archive\.gz$/\1/')"
if [ -f "$DIR/SHA256SUMS-$STAMP" ]; then
(cd "$DIR" && sha256sum -c "SHA256SUMS-$STAMP") || { echo "Bütünlük kontrolü başarısız."; exit 1; }
fi
CID="$(docker ps -q --filter "name=${MONGO_CONTAINER}" | head -n1)"
[ -n "$CID" ] || { echo "Çalışan MongoDB konteyneri yok: $MONGO_CONTAINER"; exit 1; }
echo "Geri yüklenecek: $MONGO_FILE${UPLOADS_FILE:+ ve $UPLOADS_FILE}"
echo "'$DB_NAME' veritabanındaki mevcut veri yedektekiyle DEĞİŞTİRİLECEK."
if [ "${ASSUME_YES:-0}" != "1" ]; then
read -r -p "Devam etmek için 'evet' yazın: " ANSWER
[ "$ANSWER" = "evet" ] || { echo "Vazgeçildi."; exit 1; }
fi
CONF="/tmp/butcem-restore-$$.yaml"
printf 'password: "%s"\n' "$MONGO_ROOT_PASSWORD" | docker exec -i "$CID" sh -c "umask 077 && cat > $CONF"
trap 'docker exec "$CID" rm -f "$CONF" >/dev/null 2>&1 || true' EXIT
docker exec -i "$CID" mongorestore --quiet --config "$CONF" --username "$MONGO_ROOT_USER" \
--authenticationDatabase admin --archive --gzip --drop --nsInclude "${DB_NAME}.*" <"$MONGO_FILE"
echo "✓ Veritabanı geri yüklendi."
if [ -n "$UPLOADS_FILE" ]; then
docker run --rm -v "$UPLOADS_VOLUME":/data -v "$(cd "$(dirname "$UPLOADS_FILE")" && pwd)":/backup:ro "$HELPER_IMAGE" \
sh -c "find /data -mindepth 1 -delete && tar xzf /backup/$(basename "$UPLOADS_FILE") -C /data && chown -R 1001:1001 /data"
echo "✓ Yüklenen dosyalar geri yüklendi."
fi
echo "Uygulamayı yeniden başlatın (Dokploy › Start) ve duman testini çalıştırın."
+43
View File
@@ -0,0 +1,43 @@
/**
* Canlı başlatma (Docker entrypoint, uygulamadan önce): replica set kontrolü, bekleyen migration'lar
* ve SEED_ADMIN_* tanımlıysa ilk admin hesabı (varsa dokunulmaz). İdempotent; her deploy'da çalışır.
* İmajda esbuild ile tek dosyaya derlenir (scripts/bootstrap.mjs). Lokal: npm run bootstrap
*/
import mongoose from "mongoose";
import { getDb, getMongoClient } from "@/lib/db/mongo";
import { env } from "@/lib/env";
import { runMigrations } from "./migrations";
import { closeSeedConnections, runSeed } from "./seed/run";
async function main() {
const e = env();
const hello = await getDb().admin().command({ hello: 1 });
if (!hello.setName) {
throw new Error(
"MongoDB replica set olarak çalışmıyor; transaction'lı yazmalar başarısız olur. " +
"docs/DEPLOY.md › 'MongoDB replica set' adımlarını uygulayın.",
);
}
if (!hello.isWritablePrimary) throw new Error("MongoDB düğümü PRIMARY değil (yazılamaz).");
console.log(`• MongoDB ${hello.setName} PRIMARY`);
if (e.NODE_ENV === "production" && e.SEED_ADMIN_EMAIL && e.SEED_ADMIN_PASSWORD) {
// Production'da seed yalnızca migration + admin yapar (örnek veri oluşturulmaz).
await runSeed();
} else {
await runMigrations();
if (e.NODE_ENV === "production")
console.log("• SEED_ADMIN_* tanımlı değil; admin kontrolü atlandı.");
}
}
main()
.catch((err: unknown) => {
console.error(`✗ Başlatma hatası: ${err instanceof Error ? err.message : err}`);
process.exitCode = 1;
})
.finally(async () => {
await closeSeedConnections();
await mongoose.disconnect();
await getMongoClient().close();
});
+10 -2
View File
@@ -4,9 +4,17 @@
*/
import mongoose from "mongoose";
import { getMongoClient } from "@/lib/db/mongo";
import { runMigrations } from "./migrations";
import { revertMigration, runMigrations } from "./migrations";
runMigrations()
// npm run migrate → bekleyen migration'lar
// npm run migrate -- --down <ad> → bir migration'ı geri al
const downIndex = process.argv.indexOf("--down");
const task =
downIndex >= 0
? revertMigration(process.argv[downIndex + 1] ?? "")
: runMigrations().then(() => {});
task
.catch((err: unknown) => {
console.error(err instanceof Error ? err.message : err);
process.exitCode = 1;
+10
View File
@@ -0,0 +1,10 @@
import { ShoppingListModel } from "@/models/shopping-list";
import type { Migration } from "./types";
export const migration: Migration = {
name: "015-shopping-lists",
description: "alışveriş listeleri (shoppingLists) index'leri",
async up() {
await ShoppingListModel.createIndexes();
},
};
+43
View File
@@ -0,0 +1,43 @@
import { defaultKakeibo } from "@/features/categories/service";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
/**
* Kakeibo dört grup (Faz 16): gider kategorilerine `kakeiboGroup` ve `bankCost`. Varsayılan
* kategoriler beceri eşlemesine göre doldurulur; kullanıcının kategorileri grupsuz kalır (arayüz
* "grup seç" uyarısı gösterir). Alanı zaten olan kategoriye dokunulmaz. Hiçbir kategori silinmez.
* Geri alma: alanlar kaldırılır (npm run migrate -- --down 016-kakeibo-groups).
*/
export const migration: Migration = {
name: "016-kakeibo-groups",
description: "gider kategorilerine Kakeibo grubu ve banka maliyeti; varsayılanlar dolduruldu",
async up() {
const defaults = await CategoryModel.find({
kind: "expense",
defaultKey: { $type: "string" },
kakeiboGroup: { $exists: false },
})
.select({ defaultKey: 1 })
.lean<{ _id: unknown; defaultKey: string }[]>();
const ops = defaults.map((c) => ({
updateOne: { filter: { _id: c._id }, update: { $set: defaultKakeibo(c.defaultKey) } },
}));
if (ops.length) await CategoryModel.bulkWrite(ops);
await CategoryModel.updateMany(
{ kakeiboGroup: { $exists: false } },
{ $set: { kakeiboGroup: null, bankCost: false } },
);
},
async down() {
await CategoryModel.updateMany({}, { $unset: { kakeiboGroup: "", bankCost: "" } });
await TransactionModel.updateMany(
{ kakeiboGroup: { $exists: true } },
{ $unset: { kakeiboGroup: "" } },
);
await TransactionModel.updateMany(
{ "splits.kakeiboGroup": { $exists: true } },
{ $unset: { "splits.$[].kakeiboGroup": "" } },
);
},
};
+19
View File
@@ -0,0 +1,19 @@
import { ImportBatchModel } from "@/models/import-batch";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
/** Ekstre içe aktarma (Faz 17): importBatches index'i ve işlemlerde tekrar engeli index'i. */
export const migration: Migration = {
name: "017-imports",
description: "içe aktarma partileri ve işlemlerde tekrar engeli (importKey) index'leri",
async up() {
await ImportBatchModel.createIndexes();
await TransactionModel.createIndexes();
},
async down(db) {
await db
.collection("transactions")
.dropIndex("householdId_1_importKey_1")
.catch(() => {});
},
};
+26
View File
@@ -14,6 +14,9 @@ import { migration as m011 } from "./011-stock";
import { migration as m012 } from "./012-stock-counts";
import { migration as m013 } from "./013-stores-products";
import { migration as m014 } from "./014-product-prices";
import { migration as m015 } from "./015-shopping-lists";
import { migration as m016 } from "./016-kakeibo-groups";
import { migration as m017 } from "./017-imports";
import type { Migration } from "./types";
/** Sıralı migration listesi. Yeni migration: dosyayı ekle ve buraya sırayla ekle. */
@@ -32,6 +35,9 @@ export const MIGRATIONS: Migration[] = [
m012,
m013,
m014,
m015,
m016,
m017,
];
const COLLECTION = "migrations";
@@ -61,3 +67,23 @@ export async function runMigrations(log: (line: string) => void = console.log):
if (!ran.length) log("• Bekleyen migration yok.");
return ran;
}
/**
* Bir migration'ı geri alır (yalnızca `down` tanımlıysa) ve kaydını siler; bir sonraki
* `runMigrations` onu yeniden uygular. Kullanım: npm run migrate -- --down 016-kakeibo-groups
*/
export async function revertMigration(
name: string,
log: (line: string) => void = console.log,
): Promise<void> {
const m = MIGRATIONS.find((x) => x.name === name);
if (!m) throw new Error(`Migration bulunamadı: ${name}`);
if (!m.down) throw new Error(`${name} geri alınamaz (down tanımlı değil).`);
const db = getDb();
await connectMongoose();
const col = db.collection<{ name: string }>(COLLECTION);
if (!(await col.findOne({ name }))) throw new Error(`${name} uygulanmamış.`);
await m.down(db);
await col.deleteOne({ name });
log(`↩ Geri alındı: ${name}`);
}
+5 -1
View File
@@ -1,8 +1,12 @@
import type { Db } from "mongodb";
/** Bir migration: adı dosya adıyla aynı olmalı (ör. "001-initial-indexes"). Geri alma yok; ileri yönlü. */
/**
* Bir migration: adı dosya adıyla aynı olmalı (ör. "001-initial-indexes"). İleri yönlü; Faz 16'dan
* itibaren veri değiştirenler `down` ile geri alınabilir (npm run migrate -- --down <ad>).
*/
export type Migration = {
name: string;
description: string;
up: (db: Db) => Promise<void>;
down?: (db: Db) => Promise<void>;
};
+1
View File
@@ -61,6 +61,7 @@ describe("seed", () => {
stores: 0,
products: 0,
prices: 0,
shoppingLists: 0,
});
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length);
+7 -1
View File
@@ -13,7 +13,7 @@ import { runMigrations } from "../migrations";
import { seedContacts } from "./contacts";
import { seedAssets } from "./assets";
import { seedBudgets } from "./budgets";
import { seedProductPrices, seedShopping } from "./shopping";
import { seedProductPrices, seedShopping, seedShoppingLists } from "./shopping";
import { seedStock } from "./stock";
import { seedInKind } from "./in-kind";
import { seedInstallments } from "./installments";
@@ -61,6 +61,7 @@ export type SeedSummary = {
stores: number;
products: number;
prices: number;
shoppingLists: number;
};
accounts: SeedAccountRow[];
};
@@ -91,6 +92,7 @@ const DOMAIN_COLLECTIONS = [
"stores",
"products",
"productPrices",
"shoppingLists",
];
type AuthApi = ReturnType<typeof getAuth>["api"];
@@ -150,6 +152,7 @@ export async function runSeed({
stores: 0,
products: 0,
prices: 0,
shoppingLists: 0,
},
accounts: [],
};
@@ -341,6 +344,9 @@ export async function runSeed({
log(`✓ Örnek mağazalar ve ürünler: ${shopping.stores} / ${shopping.products}`);
summary.created.prices = await seedProductPrices(householdIds, userIdMap);
if (summary.created.prices) log(`✓ Örnek ürün fiyatları: ${summary.created.prices}`);
summary.created.shoppingLists = await seedShoppingLists(householdIds, userIdMap);
if (summary.created.shoppingLists)
log(`✓ Örnek alışveriş listeleri: ${summary.created.shoppingLists}`);
// 7) Geliştirme hesapları tablosu
const all = [
+86
View File
@@ -2,6 +2,7 @@ import { Types } from "mongoose";
import { ProductModel } from "@/models/product";
import { ProductPriceModel } from "@/models/product-price";
import { ProductTypeModel } from "@/models/product-type";
import { ShoppingListModel } from "@/models/shopping-list";
import { StoreModel } from "@/models/store";
import type { MealCardProvider } from "@/shared/accounts";
import { autoConvertible } from "@/shared/products";
@@ -492,3 +493,88 @@ export async function seedProductPrices(
if (docs.length) await ProductPriceModel.collection.insertMany(docs);
return docs.length;
}
type SeedListItem =
| { type: string; qty?: number }
| { product: string; qty?: number }
| { text: string; qty?: number; unit?: string; note?: string };
/**
* Örnek alışveriş listeleri (Faz 13). Eşiğin altındaki ürünler (mercimek, tablet deterjan, diş
* macunu) listelere eklenmez; liste sayfasında öneri olarak görünür. Domatesin fiyatı yok:
* akıllı öneride "fiyatı bilinmeyen" örneği.
*/
const SHOPPING_LISTS: { ref: string; name: string; note?: string; items: SeedListItem[] }[] = [
{
ref: "haftalik",
name: "Haftalık market",
items: [
{ type: "sut", qty: 4 * K },
{ type: "yumurta", qty: 30 * K },
{ type: "pirinc", qty: 2_500 },
{ type: "beyaz-peynir", qty: 500 },
{ type: "domates", qty: 2 * K },
{ type: "toz-deterjan", qty: 40 * K },
{ type: "tuvalet-kagidi", qty: 32 * K },
{ product: "yumos-1440", qty: 1 * K },
{ text: "Doğum günü mumu", qty: 1 * K, unit: "paket", note: "Rakam mum: 7" },
],
},
{
ref: "ay-sonu",
name: "Ay sonu toptan",
note: "Metro'ya arabayla.",
items: [{ type: "camasir-suyu", qty: 4 * K }],
},
];
export async function seedShoppingLists(
householdIds: Map<string, Types.ObjectId>,
users: Map<string, string>,
): Promise<number> {
const actor = new Types.ObjectId(users.get("ayse")!);
const householdId = householdIds.get("Çakır Ailesi")!;
const [types, products] = await Promise.all([
ProductTypeModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1 })
.lean<{ _id: Types.ObjectId; seedRef: string }[]>(),
ProductModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1 })
.lean<{ _id: Types.ObjectId; seedRef: string }[]>(),
]);
const typeByRef = new Map(types.map((x) => [x.seedRef, x._id]));
const productByRef = new Map(products.map((x) => [x.seedRef, x._id]));
let created = 0;
for (const l of SHOPPING_LISTS) {
if (await ShoppingListModel.exists({ householdId, seedRef: l.ref })) continue;
const items = l.items.flatMap((i): Record<string, unknown>[] => {
const common = {
_id: new Types.ObjectId(),
quantity: i.qty ?? null,
source: "manual",
addedBy: actor,
addedAt: new Date(),
};
if ("type" in i) {
const id = typeByRef.get(i.type);
return id ? [{ ...common, kind: "type", productTypeId: id }] : [];
}
if ("product" in i) {
const id = productByRef.get(i.product);
return id ? [{ ...common, kind: "product", productId: id }] : [];
}
return [{ ...common, kind: "text", text: i.text, unit: i.unit ?? "", note: i.note ?? "" }];
});
await ShoppingListModel.create({
householdId,
name: l.name,
note: l.note ?? "",
items,
seedRef: l.ref,
createdBy: actor,
updatedBy: actor,
});
created++;
}
return created;
}
+16 -1
View File
@@ -33,6 +33,8 @@ type SeedProduct = {
waste?: { every: number; pct: number; reason: "spoiled" | "expired" | "damaged" };
/** Bu günden (gün önce) sonra yeniden alınmaz: bugün azalmış görünür. */
stopRefillDaysAgo?: number;
/** Ağır/hacimli (akıllı öneride taşıma cezası). */
bulky?: boolean;
/** Her n. sayımda küçük eksik (−%, hedefin yüzdesi). */
countDrift?: { everyCounts: number; pct: number };
};
@@ -184,6 +186,7 @@ export const PRODUCTS: SeedProduct[] = [
},
{
ref: "toz-deterjan",
bulky: true,
category: "genel-temizlik.camasir",
name: "Toz Deterjan",
unit: "yıkama",
@@ -195,6 +198,7 @@ export const PRODUCTS: SeedProduct[] = [
},
{
ref: "yumusatici",
bulky: true,
category: "genel-temizlik.camasir",
name: "Yumuşatıcı",
unit: "lt",
@@ -206,6 +210,7 @@ export const PRODUCTS: SeedProduct[] = [
},
{
ref: "camasir-suyu",
bulky: true,
category: "genel-temizlik.genel",
name: "Çamaşır Suyu",
unit: "lt",
@@ -217,6 +222,7 @@ export const PRODUCTS: SeedProduct[] = [
},
{
ref: "tuvalet-kagidi",
bulky: true,
category: "genel-temizlik.genel",
name: "Tuvalet Kağıdı",
unit: "rulo",
@@ -359,7 +365,15 @@ export async function seedStock(
const today = todayIstanbul();
let created = 0;
for (const p of PRODUCTS) {
if (await ProductTypeModel.exists({ householdId, seedRef: p.ref })) continue;
if (await ProductTypeModel.exists({ householdId, seedRef: p.ref })) {
// Faz 13 öncesi seed'lenmiş veritabanında hacimli işaretini tamamla.
if (p.bulky)
await ProductTypeModel.updateOne(
{ householdId, seedRef: p.ref, bulky: { $exists: false } },
{ $set: { bulky: true } },
);
continue;
}
const doc = await ProductTypeModel.create({
householdId,
categoryId: catByKey.get(p.category)!,
@@ -370,6 +384,7 @@ export async function seedStock(
thresholdPct: p.threshold ?? 20,
location: p.location,
step: p.step ?? K,
bulky: p.bulky ?? false,
seedRef: p.ref,
createdBy: actor,
updatedBy: actor,
+72
View File
@@ -0,0 +1,72 @@
#!/usr/bin/env bash
# BÜTÇEM duman testi (smoke test) — canlıya alma sonrası, yalnızca OKUMA yapar; veri değiştirmez.
#
# Kullanım:
# scripts/smoke-test.sh https://butcem.ta1sph.website [beklenen-sürüm]
# SMOKE_USER=admin SMOKE_PASSWORD='…' scripts/smoke-test.sh https://butcem.ta1sph.website 1.0.0
#
# Gerekenler: bash, curl. Çıkış kodu: 0 = hepsi geçti, 1 = en az bir kontrol başarısız.
set -uo pipefail
BASE="${1:?Kullanım: scripts/smoke-test.sh <adres> [beklenen-sürüm]}"
BASE="${BASE%/}"
EXPECT_VERSION="${2:-}"
FAIL=0
TMP="$(mktemp -d)"
trap 'rm -rf "$TMP"' EXIT
ok() { printf ' \033[32m✓\033[0m %s\n' "$1"; }
bad() { printf ' \033[31m✗\033[0m %s\n' "$1"; FAIL=1; }
check() { if eval "$2"; then ok "$1"; else bad "$1"; fi; }
echo "BÜTÇEM duman testi: $BASE"
echo "1) Sağlık kontrolü"
HEALTH_CODE=$(curl -s -o "$TMP/health" -w '%{http_code}' "$BASE/api/health")
HEALTH=$(cat "$TMP/health")
echo " $HEALTH"
check "GET /api/health 200" '[ "$HEALTH_CODE" = 200 ]'
check "veritabanı erişilebilir" 'grep -q "\"db\":\"ok\"" <<<"$HEALTH"'
check "MongoDB replica set (transaction için)" '! grep -q "\"replicaSet\":null" <<<"$HEALTH" && grep -q "\"replicaSet\":\"" <<<"$HEALTH"'
if [ -n "$EXPECT_VERSION" ]; then
check "sürüm $EXPECT_VERSION" 'grep -q "\"version\":\"$EXPECT_VERSION\"" <<<"$HEALTH"'
fi
echo "2) Sayfalar ve güvenlik başlıkları"
LOGIN_CODE=$(curl -s -D "$TMP/login-headers" -o /dev/null -w '%{http_code}' "$BASE/login")
H=$(tr -d '\r' <"$TMP/login-headers" | tr 'A-Z' 'a-z')
check "GET /login 200" '[ "$LOGIN_CODE" = 200 ]'
check "Content-Security-Policy var" 'grep -q "^content-security-policy:" <<<"$H"'
check "X-Frame-Options: DENY" 'grep -q "^x-frame-options: deny" <<<"$H"'
check "X-Content-Type-Options: nosniff" 'grep -q "^x-content-type-options: nosniff" <<<"$H"'
if [[ "$BASE" == https://* ]]; then
check "Strict-Transport-Security var" 'grep -q "^strict-transport-security:" <<<"$H"'
HTTP_URL="http://${BASE#https://}/login"
HTTP_CODE=$(curl -s -o /dev/null -w '%{http_code}' "$HTTP_URL")
check "HTTP → HTTPS yönlendirmesi ($HTTP_CODE)" '[[ "$HTTP_CODE" =~ ^30[1278]$ ]]'
fi
echo "3) Oturumsuz erişim engelleniyor"
DASH=$(curl -s -o /dev/null -w '%{http_code} %{redirect_url}' "$BASE/dashboard")
check "/dashboard → giriş sayfasına yönlendirme ($DASH)" '[[ "$DASH" =~ ^30[27]\ .*/login ]]'
FILE_CODE=$(curl -s -o /dev/null -w '%{http_code}' "$BASE/api/files/000000000000000000000000")
check "/api/files oturumsuz 401 ($FILE_CODE)" '[ "$FILE_CODE" = 401 ]'
CSV=$(curl -s -o "$TMP/csv" -w '%{http_code}' "$BASE/raporlar/kategoriler/csv")
check "rapor CSV'si oturumsuz veri vermiyor ($CSV)" '! grep -q "Toplam gidere oran" "$TMP/csv"'
if [ -n "${SMOKE_USER:-}" ] && [ -n "${SMOKE_PASSWORD:-}" ]; then
echo "4) Giriş ($SMOKE_USER)"
SIGN=$(curl -s -c "$TMP/jar" -o "$TMP/signin" -w '%{http_code}' -X POST "$BASE/api/auth/sign-in/username" \
-H 'Content-Type: application/json' -H "Origin: $BASE" \
--data "$(printf '{"username":"%s","password":"%s"}' "$SMOKE_USER" "$SMOKE_PASSWORD")")
check "giriş 200 ($SIGN)" '[ "$SIGN" = 200 ]'
PAGE=$(curl -s -b "$TMP/jar" -L -o /dev/null -w '%{http_code} %{url_effective}' "$BASE/dashboard")
check "oturumla ana sayfa açılıyor ($PAGE)" '[[ "$PAGE" =~ ^200\ ]] && [[ ! "$PAGE" =~ /login ]]'
curl -s -b "$TMP/jar" -X POST "$BASE/api/auth/sign-out" -H "Origin: $BASE" -o /dev/null
else
echo "4) Giriş testi atlandı (SMOKE_USER ve SMOKE_PASSWORD tanımlı değil)"
fi
echo
if [ "$FAIL" = 0 ]; then echo "Sonuç: tüm kontroller geçti."; else echo "Sonuç: başarısız kontrol var."; fi
exit "$FAIL"
+22
View File
@@ -0,0 +1,22 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ShoppingModeView } from "@/features/shopping/components/shopping-mode";
import { getShoppingList } from "@/features/shopping/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.shopping.mode.title };
/** /alisveris/:id/mod — alışverişe çıkış: mağazaya göre gruplu kontrol listesi. */
export default async function ShoppingModePage({
params,
searchParams,
}: PageProps<"/alisveris/[id]/mod">) {
const { user, household } = await requireActiveHousehold("viewer");
const [{ id }, query] = await Promise.all([params, searchParams]);
const data = await getShoppingList(user.id, household.id, id);
if (!data) notFound();
return (
<ShoppingModeView data={data} choice={query.plan === "single" ? "single" : "recommended"} />
);
}
+17
View File
@@ -0,0 +1,17 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ShoppingListDetailView } from "@/features/shopping/components/list-detail";
import { getShoppingList } from "@/features/shopping/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.shopping.title };
/** /alisveris/:id — liste kalemleri, stok önerileri ve akıllı mağaza önerisi. */
export default async function ShoppingListPage({ params }: PageProps<"/alisveris/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const { id } = await params;
const data = await getShoppingList(user.id, household.id, id);
if (!data) notFound();
return <ShoppingListDetailView data={data} />;
}
@@ -0,0 +1,19 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { CompletionForm } from "@/features/shopping/components/completion-form";
import { getCompletionSheet } from "@/features/shopping/completion";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.shopping.complete.title };
/** /alisveris/:id/tamamla — alışveriş sonrası giriş: alınanlar, ödeme, fiş, alınmayanlar. */
export default async function CompleteShoppingPage({
params,
}: PageProps<"/alisveris/[id]/tamamla">) {
const { user, household } = await requireActiveHousehold("member");
const { id } = await params;
const sheet = await getCompletionSheet(user.id, household.id, id);
if (!sheet) notFound();
return <CompletionForm sheet={sheet} />;
}
+30
View File
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { ShoppingListsView } from "@/features/shopping/components/lists-view";
import { listShoppingLists } from "@/features/shopping/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.shopping.title };
/** /alisveris — aktif ve tamamlanan alışveriş listeleri. */
export default async function ShoppingPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await listShoppingLists(user.id, household.id);
if (!data) notFound();
return (
<>
<PageHeader title={tr.shopping.title} description={tr.shopping.description} />
{!data.canWrite ? (
<p className="text-sm text-muted-foreground">{tr.shopping.readOnly}</p>
) : null}
<ShoppingListsView
active={data.active}
completed={data.completed}
suggestions={data.suggestions}
canWrite={data.canWrite}
/>
</>
);
}
+8 -1
View File
@@ -5,6 +5,7 @@ import { BudgetView } from "@/features/budgets/components/budget-view";
import { IncomePlanSection } from "@/features/budgets/components/income-plan";
import { getIncomePlan } from "@/features/budgets/plan";
import { getBudget } from "@/features/budgets/service";
import { KakeiboBudgetCard } from "@/features/reports/components/kakeibo-card";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
@@ -27,7 +28,13 @@ export default async function BudgetPage({ searchParams }: PageProps<"/butce">)
return (
<>
<PageHeader title={tr.budget.title} description={tr.budget.description} />
<BudgetView key={data.month} data={data} />
<BudgetView
key={data.month}
data={data}
summary={
<KakeiboBudgetCard userId={user.id} householdId={household.id} month={data.month} />
}
/>
<IncomePlanSection
key={`income-${data.month}`}
month={data.month}
+15 -4
View File
@@ -3,6 +3,8 @@ import Link from "next/link";
import { Suspense } from "react";
import { PageHeader } from "@/components/page-header";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton";
import { OverviewCard } from "@/features/dashboard/components/overview-card";
import { SummaryCardsSkeleton } from "@/features/dashboard/components/summary-cards-skeleton";
import { DailyPlanCard } from "@/features/budgets/components/daily-plan-card";
import { BudgetWarningBanner } from "@/features/budgets/components/warning-banner";
@@ -11,6 +13,7 @@ import { getBudget } from "@/features/budgets/service";
import { ContactsDueBanner } from "@/features/contacts/components/due-banner";
import { getNetWorth } from "@/features/net-worth/service";
import { OverdueBanner } from "@/features/recurring/components/overdue-banner";
import { ShoppingCard } from "@/features/shopping/components/shopping-card";
import { LowStockCard } from "@/features/stock/components/low-stock-card";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
@@ -83,7 +86,7 @@ async function SummaryCards({ userId, householdId }: { userId: string; household
);
}
export default async function DashboardPage() {
export default async function DashboardPage({ searchParams }: PageProps<"/dashboard">) {
const { user, household } = await requireActiveHousehold("viewer");
return (
<>
@@ -103,12 +106,20 @@ export default async function DashboardPage() {
<Suspense fallback={<SummaryCardsSkeleton />}>
<SummaryCards userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={<Skeleton className="h-96 rounded-xl" />}>
<OverviewCard userId={user.id} householdId={household.id} searchParams={searchParams} />
</Suspense>
<Suspense fallback={null}>
<DailyPlanCard userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<LowStockCard userId={user.id} householdId={household.id} />
</Suspense>
<div className="grid gap-4 lg:grid-cols-2 lg:items-start">
<Suspense fallback={null}>
<LowStockCard userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<ShoppingCard userId={user.id} householdId={household.id} />
</Suspense>
</div>
</>
);
}
@@ -0,0 +1,17 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ImportWizard } from "@/features/imports/components/import-wizard";
import { getImportDraft } from "@/features/imports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.imports.title };
/** /islemler/ice-aktar/:id — aktarma taslağı ya da işlenmiş aktarma. */
export default async function ImportPage({ params }: PageProps<"/islemler/ice-aktar/[id]">) {
const { user, household } = await requireActiveHousehold("member");
const { id } = await params;
const draft = await getImportDraft(user.id, household.id, id);
if (!draft) notFound();
return <ImportWizard key={`${draft.id}-${draft.status}`} draft={draft} />;
}
+67
View File
@@ -0,0 +1,67 @@
import { ArrowLeft, ChevronRight } from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { UploadCard } from "@/features/imports/components/upload-card";
import { listImports } from "@/features/imports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { formatDateTime } from "@/shared/format";
const t = tr.imports;
export const metadata: Metadata = { title: t.title };
/** /islemler/ice-aktar — Kakeibo çalışma kitabı yükleme ve aktarma geçmişi. */
export default async function ImportsPage() {
const { user, household } = await requireActiveHousehold("member");
const list = await listImports(user.id, household.id);
if (!list) notFound();
return (
<>
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/islemler">
<ArrowLeft />
{tr.nav.transactions}
</Link>
</Button>
<PageHeader title={t.title} description={t.description} />
<UploadCard />
<section aria-labelledby="imp-h" className="flex flex-col gap-2">
<h2 id="imp-h" className="text-sm font-medium text-muted-foreground">
{t.history}
</h2>
{list.length ? (
<ul className="divide-y rounded-xl border bg-card">
{list.map((b) => (
<li key={b.id}>
<Link
href={`/islemler/ice-aktar/${b.id}`}
className="flex items-center gap-3 p-3 text-sm hover:bg-accent/40"
>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium">{b.fileName}</span>
<span className="block text-xs text-muted-foreground">
{formatDateTime(b.createdAt)} · {t.rowsCount(b.rowCount)}
{b.committed ? ` · ${t.committed(b.committed.transactions)}` : ""}
</span>
</span>
<Badge variant={b.status === "committed" ? "default" : "secondary"}>
{t.statuses[b.status]}
</Badge>
<ChevronRight className="size-4 text-muted-foreground" aria-hidden />
</Link>
</li>
))}
</ul>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
)}
</section>
</>
);
}
@@ -0,0 +1,47 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getShoppingReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
import { parsePeriod } from "@/shared/reports";
/** GET /raporlar/alisveris/csv?donem=3|6|12&tablo=listeler|magazalar */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getShoppingReport(c.userId, c.householdId, parsePeriod(c.params.get("donem")));
if (!r) return forbidden();
const h = tr.reports.csvHeaders;
const today = todayIstanbul();
if (c.params.get("tablo") === "magazalar")
return csvResponse(
toCsv(
h.stores,
r.stores.map((s) => [
s.name,
csvMoney(s.amountMinor),
s.count,
csvPct(s.sharePct),
csvMoney(s.fromListsMinor),
]),
),
tr.reports.csvFiles.stores(today),
);
return csvResponse(
toCsv(
h.lists,
r.lists.map((l) => [
l.date,
l.name,
csvMoney(l.summary.plannedMinor),
csvMoney(l.summary.actualMinor),
csvMoney(l.summary.diffMinor),
l.summary.counts.same,
l.summary.counts.substitute,
l.summary.counts.skipped,
l.summary.counts.extra,
]),
),
tr.reports.csvFiles.lists(today),
);
}
+57
View File
@@ -0,0 +1,57 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import {
CsvButton,
RangeNav,
ReportFrame,
ToolsEnd,
} from "@/features/reports/components/report-frame";
import { ShoppingReportView } from "@/features/reports/components/shopping-waste-view";
import { getShoppingReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { parsePeriod, REPORT_PERIODS } from "@/shared/reports";
const t = tr.reports.shopping;
export const metadata: Metadata = { title: t.title };
/** /raporlar/alisveris?donem=3|6|12 — liste vs. gerçekleşen, mağaza bazlı harcama. */
export default async function ShoppingReportPage({
searchParams,
}: PageProps<"/raporlar/alisveris">) {
const { user, household } = await requireActiveHousehold("viewer");
const period = parsePeriod((await searchParams).donem);
const data = await getShoppingReport(user.id, household.id, period);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
<>
<RangeNav
path="/raporlar/alisveris"
label={tr.reports.periodLabel}
value={String(period)}
options={REPORT_PERIODS.map((p) => ({
value: String(p),
label: tr.reports.periods[p]!,
}))}
/>
<ToolsEnd>
<CsvButton
href={`/raporlar/alisveris/csv?donem=${period}&tablo=listeler`}
label={t.csvLists}
/>
<CsvButton
href={`/raporlar/alisveris/csv?donem=${period}&tablo=magazalar`}
label={t.csvStores}
/>
</ToolsEnd>
</>
}
>
<ShoppingReportView data={data} />
</ReportFrame>
);
}
@@ -0,0 +1,31 @@
import { REPORT_RANGES, type ReportRange } from "@/features/assets/service";
import { csvContext, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getAssetsReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { formatAssetQuantity } from "@/shared/assets";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
/** GET /raporlar/birikim/csv — varlık başına maliyet, değer ve kâr/zarar. */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const q = c.params.get("donem");
const range: ReportRange = REPORT_RANGES.includes(q as ReportRange) ? (q as ReportRange) : "6";
const r = await getAssetsReport(c.userId, c.householdId, range);
if (!r) return forbidden();
return csvResponse(
toCsv(
tr.reports.csvHeaders.assets,
r.items.map((a) => [
a.name || a.label,
formatAssetQuantity(a.assetKey, a.summary.quantity),
csvMoney(a.summary.costMinor),
a.summary.currentValueMinor === null ? "" : csvMoney(a.summary.currentValueMinor),
a.summary.unrealizedMinor === null ? "" : csvMoney(a.summary.unrealizedMinor),
csvMoney(a.summary.realizedMinor),
]),
),
tr.reports.csvFiles.assets(todayIstanbul()),
);
}
+46
View File
@@ -0,0 +1,46 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AssetsReportView } from "@/features/reports/components/contacts-assets-view";
import {
CsvButton,
RangeNav,
ReportFrame,
ToolsEnd,
} from "@/features/reports/components/report-frame";
import { getAssetsReport } from "@/features/reports/extra";
import { REPORT_RANGES, type ReportRange } from "@/features/assets/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
const t = tr.reports.assets;
export const metadata: Metadata = { title: t.title };
/** /raporlar/birikim?donem=3|6|12|tum — varlık kâr/zarar ve dönem özeti. */
export default async function AssetsReportPage({ searchParams }: PageProps<"/raporlar/birikim">) {
const { user, household } = await requireActiveHousehold("viewer");
const q = (await searchParams).donem;
const range: ReportRange = REPORT_RANGES.includes(q as ReportRange) ? (q as ReportRange) : "6";
const data = await getAssetsReport(user.id, household.id, range);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
<>
<RangeNav
path="/raporlar/birikim"
label={tr.reports.periodLabel}
value={range}
options={REPORT_RANGES.map((r) => ({ value: r, label: t.ranges[r]! }))}
/>
<ToolsEnd>
<CsvButton href="/raporlar/birikim/csv" />
</ToolsEnd>
</>
}
>
<AssetsReportView data={data} />
</ReportFrame>
);
}
@@ -0,0 +1,30 @@
import { csvContext, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getUnitPriceReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
import { unitPriceBase } from "@/shared/prices";
/** GET /raporlar/birim-fiyat/csv?tip=<ürün tipi> — ay başına en düşük ve ortalama (gösterim biriminde). */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getUnitPriceReport(c.userId, c.householdId, c.params.get("tip") ?? undefined);
if (!r?.selected) return forbidden();
const sel = r.selected;
const base = unitPriceBase(sel.unit);
const money = (x: number | null) => (x === null ? "" : csvMoney(Math.round(x * base.factor)));
const header = tr.reports.csvHeaders.unitPrice.map((h, i) =>
i === 1 || i === 2 ? `${h} (TL/${base.unit})` : h,
);
return csvResponse(
toCsv(
header,
sel.points.map((p) => [p.month, money(p.minMinor), money(p.avgMinor), p.count]),
),
tr.reports.csvFiles.unitPrice(
sel.name.toLocaleLowerCase("tr-TR").replace(/\s+/g, "-"),
todayIstanbul(),
),
);
}
@@ -0,0 +1,39 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { CsvButton, ReportFrame, ToolsEnd } from "@/features/reports/components/report-frame";
import { UnitPriceView } from "@/features/reports/components/unit-price-view";
import { getUnitPriceReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
const t = tr.reports.unitPrice;
export const metadata: Metadata = { title: t.title };
/** /raporlar/birim-fiyat?tip=<ürün tipi> — aylık en düşük ve ortalama birim fiyat. */
export default async function UnitPriceReportPage({
searchParams,
}: PageProps<"/raporlar/birim-fiyat">) {
const { user, household } = await requireActiveHousehold("viewer");
const tip = (await searchParams).tip;
const data = await getUnitPriceReport(
user.id,
household.id,
typeof tip === "string" ? tip : undefined,
);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
data.selected ? (
<ToolsEnd>
<CsvButton href={`/raporlar/birim-fiyat/csv?tip=${data.selected.id}`} />
</ToolsEnd>
) : undefined
}
>
<UnitPriceView data={data} />
</ReportFrame>
);
}
+23
View File
@@ -0,0 +1,23 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getBudgetReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
/** GET /raporlar/butce/csv?ay=YYYY-MM — kategori bazında limit ve gerçekleşen. */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getBudgetReport(c.userId, c.householdId, c.month);
if (!r) return forbidden();
const csv = toCsv(
tr.reports.csvHeaders.budget,
r.lines.map((l) => [
l.path,
l.limitMinor === null ? "" : csvMoney(l.limitMinor),
csvMoney(l.actualMinor),
l.remainingMinor === null ? "" : csvMoney(l.remainingMinor),
csvPct(l.ratioBp === null ? null : Math.round(l.ratioBp / 10) / 10),
]),
);
return csvResponse(csv, tr.reports.csvFiles.budget(r.month));
}
+41
View File
@@ -0,0 +1,41 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { BudgetReportView } from "@/features/reports/components/budget-report-view";
import {
CsvButton,
ToolsEnd,
MonthNav,
ReportFrame,
monthLabel,
} from "@/features/reports/components/report-frame";
import { getBudgetReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
const t = tr.reports.budget;
export const metadata: Metadata = { title: t.title };
/** /raporlar/butce?ay=YYYY-MM — bütçe ve gerçekleşen. */
export default async function BudgetReportPage({ searchParams }: PageProps<"/raporlar/butce">) {
const { user, household } = await requireActiveHousehold("viewer");
const ay = budgetMonthSchema.safeParse((await searchParams).ay);
const data = await getBudgetReport(user.id, household.id, ay.success ? ay.data : undefined);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description(monthLabel(data.month))}
tools={
<>
<MonthNav month={data.month} currentMonth={data.currentMonth} path="/raporlar/butce" />
<ToolsEnd>
<CsvButton href={`/raporlar/butce/csv?ay=${data.month}`} />
</ToolsEnd>
</>
}
>
<BudgetReportView data={data} />
</ReportFrame>
);
}
+36
View File
@@ -0,0 +1,36 @@
import { csvContext, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getContactsReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
/** GET /raporlar/cari/csv?tablo=cari|ayni */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getContactsReport(c.userId, c.householdId);
if (!r) return forbidden();
const h = tr.reports.csvHeaders;
const today = todayIstanbul();
if (c.params.get("tablo") === "ayni")
return csvResponse(
toCsv(
h.inKind,
r.inKind.map((d) => [
d.contactName,
d.direction === "receivable" ? tr.reports.contacts.receivable : tr.reports.contacts.debt,
d.remainingLabel,
d.valueMinor === null ? "" : csvMoney(d.valueMinor),
d.date,
]),
),
tr.reports.csvFiles.inKind(today),
);
return csvResponse(
toCsv(
h.contacts,
r.contacts.map((x) => [x.name, csvMoney(x.balanceMinor), x.dueDate ?? ""]),
),
tr.reports.csvFiles.contacts(today),
);
}
+31
View File
@@ -0,0 +1,31 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ContactsReportView } from "@/features/reports/components/contacts-assets-view";
import { CsvButton, ReportFrame, ToolsEnd } from "@/features/reports/components/report-frame";
import { getContactsReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
const t = tr.reports.contacts;
export const metadata: Metadata = { title: t.title };
/** /raporlar/cari — cari bakiyeler ve açık aynî borç/alacaklar. */
export default async function ContactsReportPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await getContactsReport(user.id, household.id);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
<ToolsEnd>
<CsvButton href="/raporlar/cari/csv?tablo=cari" label={t.csvContacts} />
<CsvButton href="/raporlar/cari/csv?tablo=ayni" label={t.csvInKind} />
</ToolsEnd>
}
>
<ContactsReportView data={data} />
</ReportFrame>
);
}
+29
View File
@@ -0,0 +1,29 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getWasteReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
import { quantityInput } from "@/shared/stock";
import { parsePeriod } from "@/shared/reports";
/** GET /raporlar/fire/csv?donem=3|6|12 */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getWasteReport(c.userId, c.householdId, parsePeriod(c.params.get("donem")));
if (!r) return forbidden();
return csvResponse(
toCsv(
tr.reports.csvHeaders.waste,
r.rows.map((x) => [
x.name,
x.unit,
quantityInput(x.wasted),
quantityInput(x.purchased),
csvPct(x.wastePct),
x.costMinor === null ? "" : csvMoney(x.costMinor),
]),
),
tr.reports.csvFiles.waste(todayIstanbul()),
);
}
+48
View File
@@ -0,0 +1,48 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import {
CsvButton,
RangeNav,
ReportFrame,
ToolsEnd,
} from "@/features/reports/components/report-frame";
import { WasteReportView } from "@/features/reports/components/shopping-waste-view";
import { getWasteReport } from "@/features/reports/extra";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { parsePeriod, REPORT_PERIODS } from "@/shared/reports";
const t = tr.reports.waste;
export const metadata: Metadata = { title: t.title };
/** /raporlar/fire?donem=3|6|12 — fire/zarar raporu. */
export default async function WasteReportPage({ searchParams }: PageProps<"/raporlar/fire">) {
const { user, household } = await requireActiveHousehold("viewer");
const period = parsePeriod((await searchParams).donem);
const data = await getWasteReport(user.id, household.id, period);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
<>
<RangeNav
path="/raporlar/fire"
label={tr.reports.periodLabel}
value={String(period)}
options={REPORT_PERIODS.map((p) => ({
value: String(p),
label: tr.reports.periods[p]!,
}))}
/>
<ToolsEnd>
<CsvButton href={`/raporlar/fire/csv?donem=${period}`} />
</ToolsEnd>
</>
}
>
<WasteReportView data={data} />
</ReportFrame>
);
}
@@ -0,0 +1,24 @@
import { csvContext, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getKakeiboReport } from "@/features/reports/kakeibo";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { KAKEIBO_GROUPS, type SpendingClass } from "@/shared/kakeibo";
/** GET /raporlar/kakeibo/csv?ay=YYYY-MM — sınıf × kategori tutarları. */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getKakeiboReport(c.userId, c.householdId, c.month);
if (!r) return forbidden();
const k = tr.kakeibo;
const label = (cls: SpendingClass) =>
cls === "BANK_COST" ? k.bankCost : cls === "UNGROUPED" ? k.ungrouped : k.groups[cls];
const order: SpendingClass[] = [...KAKEIBO_GROUPS, "UNGROUPED", "BANK_COST"];
const rows = order.flatMap((cls) =>
r.now.byClass[cls].map((x) => [label(cls), x.path, csvMoney(x.amountMinor)]),
);
return csvResponse(
toCsv(tr.reports.kakeiboReport.csvHeader, rows),
tr.reports.kakeiboReport.csvFile(r.month),
);
}
+44
View File
@@ -0,0 +1,44 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { KakeiboReportView } from "@/features/reports/components/kakeibo-view";
import {
CsvButton,
MonthNav,
ReportFrame,
ToolsEnd,
monthLabel,
} from "@/features/reports/components/report-frame";
import { getKakeiboReport } from "@/features/reports/kakeibo";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
const t = tr.reports.kakeiboReport;
export const metadata: Metadata = { title: t.title };
/** /raporlar/kakeibo?ay=YYYY-MM — Kakeibo dört grup, banka maliyeti, grupsuzlar. */
export default async function KakeiboReportPage({ searchParams }: PageProps<"/raporlar/kakeibo">) {
const { user, household } = await requireActiveHousehold("viewer");
const ay = budgetMonthSchema.safeParse((await searchParams).ay);
const data = await getKakeiboReport(user.id, household.id, ay.success ? ay.data : undefined);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description(monthLabel(data.month))}
tools={
<>
<MonthNav month={data.month} currentMonth={data.currentMonth} path="/raporlar/kakeibo" />
<ToolsEnd>
<CsvButton href={`/raporlar/kakeibo/csv?ay=${data.month}`} />
</ToolsEnd>
</>
}
>
{data.includesHidden ? (
<p className="text-xs text-muted-foreground">{tr.reports.includesHidden}</p>
) : null}
<KakeiboReportView data={data} />
</ReportFrame>
);
}
@@ -0,0 +1,29 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getCategoryReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
/** GET /raporlar/kategoriler/csv?ay=YYYY-MM — üst kategori ve alt kategori satırları. */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getCategoryReport(c.userId, c.householdId, c.month);
if (!r) return forbidden();
const rows = r.breakdown.rows.flatMap((top) => [
top,
...top.children.map((k) => ({ ...k, parent: top.name })),
]);
const csv = toCsv(
tr.reports.csvHeaders.categories,
rows.map((x) => [
"parent" in x ? x.parent : x.name,
"parent" in x ? x.name : "",
csvMoney(x.amountMinor),
csvPct(x.sharePct),
csvMoney(x.prevMinor),
csvMoney(x.changeMinor),
csvPct(x.changePct),
]),
);
return csvResponse(csv, tr.reports.csvFiles.categories(r.month));
}
@@ -0,0 +1,51 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { CategoriesView } from "@/features/reports/components/categories-view";
import {
CsvButton,
ToolsEnd,
MonthNav,
ReportFrame,
monthLabel,
} from "@/features/reports/components/report-frame";
import { getCategoryReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
const t = tr.reports.categories;
export const metadata: Metadata = { title: t.title };
/** /raporlar/kategoriler?ay=YYYY-MM — kategori dağılımı. */
export default async function CategoryReportPage({
searchParams,
}: PageProps<"/raporlar/kategoriler">) {
const { user, household } = await requireActiveHousehold("viewer");
const ay = budgetMonthSchema.safeParse((await searchParams).ay);
const data = await getCategoryReport(user.id, household.id, ay.success ? ay.data : undefined);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description(monthLabel(data.month))}
tools={
<>
<MonthNav
month={data.month}
currentMonth={data.currentMonth}
path="/raporlar/kategoriler"
/>
<ToolsEnd>
<CsvButton href={`/raporlar/kategoriler/csv?ay=${data.month}`} />
</ToolsEnd>
</>
}
>
{data.current ? <p className="text-xs text-muted-foreground">{t.partialMonth}</p> : null}
{data.includesHidden ? (
<p className="text-xs text-muted-foreground">{tr.reports.includesHidden}</p>
) : null}
<CategoriesView data={data} />
</ReportFrame>
);
}
@@ -0,0 +1,36 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getPeopleAccountsReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
/** GET /raporlar/kisi-hesap/csv?ay=YYYY-MM&tablo=kisi|hesap */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getPeopleAccountsReport(c.userId, c.householdId, c.month);
if (!r) return forbidden();
const h = tr.reports.csvHeaders;
if (c.params.get("tablo") === "hesap")
return csvResponse(
toCsv(
h.accounts,
r.accounts.map((a) => [
a.name,
csvMoney(a.incomeMinor),
csvMoney(a.expenseMinor),
csvMoney(a.transferInMinor),
csvMoney(a.transferOutMinor),
csvMoney(a.netMinor),
a.count,
]),
),
tr.reports.csvFiles.accounts(r.month),
);
return csvResponse(
toCsv(
h.people,
r.people.map((p) => [p.name, csvMoney(p.expenseMinor), p.count, csvPct(p.sharePct)]),
),
tr.reports.csvFiles.people(r.month),
);
}
@@ -0,0 +1,61 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PeopleView } from "@/features/reports/components/people-view";
import {
CsvButton,
ToolsEnd,
MonthNav,
ReportFrame,
monthLabel,
} from "@/features/reports/components/report-frame";
import { getPeopleAccountsReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
const t = tr.reports.people;
export const metadata: Metadata = { title: t.title };
/** /raporlar/kisi-hesap?ay=YYYY-MM — kişi bazlı harcama ve hesap bazlı hareket. */
export default async function PeopleReportPage({
searchParams,
}: PageProps<"/raporlar/kisi-hesap">) {
const { user, household } = await requireActiveHousehold("viewer");
const ay = budgetMonthSchema.safeParse((await searchParams).ay);
const data = await getPeopleAccountsReport(
user.id,
household.id,
ay.success ? ay.data : undefined,
);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description(monthLabel(data.month))}
tools={
<>
<MonthNav
month={data.month}
currentMonth={data.currentMonth}
path="/raporlar/kisi-hesap"
/>
<ToolsEnd>
<CsvButton
href={`/raporlar/kisi-hesap/csv?ay=${data.month}&tablo=kisi`}
label={t.csvPeople}
/>
<CsvButton
href={`/raporlar/kisi-hesap/csv?ay=${data.month}&tablo=hesap`}
label={t.csvAccounts}
/>
</ToolsEnd>
</>
}
>
{data.includesHidden ? (
<p className="text-xs text-muted-foreground">{tr.reports.includesHidden}</p>
) : null}
<PeopleView data={data} />
</ReportFrame>
);
}
+119
View File
@@ -0,0 +1,119 @@
import {
BookOpenCheck,
ChartPie,
ChevronRight,
Coins,
HandCoins,
ShoppingCart,
Tags,
Target,
Trash2,
TrendingUp,
Users,
} from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { monthLabel, formatPct } from "@/features/reports/components/report-frame";
import { getCategoryReport, getTrendReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
const t = tr.reports;
export const metadata: Metadata = { title: t.title };
const REPORTS = [
{ href: "/raporlar/kakeibo", key: "kakeibo", icon: BookOpenCheck },
{ href: "/raporlar/kategoriler", key: "categories", icon: ChartPie },
{ href: "/raporlar/trend", key: "trend", icon: TrendingUp },
{ href: "/raporlar/kisi-hesap", key: "people", icon: Users },
{ href: "/raporlar/butce", key: "budget", icon: Target },
{ href: "/raporlar/cari", key: "contacts", icon: HandCoins },
{ href: "/raporlar/birikim", key: "assets", icon: Coins },
{ href: "/raporlar/alisveris", key: "shopping", icon: ShoppingCart },
{ href: "/raporlar/birim-fiyat", key: "unitPrice", icon: Tags },
{ href: "/raporlar/fire", key: "waste", icon: Trash2 },
] as const;
/** /raporlar — bu bütçe ayının özeti ve raporlar. */
export default async function ReportsPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [trend, cats] = await Promise.all([
getTrendReport(user.id, household.id, 1),
getCategoryReport(user.id, household.id),
]);
if (!trend || !cats) notFound();
const m = trend.months[0]!;
const top = cats.breakdown.rows.filter((r) => r.amountMinor > 0).slice(0, 3);
const stats = [
{ label: t.hub.income, value: formatMoney(m.incomeMinor), tone: "text-income" },
{ label: t.hub.expense, value: formatMoney(m.expenseMinor), tone: "text-expense" },
{
label: t.hub.net,
value: `${m.netMinor < 0 ? "−" : ""}${formatMoney(Math.abs(m.netMinor))}`,
tone: m.netMinor < 0 ? "text-expense" : undefined,
},
{ label: t.hub.savings, value: formatPct(m.savingsPct) },
];
return (
<>
<PageHeader title={t.title} description={t.description} />
<section aria-labelledby="hub-month" className="rounded-xl border bg-card p-4">
<h2 id="hub-month" className="text-sm font-medium">
{t.hub.thisMonth}: <span className="capitalize">{monthLabel(m.month)}</span>{" "}
<span className="font-normal text-muted-foreground">({t.trend.ongoing})</span>
</h2>
<dl className="mt-3 grid grid-cols-2 gap-3 md:grid-cols-4">
{stats.map((s) => (
<div key={s.label}>
<dt className="text-xs text-muted-foreground">{s.label}</dt>
<dd className={cn("text-lg font-semibold tabular-nums", s.tone)}>{s.value}</dd>
</div>
))}
</dl>
{top.length ? (
<div className="mt-4">
<h3 className="text-xs text-muted-foreground">{t.hub.topCategories}</h3>
<ul className="mt-1 flex flex-col gap-1 text-sm">
{top.map((r) => (
<li key={r.id} className="flex justify-between gap-3">
<span className="truncate">{r.name}</span>
<span className="tabular-nums">
{formatMoney(r.amountMinor)}{" "}
<span className="text-muted-foreground">· {formatPct(r.sharePct)}</span>
</span>
</li>
))}
</ul>
</div>
) : null}
</section>
<ul className="grid gap-3 md:grid-cols-2">
{REPORTS.map((r) => {
const c = t.hub.cards[r.key];
const Icon = r.icon;
return (
<li key={r.href}>
<Link
href={r.href}
className="flex h-full items-start gap-3 rounded-xl border bg-card p-4 transition-colors hover:bg-accent/40 focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
>
<span className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-muted">
<Icon className="size-4.5 text-muted-foreground" aria-hidden />
</span>
<span className="min-w-0 flex-1">
<span className="block font-medium">{c.title}</span>
<span className="block text-sm text-muted-foreground">{c.description}</span>
</span>
<ChevronRight className="mt-2 size-4 text-muted-foreground" aria-hidden />
</Link>
</li>
);
})}
</ul>
</>
);
}
+24
View File
@@ -0,0 +1,24 @@
import { csvContext, csvPct, csvResponse, forbidden, unauthorized } from "@/features/reports/csv";
import { getTrendReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
/** GET /raporlar/trend/csv — son 12 bütçe ayı. */
export async function GET(request: Request) {
const c = await csvContext(request);
if (!c) return unauthorized();
const r = await getTrendReport(c.userId, c.householdId);
if (!r) return forbidden();
const csv = toCsv(
tr.reports.csvHeaders.trend,
r.months.map((m) => [
m.month,
csvMoney(m.incomeMinor),
csvMoney(m.expenseMinor),
csvMoney(m.netMinor),
csvPct(m.savingsPct),
]),
);
return csvResponse(csv, tr.reports.csvFiles.trend(todayIstanbul()));
}
+30
View File
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { CsvButton, ToolsEnd, ReportFrame } from "@/features/reports/components/report-frame";
import { TrendView } from "@/features/reports/components/trend-view";
import { getTrendReport } from "@/features/reports/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
const t = tr.reports.trend;
export const metadata: Metadata = { title: t.title };
/** /raporlar/trend — son 12 bütçe ayı gelir, gider, net ve tasarruf oranı. */
export default async function TrendReportPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await getTrendReport(user.id, household.id);
if (!data) notFound();
return (
<ReportFrame
title={t.title}
description={t.description}
tools={
<ToolsEnd>
<CsvButton href="/raporlar/trend/csv" />
</ToolsEnd>
}
>
<TrendView data={data} />
</ReportFrame>
);
}
+12 -1
View File
@@ -1,5 +1,5 @@
import { connection } from "next/server";
import { pingDb } from "@/lib/db/mongo";
import { getDb, pingDb } from "@/lib/db/mongo";
import { APP_COMMIT, APP_VERSION } from "@/lib/version";
/**
@@ -10,10 +10,21 @@ export async function GET() {
// Cache Components açıkken GET handler'ı build'de prerender edilmesin.
await connection();
const dbOk = await pingDb();
// Transaction'lar için replica set şart; adı yoksa (standalone) null.
let replicaSet: string | null = null;
if (dbOk) {
try {
const hello = await getDb().admin().command({ hello: 1 }, { timeoutMS: 2_000 });
replicaSet = typeof hello.setName === "string" ? hello.setName : null;
} catch {
replicaSet = null;
}
}
return Response.json(
{
status: dbOk ? "ok" : "degraded",
db: dbOk ? "ok" : "unreachable",
replicaSet,
version: APP_VERSION,
commit: APP_COMMIT,
time: new Date().toISOString(),
+3 -3
View File
@@ -28,7 +28,7 @@ export type NavItem = {
/** Şu an tamamlanmış en yüksek faz — sayfalar eklendikçe artar. */
/** Alt fazlar ondalıkla: 6.1 = Faz 6a. */
export const CURRENT_PHASE = 12.2;
export const CURRENT_PHASE = 16;
export const isAvailable = (item: NavItem) => item.phase <= CURRENT_PHASE;
@@ -43,8 +43,8 @@ export const MAIN_NAV: NavItem[] = [
{ href: "/butce", label: tr.nav.budget, icon: Target, phase: 10.1 },
{ href: "/stok", label: tr.nav.stock, icon: Package, phase: 11.1 },
{ href: "/magazalar", label: tr.nav.stores, icon: Store, phase: 12.1 },
{ href: "/alisveris", label: tr.nav.shopping, icon: ShoppingCart, phase: 13 },
{ href: "/raporlar", label: tr.nav.reports, icon: ChartColumn, phase: 14 },
{ href: "/alisveris", label: tr.nav.shopping, icon: ShoppingCart, phase: 13.1 },
{ href: "/raporlar", label: tr.nav.reports, icon: ChartColumn, phase: 14.1 },
{ href: "/ayarlar", label: tr.nav.settings, icon: Settings, phase: 5 },
];
@@ -139,7 +139,7 @@ function Stat({ label, value, tone }: { label: string; value: string; tone?: str
type Pending = { kind: "edit" } | { kind: "replace"; source: "copy" | "actuals" } | null;
export function BudgetView({ data }: { data: Data }) {
export function BudgetView({ data, summary }: { data: Data; summary?: React.ReactNode }) {
const [pending, setPending] = useState<Pending>(null);
const [busy, setBusy] = useState(false);
const close = () => setPending(null);
@@ -306,6 +306,8 @@ export function BudgetView({ data }: { data: Data }) {
</div>
) : null}
{summary}
{data.lines.length ? (
<ul className="flex flex-col divide-y rounded-xl border bg-card">
{data.lines.map((l) => (
@@ -1,17 +1,8 @@
"use client";
import Link from "next/link";
import { CartesianGrid, Line, LineChart, ReferenceLine, XAxis, YAxis } from "recharts";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import {
ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
@@ -19,24 +10,13 @@ import type { DailyPlanView as Data } from "../plan";
const t = tr.budget.daily;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
const dayFmt = new Intl.DateTimeFormat("tr-TR", {
day: "numeric",
month: "short",
timeZone: "Europe/Istanbul",
});
const monthFmt = new Intl.DateTimeFormat("tr-TR", {
month: "long",
year: "numeric",
timeZone: "Europe/Istanbul",
});
const compact = new Intl.NumberFormat("tr-TR", { notation: "compact", maximumFractionDigits: 1 });
const signed = (minor: number) => `${minor < 0 ? "−" : ""}${formatMoney(Math.abs(minor))}`;
const config = {
planned: { label: t.cumPlanned, color: "var(--budget)" },
actual: { label: t.cumActual, color: "var(--expense)" },
} satisfies ChartConfig;
function Stat({
label,
value,
@@ -57,7 +37,7 @@ function Stat({
);
}
/** Dashboard: ayın günlük planı, kümülatif grafik ve gelirle karşılaştırma. */
/** Dashboard: ayın günlük planı ve gelirle karşılaştırma (grafik ana grafikte: Aylık). */
export function DailyPlanView({ data }: { data: Data }) {
const p = data.plan;
if (!data.hasBudget) {
@@ -75,14 +55,6 @@ export function DailyPlanView({ data }: { data: Data }) {
</Card>
);
}
const chart = p.days.map((day, i) => ({
date: day.date,
label: dayFmt.format(new Date(`${day.date}T12:00:00+03:00`)),
planned: day.cumPlannedMinor / 100,
// Gerçekleşen yalnızca bugüne kadar çizilir.
actual: p.todayIndex === -1 || i <= p.todayIndex ? day.cumActualMinor / 100 : null,
}));
const income = data.income.expectedMinor / 100;
const nextDiff =
data.next.budgetMinor === null ? null : data.next.expectedIncomeMinor - data.next.budgetMinor;
@@ -116,82 +88,6 @@ export function DailyPlanView({ data }: { data: Data }) {
/>
</div>
<ChartContainer
config={config}
className="aspect-auto h-56 w-full"
aria-label={t.chartLabel}
role="img"
>
<LineChart data={chart} margin={{ left: 4, right: 12, top: 8 }}>
<CartesianGrid vertical={false} />
<XAxis
dataKey="label"
tickLine={false}
axisLine={false}
tickMargin={8}
minTickGap={24}
/>
<YAxis
tickLine={false}
axisLine={false}
width={48}
tickFormatter={(v: number) => compact.format(v)}
/>
{income > 0 ? (
<ReferenceLine
y={income}
stroke="var(--income)"
strokeDasharray="4 4"
label={{
value: `${t.income} ${compact.format(income)}`,
position: "insideTopLeft",
fill: "var(--muted-foreground)",
fontSize: 11,
}}
/>
) : null}
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) => {
const date = payload?.[0]?.payload?.date as string | undefined;
return date ? d(date) : "";
}}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">
{config[name as keyof typeof config]?.label}
</span>
<span className="font-medium text-foreground tabular-nums">
{formatMoney(Math.round(Number(value) * 100))}
</span>
</div>
)}
/>
}
/>
<ChartLegend content={<ChartLegendContent />} />
<Line
dataKey="planned"
type="linear"
stroke="var(--color-planned)"
strokeWidth={2}
dot={false}
isAnimationActive={false}
/>
<Line
dataKey="actual"
type="linear"
stroke="var(--color-actual)"
strokeWidth={2}
dot={false}
activeDot={{ r: 4 }}
connectNulls={false}
isAnimationActive={false}
/>
</LineChart>
</ChartContainer>
<p className="text-xs text-muted-foreground">
{t.modes[data.mode]} {p.fixedMinor ? t.fixedNote(formatMoney(p.fixedMinor)) : ""}
</p>
+52 -24
View File
@@ -60,7 +60,7 @@ export type IncomePlan = {
manual: { id: string; name: string; amountMinor: number }[];
};
async function incomePlan(ctx: Ctx, s: Settings, month: string): Promise<IncomePlan> {
export async function incomePlan(ctx: Ctx, s: Settings, month: string): Promise<IncomePlan> {
const { from, to } = budgetPeriod(month, s.startDay);
const [docs, budget] = await Promise.all([
TransactionModel.find(baseMatch(ctx, s, "income", from, to))
@@ -145,7 +145,7 @@ export async function saveIncomeItems(
// --- Günlük plan ---
/** Güne göre gider: sabit (düzenli/taksit; gerçekleşmiş + planlı) ve gerçekleşen (tümü). */
async function expensesByDay(ctx: Ctx, s: Settings, from: string, to: string) {
export async function expensesByDay(ctx: Ctx, s: Settings, from: string, to: string) {
const pipeline: PipelineStage[] = [
{ $match: baseMatch(ctx, s, "expense", from, to) },
{
@@ -182,6 +182,20 @@ async function expensesByDay(ctx: Ctx, s: Settings, from: string, to: string) {
return { fixed, actual, variable };
}
/** Güne göre beklenen gelir (gerçekleşmiş + planlı gelir işlemleri). */
export async function incomeByDay(ctx: Ctx, s: Settings, from: string, to: string) {
const rows = await TransactionModel.aggregate<{ _id: string; sum: number }>([
{ $match: baseMatch(ctx, s, "income", from, to) },
{
$group: {
_id: { $dateToString: { date: "$date", format: "%Y-%m-%d", timezone: "Europe/Istanbul" } },
sum: { $sum: "$amountMinor" },
},
},
]);
return new Map(rows.map((r) => [r._id, r.sum]));
}
export type DailyPlanView = {
month: string;
period: { from: string; to: string };
@@ -199,6 +213,40 @@ export type DailyPlanView = {
canWrite: boolean;
};
/**
* Bir bütçe ayının günlük planı: sabit giderler kendi günlerine, değişken bütçe hane ayarına göre
* (eşit ya da önceki ayın örüntüsü) dağıtılır.
*/
export async function monthDailyPlan(
ctx: Ctx,
s: Settings,
month: string,
budgetMinor: number,
today = todayIstanbul(),
): Promise<DailyPlan> {
const period = budgetPeriod(month, s.startDay);
const byDay = await expensesByDay(ctx, s, period.from, period.to);
let weights: number[] | undefined;
if (s.dailyMode === "previous_month_pattern") {
const prev = budgetPeriod(shiftMonth(month, -1), s.startDay);
const prevDays = await expensesByDay(ctx, s, prev.from, prev.to);
const len = daysBetween(prev.from, prev.to);
weights = patternWeights(
Array.from({ length: len }, (_, i) => prevDays.variable.get(addDays(prev.from, i)) ?? 0),
daysBetween(period.from, period.to),
);
}
return dailyPlan({
from: period.from,
to: period.to,
today,
budgetMinor,
fixedByDay: byDay.fixed,
actualByDay: byDay.actual,
weights,
});
}
/** Dashboard günlük planı: içinde bulunulan bütçe ayı. */
export async function getDailyPlan(
userId: string,
@@ -212,34 +260,14 @@ export async function getDailyPlan(
const period = budgetPeriod(month, s.startDay);
const nextMonth = shiftMonth(month, 1);
const mode = s.dailyMode;
const [budget, byDay, income, nextIncome, nextBudget] = await Promise.all([
const [budget, income, nextIncome, nextBudget] = await Promise.all([
getBudget(userId, householdId, month),
expensesByDay(ctx, s, period.from, period.to),
incomePlan(ctx, s, month),
incomePlan(ctx, s, nextMonth),
getBudget(userId, householdId, nextMonth),
]);
if (!budget) return null;
let weights: number[] | undefined;
if (mode === "previous_month_pattern") {
const prev = budgetPeriod(shiftMonth(month, -1), s.startDay);
const prevDays = await expensesByDay(ctx, s, prev.from, prev.to);
const len = daysBetween(prev.from, prev.to);
weights = patternWeights(
Array.from({ length: len }, (_, i) => prevDays.variable.get(addDays(prev.from, i)) ?? 0),
daysBetween(period.from, period.to),
);
}
const plan = dailyPlan({
from: period.from,
to: period.to,
today,
budgetMinor: budget.totals.limitMinor,
fixedByDay: byDay.fixed,
actualByDay: byDay.actual,
weights,
});
const plan = await monthDailyPlan(ctx, s, month, budget.totals.limitMinor, today);
const forecastExpense = budget.totals.forecastMinor;
return {
month,
+5 -1
View File
@@ -191,7 +191,11 @@ export async function getBudget(
): Promise<BudgetView | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const s = await settingsOf(ctx.m.householdId);
return budgetFor(ctx, await settingsOf(ctx.m.householdId), month);
}
/** Bağlam ve ayarlar hazırken bütçe (raporlarda birden çok ay için yeniden yüklemeden). */
export async function budgetFor(ctx: Ctx, s: Settings, month?: string): Promise<BudgetView> {
const today = todayIstanbul();
const currentMonth = periodOfDate(today, s.startDay);
const m = month ?? currentMonth;
@@ -12,6 +12,7 @@ import {
import { useMemo, useState, useTransition } from "react";
import { toast } from "sonner";
import { IconBadge } from "@/components/appearance/swatch";
import { KakeiboBadge } from "./kakeibo-badge";
import {
AlertDialog,
AlertDialogCancel,
@@ -61,6 +62,9 @@ export function CategoriesManager({
[categories, kind, showArchived],
);
const archivedCount = categories.filter((c) => c.kind === kind && c.archived).length;
const ungrouped = categories.filter(
(c) => c.kind === "expense" && !c.archived && !c.kakeibo.group && !c.kakeibo.bankCost,
).length;
function run(promise: Promise<{ ok: boolean; error?: string }>, success?: string) {
startTransition(async () => {
@@ -90,6 +94,9 @@ export function CategoriesManager({
<span className={cn("min-w-0 flex-1 truncate", node.depth === 0 && "font-medium")}>
{node.name}
</span>
{node.kind === "expense" && !node.archived ? (
<KakeiboBadge kakeibo={node.kakeibo} />
) : null}
{node.archived ? <Badge variant="outline">{t.archived}</Badge> : null}
{canEdit ? (
<DropdownMenu modal={false}>
@@ -191,6 +198,11 @@ export function CategoriesManager({
) : null}
</div>
{!canEdit ? <p className="text-sm text-muted-foreground">{t.readOnly}</p> : null}
{kind === "expense" && ungrouped ? (
<p className="rounded-lg border border-dashed p-3 text-sm text-muted-foreground">
{tr.kakeibo.ungroupedCount(ungrouped)}
</p>
) : null}
{tree.length ? (
<ul className="divide-y rounded-xl border bg-card" aria-busy={pending}>
@@ -8,6 +8,7 @@ import { toast } from "sonner";
import { IconPicker, SwatchPicker } from "@/components/appearance/pickers";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
@@ -18,6 +19,7 @@ import {
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { KAKEIBO_GROUPS } from "@/shared/kakeibo";
import {
categoryFormSchema,
type CategoryForm,
@@ -60,6 +62,8 @@ export function CategoryFormDialog({
parentId: c.parentId ?? "",
icon: c.icon,
color: c.color,
kakeiboGroup: c.kakeiboGroup ?? "",
bankCost: c.bankCost,
});
} else {
const parent = categories.find((c) => c.id === state.parentId);
@@ -69,6 +73,9 @@ export function CategoryFormDialog({
parentId: state.parentId ?? "",
icon: parent?.icon ?? "tag",
color: parent?.color ?? "blue",
// Yeni alt kategori grubu üstten devralır.
kakeiboGroup: "",
bankCost: false,
});
}
}, [state, categories, form]);
@@ -105,6 +112,10 @@ export function CategoryFormDialog({
}
const color = useWatch({ control: form.control, name: "color" }) ?? "blue";
const k = tr.kakeibo;
const parentId = useWatch({ control: form.control, name: "parentId" });
const parentGroup = categories.find((c) => c.id === parentId)?.kakeibo.group ?? null;
const parentBank = categories.find((c) => c.id === parentId)?.kakeibo.bankCost ?? false;
return (
<ResponsiveDialog
@@ -177,6 +188,60 @@ export function CategoryFormDialog({
);
}}
/>
{kind === "expense" ? (
<>
<Controller
name="kakeiboGroup"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="cat-kakeibo">{k.field}</FieldLabel>
<Select
value={field.value || ROOT}
onValueChange={(v) => field.onChange(v === ROOT ? "" : v)}
>
<SelectTrigger id="cat-kakeibo" className="w-full">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value={ROOT}>
{parentGroup ? k.inheritWith(k.groups[parentGroup]) : k.inherit}
</SelectItem>
{KAKEIBO_GROUPS.map((g) => (
<SelectItem key={g} value={g}>
{k.groups[g]}
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription>
{field.value
? k.groupHints[field.value as keyof typeof k.groupHints]
: k.ungroupedHint}
</FieldDescription>
</Field>
)}
/>
<Controller
name="bankCost"
control={form.control}
render={({ field }) => (
<Field orientation="horizontal">
<Checkbox
id="cat-bank"
checked={Boolean(field.value) || parentBank}
disabled={parentBank}
onCheckedChange={(x) => field.onChange(x === true)}
/>
<div className="flex flex-col gap-0.5">
<FieldLabel htmlFor="cat-bank">{k.bankCost}</FieldLabel>
<FieldDescription>{k.bankCostHint}</FieldDescription>
</div>
</Field>
)}
/>
</>
) : null}
<Controller
name="color"
control={form.control}
@@ -0,0 +1,69 @@
import { Badge } from "@/components/ui/badge";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import type { KakeiboGroup, ResolvedKakeibo } from "@/shared/kakeibo";
const k = tr.kakeibo;
/** Kakeibo grup renkleri: doğrulanmış kategorik palet (series-1…4); etiket her zaman yanında. */
export const KAKEIBO_COLOR: Record<KakeiboGroup, string> = {
ZORUNLU: "var(--series-1)",
ISTEK: "var(--series-2)",
KULTUR: "var(--series-3)",
BEKLENMEYEN: "var(--series-4)",
};
export function KakeiboDot({
group,
className,
}: {
group: KakeiboGroup | null;
className?: string;
}) {
return (
<span
aria-hidden
className={cn(
"inline-block size-2.5 shrink-0 rounded-full",
!group && "border border-dashed border-muted-foreground",
className,
)}
style={group ? { backgroundColor: KAKEIBO_COLOR[group] } : undefined}
/>
);
}
/** Kategorinin etkin Kakeibo grubu; devralınan grup soluk, banka maliyeti ve grupsuz ayrı. */
export function KakeiboBadge({ kakeibo }: { kakeibo: ResolvedKakeibo }) {
if (kakeibo.bankCost)
return (
<Badge variant="secondary" title={k.bankCostHint}>
{k.bankCost}
</Badge>
);
if (!kakeibo.group)
return (
<Badge
variant="outline"
className="gap-1.5 border-dashed text-muted-foreground"
title={k.ungroupedHint}
>
<KakeiboDot group={null} />
{k.ungrouped}
</Badge>
);
return (
<Badge
variant="outline"
className={cn("gap-1.5", kakeibo.inherited && "text-muted-foreground")}
title={
kakeibo.inherited
? `${k.groups[kakeibo.group]} (${k.inherited})`
: k.groupHints[kakeibo.group]
}
>
<KakeiboDot group={kakeibo.group} />
{k.groups[kakeibo.group]}
</Badge>
);
}
@@ -31,6 +31,8 @@ const form = (over: Partial<Parameters<typeof createCategory>[2]> = {}) => ({
parentId: null,
icon: "tag" as const,
color: "blue" as const,
kakeiboGroup: null,
bankCost: false,
...over,
});
+60 -5
View File
@@ -9,6 +9,13 @@ import { toObjectId } from "@/lib/object-id";
import { CategoryModel } from "@/models/category";
import type { IconKey, Swatch } from "@/shared/appearance";
import type { CategoryForm, CategoryKind } from "@/shared/schemas/category";
import {
DEFAULT_BANK_COST_KEYS,
DEFAULT_KAKEIBO_GROUPS,
resolveKakeibo,
type KakeiboGroup,
type ResolvedKakeibo,
} from "@/shared/kakeibo";
import { foldTr } from "@/shared/search";
import { DEFAULT_CATEGORIES } from "./defaults";
import {
@@ -26,7 +33,16 @@ import {
const t = tr.categories;
export type CategoryView = FlatCategory & { icon: IconKey; color: Swatch; isDefault: boolean };
export type CategoryView = FlatCategory & {
icon: IconKey;
color: Swatch;
isDefault: boolean;
/** Kendi Kakeibo grubu (null = üstten devral). */
kakeiboGroup: KakeiboGroup | null;
bankCost: boolean;
/** Etkin grup ve banka maliyeti (devralma dahil). */
kakeibo: ResolvedKakeibo;
};
type Lean = {
_id: Types.ObjectId;
@@ -39,9 +55,26 @@ type Lean = {
color: string;
defaultKey: string | null;
ancestors: Types.ObjectId[];
kakeiboGroup?: KakeiboGroup | null;
bankCost?: boolean;
};
const toView = (c: Lean): CategoryView => ({
const NONE: ResolvedKakeibo = { group: null, inherited: false, bankCost: false };
/** Görünümler: etkin Kakeibo grubu tüm kategoriler (arşivliler dahil) üzerinden çözülür. */
function toViews(rows: Lean[], all: Lean[] = rows): CategoryView[] {
const resolved = resolveKakeibo(
all.map((c) => ({
id: String(c._id),
parentId: c.parentId ? String(c.parentId) : null,
kakeiboGroup: c.kakeiboGroup ?? null,
bankCost: Boolean(c.bankCost),
})),
);
return rows.map((c) => ({ ...toView(c), kakeibo: resolved.get(String(c._id)) ?? NONE }));
}
const toView = (c: Lean): Omit<CategoryView, "kakeibo"> & { kakeibo?: ResolvedKakeibo } => ({
id: String(c._id),
kind: c.kind,
name: c.name,
@@ -51,8 +84,16 @@ const toView = (c: Lean): CategoryView => ({
icon: c.icon as IconKey,
color: c.color as Swatch,
isDefault: Boolean(c.defaultKey),
kakeiboGroup: c.kakeiboGroup ?? null,
bankCost: Boolean(c.bankCost),
});
/** Kakeibo alanları yalnızca gider kategorisinde; gelirde temizlenir. */
const kakeiboFields = (input: CategoryForm) =>
input.kind === "expense"
? { kakeiboGroup: input.kakeiboGroup, bankCost: input.bankCost }
: { kakeiboGroup: null, bankCost: false };
const violationMessage = (v: MoveViolation) => t.violations[v];
export async function listCategories(
@@ -64,9 +105,9 @@ export async function listCategories(
if (!m) return null;
const filter: Record<string, unknown> = { householdId: m.householdId };
if (opts.kind) filter.kind = opts.kind;
if (!opts.includeArchived) filter.archivedAt = null;
const rows = await CategoryModel.find(filter).lean<Lean[]>();
return rows.map(toView);
const all = await CategoryModel.find(filter).lean<Lean[]>();
const rows = opts.includeArchived ? all : all.filter((c) => !c.archivedAt);
return toViews(rows, all);
}
async function loadKind(householdId: Types.ObjectId, kind: CategoryKind, session?: ClientSession) {
@@ -86,6 +127,17 @@ function hasSiblingNamed(all: Lean[], parentId: string | null, name: string, exc
);
}
/** Varsayılan kategorinin Kakeibo grubu ve banka maliyeti işareti (Faz 16). */
export function defaultKakeibo(key: string): {
kakeiboGroup: KakeiboGroup | null;
bankCost: boolean;
} {
return {
kakeiboGroup: DEFAULT_KAKEIBO_GROUPS[key] ?? null,
bankCost: (DEFAULT_BANK_COST_KEYS as readonly string[]).includes(key),
};
}
/**
* Varsayılan seti yükler (idempotent: defaultKey'e göre). Yeni hane oluşturulurken aynı
* transaction içinde (session) ya da migration/seed'den çağrılır. Eklenen kategori sayısını döner.
@@ -117,6 +169,7 @@ export async function installDefaultCategories(
color: def.color,
order,
defaultKey: def.key,
...(kind === "expense" ? defaultKakeibo(def.key) : {}),
createdBy: actor,
updatedBy: actor,
},
@@ -164,6 +217,7 @@ export async function createCategory(
ancestors: parent ? [...parent.ancestors, parent._id] : [],
icon: input.icon,
color: input.color,
...kakeiboFields(input),
order: siblings.length ? Math.max(...siblings.map((s) => s.order)) + 1 : 0,
createdBy: actor,
updatedBy: actor,
@@ -209,6 +263,7 @@ export async function updateCategory(
nameKey: foldTr(input.name),
icon: input.icon,
color: input.color,
...kakeiboFields(input),
updatedBy: actor,
};
if (moving) {
@@ -0,0 +1,24 @@
import { OVERVIEW_PERIODS, type OverviewPeriod } from "@/shared/overview";
import { getOverview } from "../service";
import { OverviewChart } from "./overview-chart";
type Search = Record<string, string | string[] | undefined>;
const periodOf = (x: unknown): OverviewPeriod =>
OVERVIEW_PERIODS.includes(x as OverviewPeriod) ? (x as OverviewPeriod) : "month";
/** Dashboard ana grafiği (sunucu): ?periyot=week|month|half|year&gorunum=kumulatif|donemsel. */
export async function OverviewCard({
userId,
householdId,
searchParams,
}: {
userId: string;
householdId: string;
searchParams: Promise<Search>;
}) {
const q = await searchParams;
const data = await getOverview(userId, householdId, periodOf(q.periyot));
if (!data) return null;
return <OverviewChart data={data} view={q.gorunum === "donemsel" ? "periodic" : "cumulative"} />;
}
@@ -0,0 +1,209 @@
"use client";
import Link from "next/link";
import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import {
ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { cumulative, OVERVIEW_PERIODS, type OverviewPeriod } from "@/shared/overview";
import type { OverviewData } from "../service";
const t = tr.dashboard.overview;
export type OverviewView = "cumulative" | "periodic";
const compact = new Intl.NumberFormat("tr-TR", { notation: "compact", maximumFractionDigits: 1 });
const dayShort = new Intl.DateTimeFormat("tr-TR", { day: "numeric", month: "short" });
const weekdayShort = new Intl.DateTimeFormat("tr-TR", { weekday: "short", day: "numeric" });
const monthShort = new Intl.DateTimeFormat("tr-TR", { month: "short", year: "2-digit" });
const monthLong = new Intl.DateTimeFormat("tr-TR", { month: "long", year: "numeric" });
const config = {
plannedIncome: { label: t.series.plannedIncome, color: "var(--income)" },
budget: { label: t.series.budget, color: "var(--budget)" },
actual: { label: t.series.actual, color: "var(--expense)" },
} satisfies ChartConfig;
const SERIES = ["plannedIncome", "budget", "actual"] as const;
const asDate = (key: string) =>
new Date(key.length === 7 ? `${key}-15T12:00:00+03:00` : `${key}T12:00:00+03:00`);
function bucketLabel(key: string, period: OverviewPeriod) {
const d = asDate(key);
if (key.length === 7) return monthShort.format(d);
return period === "week" ? weekdayShort.format(d) : dayShort.format(d);
}
/** Bölüm 6.13 ana çizgi grafik: periyot seçici ve kümülatif / dönemsel görünüm (URL'de). */
export function OverviewChart({ data, view }: { data: OverviewData; view: OverviewView }) {
const points = view === "cumulative" ? cumulative(data.points) : data.points;
const chart = points.map((p) => ({
key: p.key,
label: bucketLabel(p.key, data.period),
plannedIncome: p.plannedIncome === null ? null : p.plannedIncome / 100,
budget: p.budget === null ? null : p.budget / 100,
actual: p.actual === null ? null : p.actual / 100,
}));
const hasGap = data.points.some((p) => p.budget === null);
const href = (period: OverviewPeriod, v: OverviewView) =>
`?periyot=${period}&gorunum=${v === "cumulative" ? "kumulatif" : "donemsel"}`;
const rangeText =
data.range.granularity === "month"
? `${monthLong.format(asDate(data.range.buckets[0]!))} – ${monthLong.format(asDate(data.range.buckets.at(-1)!))}`
: `${formatDate(asDate(data.range.from))} – ${formatDate(asDate(data.range.to))}`;
const pill = (active: boolean) =>
cn(
"rounded-md px-2.5 py-1 text-sm transition-colors focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none",
active
? "bg-background font-medium shadow-sm"
: "text-muted-foreground hover:text-foreground",
);
return (
<Card size="sm">
<CardHeader className="flex flex-wrap items-start gap-3">
<div className="min-w-0 flex-1">
<CardTitle className="text-base">{t.title}</CardTitle>
<CardDescription>{t.description(rangeText)}</CardDescription>
</div>
<div className="flex flex-wrap gap-2">
<nav aria-label={t.periodLabel} className="flex rounded-lg bg-muted p-0.5">
{OVERVIEW_PERIODS.map((p) => (
<Link
key={p}
href={href(p, view)}
scroll={false}
replace
aria-current={p === data.period ? "page" : undefined}
className={pill(p === data.period)}
>
{t.periods[p]}
</Link>
))}
</nav>
<nav aria-label={t.viewLabel} className="flex rounded-lg bg-muted p-0.5">
{(["cumulative", "periodic"] as const).map((v) => (
<Link
key={v}
href={href(data.period, v)}
scroll={false}
replace
aria-current={v === view ? "page" : undefined}
className={pill(v === view)}
>
{t.views[v]}
</Link>
))}
</nav>
</div>
</CardHeader>
<CardContent className="flex flex-col gap-3">
<ChartContainer
config={config}
className="aspect-auto h-64 w-full"
aria-label={t.chartLabel}
role="img"
>
<LineChart data={chart} margin={{ left: 4, right: 12, top: 8 }}>
<CartesianGrid vertical={false} />
<XAxis
dataKey="label"
tickLine={false}
axisLine={false}
tickMargin={8}
minTickGap={16}
/>
<YAxis
tickLine={false}
axisLine={false}
width={48}
tickFormatter={(v: number) => compact.format(v)}
/>
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) => {
const key = payload?.[0]?.payload?.key as string | undefined;
if (!key) return "";
return key.length === 7
? monthLong.format(asDate(key))
: formatDate(asDate(key));
}}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">
{config[name as keyof typeof config]?.label}
</span>
<span className="font-medium text-foreground tabular-nums">
{formatMoney(Math.round(Number(value) * 100))}
</span>
</div>
)}
/>
}
/>
<ChartLegend content={<ChartLegendContent />} />
{SERIES.map((k) => (
<Line
key={k}
dataKey={k}
type="linear"
stroke={`var(--color-${k})`}
strokeWidth={2}
strokeDasharray={k === "budget" ? "6 3" : undefined}
dot={
data.range.granularity === "month" || data.period === "week" ? { r: 3 } : false
}
activeDot={{ r: 5 }}
connectNulls={false}
isAnimationActive={false}
/>
))}
</LineChart>
</ChartContainer>
{hasGap ? <p className="text-xs text-muted-foreground">{t.noBudget}</p> : null}
<details className="text-sm">
<summary className="cursor-pointer text-xs text-muted-foreground">{t.table}</summary>
<div className="mt-2 max-h-80 overflow-y-auto">
<table className="w-full text-right tabular-nums">
<thead className="sticky top-0 bg-card text-xs text-muted-foreground">
<tr>
<th className="py-1 text-left font-normal">{t.bucket[data.range.granularity]}</th>
{SERIES.map((k) => (
<th key={k} className="py-1 font-normal">
{t.series[k]}
</th>
))}
</tr>
</thead>
<tbody className="divide-y">
{points.map((p) => (
<tr key={p.key}>
<td className="py-1 text-left">
{p.key.length === 7
? monthLong.format(asDate(p.key))
: formatDate(asDate(p.key))}
</td>
{SERIES.map((k) => (
<td key={k} className="py-1">
{p[k] === null ? "—" : formatMoney(p[k])}
</td>
))}
</tr>
))}
</tbody>
</table>
</div>
</details>
</CardContent>
</Card>
);
}
+83
View File
@@ -0,0 +1,83 @@
import "server-only";
import { budgetFor, settingsOf } from "@/features/budgets/service";
import { incomeByDay, incomePlan, monthDailyPlan } from "@/features/budgets/plan";
import { loadContext } from "@/features/transactions/service";
import { budgetPeriod, periodOfDate } from "@/shared/budget";
import { todayIstanbul } from "@/shared/dates";
import {
overviewRange,
type OverviewPeriod,
type OverviewPoint,
type OverviewRange,
} from "@/shared/overview";
/**
* Dashboard ana grafiği (Bölüm 6.13). Bütçe ve gelir planı motorlarıyla aynı kurallar: bütçe ayı,
* taksit modu ve gizli hesap ayarı.
*
* Aylık noktalar: beklenen gelir (gerçekleşen + planlı + elle), bütçe toplamı (bütçe yoksa boş),
* gerçekleşen gider. Günlük noktalar: o günün gelirleri (elle eklenen beklenen gelir dönemin ilk
* gününe), günlük plan payı, o günün gerçekleşen gideri; gelecek günlerde gerçekleşen boş.
*/
export type OverviewData = {
period: OverviewPeriod;
range: OverviewRange;
points: OverviewPoint[];
today: string;
};
export async function getOverview(
userId: string,
householdId: string,
period: OverviewPeriod,
): Promise<OverviewData | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const s = await settingsOf(ctx.m.householdId);
const today = todayIstanbul();
const range = overviewRange(period, today, s.startDay);
if (range.granularity === "month") {
const points = await Promise.all(
range.buckets.map(async (month) => {
const [budget, income] = await Promise.all([
budgetFor(ctx, s, month),
incomePlan(ctx, s, month),
]);
return {
key: month,
plannedIncome: income.expectedMinor,
budget: budget.hasBudget ? budget.totals.limitMinor : null,
actual: budget.totals.actualMinor,
};
}),
);
return { period, range, points, today };
}
// Günlük: aralığın dokunduğu bütçe ayları (hafta iki aya yayılabilir).
const months = [...new Set([range.from, range.to].map((d) => periodOfDate(d, s.startDay)))];
const planned = new Map<string, number | null>();
const actual = new Map<string, number>();
const income = new Map<string, number>();
for (const month of months) {
const [budget, plan] = await Promise.all([budgetFor(ctx, s, month), incomePlan(ctx, s, month)]);
const dp = await monthDailyPlan(ctx, s, month, budget.totals.limitMinor, today);
for (const d of dp.days) {
planned.set(d.date, budget.hasBudget ? d.plannedMinor : null);
actual.set(d.date, d.actualMinor);
}
const first = budgetPeriod(month, s.startDay).from;
if (plan.manualMinor) income.set(first, (income.get(first) ?? 0) + plan.manualMinor);
}
for (const [d, v] of await incomeByDay(ctx, s, range.from, range.to))
income.set(d, (income.get(d) ?? 0) + v);
const points = range.buckets.map((d) => ({
key: d,
plannedIncome: income.get(d) ?? 0,
budget: planned.get(d) ?? null,
actual: d <= today ? (actual.get(d) ?? 0) : null,
}));
return { period, range, points, today };
}
+126
View File
@@ -0,0 +1,126 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import { tr } from "@/i18n/tr";
import { fail, type ActionResult } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import { KAKEIBO_GROUPS } from "@/shared/kakeibo";
import { parseMoney } from "@/shared/money";
import {
commitImport,
createImportAccount,
createImportDraft,
deleteImportDraft,
MAX_IMPORT_BYTES,
revertImport,
setImportAccount,
updateImportRow,
} from "./service";
const t = tr.imports;
const id = z.string().regex(/^[a-f0-9]{24}$/i);
const role = z.enum(["card", "bank", "cash", "extra"]);
async function ctx() {
return getHouseholdActionContext("member");
}
function done<T>(r: ActionResult<T>) {
if (r.ok) revalidatePath("/", "layout");
return r;
}
/** Dosya yükleme (FormData: file). Yalnızca .xlsx; boyut sınırı Server Action gövdesiyle uyumlu. */
export async function uploadImportAction(form: FormData) {
const c = await ctx();
if (!c) return fail(tr.common.unauthorized);
const file = form.get("file");
if (!(file instanceof File) || file.size === 0) return fail(t.errors.noFile);
if (file.size > MAX_IMPORT_BYTES) return fail(t.errors.tooLarge);
if (!/\.xlsx$/i.test(file.name)) return fail(t.errors.unreadable);
const buffer = Buffer.from(await file.arrayBuffer());
return done(await createImportDraft(c.user.id, c.household.id, { name: file.name, buffer }));
}
export async function setImportAccountAction(batchId: unknown, r: unknown, accountId: unknown) {
const c = await ctx();
const p = z
.object({ batchId: id, role, accountId: id })
.safeParse({ batchId, role: r, accountId });
if (!c || !p.success) return fail(tr.common.notFound);
return done(
await setImportAccount(
c.user.id,
c.household.id,
p.data.batchId,
p.data.role,
p.data.accountId,
),
);
}
export async function createImportAccountAction(batchId: unknown, r: unknown, input: unknown) {
const c = await ctx();
const p = z
.object({
batchId: id,
role,
name: z.string().trim().min(1, tr.common.required).max(80),
opening: z.string().trim(),
openingDate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
})
.safeParse({ batchId, role: r, ...(input as object) });
if (!c || !p.success) return fail(tr.adminUsers.errors.checkFields);
const minor = p.data.opening ? parseMoney(p.data.opening.replace("−", "-")) : 0;
if (minor === null) return fail(tr.validation.money);
return done(
await createImportAccount(c.user.id, c.household.id, p.data.batchId, p.data.role, {
name: p.data.name,
openingMinor: minor,
openingDate: p.data.openingDate,
}),
);
}
export async function updateImportRowAction(batchId: unknown, edit: unknown) {
const c = await ctx();
const p = z
.object({
batchId: id,
rowId: id,
kind: z.enum(["expense", "income", "skip"]).optional(),
categoryId: z
.union([id, z.string().regex(/^new:[a-z.-]+$/)])
.nullable()
.optional(),
kakeiboGroup: z.enum(KAKEIBO_GROUPS).nullable().optional(),
applyToSame: z.boolean().optional(),
})
.safeParse({ batchId, ...(edit as object) });
if (!c || !p.success) return fail(tr.common.notFound);
const { batchId: b, ...rest } = p.data;
// Satır düzenlemesi sık; tüm sayfayı yenilemeye gerek yok.
return updateImportRow(c.user.id, c.household.id, b, rest);
}
export async function commitImportAction(batchId: unknown) {
const c = await ctx();
const p = id.safeParse(batchId);
if (!c || !p.success) return fail(tr.common.notFound);
return done(await commitImport(c.user.id, c.household.id, p.data));
}
export async function revertImportAction(batchId: unknown) {
const c = await ctx();
const p = id.safeParse(batchId);
if (!c || !p.success) return fail(tr.common.notFound);
return done(await revertImport(c.user.id, c.household.id, p.data));
}
export async function deleteImportDraftAction(batchId: unknown) {
const c = await ctx();
const p = id.safeParse(batchId);
if (!c || !p.success) return fail(tr.common.notFound);
return done(await deleteImportDraft(c.user.id, c.household.id, p.data));
}
@@ -0,0 +1,678 @@
"use client";
import {
AlertTriangle,
ArrowLeft,
CheckCircle2,
Copy,
Loader2,
Plus,
Undo2,
XCircle,
} from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useMemo, useState } from "react";
import { toast } from "sonner";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { PageHeader } from "@/components/page-header";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Field, FieldDescription, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { KakeiboSelect } from "@/features/transactions/components/kakeibo-select";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import type { AccountType } from "@/shared/accounts";
import { formatDate, formatMoney } from "@/shared/format";
import type { ImportRole } from "@/shared/import/kakeibo-workbook";
import type { KakeiboGroup } from "@/shared/kakeibo";
import { formatMoneyInput } from "@/shared/money";
import {
commitImportAction,
createImportAccountAction,
deleteImportDraftAction,
revertImportAction,
setImportAccountAction,
updateImportRowAction,
} from "../actions";
import type { ImportDraft, ImportRowView } from "../service";
const t = tr.imports;
const PAGE = 50;
const ROLE_TYPES: Record<string, AccountType[]> = {
card: ["credit_card"],
bank: ["bank"],
cash: ["cash"],
extra: ["bank", "cash"],
};
type Filter = "all" | "review" | "ungrouped" | "transfer" | "skip";
const day = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
function Step({ title, children }: { title: string; children: React.ReactNode }) {
return (
<section className="flex flex-col gap-3 rounded-xl border bg-card p-4">
<h2 className="font-medium">{title}</h2>
{children}
</section>
);
}
function RoleRow({ draft, role }: { draft: ImportDraft; role: ImportRole }) {
const router = useRouter();
const preset = draft.presets[role];
const current = draft.accounts[role] ?? "";
const options = draft.accountOptions.filter((a) => ROLE_TYPES[role]?.includes(a.type));
const [creating, setCreating] = useState(false);
const [busy, setBusy] = useState(false);
const isCard = role === "card";
const [v, setV] = useState({
name: preset?.name ?? "",
opening: preset ? formatMoneyInput(Math.abs(preset.openingMinor)) : "",
sign: (preset?.openingMinor ?? 0) < 0 ? "-" : "",
openingDate: preset?.openingDate ?? "",
});
async function pick(accountId: string) {
const r = await setImportAccountAction(draft.id, role, accountId);
if (!r.ok) toast.error(r.error);
else router.refresh();
}
async function create() {
setBusy(true);
const r = await createImportAccountAction(draft.id, role, {
name: v.name,
opening: `${v.sign}${v.opening}`,
openingDate: v.openingDate,
});
setBusy(false);
if (!r.ok) toast.error(r.error);
else {
setCreating(false);
router.refresh();
}
}
return (
<li className="flex flex-col gap-2 py-3 first:pt-0 last:pb-0">
<div className="flex flex-wrap items-center gap-3">
<div className="min-w-0 flex-1">
<p className="flex items-center gap-1.5 text-sm font-medium">
{current ? (
<CheckCircle2 className="size-4 text-income" aria-hidden />
) : (
<AlertTriangle className="size-4 text-amber-600" aria-hidden />
)}
{t.roles[role]}
</p>
<p className="text-xs text-muted-foreground">{t.roleHints[role]}</p>
</div>
<Select value={current || undefined} onValueChange={pick}>
<SelectTrigger className="w-56" aria-label={t.roles[role]}>
<SelectValue placeholder={t.selectAccount} />
</SelectTrigger>
<SelectContent>
{options.map((a) => (
<SelectItem key={a.id} value={a.id}>
{a.name}
</SelectItem>
))}
</SelectContent>
</Select>
{draft.canCreateAccounts && preset && !current ? (
<Button size="sm" variant="outline" onClick={() => setCreating((x) => !x)}>
<Plus />
{t.createSuggested}
</Button>
) : null}
</div>
{creating && preset ? (
<div className="grid gap-3 rounded-lg border bg-muted/30 p-3 sm:grid-cols-3">
<Field>
<FieldLabel htmlFor={`acc-${role}-name`}>{t.accountName}</FieldLabel>
<Input
id={`acc-${role}-name`}
value={v.name}
onChange={(e) => setV((s) => ({ ...s, name: e.target.value }))}
/>
</Field>
<Field>
<FieldLabel htmlFor={`acc-${role}-open`}>
{isCard ? t.openingDebt : t.openingBalance}
</FieldLabel>
<div className="flex gap-1">
{!isCard ? (
<Button
type="button"
variant="outline"
size="icon"
aria-label="±"
onClick={() => setV((s) => ({ ...s, sign: s.sign ? "" : "-" }))}
>
{v.sign ? "−" : "+"}
</Button>
) : null}
<Input
id={`acc-${role}-open`}
inputMode="decimal"
value={v.opening}
onChange={(e) => setV((s) => ({ ...s, opening: e.target.value }))}
className="text-right tabular-nums"
/>
</div>
</Field>
<Field>
<FieldLabel htmlFor={`acc-${role}-date`}>{t.openingDate}</FieldLabel>
<Input
id={`acc-${role}-date`}
type="date"
value={v.openingDate}
onChange={(e) => setV((s) => ({ ...s, openingDate: e.target.value }))}
/>
</Field>
<FieldDescription className="sm:col-span-2">
{isCard ? t.openingHintCard : role === "bank" ? t.openingHintBank : ""}
</FieldDescription>
<Button className="sm:justify-self-end" onClick={create} disabled={busy}>
{busy ? <Loader2 className="animate-spin" /> : null}
{tr.common.create}
</Button>
</div>
) : null}
</li>
);
}
function RowItem({
row,
draft,
onEdit,
}: {
row: ImportRowView;
draft: ImportDraft;
onEdit: (
row: ImportRowView,
patch: Partial<Pick<ImportRowView, "kind" | "categoryId" | "kakeiboGroup">>,
) => void;
}) {
const cats = draft.categories.filter(
(c) => c.kind === (row.kind === "income" ? "income" : "expense"),
);
const cat = draft.categories.find((c) => c.id === row.categoryId);
const editable =
!row.duplicate && (row.kind === "expense" || row.kind === "income" || row.kind === "skip");
const muted = row.duplicate || row.kind === "skip" || row.kind === "deferred";
return (
<li
className={cn(
"flex flex-col gap-2 p-3 text-sm",
muted && "bg-muted/30 text-muted-foreground",
)}
>
<div className="flex items-start gap-3">
<span className="w-20 shrink-0 tabular-nums">{day(row.date)}</span>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium">{row.description || "—"}</span>
<span className="mt-0.5 flex flex-wrap gap-1">
{row.installment ? (
<Badge variant="outline">
{t.installment(row.installment.index, row.installment.count)}
</Badge>
) : null}
{row.duplicate ? (
<Badge variant="secondary" className="gap-1">
<Copy className="size-3" aria-hidden />
{t.duplicate}
</Badge>
) : null}
{row.review && !row.duplicate ? (
<Badge
variant="outline"
className="gap-1 border-amber-500/50 text-amber-700 dark:text-amber-400"
>
<AlertTriangle className="size-3" aria-hidden />
{t.reviews[row.review] ?? row.review}
</Badge>
) : null}
{row.source.category || row.source.type ? (
<span className="text-xs text-muted-foreground">
{row.source.category || row.source.type}
</span>
) : null}
</span>
</span>
<span
className={cn(
"shrink-0 text-right font-medium tabular-nums",
row.amountMinor < 0 ? "" : "text-income",
)}
>
{row.amountMinor < 0 ? "−" : "+"}
{formatMoney(Math.abs(row.amountMinor))}
</span>
</div>
{row.kind === "transfer" ? (
<p className="pl-23 text-xs">
{t.kinds.transfer}{" "}
{row.amountMinor < 0
? t.transferTo(t.roles[row.counterRole ?? ""] ?? "")
: t.transferFrom(t.roles[row.counterRole ?? ""] ?? "")}
</p>
) : row.kind === "deferred" ? (
<p className="pl-23 text-xs">
{t.kinds.deferred}: {t.roles.gold}
</p>
) : editable ? (
<div className="grid gap-2 sm:grid-cols-[8rem_minmax(0,1fr)_12rem] sm:pl-23">
<Select
value={row.kind}
onValueChange={(k) => onEdit(row, { kind: k as ImportRowView["kind"] })}
>
<SelectTrigger className="h-8 w-full text-sm" aria-label={t.columns.kind}>
<SelectValue />
</SelectTrigger>
<SelectContent>
{(["expense", "income", "skip"] as const).map((k) => (
<SelectItem key={k} value={k}>
{t.kinds[k]}
</SelectItem>
))}
</SelectContent>
</Select>
{row.kind !== "skip" ? (
<Select
value={row.categoryId ?? undefined}
onValueChange={(c) => onEdit(row, { categoryId: c })}
>
<SelectTrigger className="h-8 w-full text-sm" aria-label={t.columns.category}>
<SelectValue placeholder={tr.transactions.fields.selectCategory} />
</SelectTrigger>
<SelectContent className="max-h-72">
{cats.map((c) => (
<SelectItem key={c.id} value={c.id}>
{c.path}
</SelectItem>
))}
</SelectContent>
</Select>
) : (
<span />
)}
{row.kind === "expense" ? (
<KakeiboSelect
compact
value={row.kakeiboGroup && row.kakeiboGroup !== cat?.group ? row.kakeiboGroup : ""}
onChange={(g) =>
onEdit(row, { kakeiboGroup: (g || cat?.group || null) as KakeiboGroup | null })
}
suggested={cat?.group ?? null}
bankCost={cat?.bankCost ?? false}
ariaLabel={t.columns.group}
/>
) : null}
</div>
) : null}
</li>
);
}
/** /islemler/ice-aktar/:id — hesaplar, kontroller, önizleme ve işleme. */
export function ImportWizard({ draft }: { draft: ImportDraft }) {
const router = useRouter();
const [rows, setRows] = useState(draft.rows);
const [sheet, setSheet] = useState<"card" | "bank">(
draft.rows.some((r) => r.sheet === "card") ? "card" : "bank",
);
const [filter, setFilter] = useState<Filter>("all");
const [page, setPage] = useState(0);
const [applyToSame, setApplyToSame] = useState(true);
const [busy, setBusy] = useState(false);
const [confirmRevert, setConfirmRevert] = useState(false);
const isDraft = draft.status === "draft";
const catOf = (id: string | null) => draft.categories.find((c) => c.id === id);
const visible = useMemo(() => {
const ofSheet = rows.filter((r) => r.sheet === sheet);
switch (filter) {
case "review":
return ofSheet.filter((r) => r.review && !r.duplicate);
case "ungrouped":
return ofSheet.filter(
(r) =>
r.kind === "expense" &&
!r.duplicate &&
!(r.kakeiboGroup ?? catOf(r.categoryId)?.group) &&
!catOf(r.categoryId)?.bankCost,
);
case "transfer":
return ofSheet.filter((r) => r.kind === "transfer");
case "skip":
return ofSheet.filter((r) => r.kind === "skip" || r.kind === "deferred" || r.duplicate);
default:
return ofSheet;
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [rows, sheet, filter]);
const pageRows = visible.slice(page * PAGE, page * PAGE + PAGE);
const toCreate = rows.filter((r) => !r.duplicate && r.kind !== "skip" && r.kind !== "deferred");
const missingCategory = toCreate.filter(
(r) => (r.kind === "expense" || r.kind === "income") && !r.categoryId,
);
const missingRoles = draft.neededRoles.filter((r) => !draft.accounts[r]);
const deferredRows = rows.filter((r) => r.kind === "deferred");
const deferred = deferredRows.length;
const deferredNet = deferredRows.reduce((sum, r) => sum + r.amountMinor, 0);
const duplicates = rows.filter((r) => r.duplicate).length;
const okStatements = draft.checks.statements.filter((s) => s.ok).length;
async function edit(
row: ImportRowView,
patch: Partial<Pick<ImportRowView, "kind" | "categoryId" | "kakeiboGroup">>,
) {
const same = (x: ImportRowView) =>
applyToSame
? x.sheet === row.sheet &&
x.description.toLocaleLowerCase("tr-TR") === row.description.toLocaleLowerCase("tr-TR") &&
x.kind === row.kind
: x.id === row.id;
const before = rows;
setRows((rs) => rs.map((x) => (same(x) ? { ...x, ...patch, edited: true } : x)));
const r = await updateImportRowAction(draft.id, { rowId: row.id, ...patch, applyToSame });
if (!r.ok) {
setRows(before);
toast.error(r.error);
}
}
async function commit() {
setBusy(true);
const r = await commitImportAction(draft.id);
setBusy(false);
if (!r.ok) toast.error(r.error);
else {
toast.success(t.committed(r.data.transactions));
router.refresh();
}
}
async function revert() {
setConfirmRevert(false);
setBusy(true);
const r = await revertImportAction(draft.id);
setBusy(false);
if (!r.ok) toast.error(r.error);
else {
toast.success(t.reverted(r.data.transactions));
router.refresh();
}
}
async function removeDraft() {
const r = await deleteImportDraftAction(draft.id);
if (!r.ok) toast.error(r.error);
else router.push("/islemler/ice-aktar");
}
const filters: Filter[] = ["all", "review", "ungrouped", "transfer", "skip"];
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/islemler/ice-aktar">
<ArrowLeft />
{t.back}
</Link>
</Button>
<PageHeader
title={draft.fileName}
description={
<>
{t.statuses[draft.status]} · {t.rowsCount(draft.rowCount)}
</>
}
/>
{!isDraft ? (
<Step title={t.statuses[draft.status]!}>
{draft.committed ? (
<p className="text-sm">
{t.committedSummary(
draft.committed.transactions,
draft.committed.skipped,
draft.committed.categoriesCreated,
)}
</p>
) : null}
<div className="flex flex-wrap gap-2">
<Button variant="outline" size="sm" asChild>
<Link href="/islemler">{t.goTransactions}</Link>
</Button>
{draft.status === "committed" ? (
<Button
variant="destructive"
size="sm"
onClick={() => setConfirmRevert(true)}
disabled={busy}
>
<Undo2 />
{t.revert}
</Button>
) : null}
</div>
</Step>
) : null}
{isDraft && draft.neededRoles.length ? (
<Step title={t.steps.accounts}>
{!draft.canCreateAccounts ? (
<p className="text-xs text-muted-foreground">{t.ownerOnly}</p>
) : null}
<ul className="divide-y">
{draft.neededRoles.map((role) => (
<RoleRow key={role} draft={draft} role={role} />
))}
</ul>
</Step>
) : null}
<Step title={t.steps.checks}>
<ul className="flex flex-col gap-1.5 text-sm">
{draft.checks.statements.length ? (
<li className="flex items-start gap-2">
{okStatements === draft.checks.statements.length ? (
<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-income" aria-hidden />
) : (
<XCircle className="mt-0.5 size-4 shrink-0 text-expense" aria-hidden />
)}
<span>
{t.statementsSummary(okStatements, draft.checks.statements.length)}
{draft.checks.statements
.filter((s) => !s.ok)
.map((s) => (
<span key={s.cut} className="block text-xs text-expense">
{t.statementBad(
day(s.cut),
formatMoney(s.rowsMinor),
s.statementMinor === null ? "—" : formatMoney(s.statementMinor),
)}
</span>
))}
</span>
</li>
) : (
<li className="text-muted-foreground">{t.noStatements}</li>
)}
{draft.checks.balance.closingMinor !== null ? (
<li className="flex items-start gap-2">
{draft.checks.balance.mismatchLine === null ? (
<CheckCircle2 className="mt-0.5 size-4 shrink-0 text-income" aria-hidden />
) : (
<XCircle className="mt-0.5 size-4 shrink-0 text-expense" aria-hidden />
)}
{draft.checks.balance.mismatchLine === null
? t.balanceOk(formatMoney(draft.checks.balance.closingMinor))
: t.balanceBad(draft.checks.balance.mismatchLine)}
</li>
) : null}
{duplicates ? (
<li className="text-muted-foreground">{t.duplicates(duplicates)}</li>
) : null}
{deferred ? (
<li className="text-muted-foreground">
{t.deferred(
deferred,
`${deferredNet < 0 ? "−" : "+"}${formatMoney(Math.abs(deferredNet))}`,
)}
</li>
) : null}
{isDraft && draft.newCategories.length ? (
<li className="text-muted-foreground">
{t.newCategories(draft.newCategories.join(", "))}
</li>
) : null}
</ul>
</Step>
<Step title={t.steps.rows}>
<div className="flex flex-wrap items-center gap-2">
<Tabs
value={sheet}
onValueChange={(x) => {
setSheet(x as "card" | "bank");
setPage(0);
}}
>
<TabsList>
{(["card", "bank"] as const)
.filter((s) => rows.some((r) => r.sheet === s))
.map((s) => (
<TabsTrigger key={s} value={s}>
{t.sheets[s]} ({rows.filter((r) => r.sheet === s).length})
</TabsTrigger>
))}
</TabsList>
</Tabs>
<div className="flex flex-wrap gap-1">
{filters.map((f) => (
<Button
key={f}
size="sm"
variant={filter === f ? "secondary" : "ghost"}
onClick={() => {
setFilter(f);
setPage(0);
}}
>
{t.filters[f]}
</Button>
))}
</div>
{isDraft ? (
<label className="ml-auto flex items-center gap-2 text-sm">
<Checkbox checked={applyToSame} onCheckedChange={(x) => setApplyToSame(x === true)} />
{t.applyToSame}
</label>
) : null}
</div>
<ul
className={cn("divide-y rounded-lg border", !isDraft && "pointer-events-none opacity-90")}
>
{pageRows.map((r) => (
<RowItem key={r.id} row={r} draft={draft} onEdit={edit} />
))}
{!pageRows.length ? (
<li className="p-6 text-center text-sm text-muted-foreground">{t.empty}</li>
) : null}
</ul>
{visible.length > PAGE ? (
<div className="flex items-center justify-end gap-2 text-sm">
<span className="text-muted-foreground tabular-nums">
{t.page(page * PAGE + 1, Math.min(visible.length, (page + 1) * PAGE), visible.length)}
</span>
<Button
size="sm"
variant="outline"
disabled={page === 0}
onClick={() => setPage((p) => p - 1)}
>
{t.prev}
</Button>
<Button
size="sm"
variant="outline"
disabled={(page + 1) * PAGE >= visible.length}
onClick={() => setPage((p) => p + 1)}
>
{t.next}
</Button>
</div>
) : null}
</Step>
{isDraft ? (
<Step title={t.steps.commit}>
<p className="text-sm">
{t.commitSummary(toCreate.length, rows.length - toCreate.length)}
</p>
{missingRoles.map((r) => (
<p key={r} className="text-sm text-expense">
{t.errors.roleMissing(t.roles[r] ?? r)}
</p>
))}
{missingCategory.length ? (
<p className="text-sm text-expense">
{t.errors.category(String(missingCategory.length))}
</p>
) : null}
<p className="text-xs text-muted-foreground">{t.commitHint}</p>
<div className="flex flex-wrap gap-2">
<Button
onClick={commit}
disabled={busy || missingRoles.length > 0 || missingCategory.length > 0}
>
{busy ? <Loader2 className="animate-spin" /> : null}
{busy ? t.committing : t.commit}
</Button>
<Button variant="ghost" onClick={removeDraft} disabled={busy}>
{t.deleteDraft}
</Button>
</div>
</Step>
) : null}
<AlertDialog open={confirmRevert} onOpenChange={setConfirmRevert}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.revertTitle}</AlertDialogTitle>
<AlertDialogDescription>{t.revertDescription}</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button variant="destructive" onClick={revert}>
{t.revert}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
@@ -0,0 +1,54 @@
"use client";
import { FileSpreadsheet, Loader2, Upload } from "lucide-react";
import { useRouter } from "next/navigation";
import { useRef, useState } from "react";
import { toast } from "sonner";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import { uploadImportAction } from "../actions";
const t = tr.imports;
/** Kakeibo çalışma kitabı yükleme: dosya seçilince okunur ve taslağa gidilir. */
export function UploadCard() {
const router = useRouter();
const input = useRef<HTMLInputElement>(null);
const [busy, setBusy] = useState(false);
async function onPick(file: File | undefined) {
if (!file) return;
setBusy(true);
const form = new FormData();
form.set("file", file);
const r = await uploadImportAction(form);
setBusy(false);
if (input.current) input.current.value = "";
if (!r.ok) {
toast.error(r.error);
return;
}
router.push(`/islemler/ice-aktar/${r.data.id}`);
}
return (
<section className="flex flex-col items-start gap-3 rounded-xl border border-dashed bg-card p-5 sm:flex-row sm:items-center">
<span className="flex size-10 shrink-0 items-center justify-center rounded-lg bg-muted">
<FileSpreadsheet className="size-5 text-muted-foreground" aria-hidden />
</span>
<p className="min-w-0 flex-1 text-sm text-muted-foreground">{t.uploadHint}</p>
<input
ref={input}
type="file"
accept=".xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
className="sr-only"
id="import-file"
onChange={(e) => onPick(e.target.files?.[0])}
/>
<Button onClick={() => input.current?.click()} disabled={busy}>
{busy ? <Loader2 className="animate-spin" /> : <Upload />}
{busy ? t.uploading : t.upload}
</Button>
</section>
);
}
+264
View File
@@ -0,0 +1,264 @@
import * as XLSX from "xlsx";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { listAccounts } from "@/features/accounts/service";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
commitImport,
createImportAccount,
createImportDraft,
getImportDraft,
revertImport,
updateImportRow,
} from "./service";
/** Yapay Kakeibo çalışma kitabı (gerçek veri değil; yapı gerçek dosyayla aynı). */
const serial = (ymd: string) =>
Date.UTC(+ymd.slice(0, 4), +ymd.slice(5, 7) - 1, +ymd.slice(8, 10)) / 86_400_000 + 25569;
function workbook(): Buffer {
const card = [
[
"İşlem tarihi",
"Ekstre kesim",
"İşyeri",
"Kategori",
"Kakeibo",
"Kart",
"Taksit",
"Tutar (TL)",
],
[
serial("2026-01-05"),
serial("2026-01-28"),
"Test Market",
"Market & gıda",
"Zorunlu",
"Fiziksel kart",
null,
100,
],
[
serial("2026-01-06"),
serial("2026-01-28"),
"Test Market",
"Market & gıda",
"İstek",
"Fiziksel kart",
null,
40,
],
[
serial("2025-12-10"),
serial("2026-01-28"),
"Test Yapı (taksit)",
"Ev / tadilat / yapı market",
"Beklenmeyen",
"Fiziksel kart",
"1/3 (300,00 TL)",
100,
],
[
serial("2025-12-10"),
serial("2026-02-28"),
"Test Yapı (taksit)",
"Ev / tadilat / yapı market",
"Beklenmeyen",
"Fiziksel kart",
"2/3 (300,00 TL)",
100,
],
[
serial("2026-01-07"),
serial("2026-01-28"),
"Test Esnaf",
"Tanımsız esnaf",
null,
"Fiziksel kart",
null,
20,
],
[
serial("2026-01-08"),
serial("2026-01-28"),
"Kampanya iadesi",
"Kampanya iadesi",
"İstek",
"Fiziksel kart",
null,
-10,
],
];
const bank = [
["Tarih", "Açıklama", "Tür", "Tutar (TL)", "Bakiye (TL)", "Ay"],
[serial("2025-12-31"), "Devreden bakiye", "Açılış", null, 1000, null],
[serial("2026-01-02"), "Yol parası", "Yol parası", 500, 1500, null],
[serial("2026-01-03"), "ATM nakit çekim", "Nakit çekim (ATM)", -200, 1300, null],
[serial("2026-01-04"), "Kredi kartı borç ödemesi", "Kredi kartı ödemesi", -250, 1050, null],
[serial("2026-01-05"), "Giden havale (kişi)", "Havale/EFT (kişi)", -50, 1000, null],
[serial("2026-01-06"), "KMH faiz tahakkuku", "KMH faiz ve vergi", -5, 995, null],
];
const summary = [
["Kakeibo özeti"],
[
"Ekstre kesim",
"Zorunlu",
"İstek",
"Kültür",
"Beklenmeyen",
"Toplam",
"Ekstredeki harcama",
"Fark",
],
[serial("2026-01-28"), 0, 0, 0, 0, 0, 250, 0],
[serial("2026-02-28"), 0, 0, 0, 0, 0, 100, 0],
];
const wb = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet(summary), "Özet");
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet(card), "Kredi Kartı");
XLSX.utils.book_append_sheet(wb, XLSX.utils.aoa_to_sheet(bank), "Maaş Hesabı");
return XLSX.write(wb, { type: "buffer", bookType: "xlsx" }) as Buffer;
}
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let household = "";
let ayse = "";
let zeynep = "";
beforeAll(async () => {
ids = await setupSeededDb();
// Tertemiz bir hane: Annemler'de ayse izleyici; testte Çakır yerine yeni hesaplar açılır.
household = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
zeynep = ids.user("zeynep");
});
afterAll(teardownDb);
describe("Kakeibo çalışma kitabı içe aktarma", () => {
let batch = "";
const accounts: Record<string, string> = {};
it("taslak: öneriler, kontroller, ihtiyaç duyulan roller; izleyici aktaramaz", async () => {
expect(
(await createImportDraft(zeynep, household, { name: "x.xlsx", buffer: workbook() })).ok,
).toBe(false);
const r = await createImportDraft(ayse, household, {
name: "kakeibo.xlsx",
buffer: workbook(),
});
expect(r.ok).toBe(true);
batch = r.ok ? r.data.id : "";
const d = (await getImportDraft(ayse, household, batch))!;
expect(d.rows).toHaveLength(11);
expect(d.checks.statements.every((s) => s.ok)).toBe(true);
expect(d.checks.balance).toEqual({ mismatchLine: null, closingMinor: 99_500 });
expect(d.neededRoles).toEqual(["card", "bank", "cash"]);
expect(d.presets.bank).toMatchObject({ openingMinor: 100_000, openingDate: "2026-01-01" });
expect(d.presets.card).toMatchObject({ openingMinor: 25_000 });
expect(d.newCategories).toContain("Yol parası");
// İşlenince oluşacak kategori önizlemede eksik sayılmaz; seçilebilir.
const yol = d.rows.find((r) => r.description === "Yol parası")!;
expect(yol.categoryId).toBe("new:kakeibo.yol");
expect(d.categories.find((c) => c.id === "new:kakeibo.yol")).toMatchObject({ kind: "income" });
expect(
d.rows.filter((r) => (r.kind === "expense" || r.kind === "income") && !r.categoryId),
).toEqual([]);
});
it("önerilen hesaplar oluşturulup rollere bağlanır", async () => {
const d = (await getImportDraft(ayse, household, batch))!;
for (const role of ["bank", "card", "cash"] as const) {
const p = d.presets[role]!;
const r = await createImportAccount(ayse, household, batch, role, {
name: `Test ${p.name}`,
openingMinor: p.openingMinor,
openingDate: p.openingDate,
});
expect(r.ok).toBe(true);
if (r.ok) accounts[role] = r.data.id;
}
expect((await getImportDraft(ayse, household, batch))!.accounts).toMatchObject(accounts);
});
it("satır düzenleme: grupsuz havaleye kategori ve grup; aynı işyerine toplu", async () => {
const d = (await getImportDraft(ayse, household, batch))!;
const havale = d.rows.find((r) => r.description === "Giden havale (kişi)")!;
expect(havale.review).toBe("ungrouped");
const dining = d.categories.find((c) => c.path === "Eğlence › Dışarıda yemek")!;
expect(
(await updateImportRow(ayse, household, batch, { rowId: havale.id, categoryId: dining.id }))
.ok,
).toBe(true);
const market = d.rows.find((r) => r.description === "Test Market")!;
const multi = await updateImportRow(ayse, household, batch, {
rowId: market.id,
kakeiboGroup: "ZORUNLU",
applyToSame: true,
});
expect(multi).toMatchObject({ ok: true, data: { updated: 2 } });
// Geri dön: ikinci market satırı İstek kalsın (kayıt bazında grup testi için).
const second = d.rows.filter((r) => r.description === "Test Market")[1]!;
await updateImportRow(ayse, household, batch, { rowId: second.id, kakeiboGroup: "ISTEK" });
});
it("işle: işlemler, transferler, taksit planı, grup, yeni kategoriler; bakiye dosyayla tutar", async () => {
const r = await commitImport(ayse, household, batch);
expect(r).toMatchObject({ ok: true, data: { transactions: 11, skipped: 0 } });
const txs = await TransactionModel.find({
importBatchId: { $ne: null },
deletedAt: null,
}).lean();
expect(txs).toHaveLength(11);
const cardPay = txs.find((x) => x.payeeName === "Kredi kartı borç ödemesi")!;
expect(cardPay).toMatchObject({ type: "transfer", amountMinor: 25_000 });
expect(String(cardPay.accountId)).toBe(accounts.bank);
expect(String(cardPay.toAccountId)).toBe(accounts.card);
const inst = txs.filter((x) => x.installment);
expect(inst).toHaveLength(2);
expect(String(inst[0]!.installment!.planId)).toBe(String(inst[1]!.installment!.planId));
const markets = txs.filter((x) => x.payeeName === "Test Market");
expect(markets.map((x) => x.kakeiboGroup).sort()).toEqual(["ISTEK", null]);
const refund = txs.find((x) => x.payeeName === "Kampanya iadesi")!;
expect(refund.type).toBe("income");
expect(await CategoryModel.exists({ defaultKey: "kakeibo.yol" })).toBeTruthy();
const list = (await listAccounts(ayse, household))!.accounts;
const bal = (id: string) => list.find((a) => a.id === id)!.balanceMinor;
expect(bal(accounts.bank!)).toBe(99_500); // dosyadaki son bakiye
expect(bal(accounts.cash!)).toBe(20_000);
// Kart: −250 açılış + 250 ödeme − (100 + 40 + 100 + 100 + 20) + 10 iade.
expect(bal(accounts.card!)).toBe(-35_000);
});
it("aynı dosya tekrar yüklenince tüm satırlar daha önce aktarılmış sayılır", async () => {
const again = await createImportDraft(ayse, household, {
name: "kakeibo.xlsx",
buffer: workbook(),
});
const d = (await getImportDraft(ayse, household, again.ok ? again.data.id : ""))!;
expect(d.rows.every((r) => r.duplicate)).toBe(true);
expect(d.neededRoles).toEqual([]);
expect(await commitImport(ayse, household, d.id)).toMatchObject({
ok: true,
data: { transactions: 0, skipped: 11 },
});
});
it("geri alma işlemleri siler; dosya yeniden aktarılabilir", async () => {
expect(await revertImport(ayse, household, batch)).toMatchObject({
ok: true,
data: { transactions: 11 },
});
expect(
await TransactionModel.countDocuments({ importBatchId: { $ne: null }, deletedAt: null }),
).toBe(0);
expect((await revertImport(ayse, household, batch)).ok).toBe(false);
const fresh = await createImportDraft(ayse, household, {
name: "kakeibo.xlsx",
buffer: workbook(),
});
const d = (await getImportDraft(ayse, household, fresh.ok ? fresh.data.id : ""))!;
expect(d.rows.some((r) => r.duplicate)).toBe(false);
});
});
+816
View File
@@ -0,0 +1,816 @@
import "server-only";
import { createHash } from "node:crypto";
import { Types } from "mongoose";
import * as XLSX from "xlsx";
import { createAccount } from "@/features/accounts/service";
import { hasHouseholdRole } from "@/features/households/roles";
import { resolveMembership, type Membership } from "@/features/households/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { connectMongoose } from "@/lib/db/mongoose";
import { toObjectId } from "@/lib/object-id";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { ImportBatchModel } from "@/models/import-batch";
import { TransactionModel } from "@/models/transaction";
import type { AccountType } from "@/shared/accounts";
import { istanbulDayStart } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import {
checkStatements,
firstCardPayment,
IMPORT_CATEGORIES,
parseBankSheet,
parseCardSheet,
parseStatementTotals,
type ImportRole,
type ProposedRow,
type RowKind,
type StatementCheck,
} from "@/shared/import/kakeibo-workbook";
import { isKakeiboGroup, resolveKakeibo, type KakeiboGroup } from "@/shared/kakeibo";
import { accountFormSchema } from "@/shared/schemas/account";
import { compareTr, foldTr } from "@/shared/search";
import { addDays } from "@/shared/recurrence";
/**
* Ekstre içe aktarma (Faz 17a): Kakeibo çalışma kitabı. Okuma: member; hesap oluşturma owner
* (hesap servisinin kuralı). Akış: dosya → taslak (öneriler, tekrar işaretleri, kontroller) →
* hesap eşleme → satır düzenleme → tek transaction'da işle → gerekirse toplu geri al.
*
* Kişisel veri: dosyanın başlık alanları (müşteri/kart no) okunmaz; satır açıklamaları yalnızca
* hanenin kendi verisinde saklanır. Tekrar engeli için işlemde anahtarın SHA-256 özeti tutulur.
*/
const t = tr.imports;
// Server Action gövde sınırı (Next varsayılanı 1 MB) ile uyumlu.
export const MAX_IMPORT_BYTES = 1024 * 1024 - 64 * 1024;
const ROLES: ImportRole[] = ["card", "bank", "cash", "extra"];
const ROLE_TYPES: Record<ImportRole, AccountType[]> = {
card: ["credit_card"],
bank: ["bank"],
cash: ["cash"],
extra: ["bank", "cash"],
gold: [],
};
type RowDoc = ProposedRow & {
_id: Types.ObjectId;
categoryId: Types.ObjectId | null;
duplicate: boolean;
edited: boolean;
};
type BatchDoc = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
fileName: string;
fileHash: string;
status: "draft" | "committed" | "reverted";
accounts: Partial<Record<ImportRole, string>>;
rows: RowDoc[];
checks: ImportChecks;
committed: { transactions: number; skipped: number; categoriesCreated: number } | null;
committedAt: Date | null;
revertedAt: Date | null;
createdAt: Date;
};
export type ImportChecks = {
statements: StatementCheck[];
balance: { mismatchLine: number | null; closingMinor: number | null };
opening: {
bank: { date: string; balanceMinor: number } | null;
card: { date: string; amountMinor: number } | null;
};
/** Kart satırlarının en erken tarihi (kart açılış tarihi önerisi). */
firstCardDate: string | null;
firstBankDate: string | null;
};
const hashKey = (key: string) => createHash("sha256").update(key).digest("hex");
// --- Dosya okuma ---
/** Kakeibo çalışma kitabını okur. Sayfalar yoksa açık hata döner. */
export function readWorkbook(
buffer: Buffer,
): ActionResult<{ rows: ProposedRow[]; checks: ImportChecks }> {
let wb: XLSX.WorkBook;
try {
wb = XLSX.read(buffer, { type: "buffer", cellDates: false, dense: true });
} catch {
return fail(t.errors.unreadable);
}
const sheet = (name: string) => {
const ws = wb.Sheets[name];
return ws
? (XLSX.utils.sheet_to_json(ws, { header: 1, raw: true, defval: null }) as unknown[][])
: null;
};
const cardRows = sheet("Kredi Kartı");
const bankRows = sheet("Maaş Hesabı");
if (!cardRows && !bankRows) return fail(t.errors.noSheets);
const card = cardRows ? parseCardSheet(cardRows) : [];
const bank = bankRows ? parseBankSheet(bankRows) : null;
const summary = sheet("Özet");
const rows = [...card, ...(bank?.rows ?? [])];
const dates = (s: "card" | "bank") =>
rows
.filter((r) => r.sheet === s)
.map((r) => r.date)
.sort();
return ok({
rows,
checks: {
statements: summary ? checkStatements(card, parseStatementTotals(summary)) : [],
balance: {
mismatchLine: bank?.balanceMismatch?.line ?? null,
closingMinor: bank?.closingBalanceMinor ?? null,
},
opening: { bank: bank?.opening ?? null, card: firstCardPayment(rows) },
firstCardDate: dates("card")[0] ?? null,
firstBankDate: dates("bank")[0] ?? null,
},
});
}
// --- Görünümler ---
export type ImportRowView = {
id: string;
sheet: "card" | "bank";
line: number;
date: string;
statementCut: string | null;
description: string;
amountMinor: number;
kind: RowKind;
categoryId: string | null;
kakeiboGroup: KakeiboGroup | null;
counterRole: ImportRole | null;
installment: { index: number; count: number; totalMinor: number } | null;
source: { category: string; type: string };
review: string | null;
duplicate: boolean;
edited: boolean;
};
export type ImportSummary = {
id: string;
fileName: string;
status: BatchDoc["status"];
createdAt: string;
committedAt: string | null;
revertedAt: string | null;
rowCount: number;
committed: BatchDoc["committed"];
};
export type AccountPreset = {
role: ImportRole;
name: string;
type: AccountType;
openingMinor: number;
openingDate: string;
};
export type ImportDraft = ImportSummary & {
rows: ImportRowView[];
checks: ImportChecks;
accounts: Partial<Record<ImportRole, string>>;
/** Satırların ihtiyaç duyduğu roller. */
neededRoles: ImportRole[];
accountOptions: { id: string; name: string; type: AccountType }[];
presets: Record<string, AccountPreset>;
categories: {
id: string;
path: string;
kind: "expense" | "income";
group: KakeiboGroup | null;
bankCost: boolean;
}[];
/** Henüz hanede olmayan ve işlenince oluşturulacak kategoriler. */
newCategories: string[];
canCreateAccounts: boolean;
};
const summaryOf = (b: BatchDoc): ImportSummary => ({
id: String(b._id),
fileName: b.fileName,
status: b.status,
createdAt: b.createdAt.toISOString(),
committedAt: b.committedAt?.toISOString() ?? null,
revertedAt: b.revertedAt?.toISOString() ?? null,
rowCount: b.rows.length,
committed: b.committed,
});
type CatLean = {
_id: Types.ObjectId;
kind: "expense" | "income";
name: string;
parentId: Types.ObjectId | null;
defaultKey: string | null;
archivedAt: Date | null;
kakeiboGroup?: KakeiboGroup | null;
bankCost?: boolean;
};
async function loadCategories(householdId: Types.ObjectId) {
const cats = await CategoryModel.find({ householdId }).lean<CatLean[]>();
const byId = new Map(cats.map((c) => [String(c._id), c]));
const path = (c: CatLean): string => {
const p = c.parentId ? byId.get(String(c.parentId)) : undefined;
return p ? `${path(p)} › ${c.name}` : c.name;
};
const resolved = resolveKakeibo(
cats.map((c) => ({
id: String(c._id),
parentId: c.parentId ? String(c.parentId) : null,
kakeiboGroup: c.kakeiboGroup ?? null,
bankCost: Boolean(c.bankCost),
})),
);
const byKey = new Map(cats.filter((c) => c.defaultKey).map((c) => [c.defaultKey!, c]));
return { cats, byId, byKey, path, resolved };
}
const rowCategoryId = (r: RowDoc, byKey: Map<string, CatLean>) =>
r.categoryId
? String(r.categoryId)
: r.categoryKey
? byKey.get(r.categoryKey)
? String(byKey.get(r.categoryKey)!._id)
: null
: null;
/** İşlenirken oluşturulacak kategori için önizlemedeki sözde kimlik. */
export const NEW_CATEGORY_PREFIX = "new:";
const IMPORT_KEYS = new Set(IMPORT_CATEGORIES.map((x) => x.key));
const draftCategoryId = (r: RowDoc, byKey: Map<string, CatLean>) =>
rowCategoryId(r, byKey) ??
(r.categoryId === null && r.categoryKey && IMPORT_KEYS.has(r.categoryKey)
? NEW_CATEGORY_PREFIX + r.categoryKey
: null);
function neededRoles(rows: readonly RowDoc[]): ImportRole[] {
const need = new Set<ImportRole>();
for (const r of rows) {
if (r.kind === "skip" || r.kind === "deferred" || r.duplicate) continue;
need.add(r.sheet);
if (r.kind === "transfer" && r.counterRole) need.add(r.counterRole);
}
return ROLES.filter((x) => need.has(x));
}
async function loadBatch(m: Membership, batchId: string) {
const id = toObjectId(batchId);
if (!id) return null;
return ImportBatchModel.findOne({ _id: id, householdId: m.householdId }).lean<BatchDoc>();
}
// --- Okuma ---
export async function listImports(
userId: string,
householdId: string,
): Promise<ImportSummary[] | null> {
const m = await resolveMembership(userId, householdId, "member");
if (!m) return null;
const rows = await ImportBatchModel.find({ householdId: m.householdId })
.select({ rows: 0 })
.sort({ createdAt: -1 })
.limit(50)
.lean<(Omit<BatchDoc, "rows"> & { rows?: undefined })[]>();
const counts = await ImportBatchModel.aggregate<{ _id: Types.ObjectId; n: number }>([
{ $match: { householdId: m.householdId } },
{ $project: { n: { $size: "$rows" } } },
]);
const n = new Map(counts.map((c) => [String(c._id), c.n]));
return rows.map((b) => ({
...summaryOf({ ...b, rows: [] } as BatchDoc),
rowCount: n.get(String(b._id)) ?? 0,
}));
}
export async function getImportDraft(
userId: string,
householdId: string,
batchId: string,
): Promise<ImportDraft | null> {
const m = await resolveMembership(userId, householdId, "member");
if (!m) return null;
const b = await loadBatch(m, batchId);
if (!b) return null;
const [cats, accounts] = await Promise.all([
loadCategories(m.householdId),
AccountModel.find({ householdId: m.householdId, archivedAt: null })
.select({ name: 1, type: 1, isPrivate: 1, ownerUserId: 1 })
.lean<
{
_id: Types.ObjectId;
name: string;
type: AccountType;
isPrivate: boolean;
ownerUserId: Types.ObjectId | null;
}[]
>(),
]);
const c = b.checks;
const presets: Record<string, AccountPreset> = {
bank: {
role: "bank",
name: t.presets.bank,
type: "bank",
openingMinor: c.opening.bank?.balanceMinor ?? 0,
openingDate: c.opening.bank
? addDays(c.opening.bank.date, 1)
: (c.firstBankDate ?? "2026-01-01"),
},
card: {
role: "card",
name: t.presets.card,
type: "credit_card",
openingMinor: c.opening.card?.amountMinor ?? 0,
openingDate: c.firstCardDate ?? "2026-01-01",
},
cash: {
role: "cash",
name: t.presets.cash,
type: "cash",
openingMinor: 0,
openingDate: c.firstBankDate ?? "2026-01-01",
},
extra: {
role: "extra",
name: t.presets.extra,
type: "bank",
openingMinor: 0,
openingDate: c.firstBankDate ?? "2026-01-01",
},
};
const visible = accounts.filter((a) => !a.isPrivate || String(a.ownerUserId) === userId);
const missingCats = IMPORT_CATEGORIES.filter((x) => !cats.byKey.has(x.key));
const missing = missingCats.map((x) => x.name);
return {
...summaryOf(b),
rows: b.rows.map((r) => ({
id: String(r._id),
sheet: r.sheet,
line: r.line,
date: r.date,
statementCut: r.statementCut,
description: r.description,
amountMinor: r.amountMinor,
kind: r.kind,
categoryId: draftCategoryId(r, cats.byKey),
kakeiboGroup: isKakeiboGroup(r.kakeiboGroup) ? r.kakeiboGroup : null,
counterRole: r.counterRole,
installment: r.installment
? {
index: r.installment.index,
count: r.installment.count,
totalMinor: r.installment.totalMinor,
}
: null,
source: r.source,
review: r.review,
duplicate: r.duplicate,
edited: r.edited,
})),
checks: b.checks,
accounts: b.accounts ?? {},
neededRoles: neededRoles(b.rows),
accountOptions: visible
.map((a) => ({ id: String(a._id), name: a.name, type: a.type }))
.sort((x, y) => compareTr(x.name, y.name)),
presets,
categories: cats.cats
.filter((x) => !x.archivedAt)
.map((x) => {
const k = cats.resolved.get(String(x._id));
return {
id: String(x._id),
path: cats.path(x),
kind: x.kind,
group: k?.group ?? null,
bankCost: k?.bankCost ?? false,
};
})
.concat(
missingCats.map((x) => ({
id: NEW_CATEGORY_PREFIX + x.key,
path: t.newCategoryName(x.name),
kind: x.kind,
group: x.kind === "expense" ? x.kakeiboGroup : null,
bankCost: false,
})),
)
.sort((x, y) => compareTr(x.path, y.path)),
newCategories: missing,
canCreateAccounts: hasHouseholdRole(m.role, "owner"),
};
}
// --- Yazma ---
export async function createImportDraft(
actorId: string,
householdId: string,
file: { name: string; buffer: Buffer },
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
if (file.buffer.byteLength > MAX_IMPORT_BYTES) return fail(t.errors.tooLarge);
const parsed = readWorkbook(file.buffer);
if (!parsed.ok) return parsed;
const { rows, checks } = parsed.data;
if (!rows.length) return fail(t.errors.empty);
// Hanede zaten içe aktarılmış satırlar (aynı anahtar) atlanmak üzere işaretlenir.
const hashes = rows.map((r) => hashKey(r.key));
const existing = new Set(
(
await TransactionModel.find({ householdId: m.householdId, importKey: { $in: hashes } })
.select({ importKey: 1 })
.lean<{ importKey: string }[]>()
).map((x) => x.importKey),
);
const actor = new Types.ObjectId(actorId);
const doc = await ImportBatchModel.create({
householdId: m.householdId,
source: "kakeibo-workbook",
fileName: file.name.slice(0, 200),
fileHash: createHash("sha256").update(file.buffer).digest("hex"),
rows: rows.map((r, i) => ({ ...r, duplicate: existing.has(hashes[i]!) })),
checks,
createdBy: actor,
updatedBy: actor,
});
return ok({ id: String(doc._id) });
}
async function draftFor(actorId: string, householdId: string, batchId: string) {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return { error: fail(tr.common.unauthorized) } as const;
const b = await loadBatch(m, batchId);
if (!b) return { error: fail(tr.common.notFound) } as const;
if (b.status !== "draft") return { error: fail(t.errors.notDraft) } as const;
return { error: null, m, b, actor: new Types.ObjectId(actorId) } as const;
}
/** Bir rolü mevcut bir hesaba bağlar. */
export async function setImportAccount(
actorId: string,
householdId: string,
batchId: string,
role: ImportRole,
accountId: string,
): Promise<ActionResult> {
const r = await draftFor(actorId, householdId, batchId);
if (r.error) return r.error;
const id = toObjectId(accountId);
const acc = id
? await AccountModel.findOne({ _id: id, householdId: r.m.householdId, archivedAt: null })
.select({ type: 1 })
.lean<{ type: AccountType }>()
: null;
if (!acc || !ROLE_TYPES[role].includes(acc.type)) return fail(t.errors.accountType);
await ImportBatchModel.updateOne(
{ _id: r.b._id },
{ $set: { [`accounts.${role}`]: accountId, updatedBy: r.actor } },
);
return ok(undefined);
}
/** Önerilen değerlerle hesap oluşturup role bağlar (hesap oluşturma: owner). */
export async function createImportAccount(
actorId: string,
householdId: string,
batchId: string,
role: ImportRole,
input: { name: string; openingMinor: number; openingDate: string },
): Promise<ActionResult<{ id: string }>> {
const draft = await getImportDraft(actorId, householdId, batchId);
if (!draft || draft.status !== "draft") return fail(tr.common.notFound);
const preset = draft.presets[role];
if (!preset) return fail(tr.common.notFound);
const isCard = preset.type === "credit_card";
const form = accountFormSchema.safeParse({
name: input.name,
type: preset.type,
institution: "",
mealCardProvider: null,
// Kartta açılış borcu pozitif girilir; hesap servisi negatife çevirir. Bankada eksi bakiye
// (KMH) eksi işaretle girilir.
openingBalance: formatMoneyInput(isCard ? Math.abs(input.openingMinor) : input.openingMinor),
openingDate: input.openingDate,
color: isCard ? "purple" : preset.type === "cash" ? "green" : "blue",
icon: isCard ? "credit-card" : preset.type === "cash" ? "wallet" : "landmark",
ownerUserId: "",
isPrivate: false,
overdraftEnabled: role === "bank",
overdraftLimit: "0",
overdraftMonthlyRate: "",
overdraftStatementDay: "",
cardLimit: "0",
cardStatementDay: "28",
cardDueKind: "daysAfter",
cardDueValue: "12",
cardPaymentAccountId: "",
cardMinimumRate: "",
});
if (!form.success) return fail(form.error.issues[0]?.message ?? t.errors.accountType);
const created = await createAccount(actorId, householdId, form.data);
if (!created.ok) return created;
const set = await setImportAccount(actorId, householdId, batchId, role, created.data.id);
if (!set.ok) return set;
return ok({ id: created.data.id });
}
export type ImportRowEdit = {
rowId: string;
kind?: "expense" | "income" | "skip";
categoryId?: string | null;
kakeiboGroup?: KakeiboGroup | null;
/** Aynı açıklamalı (işyeri) tüm satırlara uygula. */
applyToSame?: boolean;
};
export async function updateImportRow(
actorId: string,
householdId: string,
batchId: string,
edit: ImportRowEdit,
): Promise<ActionResult<{ updated: number }>> {
const r = await draftFor(actorId, householdId, batchId);
if (r.error) return r.error;
const row = r.b.rows.find((x) => String(x._id) === edit.rowId);
if (!row) return fail(tr.common.notFound);
const newKey = edit.categoryId?.startsWith(NEW_CATEGORY_PREFIX)
? edit.categoryId.slice(NEW_CATEGORY_PREFIX.length)
: null;
if (newKey !== null && !IMPORT_KEYS.has(newKey))
return fail(tr.transactions.validation.categoryInvalid);
if (edit.categoryId && newKey === null) {
const ok = await CategoryModel.exists({
_id: new Types.ObjectId(edit.categoryId),
householdId: r.m.householdId,
archivedAt: null,
});
if (!ok) return fail(tr.transactions.validation.categoryInvalid);
}
const targets = edit.applyToSame
? r.b.rows.filter(
(x) =>
x.sheet === row.sheet &&
foldTr(x.description) === foldTr(row.description) &&
x.kind === row.kind,
)
: [row];
const ops = targets.map((x) => {
const s: Record<string, unknown> = { "rows.$[r].edited": true };
if (edit.kind) s["rows.$[r].kind"] = edit.kind;
if (newKey !== null) {
s["rows.$[r].categoryId"] = null;
s["rows.$[r].categoryKey"] = newKey;
} else if (edit.categoryId !== undefined)
s["rows.$[r].categoryId"] = edit.categoryId ? new Types.ObjectId(edit.categoryId) : null;
if (edit.kakeiboGroup !== undefined) s["rows.$[r].kakeiboGroup"] = edit.kakeiboGroup;
return {
updateOne: {
filter: { _id: r.b._id },
update: { $set: { ...s, updatedBy: r.actor } },
arrayFilters: [{ "r._id": x._id }],
},
};
});
if (ops.length) await ImportBatchModel.bulkWrite(ops);
return ok({ updated: ops.length });
}
/** Partideki satırları tek transaction'da işler. */
export async function commitImport(
actorId: string,
householdId: string,
batchId: string,
): Promise<ActionResult<{ transactions: number; skipped: number }>> {
const r = await draftFor(actorId, householdId, batchId);
if (r.error) return r.error;
const { m, b, actor } = r;
const need = neededRoles(b.rows);
const accountIds: Partial<Record<ImportRole, Types.ObjectId>> = {};
for (const role of need) {
const id = b.accounts?.[role] ? toObjectId(b.accounts[role]!) : null;
const acc = id
? await AccountModel.findOne({ _id: id, householdId: m.householdId, archivedAt: null })
.select({ type: 1 })
.lean<{ type: AccountType }>()
: null;
if (!acc || !ROLE_TYPES[role].includes(acc.type))
return fail(t.errors.roleMissing(t.roles[role] ?? role));
accountIds[role] = id!;
}
const mongoose = await connectMongoose();
let inserted = 0;
let skipped = 0;
let categoriesCreated = 0;
try {
await mongoose.connection.transaction(async (session) => {
inserted = 0;
skipped = 0;
categoriesCreated = 0;
// Eksik içe aktarma kategorileri (anahtar: kakeibo.*).
const existing = await CategoryModel.find({
householdId: m.householdId,
defaultKey: { $in: IMPORT_CATEGORIES.map((x) => x.key) },
})
.select({ defaultKey: 1 })
.session(session)
.lean<{ defaultKey: string }[]>();
const have = new Set(existing.map((x) => x.defaultKey));
const missing = IMPORT_CATEGORIES.filter((x) => !have.has(x.key));
if (missing.length) {
await CategoryModel.insertMany(
missing.map((x, i) => ({
householdId: m.householdId,
kind: x.kind,
name: x.name,
nameKey: foldTr(x.name),
parentId: null,
ancestors: [],
icon: x.icon,
color: x.color,
order: 100 + i,
defaultKey: x.key,
kakeiboGroup: x.kind === "expense" ? x.kakeiboGroup : null,
bankCost: false,
createdBy: actor,
updatedBy: actor,
})),
{ session },
);
categoriesCreated = missing.length;
}
const cats = await CategoryModel.find({ householdId: m.householdId })
.session(session)
.lean<CatLean[]>();
const byKey = new Map(cats.filter((c) => c.defaultKey).map((c) => [c.defaultKey!, c]));
const byId = new Map(cats.map((c) => [String(c._id), c]));
const resolved = resolveKakeibo(
cats.map((c) => ({
id: String(c._id),
parentId: c.parentId ? String(c.parentId) : null,
kakeiboGroup: c.kakeiboGroup ?? null,
bankCost: Boolean(c.bankCost),
})),
);
const plans = new Map<string, Types.ObjectId>();
const docs: Record<string, unknown>[] = [];
for (const row of b.rows) {
if (row.duplicate || row.kind === "skip" || row.kind === "deferred") {
skipped++;
continue;
}
const own = accountIds[row.sheet]!;
const base = {
householdId: m.householdId,
status: "posted",
date: istanbulDayStart(row.date)!,
amountMinor: Math.abs(row.amountMinor),
payeeName: row.description.slice(0, 80),
description: "",
searchText: foldTr(row.description),
tags: [t.tag],
importBatchId: b._id,
importKey: hashKey(row.key),
createdBy: actor,
updatedBy: actor,
};
if (row.kind === "transfer") {
const other = accountIds[row.counterRole as ImportRole]!;
const out = row.amountMinor < 0;
docs.push({
...base,
type: "transfer",
accountId: out ? own : other,
toAccountId: out ? other : own,
categoryId: null,
splits: [],
effectiveCategoryIds: [],
});
continue;
}
const catId = rowCategoryId(row, byKey);
const cat = catId ? byId.get(catId) : undefined;
const kind = row.kind as "expense" | "income";
if (!cat || cat.kind !== kind || cat.archivedAt)
throw new ImportError(fail(t.errors.category(row.description || String(row.line))));
const group = isKakeiboGroup(row.kakeiboGroup) ? row.kakeiboGroup : null;
const categoryGroup = resolved.get(catId!)?.group ?? null;
let installment = null;
if (row.installment && kind === "expense") {
const planId = plans.get(row.installment.key) ?? new Types.ObjectId();
plans.set(row.installment.key, planId);
installment = { planId, index: row.installment.index, count: row.installment.count };
}
docs.push({
...base,
type: kind,
accountId: own,
toAccountId: null,
categoryId: cat._id,
splits: [],
effectiveCategoryIds: [cat._id],
kakeiboGroup: kind === "expense" && group && group !== categoryGroup ? group : null,
installment,
});
}
if (docs.length) await TransactionModel.insertMany(docs, { session });
inserted = docs.length;
await ImportBatchModel.updateOne(
{ _id: b._id, status: "draft" },
{
$set: {
status: "committed",
committedAt: new Date(),
committed: { transactions: inserted, skipped, categoriesCreated },
updatedBy: actor,
},
},
{ session },
);
});
} catch (error) {
if (error instanceof ImportError) return error.result;
if ((error as { code?: number }).code === 11000) return fail(t.errors.duplicate);
throw error;
}
await writeAudit({
action: "import.commit",
actorId: actor,
householdId: m.householdId,
targetType: "importBatch",
targetId: String(b._id),
diff: { transactions: inserted, skipped, categoriesCreated, fileName: b.fileName },
});
return ok({ transactions: inserted, skipped });
}
class ImportError extends Error {
constructor(readonly result: ActionResult<never>) {
super(result.ok ? "" : result.error);
}
}
/** İşlenmiş partinin işlemlerini siler (soft delete; anahtar boşaltılır, yeniden içe aktarılabilir). */
export async function revertImport(
actorId: string,
householdId: string,
batchId: string,
): Promise<ActionResult<{ transactions: number }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const b = await loadBatch(m, batchId);
if (!b) return fail(tr.common.notFound);
if (b.status !== "committed") return fail(t.errors.notCommitted);
const actor = new Types.ObjectId(actorId);
const mongoose = await connectMongoose();
let n = 0;
await mongoose.connection.transaction(async (session) => {
const res = await TransactionModel.updateMany(
{ householdId: m.householdId, importBatchId: b._id, deletedAt: null },
{ $set: { deletedAt: new Date(), importKey: null, updatedBy: actor } },
{ session },
);
n = res.modifiedCount;
await ImportBatchModel.updateOne(
{ _id: b._id },
{ $set: { status: "reverted", revertedAt: new Date(), updatedBy: actor } },
{ session },
);
});
await writeAudit({
action: "import.revert",
actorId: actor,
householdId: m.householdId,
targetType: "importBatch",
targetId: String(b._id),
diff: { transactions: n, fileName: b.fileName },
});
return ok({ transactions: n });
}
/** Taslağı siler (yalnızca işlenmemiş). */
export async function deleteImportDraft(
actorId: string,
householdId: string,
batchId: string,
): Promise<ActionResult> {
const r = await draftFor(actorId, householdId, batchId);
if (r.error) return r.error;
await ImportBatchModel.deleteOne({ _id: r.b._id, status: "draft" });
return ok(undefined);
}
+113 -14
View File
@@ -293,17 +293,35 @@ export async function getTypePriceComparison(
};
}
/** Ürün tipi birimine çevrilebilen ürünlerin mağaza başına geçerli fiyatı (planlayıcı girdisi). */
export type TypeOffer = {
productId: string;
productTypeId: string;
storeId: string;
priceMinor: number;
inTypeUnit: number;
unitPriceMinor: number;
date: string;
stale: boolean;
isPromo: boolean;
};
/**
* Ürün tipi başına son bilinen birim fiyat (en yeni geçerli fiyat kaydı; tüm marka/mağazalar).
* Tüketim analizinde aylık maliyet tahmini için. Dönüşümü eksik ürünler atlanır.
* Ürün tiplerinin tüm (arşivsiz) ürünlerinin mağaza başına geçerli fiyatları. Dönüşümü eksik
* ürünler atlanır. `activeOnly`: arşivli ürün ve mağazaları dışarıda bırak.
*/
export async function latestTypeUnitPrices(
export async function loadTypeOffers(
householdId: Types.ObjectId,
productTypeIds: Types.ObjectId[],
today = todayIstanbul(),
): Promise<Map<string, { unitPriceMinor: number; date: string }>> {
const [products, types] = await Promise.all([
ProductModel.find({ householdId, productTypeId: { $in: productTypeIds } })
{ today = todayIstanbul(), activeOnly = false } = {},
): Promise<TypeOffer[]> {
if (!productTypeIds.length) return [];
const [products, types, archivedStores] = await Promise.all([
ProductModel.find({
householdId,
productTypeId: { $in: productTypeIds },
...(activeOnly ? { archivedAt: null } : {}),
})
.select({ productTypeId: 1, packageQuantity: 1, packageUnit: 1, typeQuantity: 1 })
.lean<
{
@@ -317,7 +335,13 @@ export async function latestTypeUnitPrices(
ProductTypeModel.find({ householdId, _id: { $in: productTypeIds } })
.select({ unit: 1 })
.lean<{ _id: Types.ObjectId; unit: string }[]>(),
activeOnly
? StoreModel.find({ householdId, archivedAt: { $ne: null } })
.select({ _id: 1 })
.lean<{ _id: Types.ObjectId }[]>()
: Promise.resolve([]),
]);
const skipStore = new Set(archivedStores.map((x) => String(x._id)));
const unitOf = new Map(types.map((x) => [String(x._id), x.unit]));
const prices = await loadPrices(
householdId,
@@ -325,11 +349,12 @@ export async function latestTypeUnitPrices(
);
const groups = new Map<string, PriceLean[]>();
for (const r of prices) {
if (skipStore.has(String(r.storeId))) continue;
const key = `${r.productId}:${r.storeId}`;
groups.set(key, [...(groups.get(key) ?? []), r]);
}
const productById = new Map(products.map((p) => [String(p._id), p]));
const out = new Map<string, { unitPriceMinor: number; date: string }>();
const out: TypeOffer[] = [];
for (const records of groups.values()) {
const p = productById.get(String(records[0]!.productId))!;
const typeId = String(p.productTypeId);
@@ -341,12 +366,86 @@ export async function latestTypeUnitPrices(
});
if (!inType) continue;
const eff = effectivePrice(records, today)!;
const prev = out.get(typeId);
if (!prev || eff.record.date > prev.date)
out.set(typeId, {
unitPriceMinor: unitPrice(eff.record.priceMinor, inType),
date: eff.record.date,
});
out.push({
productId: String(p._id),
productTypeId: typeId,
storeId: String(records[0]!.storeId),
priceMinor: eff.record.priceMinor,
inTypeUnit: inType,
unitPriceMinor: unitPrice(eff.record.priceMinor, inType),
date: eff.record.date,
stale: eff.stale,
isPromo: eff.record.isPromo && !eff.promoEnded,
});
}
return out;
}
/** Bir ürün tipinin tüm fiyat kayıtları, ürün tipi biriminde birim fiyatla (dönüşümsüzler hariç). */
export async function loadTypePriceHistory(
householdId: Types.ObjectId,
productTypeId: Types.ObjectId,
): Promise<{ date: string; productId: string; storeId: string; unitPriceMinor: number }[]> {
const [products, type] = await Promise.all([
ProductModel.find({ householdId, productTypeId })
.select({ packageQuantity: 1, packageUnit: 1, typeQuantity: 1 })
.lean<
{
_id: Types.ObjectId;
packageQuantity: number;
packageUnit: string;
typeQuantity: number | null;
}[]
>(),
ProductTypeModel.findOne({ householdId, _id: productTypeId })
.select({ unit: 1 })
.lean<{ unit: string }>(),
]);
if (!type) return [];
const inType = new Map(
products.map((p) => [
String(p._id),
packageInTypeUnit({
packageQuantity: p.packageQuantity,
packageUnit: p.packageUnit,
typeUnit: type.unit,
typeQuantity: p.typeQuantity,
}),
]),
);
const prices = await loadPrices(
householdId,
products.map((p) => p._id),
);
return prices.flatMap((r) => {
const q = inType.get(String(r.productId));
return q
? [
{
date: r.date,
productId: String(r.productId),
storeId: String(r.storeId),
unitPriceMinor: unitPrice(r.priceMinor, q),
},
]
: [];
});
}
/**
* Ürün tipi başına son bilinen birim fiyat (en yeni geçerli fiyat kaydı; tüm marka/mağazalar).
* Tüketim analizinde aylık maliyet tahmini için. Dönüşümü eksik ürünler atlanır.
*/
export async function latestTypeUnitPrices(
householdId: Types.ObjectId,
productTypeIds: Types.ObjectId[],
today = todayIstanbul(),
): Promise<Map<string, { unitPriceMinor: number; date: string }>> {
const out = new Map<string, { unitPriceMinor: number; date: string }>();
for (const o of await loadTypeOffers(householdId, productTypeIds, { today })) {
const prev = out.get(o.productTypeId);
if (!prev || o.date > prev.date)
out.set(o.productTypeId, { unitPriceMinor: o.unitPriceMinor, date: o.date });
}
return out;
}
@@ -0,0 +1,202 @@
"use client";
import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
import {
ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import type { BudgetReport } from "../service";
import { monthLabel, monthShort } from "./report-frame";
const t = tr.reports.budget;
const compact = new Intl.NumberFormat("tr-TR", { notation: "compact", maximumFractionDigits: 1 });
const ratio = (bp: number | null) => (bp === null ? "—" : `%${Math.round(bp / 100)}`);
const STATUS_TONE: Record<string, string> = {
ok: "bg-income",
warning: "bg-amber-500",
over: "bg-expense",
none: "bg-muted-foreground",
};
const config = {
limit: { label: t.limit, color: "var(--budget)" },
actual: { label: t.actual, color: "var(--expense)" },
} satisfies ChartConfig;
export function BudgetReportView({ data }: { data: BudgetReport }) {
const chart = data.history.map((h) => ({
month: h.month,
label: monthShort(h.month),
limit: h.limitMinor === null ? null : h.limitMinor / 100,
actual: h.actualMinor / 100,
}));
const { totals, hasBudget } = data.budget;
return (
<div className="flex flex-col gap-4">
{!hasBudget ? <p className="text-sm text-muted-foreground">{t.noBudget}</p> : null}
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[34rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.category}</th>
<th className="px-3 py-2 text-right font-normal">{t.limit}</th>
<th className="px-3 py-2 text-right font-normal">{t.actual}</th>
<th className="px-3 py-2 text-right font-normal">{t.remaining}</th>
<th className="w-40 px-3 py-2 text-left font-normal">{t.ratio}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.lines.map((l) => (
<tr key={l.categoryId} className={cn(l.depth === 0 && "font-medium")}>
<td className="py-1.5 pr-3" style={{ paddingLeft: `${0.75 + l.depth * 1.25}rem` }}>
{l.name}
</td>
<td className="px-3 py-1.5 text-right">
{l.limitMinor === null ? (
<span className="text-xs font-normal text-muted-foreground">
{l.covered ? t.covered : "—"}
</span>
) : (
formatMoney(l.limitMinor)
)}
</td>
<td className="px-3 py-1.5 text-right">{formatMoney(l.actualMinor)}</td>
<td
className={cn(
"px-3 py-1.5 text-right",
(l.remainingMinor ?? 0) < 0 && "text-expense",
)}
>
{l.remainingMinor === null
? "—"
: `${l.remainingMinor < 0 ? "−" : ""}${formatMoney(Math.abs(l.remainingMinor))}`}
</td>
<td className="px-3 py-1.5">
{l.ratioBp === null ? (
<span className="text-muted-foreground">—</span>
) : (
<span className="flex items-center gap-2">
<span
className="h-1.5 flex-1 overflow-hidden rounded-full bg-muted"
aria-hidden
>
<span
className={cn("block h-full rounded-full", STATUS_TONE[l.status])}
style={{ width: `${Math.min(100, l.ratioBp / 100)}%` }}
/>
</span>
<span className="w-12 text-right text-xs">{ratio(l.ratioBp)}</span>
</span>
)}
</td>
</tr>
))}
</tbody>
<tfoot className="border-t font-medium">
<tr>
<td className="px-3 py-2">{tr.reports.categories.total}</td>
<td className="px-3 py-2 text-right">
{hasBudget ? formatMoney(totals.limitMinor) : "—"}
</td>
<td className="px-3 py-2 text-right">{formatMoney(totals.actualMinor)}</td>
<td
className={cn("px-3 py-2 text-right", totals.remainingMinor < 0 && "text-expense")}
>
{hasBudget
? `${totals.remainingMinor < 0 ? "−" : ""}${formatMoney(Math.abs(totals.remainingMinor))}`
: "—"}
</td>
<td className="px-3 py-2 text-left text-xs">{ratio(totals.ratioBp)}</td>
</tr>
</tfoot>
</table>
</div>
<section className="rounded-xl border bg-card p-4" aria-labelledby="bh-h">
<h2 id="bh-h" className="mb-2 text-sm font-medium">
{t.historyTitle}
</h2>
<ChartContainer
config={config}
className="aspect-auto h-56 w-full"
role="img"
aria-label={t.historyChartLabel}
>
<BarChart data={chart} margin={{ left: 4, right: 8, top: 8 }} barGap={2}>
<CartesianGrid vertical={false} />
<XAxis dataKey="label" tickLine={false} axisLine={false} tickMargin={8} />
<YAxis
tickLine={false}
axisLine={false}
width={48}
tickFormatter={(v: number) => compact.format(v)}
/>
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) => {
const m = payload?.[0]?.payload?.month as string | undefined;
return m ? monthLabel(m) : "";
}}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">
{config[name as keyof typeof config]?.label}
</span>
<span className="font-medium text-foreground tabular-nums">
{formatMoney(Math.round(Number(value) * 100))}
</span>
</div>
)}
/>
}
/>
<ChartLegend content={<ChartLegendContent />} />
<Bar
dataKey="limit"
fill="var(--color-limit)"
radius={[4, 4, 0, 0]}
isAnimationActive={false}
/>
<Bar
dataKey="actual"
fill="var(--color-actual)"
radius={[4, 4, 0, 0]}
isAnimationActive={false}
/>
</BarChart>
</ChartContainer>
<table className="mt-3 w-full text-sm tabular-nums">
<thead className="text-xs text-muted-foreground">
<tr>
<th className="py-1 text-left font-normal">{t.month}</th>
<th className="py-1 text-right font-normal">{t.limit}</th>
<th className="py-1 text-right font-normal">{t.actual}</th>
<th className="py-1 text-right font-normal">{t.ratio}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.history.map((h) => (
<tr key={h.month}>
<td className="py-1 capitalize">{monthLabel(h.month)}</td>
<td className="py-1 text-right">
{h.limitMinor === null ? t.noLimit : formatMoney(h.limitMinor)}
</td>
<td className="py-1 text-right">{formatMoney(h.actualMinor)}</td>
<td className="py-1 text-right">{ratio(h.ratioBp)}</td>
</tr>
))}
</tbody>
</table>
</section>
</div>
);
}
@@ -0,0 +1,217 @@
"use client";
import { Cell, Pie, PieChart } from "recharts";
import {
ChartContainer,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import { IconBadge } from "@/components/appearance/swatch";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import type { CategoryReport } from "../service";
import { Change, formatPct } from "./report-frame";
const t = tr.reports.categories;
/** Halkada en fazla bu kadar dilim; kalanlar "Diğer". */
const MAX_SLICES = 7;
export function CategoriesView({ data }: { data: CategoryReport }) {
const { breakdown, appearance } = data;
const positive = breakdown.rows.filter((r) => r.amountMinor > 0);
const head = positive.slice(0, MAX_SLICES);
const rest = positive.slice(MAX_SLICES);
const slices = [
...head.map((r) => ({
key: r.id,
name: r.name,
value: r.amountMinor / 100,
share: r.sharePct,
color: `var(--swatch-${appearance[r.id]?.color ?? "slate"})`,
})),
...(rest.length
? [
{
key: "__other__",
name: t.other(rest.length),
value: rest.reduce((a, r) => a + r.amountMinor, 0) / 100,
share: Math.round(rest.reduce((a, r) => a + r.sharePct, 0) * 10) / 10,
color: "var(--muted-foreground)",
},
]
: []),
];
const config = Object.fromEntries(
slices.map((s) => [s.key, { label: s.name, color: s.color }]),
) satisfies ChartConfig;
if (breakdown.totalMinor === 0 && breakdown.rows.length === 0)
return (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{tr.reports.noData}
</p>
);
return (
<div className="grid gap-4 lg:grid-cols-[minmax(0,20rem)_minmax(0,1fr)] lg:items-start">
<div className="rounded-xl border bg-card p-4">
<div className="relative">
<ChartContainer
config={config}
className="mx-auto aspect-square w-full max-w-64"
role="img"
aria-label={t.chartLabel}
>
<PieChart>
<ChartTooltip
content={
<ChartTooltipContent
hideLabel
nameKey="key"
formatter={(value, _name, item) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">{item.payload.name}</span>
<span className="font-medium text-foreground tabular-nums">
{formatMoney(Math.round(Number(value) * 100))} ·{" "}
{formatPct(item.payload.share)}
</span>
</div>
)}
/>
}
/>
<Pie
data={slices}
dataKey="value"
nameKey="key"
innerRadius="62%"
outerRadius="100%"
stroke="var(--card)"
strokeWidth={2}
isAnimationActive={false}
>
{slices.map((s) => (
<Cell key={s.key} fill={s.color} />
))}
</Pie>
</PieChart>
</ChartContainer>
<div className="pointer-events-none absolute inset-0 flex flex-col items-center justify-center">
<span className="text-xs text-muted-foreground">{t.total}</span>
<span className="text-lg font-semibold tabular-nums">
{formatMoney(breakdown.totalMinor)}
</span>
</div>
</div>
<ul className="mt-4 flex flex-col gap-1.5 text-sm">
{slices.map((s) => (
<li key={s.key} className="flex items-center gap-2">
<span
aria-hidden
className="size-2.5 shrink-0 rounded-sm"
style={{ background: s.color }}
/>
<span className="min-w-0 flex-1 truncate">{s.name}</span>
<span className="text-muted-foreground tabular-nums">{formatPct(s.share)}</span>
</li>
))}
</ul>
</div>
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[34rem] text-sm">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.category}</th>
<th className="px-3 py-2 text-right font-normal">{t.amount}</th>
<th className="px-3 py-2 text-right font-normal">{t.share}</th>
<th className="px-3 py-2 text-right font-normal">{t.previous}</th>
<th className="px-3 py-2 text-right font-normal">{t.change}</th>
</tr>
</thead>
<tbody>
{breakdown.rows.map((r) => {
const a = appearance[r.id];
return [
<tr key={r.id} className="border-t bg-muted/20 font-medium">
<td className="px-3 py-2">
<span className="flex items-center gap-2">
{a ? <IconBadge icon={a.icon} color={a.color} size="sm" /> : null}
{r.name}
</span>
</td>
<td className="px-3 py-2 text-right tabular-nums">
{formatMoney(r.amountMinor)}
</td>
<td className="px-3 py-2 text-right tabular-nums">{formatPct(r.sharePct)}</td>
<td className="px-3 py-2 text-right text-muted-foreground tabular-nums">
{formatMoney(r.prevMinor)}
</td>
<td className="px-3 py-2 text-right">
<Change minor={r.changeMinor} pct={r.changePct} format={formatMoney} />
</td>
</tr>,
...(r.children.length && r.ownMinor
? [
<tr key={`${r.id}-own`} className="text-muted-foreground">
<td className="py-1.5 pr-3 pl-10 italic">{t.own}</td>
<td className="px-3 py-1.5 text-right tabular-nums">
{formatMoney(r.ownMinor)}
</td>
<td colSpan={3} />
</tr>,
]
: []),
...r.children.map((c) => (
<tr key={c.id}>
<td className={cn("py-1.5 pr-3", c.depth > 1 ? "pl-14" : "pl-10")}>{c.name}</td>
<td className="px-3 py-1.5 text-right tabular-nums">
{formatMoney(c.amountMinor)}
</td>
<td className="px-3 py-1.5 text-right text-muted-foreground tabular-nums">
{formatPct(c.sharePct)}
</td>
<td className="px-3 py-1.5 text-right text-muted-foreground tabular-nums">
{formatMoney(c.prevMinor)}
</td>
<td className="px-3 py-1.5 text-right">
<Change minor={c.changeMinor} pct={c.changePct} format={formatMoney} />
</td>
</tr>
)),
];
})}
</tbody>
<tfoot className="border-t font-medium">
<tr>
<td className="px-3 py-2">{t.total}</td>
<td className="px-3 py-2 text-right tabular-nums">
{formatMoney(breakdown.totalMinor)}
</td>
<td className="px-3 py-2 text-right tabular-nums">%100</td>
<td className="px-3 py-2 text-right text-muted-foreground tabular-nums">
{formatMoney(breakdown.prevTotalMinor)}
</td>
<td className="px-3 py-2 text-right">
<Change
minor={breakdown.totalMinor - breakdown.prevTotalMinor}
pct={
breakdown.prevTotalMinor
? Math.round(
((breakdown.totalMinor - breakdown.prevTotalMinor) * 1000) /
breakdown.prevTotalMinor,
) / 10
: null
}
format={formatMoney}
/>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
);
}
@@ -0,0 +1,250 @@
import Link from "next/link";
import { Badge } from "@/components/ui/badge";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import { formatAssetQuantity } from "@/shared/assets";
import type { AssetsReport, ContactsReport } from "../extra";
import { dayLabel } from "./report-frame";
const signed = (n: number) => `${n > 0 ? "+" : n < 0 ? "−" : ""}${formatMoney(Math.abs(n))}`;
const bp = (n: number | null) =>
n === null
? ""
: ` (${n < 0 ? "−" : "+"}%${(Math.abs(n) / 100).toLocaleString("tr-TR", { maximumFractionDigits: 1 })})`;
function Stat({ label, value, tone }: { label: string; value: string; tone?: string }) {
return (
<div className="rounded-xl border bg-card p-3">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("text-lg font-semibold tabular-nums", tone)}>{value}</p>
</div>
);
}
export function ContactsReportView({ data }: { data: ContactsReport }) {
const t = tr.reports.contacts;
return (
<div className="flex flex-col gap-6">
<div className="grid grid-cols-2 gap-3 md:grid-cols-4">
<Stat label={t.owesMe} value={formatMoney(data.totals.owesMeMinor)} tone="text-income" />
<Stat label={t.iOwe} value={formatMoney(data.totals.iOweMinor)} tone="text-expense" />
<Stat
label={`${t.receivable} (${t.value.toLocaleLowerCase("tr-TR")})`}
value={formatMoney(data.inKindTotals.receivableMinor)}
/>
<Stat
label={`${t.debt} (${t.value.toLocaleLowerCase("tr-TR")})`}
value={formatMoney(data.inKindTotals.debtMinor)}
/>
</div>
<section aria-labelledby="cari-h" className="flex flex-col gap-2">
<h2 id="cari-h" className="font-medium">
{t.contact}
</h2>
{data.contacts.length ? (
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[28rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.contact}</th>
<th className="px-3 py-2 text-left font-normal">{t.direction}</th>
<th className="px-3 py-2 text-right font-normal">{t.balance}</th>
<th className="px-3 py-2 text-right font-normal">{t.due}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.contacts.map((c) => (
<tr key={c.id}>
<td className="px-3 py-1.5">
<Link href={`/cari/${c.id}`} className="hover:underline">
{c.name}
</Link>
</td>
<td className="px-3 py-1.5">{c.balanceMinor > 0 ? t.owesMe : t.iOwe}</td>
<td
className={cn(
"px-3 py-1.5 text-right font-medium",
c.balanceMinor > 0 ? "text-income" : "text-expense",
)}
>
{formatMoney(Math.abs(c.balanceMinor))}
</td>
<td className="px-3 py-1.5 text-right">
{c.dueDate ? dayLabel(c.dueDate) : "—"}
{t.dueStates[c.due] ? (
<Badge
variant="outline"
className={cn(
"ml-2",
c.due === "overdue" && "border-expense/50 text-expense",
)}
>
{t.dueStates[c.due]}
</Badge>
) : null}
</td>
</tr>
))}
</tbody>
</table>
</div>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.noContacts}
</p>
)}
</section>
<section aria-labelledby="ayni-h" className="flex flex-col gap-2">
<div>
<h2 id="ayni-h" className="font-medium">
{t.inKindTitle}
</h2>
<p className="text-xs text-muted-foreground">{t.inKindHint}</p>
</div>
{data.inKind.length ? (
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[32rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.contact}</th>
<th className="px-3 py-2 text-left font-normal">{t.direction}</th>
<th className="px-3 py-2 text-right font-normal">{t.remaining}</th>
<th className="px-3 py-2 text-right font-normal">{t.value}</th>
<th className="px-3 py-2 text-right font-normal">{t.since}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.inKind.map((d) => (
<tr key={d.id}>
<td className="px-3 py-1.5">
<Link href={`/cari/${d.contactId}`} className="hover:underline">
{d.contactName}
</Link>
</td>
<td className="px-3 py-1.5">
{d.direction === "receivable" ? t.receivable : t.debt}
</td>
<td className="px-3 py-1.5 text-right">{d.remainingLabel}</td>
<td className="px-3 py-1.5 text-right">
{d.valueMinor === null ? "—" : formatMoney(d.valueMinor)}
</td>
<td className="px-3 py-1.5 text-right">{dayLabel(d.date)}</td>
</tr>
))}
</tbody>
</table>
</div>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.noInKind}
</p>
)}
{data.inKindTotals.unpriced ? (
<p className="text-xs text-muted-foreground">{t.unpriced(data.inKindTotals.unpriced)}</p>
) : null}
</section>
</div>
);
}
export function AssetsReportView({ data }: { data: AssetsReport }) {
const t = tr.reports.assets;
const p = data.period;
const tone = (n: number | null) =>
n === null ? "" : n < 0 ? "text-expense" : n > 0 ? "text-income" : "";
return (
<div className="flex flex-col gap-6">
<section aria-labelledby="period-h" className="flex flex-col gap-2">
<h2 id="period-h" className="font-medium">
{t.periodTitle}: {dayLabel(p.from)} – {dayLabel(p.to)}
</h2>
<div className="grid grid-cols-2 gap-3 md:grid-cols-5">
<Stat
label={t.startValue}
value={p.startValueMinor === null ? "—" : formatMoney(p.startValueMinor)}
/>
<Stat label={t.invested} value={formatMoney(p.investedMinor)} />
<Stat label={t.proceeds} value={formatMoney(p.proceedsMinor)} />
<Stat
label={t.endValue}
value={p.endValueMinor === null ? "—" : formatMoney(p.endValueMinor)}
/>
<Stat
label={t.profit}
value={p.profitMinor === null ? "—" : `${signed(p.profitMinor)}${bp(p.profitBp)}`}
tone={tone(p.profitMinor)}
/>
</div>
{p.excluded ? (
<p className="text-xs text-muted-foreground">{t.excluded(p.excluded)}</p>
) : null}
</section>
{data.items.length ? (
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[40rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.asset}</th>
<th className="px-3 py-2 text-right font-normal">{t.quantity}</th>
<th className="px-3 py-2 text-right font-normal">{t.cost}</th>
<th className="px-3 py-2 text-right font-normal">{t.value}</th>
<th className="px-3 py-2 text-right font-normal">{t.unrealized}</th>
<th className="px-3 py-2 text-right font-normal">{t.realized}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.items.map((a) => (
<tr key={a.id}>
<td className="px-3 py-1.5">
<Link href={`/birikim/${a.id}`} className="hover:underline">
{a.name || a.label}
</Link>
</td>
<td className="px-3 py-1.5 text-right">
{formatAssetQuantity(a.assetKey, a.summary.quantity)}
</td>
<td className="px-3 py-1.5 text-right">{formatMoney(a.summary.costMinor)}</td>
<td className="px-3 py-1.5 text-right">
{a.summary.currentValueMinor === null
? t.noPrice
: formatMoney(a.summary.currentValueMinor)}
</td>
<td className={cn("px-3 py-1.5 text-right", tone(a.summary.unrealizedMinor))}>
{a.summary.unrealizedMinor === null
? "—"
: `${signed(a.summary.unrealizedMinor)}${bp(a.summary.unrealizedBp)}`}
</td>
<td className={cn("px-3 py-1.5 text-right", tone(a.summary.realizedMinor))}>
{signed(a.summary.realizedMinor)}
</td>
</tr>
))}
</tbody>
<tfoot className="border-t font-medium">
<tr>
<td className="px-3 py-2">{t.total}</td>
<td />
<td className="px-3 py-2 text-right">{formatMoney(data.totals.costMinor)}</td>
<td className="px-3 py-2 text-right">{formatMoney(data.totals.valueMinor)}</td>
<td className={cn("px-3 py-2 text-right", tone(data.totals.unrealizedMinor))}>
{signed(data.totals.unrealizedMinor)}
</td>
<td className={cn("px-3 py-2 text-right", tone(data.totals.realizedMinor))}>
{signed(data.totals.realizedMinor)}
</td>
</tr>
</tfoot>
</table>
</div>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
)}
</div>
);
}
@@ -0,0 +1,68 @@
import { ChevronRight } from "lucide-react";
import Link from "next/link";
import { KakeiboDot } from "@/features/categories/components/kakeibo-badge";
import { tr } from "@/i18n/tr";
import { formatMoney } from "@/shared/format";
import { KAKEIBO_GROUPS } from "@/shared/kakeibo";
import { getKakeiboReport } from "../kakeibo";
import { formatPct } from "./report-frame";
const k = tr.kakeibo;
/** Bütçe sayfası: seçili bütçe ayının Kakeibo grup özeti (rapora bağlantılı). */
export async function KakeiboBudgetCard({
userId,
householdId,
month,
}: {
userId: string;
householdId: string;
month: string;
}) {
const data = await getKakeiboReport(userId, householdId, month);
if (!data) return null;
const s = data.now.summary;
return (
<section
aria-labelledby="kb-card"
className="flex flex-col gap-3 rounded-xl border bg-card p-4"
>
<div className="flex items-center gap-2">
<h2 id="kb-card" className="font-medium">
{tr.reports.kakeiboReport.title}
</h2>
<Link
href={`/raporlar/kakeibo?ay=${month}`}
className="ml-auto flex items-center gap-0.5 text-sm text-primary hover:underline"
>
{tr.reports.hub.open}
<ChevronRight className="size-3.5" aria-hidden />
</Link>
</div>
<dl className="grid grid-cols-2 gap-3 md:grid-cols-6">
{KAKEIBO_GROUPS.map((g) => (
<div key={g}>
<dt className="flex items-center gap-1.5 text-xs text-muted-foreground">
<KakeiboDot group={g} />
{k.groups[g]}
</dt>
<dd className="font-semibold tabular-nums">
{formatMoney(s.groups[g])}{" "}
<span className="text-xs font-normal text-muted-foreground">
{formatPct(s.shares[g])}
</span>
</dd>
</div>
))}
<div>
<dt className="text-xs text-muted-foreground">{k.ungrouped}</dt>
<dd className="font-semibold tabular-nums">{formatMoney(s.ungroupedMinor)}</dd>
</div>
<div>
<dt className="text-xs text-muted-foreground">{k.bankCost}</dt>
<dd className="font-semibold tabular-nums">{formatMoney(s.bankCostMinor)}</dd>
</div>
</dl>
</section>
);
}
@@ -0,0 +1,191 @@
import { AlertTriangle, Landmark } from "lucide-react";
import Link from "next/link";
import { KAKEIBO_COLOR, KakeiboDot } from "@/features/categories/components/kakeibo-badge";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import { KAKEIBO_GROUPS, type KakeiboGroup } from "@/shared/kakeibo";
import type { KakeiboReport } from "../kakeibo";
import { Change, formatPct } from "./report-frame";
const k = tr.kakeibo;
const t = tr.reports.kakeiboReport;
/** Dört grubun (ve grupsuzun) harcamadaki payı: tek yığılmış çubuk + lejant + tablo. */
function Composition({ data }: { data: KakeiboReport }) {
const s = data.now.summary;
const parts = [
...KAKEIBO_GROUPS.map((g) => ({
key: g,
label: k.groups[g],
share: s.shares[g],
color: KAKEIBO_COLOR[g],
})),
...(s.ungroupedMinor
? [
{
key: "UNGROUPED",
label: k.ungrouped,
share: s.ungroupedShare,
color: "var(--muted-foreground)",
},
]
: []),
].filter((p) => p.share > 0);
return (
<div className="flex flex-col gap-2">
<div
className="flex h-4 w-full gap-0.5 overflow-hidden rounded-md bg-muted"
role="img"
aria-label={t.chartLabel}
>
{parts.map((p) => (
<div
key={p.key}
className="h-full first:rounded-l-md last:rounded-r-md"
style={{ width: `${p.share}%`, backgroundColor: p.color }}
title={`${p.label}: ${formatPct(p.share)}`}
/>
))}
</div>
<ul className="flex flex-wrap gap-x-4 gap-y-1 text-xs text-muted-foreground">
{parts.map((p) => (
<li key={p.key} className="flex items-center gap-1.5">
<span
aria-hidden
className="size-2.5 rounded-sm"
style={{ backgroundColor: p.color }}
/>
{p.label} <span className="tabular-nums">{formatPct(p.share)}</span>
</li>
))}
</ul>
</div>
);
}
function GroupCard({ data, group }: { data: KakeiboReport; group: KakeiboGroup }) {
const s = data.now.summary;
const rows = data.now.byClass[group];
const ch = data.change[group];
return (
<section
aria-labelledby={`kg-${group}`}
className="flex flex-col gap-2 rounded-xl border bg-card p-4"
>
<header className="flex items-start gap-2">
<KakeiboDot group={group} className="mt-1.5" />
<div className="min-w-0 flex-1">
<h2 id={`kg-${group}`} className="font-medium">
{k.groups[group]}
</h2>
<p className="text-xs text-muted-foreground">{k.groupHints[group]}</p>
</div>
<div className="text-right">
<p className="text-lg font-semibold tabular-nums">{formatMoney(s.groups[group])}</p>
<p className="text-xs text-muted-foreground tabular-nums">
{formatPct(s.shares[group])} ·{" "}
<Change minor={ch.minor} pct={ch.pct} format={formatMoney} />
</p>
</div>
</header>
{rows.length ? (
<ul className="divide-y text-sm">
{rows.map((r) => (
<li key={r.id} className="flex justify-between gap-3 py-1.5">
<span className="min-w-0 truncate">{r.path}</span>
<span className="shrink-0 tabular-nums">{formatMoney(r.amountMinor)}</span>
</li>
))}
</ul>
) : (
<p className="text-sm text-muted-foreground">{t.noSpending}</p>
)}
</section>
);
}
/** /raporlar/kakeibo — dört grup, banka maliyeti ve grupsuz harcamalar. */
export function KakeiboReportView({ data }: { data: KakeiboReport }) {
const s = data.now.summary;
const bank = data.now.byClass.BANK_COST;
const ungrouped = data.now.byClass.UNGROUPED;
const bankChange = data.change.BANK_COST;
return (
<div className="flex flex-col gap-4">
<div className="grid gap-3 md:grid-cols-[minmax(0,1fr)_auto]">
<div className="flex flex-col gap-3 rounded-xl border bg-card p-4">
<div className="flex items-baseline justify-between gap-3">
<span className="text-sm text-muted-foreground">{t.spending}</span>
<span className="text-xl font-semibold tabular-nums">
{formatMoney(s.spendingMinor)}
</span>
</div>
<Composition data={data} />
</div>
<div className="flex flex-col justify-between gap-1 rounded-xl border bg-card p-4 md:w-64">
<span className="flex items-center gap-1.5 text-sm text-muted-foreground">
<Landmark className="size-4" aria-hidden />
{k.bankCost}
</span>
<span className="text-xl font-semibold tabular-nums">{formatMoney(s.bankCostMinor)}</span>
<span className="text-xs">
<Change minor={bankChange.minor} pct={bankChange.pct} format={formatMoney} />
</span>
<span className="text-[11px] leading-tight text-muted-foreground">{t.bankCostNote}</span>
</div>
</div>
{ungrouped.length ? (
<section
aria-labelledby="kg-ungrouped"
className="flex flex-col gap-2 rounded-xl border border-dashed border-amber-500/50 bg-amber-500/5 p-4"
>
<h2 id="kg-ungrouped" className="flex items-center gap-1.5 font-medium">
<AlertTriangle className="size-4 text-amber-600" aria-hidden />
{k.ungrouped}: {formatMoney(s.ungroupedMinor)}
</h2>
<p className="text-sm text-muted-foreground">
{t.ungroupedHelp}{" "}
<Link href="/kategoriler" className="text-primary hover:underline">
{t.goCategories}
</Link>
</p>
<ul className="divide-y text-sm">
{ungrouped.map((r) => (
<li key={r.id} className="flex justify-between gap-3 py-1.5">
<span className="min-w-0 truncate">{r.path}</span>
<span className="tabular-nums">{formatMoney(r.amountMinor)}</span>
</li>
))}
</ul>
</section>
) : null}
<div className="grid gap-3 lg:grid-cols-2">
{KAKEIBO_GROUPS.map((g) => (
<GroupCard key={g} data={data} group={g} />
))}
</div>
{bank.length ? (
<section
aria-labelledby="kg-bank"
className={cn("flex flex-col gap-2 rounded-xl border bg-card p-4")}
>
<h2 id="kg-bank" className="font-medium">
{k.bankCost}
</h2>
<ul className="divide-y text-sm">
{bank.map((r) => (
<li key={r.id} className="flex justify-between gap-3 py-1.5">
<span className="min-w-0 truncate">{r.path}</span>
<span className="tabular-nums">{formatMoney(r.amountMinor)}</span>
</li>
))}
</ul>
</section>
) : null}
</div>
);
}
@@ -0,0 +1,108 @@
import { Badge } from "@/components/ui/badge";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import type { PeopleAccountsReport } from "../service";
import { formatPct } from "./report-frame";
const t = tr.reports.people;
const signed = (n: number) => `${n > 0 ? "+" : n < 0 ? "−" : ""}${formatMoney(Math.abs(n))}`;
/** Kişi bazlı harcama (pay çubuğu + tablo) ve hesap bazlı hareket tablosu. */
export function PeopleView({ data }: { data: PeopleAccountsReport }) {
return (
<div className="flex flex-col gap-6">
<section aria-labelledby="people-h" className="flex flex-col gap-2">
<div>
<h2 id="people-h" className="font-medium">
{t.peopleTitle}
</h2>
<p className="text-xs text-muted-foreground">{t.peopleHint}</p>
</div>
{data.people.length ? (
<ul className="divide-y rounded-xl border bg-card">
{data.people.map((p) => (
<li key={p.userId} className="flex flex-col gap-1.5 p-3 text-sm">
<div className="flex items-baseline gap-3">
<span className="min-w-0 flex-1 truncate font-medium">{p.name}</span>
<span className="text-xs text-muted-foreground tabular-nums">
{p.count} {t.count.toLocaleLowerCase("tr-TR")}
</span>
<span className="w-24 text-right tabular-nums">
{formatMoney(p.expenseMinor)}
</span>
<span className="w-14 text-right text-muted-foreground tabular-nums">
{formatPct(p.sharePct)}
</span>
</div>
<div className="h-1.5 overflow-hidden rounded-full bg-muted" aria-hidden>
<div
className="h-full rounded-full bg-expense"
style={{ width: `${p.sharePct}%` }}
/>
</div>
</li>
))}
<li className="flex justify-between p-3 text-sm font-medium">
<span>{tr.reports.categories.total}</span>
<span className="tabular-nums">{formatMoney(data.peopleTotalMinor)}</span>
</li>
</ul>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{tr.reports.noData}
</p>
)}
</section>
<section aria-labelledby="acc-h" className="flex flex-col gap-2">
<div>
<h2 id="acc-h" className="font-medium">
{t.accountsTitle}
</h2>
<p className="text-xs text-muted-foreground">{t.accountsHint}</p>
</div>
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[40rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.account}</th>
<th className="px-3 py-2 text-right font-normal">{t.income}</th>
<th className="px-3 py-2 text-right font-normal">{t.expense}</th>
<th className="px-3 py-2 text-right font-normal">{t.transferIn}</th>
<th className="px-3 py-2 text-right font-normal">{t.transferOut}</th>
<th className="px-3 py-2 text-right font-normal">{t.net}</th>
<th className="px-3 py-2 text-right font-normal">{t.count}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.accounts.map((a) => (
<tr key={a.id} className={cn(a.count === 0 && "text-muted-foreground")}>
<td className="px-3 py-1.5">
<span className="flex items-center gap-2">
{a.name}
{a.archived ? <Badge variant="secondary">{t.archived}</Badge> : null}
</span>
</td>
<td className="px-3 py-1.5 text-right">{formatMoney(a.incomeMinor)}</td>
<td className="px-3 py-1.5 text-right">{formatMoney(a.expenseMinor)}</td>
<td className="px-3 py-1.5 text-right">{formatMoney(a.transferInMinor)}</td>
<td className="px-3 py-1.5 text-right">{formatMoney(a.transferOutMinor)}</td>
<td
className={cn(
"px-3 py-1.5 text-right font-medium",
a.netMinor < 0 ? "text-expense" : a.netMinor > 0 ? "text-income" : "",
)}
>
{signed(a.netMinor)}
</td>
<td className="px-3 py-1.5 text-right">{a.count}</td>
</tr>
))}
</tbody>
</table>
</div>
</section>
</div>
);
}
@@ -0,0 +1,168 @@
import { ArrowLeft, ChevronLeft, ChevronRight, Download } from "lucide-react";
import Link from "next/link";
import { PageHeader } from "@/components/page-header";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import { shiftMonth } from "@/shared/budget";
const t = tr.reports;
const monthFmt = new Intl.DateTimeFormat("tr-TR", { month: "long", year: "numeric" });
export const monthLabel = (month: string) =>
monthFmt.format(new Date(`${month}-15T12:00:00+03:00`));
const monthShortFmt = new Intl.DateTimeFormat("tr-TR", { month: "short", year: "2-digit" });
export const monthShort = (month: string) =>
monthShortFmt.format(new Date(`${month}-15T12:00:00+03:00`));
/** 14,3 → "%14,3"; −20 → "−%20"; null → "—". */
export function formatPct(n: number | null): string {
if (n === null) return "—";
const abs = Math.abs(n).toLocaleString("tr-TR", { maximumFractionDigits: 1 });
return n < 0 ? `−%${abs}` : `%${abs}`;
}
/** Önceki / sonraki bütçe ayı (?ay=). Gelecek aya gidilmez. */
export function MonthNav({
month,
currentMonth,
path,
}: {
month: string;
currentMonth: string;
path: string;
}) {
const next = shiftMonth(month, 1);
return (
<nav aria-label={t.currentMonth} className="flex items-center gap-1">
<Button variant="outline" size="icon-sm" asChild>
<Link href={`${path}?ay=${shiftMonth(month, -1)}`} aria-label={t.prevMonth}>
<ChevronLeft />
</Link>
</Button>
<span className="min-w-36 text-center text-sm font-medium capitalize">
{monthLabel(month)}
</span>
{next <= currentMonth ? (
<Button variant="outline" size="icon-sm" asChild>
<Link href={`${path}?ay=${next}`} aria-label={t.nextMonth}>
<ChevronRight />
</Link>
</Button>
) : (
<Button variant="outline" size="icon-sm" disabled aria-label={t.nextMonth}>
<ChevronRight />
</Button>
)}
{month !== currentMonth ? (
<Button variant="ghost" size="sm" asChild>
<Link href={path}>{t.currentMonth}</Link>
</Button>
) : null}
</nav>
);
}
/** Rapor sayfası çerçevesi: geri bağlantısı, başlık, araçlar (ay seçici, CSV). */
export function ReportFrame({
title,
description,
tools,
children,
}: {
title: string;
description: React.ReactNode;
tools?: React.ReactNode;
children: React.ReactNode;
}) {
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/raporlar">
<ArrowLeft />
{t.back}
</Link>
</Button>
<PageHeader title={title} description={description} />
{tools ? <div className="flex flex-wrap items-center gap-2">{tools}</div> : null}
{children}
</div>
);
}
export function CsvButton({ href, label }: { href: string; label?: string }) {
return (
<Button variant="outline" size="sm" asChild>
<a href={href} download>
<Download />
{label ?? t.csv}
</a>
</Button>
);
}
/** Araç çubuğunun sağ tarafı (CSV düğmeleri). */
export function ToolsEnd({ children }: { children: React.ReactNode }) {
return <div className="ml-auto flex flex-wrap gap-2">{children}</div>;
}
/** İşaretli tutar ve yüzde değişim; renk tek başına anlam taşımaz (işaret metinde). */
export function Change({
minor,
pct,
format,
}: {
minor: number;
pct: number | null;
format: (n: number) => string;
}) {
if (minor === 0) return <span className="text-muted-foreground tabular-nums">0</span>;
const up = minor > 0;
return (
<span className={`tabular-nums ${up ? "text-expense" : "text-income"}`}>
{up ? "+" : "−"}
{format(Math.abs(minor))}
{pct !== null ? ` (${up ? "+" : "−"}%${Math.abs(pct).toLocaleString("tr-TR")})` : ""}
</span>
);
}
/** Dönem seçici (?donem=…): seçenekler bağlantı, seçili olan vurgulu. */
export function RangeNav({
path,
param = "donem",
options,
value,
label,
}: {
path: string;
param?: string;
options: { value: string; label: string }[];
value: string;
label: string;
}) {
return (
<nav aria-label={label} className="flex rounded-lg bg-muted p-0.5">
{options.map((o) => (
<Link
key={o.value}
href={`${path}?${param}=${o.value}`}
aria-current={o.value === value ? "page" : undefined}
className={
o.value === value
? "rounded-md bg-background px-2.5 py-1 text-sm font-medium shadow-sm"
: "rounded-md px-2.5 py-1 text-sm text-muted-foreground hover:text-foreground"
}
>
{o.label}
</Link>
))}
</nav>
);
}
const dayFmt = new Intl.DateTimeFormat("tr-TR", {
day: "numeric",
month: "short",
year: "numeric",
});
export const dayLabel = (ymd: string) => dayFmt.format(new Date(`${ymd}T12:00:00+03:00`));
@@ -0,0 +1,234 @@
import Link from "next/link";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import { WASTE_REASONS } from "@/shared/stock";
import { formatStock } from "@/shared/stock";
import type { ShoppingReport, WasteReport } from "../extra";
import { dayLabel, formatPct } from "./report-frame";
const signed = (n: number) => `${n > 0 ? "+" : n < 0 ? "−" : ""}${formatMoney(Math.abs(n))}`;
const empty = (text: string) => (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{text}
</p>
);
export function ShoppingReportView({ data }: { data: ShoppingReport }) {
const t = tr.reports.shopping;
const reasons = tr.shopping.report.reasons;
const reasonRows = (
["price", "quantity", "substitute", "skipped", "extra", "unplanned"] as const
).filter((k) => data.listTotals[k] !== 0);
return (
<div className="flex flex-col gap-6">
<section aria-labelledby="lists-h" className="flex flex-col gap-2">
<h2 id="lists-h" className="font-medium">
{t.listsTitle}
</h2>
{data.lists.length ? (
<>
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[36rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.date}</th>
<th className="px-3 py-2 text-left font-normal">{t.list}</th>
<th className="px-3 py-2 text-right font-normal">{t.planned}</th>
<th className="px-3 py-2 text-right font-normal">{t.actual}</th>
<th className="px-3 py-2 text-right font-normal">{t.diff}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.lists.map((l) => (
<tr key={l.id}>
<td className="px-3 py-1.5 whitespace-nowrap">{dayLabel(l.date)}</td>
<td className="px-3 py-1.5">
<Link href={`/alisveris/${l.id}`} className="font-medium hover:underline">
{l.name}
</Link>
<span className="block text-xs text-muted-foreground">
{t.counts(
l.summary.counts.same,
l.summary.counts.substitute,
l.summary.counts.skipped,
l.summary.counts.extra,
)}
{l.stores.length ? ` · ${l.stores.join(", ")}` : ""}
</span>
</td>
<td className="px-3 py-1.5 text-right">
{formatMoney(l.summary.plannedMinor)}
</td>
<td className="px-3 py-1.5 text-right">
{formatMoney(l.summary.actualMinor)}
</td>
<td
className={cn(
"px-3 py-1.5 text-right",
l.summary.diffMinor > 0
? "text-expense"
: l.summary.diffMinor < 0
? "text-income"
: "",
)}
>
{signed(l.summary.diffMinor)}
</td>
</tr>
))}
</tbody>
<tfoot className="border-t font-medium">
<tr>
<td className="px-3 py-2" colSpan={2}>
{t.total}
</td>
<td className="px-3 py-2 text-right">
{formatMoney(data.listTotals.plannedMinor)}
</td>
<td className="px-3 py-2 text-right">
{formatMoney(data.listTotals.actualMinor)}
</td>
<td className="px-3 py-2 text-right">{signed(data.listTotals.diffMinor)}</td>
</tr>
</tfoot>
</table>
</div>
{reasonRows.length ? (
<ul className="flex flex-col gap-1 rounded-xl border bg-card p-3 text-sm">
{reasonRows.map((k) => (
<li key={k} className="flex justify-between gap-3">
<span>{reasons[k]}</span>
<span className="tabular-nums">{signed(data.listTotals[k])}</span>
</li>
))}
</ul>
) : null}
</>
) : (
empty(t.listsEmpty)
)}
</section>
<section aria-labelledby="stores-h" className="flex flex-col gap-2">
<div>
<h2 id="stores-h" className="font-medium">
{t.storesTitle}
</h2>
<p className="text-xs text-muted-foreground">{t.storesHint}</p>
</div>
{data.stores.length ? (
<ul className="divide-y rounded-xl border bg-card">
{data.stores.map((s) => (
<li key={s.name} className="flex flex-col gap-1.5 p-3 text-sm">
<div className="flex items-baseline gap-3">
<span className="min-w-0 flex-1 truncate font-medium">{s.name}</span>
<span className="text-xs text-muted-foreground tabular-nums">
{s.count} {t.count.toLocaleLowerCase("tr-TR")}
{s.fromListsMinor ? ` · ${t.fromLists} ${formatMoney(s.fromListsMinor)}` : ""}
</span>
<span className="w-28 text-right tabular-nums">{formatMoney(s.amountMinor)}</span>
<span className="w-14 text-right text-muted-foreground tabular-nums">
{formatPct(s.sharePct)}
</span>
</div>
<div className="h-1.5 overflow-hidden rounded-full bg-muted" aria-hidden>
<div
className="h-full rounded-full bg-budget"
style={{ width: `${s.sharePct}%` }}
/>
</div>
</li>
))}
<li className="flex justify-between p-3 text-sm font-medium">
<span>{t.total}</span>
<span className="tabular-nums">{formatMoney(data.storesTotalMinor)}</span>
</li>
</ul>
) : (
empty(t.storesEmpty)
)}
</section>
</div>
);
}
export function WasteReportView({ data }: { data: WasteReport }) {
const t = tr.reports.waste;
const reasonText = tr.stock.wasteReasons;
if (!data.rows.length) return empty(t.empty);
return (
<div className="flex flex-col gap-4">
<div className="grid gap-3 md:grid-cols-[minmax(0,14rem)_minmax(0,1fr)]">
<div className="rounded-xl border bg-card p-3">
<p className="text-xs text-muted-foreground">{t.total}</p>
<p className="text-lg font-semibold text-expense tabular-nums">
{formatMoney(data.totalCostMinor)}
</p>
<p className="text-[11px] text-muted-foreground">{t.costHint}</p>
</div>
<div className="rounded-xl border bg-card p-3">
<h2 className="mb-1 text-xs text-muted-foreground">{t.reasonsTitle}</h2>
<ul className="flex flex-col gap-1 text-sm">
{WASTE_REASONS.filter((r) => data.reasons[r].count).map((r) => (
<li key={r} className="flex justify-between gap-3">
<span>
{reasonText[r]}{" "}
<span className="text-xs text-muted-foreground">
({t.count(data.reasons[r].count)})
</span>
</span>
<span className="tabular-nums">{formatMoney(data.reasons[r].costMinor)}</span>
</li>
))}
</ul>
</div>
</div>
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[36rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.product}</th>
<th className="px-3 py-2 text-right font-normal">{t.wasted}</th>
<th className="px-3 py-2 text-right font-normal">{t.purchased}</th>
<th className="px-3 py-2 text-right font-normal">{t.ratio}</th>
<th className="px-3 py-2 text-right font-normal">{t.cost}</th>
</tr>
</thead>
<tbody className="divide-y">
{data.rows.map((r) => (
<tr key={r.productTypeId}>
<td className="px-3 py-1.5">
<Link href={`/stok/${r.productTypeId}`} className="hover:underline">
{r.name}
</Link>
<span className="block text-xs text-muted-foreground">
{WASTE_REASONS.filter((x) => r.byReason[x])
.map((x) => `${reasonText[x]}: ${formatStock(r.byReason[x], r.unit)}`)
.join(" · ")}
</span>
</td>
<td className="px-3 py-1.5 text-right">{formatStock(r.wasted, r.unit)}</td>
<td className="px-3 py-1.5 text-right">{formatStock(r.purchased, r.unit)}</td>
<td
className={cn(
"px-3 py-1.5 text-right",
(r.wastePct ?? 0) >= 15 && "font-medium text-expense",
)}
>
{formatPct(r.wastePct)}
</td>
<td className="px-3 py-1.5 text-right">
{r.costMinor === null ? "—" : formatMoney(r.costMinor)}
</td>
</tr>
))}
</tbody>
</table>
</div>
{data.unpriced ? (
<p className="text-xs text-muted-foreground">{t.unpriced(data.unpriced)}</p>
) : null}
</div>
);
}
@@ -0,0 +1,196 @@
"use client";
import {
Bar,
BarChart,
CartesianGrid,
Line,
LineChart,
ReferenceLine,
XAxis,
YAxis,
} from "recharts";
import {
ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import type { TrendReport } from "../service";
import { monthLabel, monthShort, formatPct } from "./report-frame";
const t = tr.reports.trend;
const compact = new Intl.NumberFormat("tr-TR", { notation: "compact", maximumFractionDigits: 1 });
const barConfig = {
income: { label: t.income, color: "var(--income)" },
expense: { label: t.expense, color: "var(--expense)" },
} satisfies ChartConfig;
const rateConfig = { rate: { label: t.savings, color: "var(--budget)" } } satisfies ChartConfig;
export function TrendView({ data }: { data: TrendReport }) {
const chart = data.months.map((m) => ({
month: m.month,
label: monthShort(m.month),
income: m.incomeMinor / 100,
expense: m.expenseMinor / 100,
// Devam eden ayın oranı (maaş henüz yatmamış olabilir) ölçeği bozmasın: grafikte yok.
rate: m.month === data.currentMonth ? null : m.savingsPct,
}));
const moneyTip = (
<ChartTooltipContent
labelFormatter={(_, payload) => {
const m = payload?.[0]?.payload?.month as string | undefined;
return m ? monthLabel(m) : "";
}}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">
{barConfig[name as keyof typeof barConfig]?.label}
</span>
<span className="font-medium text-foreground tabular-nums">
{formatMoney(Math.round(Number(value) * 100))}
</span>
</div>
)}
/>
);
return (
<div className="flex flex-col gap-4">
<div className="rounded-xl border bg-card p-4">
<ChartContainer
config={barConfig}
className="aspect-auto h-64 w-full"
role="img"
aria-label={t.chartLabel}
>
<BarChart data={chart} margin={{ left: 4, right: 8, top: 8 }} barGap={2}>
<CartesianGrid vertical={false} />
<XAxis dataKey="label" tickLine={false} axisLine={false} tickMargin={8} />
<YAxis
tickLine={false}
axisLine={false}
width={48}
tickFormatter={(v: number) => compact.format(v)}
/>
<ChartTooltip content={moneyTip} />
<ChartLegend content={<ChartLegendContent />} />
<Bar
dataKey="income"
fill="var(--color-income)"
radius={[4, 4, 0, 0]}
isAnimationActive={false}
/>
<Bar
dataKey="expense"
fill="var(--color-expense)"
radius={[4, 4, 0, 0]}
isAnimationActive={false}
/>
</BarChart>
</ChartContainer>
</div>
<div className="rounded-xl border bg-card p-4">
<h2 className="text-sm font-medium">{t.rateTitle}</h2>
<p className="mb-2 text-xs text-muted-foreground">
{t.rateHint} {t.partialHint}
</p>
<ChartContainer
config={rateConfig}
className="aspect-auto h-40 w-full"
role="img"
aria-label={t.rateChartLabel}
>
<LineChart data={chart} margin={{ left: 4, right: 8, top: 8 }}>
<CartesianGrid vertical={false} />
<XAxis dataKey="label" tickLine={false} axisLine={false} tickMargin={8} />
<YAxis
tickLine={false}
axisLine={false}
width={40}
tickFormatter={(v: number) => `%${v}`}
/>
<ReferenceLine y={0} stroke="var(--border)" />
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) => {
const m = payload?.[0]?.payload?.month as string | undefined;
return m ? monthLabel(m) : "";
}}
formatter={(value) => (
<span className="font-medium text-foreground tabular-nums">
{formatPct(Number(value))}
</span>
)}
/>
}
/>
<Line
dataKey="rate"
stroke="var(--color-rate)"
strokeWidth={2}
dot={{ r: 3 }}
connectNulls={false}
isAnimationActive={false}
/>
</LineChart>
</ChartContainer>
</div>
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full min-w-[32rem] text-sm tabular-nums">
<thead className="border-b text-xs text-muted-foreground">
<tr>
<th className="px-3 py-2 text-left font-normal">{t.month}</th>
<th className="px-3 py-2 text-right font-normal">{t.income}</th>
<th className="px-3 py-2 text-right font-normal">{t.expense}</th>
<th className="px-3 py-2 text-right font-normal">{t.net}</th>
<th className="px-3 py-2 text-right font-normal">{t.savings}</th>
</tr>
</thead>
<tbody className="divide-y">
{[...data.months].reverse().map((m) => (
<tr key={m.month} className={cn(m.month === data.currentMonth && "bg-muted/40")}>
<td className="px-3 py-1.5">
<span className="capitalize">{monthLabel(m.month)}</span>
{m.month === data.currentMonth ? (
<span className="ml-1 text-xs text-muted-foreground">({t.ongoing})</span>
) : null}
</td>
<td className="px-3 py-1.5 text-right">{formatMoney(m.incomeMinor)}</td>
<td className="px-3 py-1.5 text-right">{formatMoney(m.expenseMinor)}</td>
<td className={cn("px-3 py-1.5 text-right", m.netMinor < 0 && "text-expense")}>
{m.netMinor < 0 ? "−" : ""}
{formatMoney(Math.abs(m.netMinor))}
</td>
<td className="px-3 py-1.5 text-right">{formatPct(m.savingsPct)}</td>
</tr>
))}
</tbody>
<tfoot className="border-t font-medium">
<tr>
<td className="px-3 py-2">{t.total}</td>
<td className="px-3 py-2 text-right">{formatMoney(data.totals.incomeMinor)}</td>
<td className="px-3 py-2 text-right">{formatMoney(data.totals.expenseMinor)}</td>
<td
className={cn("px-3 py-2 text-right", data.totals.netMinor < 0 && "text-expense")}
>
{data.totals.netMinor < 0 ? "−" : ""}
{formatMoney(Math.abs(data.totals.netMinor))}
</td>
<td className="px-3 py-2 text-right">{formatPct(data.totals.savingsPct)}</td>
</tr>
</tfoot>
</table>
</div>
</div>
);
}
@@ -0,0 +1,178 @@
"use client";
import { useRouter } from "next/navigation";
import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
import {
ChartContainer,
ChartLegend,
ChartLegendContent,
ChartTooltip,
ChartTooltipContent,
type ChartConfig,
} from "@/components/ui/chart";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { formatUnitPrice, unitPriceBase } from "@/shared/prices";
import type { UnitPriceReport } from "../extra";
import { dayLabel, monthLabel, monthShort } from "./report-frame";
const t = tr.reports.unitPrice;
const config = {
min: { label: t.min, color: "var(--income)" },
avg: { label: t.avg, color: "var(--budget)" },
} satisfies ChartConfig;
/** Ürün tipi seçimi (URL'de) ve aylık en düşük / ortalama birim fiyat. */
export function UnitPriceView({ data }: { data: UnitPriceReport }) {
const router = useRouter();
const sel = data.selected;
if (!sel)
return (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.noTypes}
</p>
);
const base = unitPriceBase(sel.unit);
// Gösterim biriminde TL (g → kg, ml → lt).
const tl = (minor: number | null) => (minor === null ? null : (minor * base.factor) / 100);
const chart = sel.points.map((p) => ({
month: p.month,
label: monthShort(p.month),
min: tl(p.minMinor),
avg: tl(p.avgMinor),
}));
const fmt = (minor: number | null) => (minor === null ? "—" : formatUnitPrice(minor, sel.unit));
return (
<div className="flex flex-col gap-4">
<div className="flex items-center gap-2">
<label htmlFor="up-type" className="text-sm text-muted-foreground">
{t.type}
</label>
<Select
value={sel.id}
onValueChange={(id) => router.replace(`/raporlar/birim-fiyat?tip=${id}`)}
>
<SelectTrigger id="up-type" className="w-64">
<SelectValue />
</SelectTrigger>
<SelectContent className="max-h-72">
{data.types.map((x) => (
<SelectItem key={x.id} value={x.id}>
{x.name}{" "}
<span className="text-xs text-muted-foreground">({t.records(x.records)})</span>
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<div className="rounded-xl border bg-card p-4">
<ChartContainer
config={config}
className="aspect-auto h-60 w-full"
role="img"
aria-label={t.chartLabel(sel.name)}
>
<LineChart data={chart} margin={{ left: 4, right: 8, top: 8 }}>
<CartesianGrid vertical={false} />
<XAxis dataKey="label" tickLine={false} axisLine={false} tickMargin={8} />
<YAxis
tickLine={false}
axisLine={false}
width={56}
tickFormatter={(v: number) =>
`₺${v.toLocaleString("tr-TR", { maximumFractionDigits: 2 })}`
}
/>
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) => {
const m = payload?.[0]?.payload?.month as string | undefined;
return m ? monthLabel(m) : "";
}}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="text-muted-foreground">
{config[name as keyof typeof config]?.label}
</span>
<span className="font-medium text-foreground tabular-nums">
{formatUnitPrice((Number(value) * 100) / base.factor, sel.unit)}
</span>
</div>
)}
/>
}
/>
<ChartLegend content={<ChartLegendContent />} />
{(["min", "avg"] as const).map((k) => (
<Line
key={k}
dataKey={k}
stroke={`var(--color-${k})`}
strokeWidth={2}
strokeDasharray={k === "avg" ? "6 3" : undefined}
dot={{ r: 3 }}
connectNulls
isAnimationActive={false}
/>
))}
</LineChart>
</ChartContainer>
<table className="mt-3 w-full text-sm tabular-nums">
<thead className="text-xs text-muted-foreground">
<tr>
<th className="py-1 text-left font-normal">{t.month}</th>
<th className="py-1 text-right font-normal">{t.min}</th>
<th className="py-1 text-right font-normal">{t.avg}</th>
<th className="py-1 text-right font-normal">{t.count}</th>
</tr>
</thead>
<tbody className="divide-y">
{[...sel.points].reverse().map((p) => (
<tr key={p.month}>
<td className="py-1 capitalize">{monthLabel(p.month)}</td>
<td className="py-1 text-right">{fmt(p.minMinor)}</td>
<td className="py-1 text-right">{fmt(p.avgMinor)}</td>
<td className="py-1 text-right">{p.count}</td>
</tr>
))}
</tbody>
</table>
</div>
{sel.stores.length ? (
<section className="rounded-xl border bg-card p-4" aria-labelledby="up-stores">
<h2 id="up-stores" className="mb-2 text-sm font-medium">
{t.storesTitle}
</h2>
<table className="w-full text-sm tabular-nums">
<thead className="text-xs text-muted-foreground">
<tr>
<th className="py-1 text-left font-normal">{t.store}</th>
<th className="py-1 text-right font-normal">{t.min}</th>
<th className="py-1 text-right font-normal">{t.last}</th>
</tr>
</thead>
<tbody className="divide-y">
{sel.stores.map((s) => (
<tr key={s.id}>
<td className="py-1">{s.label}</td>
<td className="py-1 text-right">{fmt(s.minMinor)}</td>
<td className="py-1 text-right">{dayLabel(s.lastDate)}</td>
</tr>
))}
</tbody>
</table>
</section>
) : null}
</div>
);
}
+34
View File
@@ -0,0 +1,34 @@
import "server-only";
import { tr } from "@/i18n/tr";
import { getHouseholdContext } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
/** CSV rotaları için ortak: oturum + aktif hane, ?ay= doğrulaması ve yanıt üretimi. */
export async function csvContext(request: Request) {
const ctx = await getHouseholdContext();
if (!ctx?.household) return null;
const params = new URL(request.url).searchParams;
const ay = budgetMonthSchema.safeParse(params.get("ay"));
return {
userId: ctx.user.id,
householdId: ctx.household.id,
month: ay.success ? ay.data : undefined,
params,
};
}
export const unauthorized = () => new Response(tr.common.unauthorized, { status: 401 });
export const forbidden = () => new Response(tr.common.unauthorized, { status: 403 });
export function csvResponse(csv: string, filename: string) {
return new Response(csv, {
headers: {
"Content-Type": "text/csv; charset=utf-8",
"Content-Disposition": `attachment; filename="${filename}"`,
"Cache-Control": "no-store",
},
});
}
/** 14,3 → "14,3" (CSV ondalık virgül). */
export const csvPct = (n: number | null) => (n === null ? "" : String(n).replace(".", ","));
+130
View File
@@ -0,0 +1,130 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { completeShopping, getCompletionSheet } from "@/features/shopping/completion";
import { AccountModel } from "@/models/account";
import { ProductTypeModel } from "@/models/product-type";
import { ShoppingListModel } from "@/models/shopping-list";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import { shoppingCompletionSchema } from "@/shared/schemas/shopping";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
getAssetsReport,
getContactsReport,
getShoppingReport,
getUnitPriceReport,
getWasteReport,
} from "./extra";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let zeynep = "";
let fatma = "";
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
describe("cari ve aynî", () => {
it("bakiyeli cariler büyükten küçüğe; toplamlar; açık aynî borçlar; başka hane göremez", async () => {
const r = (await getContactsReport(ayse, cakir))!;
expect(r.contacts.length).toBeGreaterThan(0);
expect(r.contacts.every((c) => c.balanceMinor !== 0 && !c.archived)).toBe(true);
const abs = r.contacts.map((c) => Math.abs(c.balanceMinor));
expect(abs).toEqual([...abs].sort((a, b) => b - a));
expect(r.inKind.length).toBeGreaterThan(0);
expect(r.inKind.every((d) => d.remainingQuantity > 0)).toBe(true);
expect(await getContactsReport(fatma, cakir)).toBeNull();
});
});
describe("birikim", () => {
it("varlık kâr/zarar ve dönem raporu", async () => {
const r = (await getAssetsReport(ayse, cakir, "6"))!;
expect(r.items.length).toBeGreaterThan(0);
expect(r.period.from < r.period.to).toBe(true);
expect(r.range).toBe("6");
});
});
describe("alışveriş", () => {
it("mağaza bazlı harcama alıcı adıyla eşleşir; tamamlanan liste plan/gerçek satırı verir", async () => {
const before = (await getShoppingReport(ayse, cakir, 6))!;
expect(before.lists).toEqual([]);
expect(before.stores.map((s) => s.name)).toEqual(expect.arrayContaining(["Migros", "BİM"]));
expect(before.stores.reduce((a, s) => a + s.amountMinor, 0)).toBe(before.storesTotalMinor);
// Haftalık marketten yalnızca süt alınır, kalanlar bırakılır.
const weekly = String((await ShoppingListModel.findOne({ seedRef: "haftalik" }).lean())!._id);
const sheet = (await getCompletionSheet(ayse, cakir, weekly))!;
const milk = sheet.items.find((i) => i.label === "Süt")!;
const plan = sheet.planned[milk.id]!;
const account = String((await AccountModel.findOne({ name: "Ziraat Maaş" }).lean())!._id);
const done = await completeShopping(
ayse,
cakir,
weekly,
shoppingCompletionSchema.parse({
date: todayIstanbul(),
lines: [
{
itemId: milk.id,
productId: plan.productId,
storeId: plan.storeId,
packages: String(plan.packages),
amount: formatMoneyInput(plan.priceMinor * plan.packages),
},
],
stores: [{ storeId: plan.storeId, accountId: account, attachmentIds: [] }],
leftover: { action: "drop" },
}),
);
expect(done.ok).toBe(true);
const after = (await getShoppingReport(ayse, cakir, 3))!;
expect(after.lists).toHaveLength(1);
const row = after.lists[0]!;
expect(row.summary.counts.same).toBe(1);
expect(row.summary.actualMinor).toBe(plan.priceMinor * plan.packages);
expect(after.listTotals.diffMinor).toBe(row.summary.diffMinor);
const store = after.stores.find((s) => s.fromListsMinor > 0)!;
expect(store.fromListsMinor).toBe(plan.priceMinor * plan.packages);
});
});
describe("birim fiyat geçmişi", () => {
it("fiyatı olan tipler; seçilen tipte 12 ay noktası ve mağaza en düşükleri", async () => {
const r = (await getUnitPriceReport(ayse, cakir))!;
expect(r.types.length).toBeGreaterThan(5);
expect(r.months).toHaveLength(12);
const toz = String((await ProductTypeModel.findOne({ seedRef: "toz-deterjan" }).lean())!._id);
const d = (await getUnitPriceReport(ayse, cakir, toz))!;
expect(d.selected!.id).toBe(toz);
expect(d.selected!.points).toHaveLength(12);
const priced = d.selected!.points.filter((p) => p.count > 0);
expect(priced.length).toBeGreaterThan(3);
for (const p of priced) expect(p.minMinor!).toBeLessThanOrEqual(p.avgMinor!);
const mins = d.selected!.stores.map((s) => s.minMinor);
expect(mins).toEqual([...mins].sort((a, b) => a - b));
});
});
describe("fire / zarar", () => {
it("fire satırları, oran ve nedenler; izleyici de okuyabilir", async () => {
const r = (await getWasteReport(zeynep, cakir, 12))!;
expect(r.rows.length).toBeGreaterThan(0);
for (const row of r.rows) {
const sum = Object.values(row.byReason).reduce((a, b) => a + b, 0);
expect(sum).toBe(row.wasted);
if (row.purchased > 0) expect(row.wastePct).not.toBeNull();
}
const priced = r.rows.reduce((a, x) => a + (x.costMinor ?? 0), 0);
expect(priced).toBe(r.totalCostMinor);
expect(await getWasteReport(fatma, cakir, 12)).toBeNull();
});
});
+482
View File
@@ -0,0 +1,482 @@
import "server-only";
import { Types } from "mongoose";
import {
getPeriodReport,
listAssets,
type AssetView,
type ReportRange,
} from "@/features/assets/service";
import { listContacts, type ContactView } from "@/features/contacts/service";
import { listInKind } from "@/features/in-kind/service";
import { latestTypeUnitPrices, loadTypePriceHistory } from "@/features/prices/service";
import { storeLabel } from "@/features/stores/service";
import { TransactionModel } from "@/models/transaction";
import { ProductPriceModel } from "@/models/product-price";
import { ProductTypeModel } from "@/models/product-type";
import { ShoppingListModel } from "@/models/shopping-list";
import { StockMovementModel } from "@/models/stock-movement";
import { StoreModel } from "@/models/store";
import { formatAssetQuantity, type AssetKey, type InKindDirection } from "@/shared/assets";
import { budgetPeriod, periodOfDate, shiftMonth } from "@/shared/budget";
import { istanbulDayStart } from "@/shared/dates";
import type { PeriodReport } from "@/shared/portfolio";
import {
matchStoreName,
monthlyUnitPrices,
sharePct,
type ReportPeriod,
type UnitPricePoint,
} from "@/shared/reports";
import { foldTr, compareTr } from "@/shared/search";
import type { ShoppingCompletion } from "@/shared/shopping";
import { compareShopping, type ComparisonSummary } from "@/shared/shopping-compare";
import { WASTE_REASONS, type WasteReason } from "@/shared/stock";
import { base, type Base } from "./service";
/**
* Faz 14b raporları: cari ve aynî borçlar, birikim kâr/zarar, alışveriş (liste vs. gerçekleşen,
* mağaza bazlı harcama), birim fiyat geçmişi, fire/zarar. Okuma: viewer; gizlilik kuralları
* kaynak servislerle aynı (gizli cari/varlık/hesap görünmez).
*/
const DAY_MS = 86_400_000;
/** İçinde bulunulan dahil son N bütçe ayı ve tarih aralığı. */
function periodRange(b: Base, months: number) {
const list = Array.from({ length: months }, (_, i) => shiftMonth(b.currentMonth, i - months + 1));
return {
months: list,
from: budgetPeriod(list[0]!, b.s.startDay).from,
to: budgetPeriod(list.at(-1)!, b.s.startDay).to,
};
}
// --- Cari özet ve aynî borçlar ---
export type InKindRow = {
id: string;
contactId: string;
contactName: string;
direction: InKindDirection;
assetKey: AssetKey;
/** Kalan miktar ("12,5 gr 22 ayar"). */
remainingLabel: string;
remainingQuantity: number;
valueMinor: number | null;
date: string;
};
export type ContactsReport = {
contacts: ContactView[];
totals: { owesMeMinor: number; iOweMinor: number };
inKind: InKindRow[];
inKindTotals: { receivableMinor: number; debtMinor: number; unpriced: number };
};
export async function getContactsReport(
userId: string,
householdId: string,
): Promise<ContactsReport | null> {
const [list, inKind] = await Promise.all([
listContacts(userId, householdId),
listInKind(userId, householdId),
]);
if (!list || !inKind) return null;
const open = inKind.filter((d) => !d.closedAt && d.progress.remainingQuantity > 0);
const totals = { receivableMinor: 0, debtMinor: 0, unpriced: 0 };
for (const d of open) {
const v = d.progress.currentValueMinor;
if (v === null) totals.unpriced++;
else if (d.direction === "receivable") totals.receivableMinor += v;
else totals.debtMinor += v;
}
return {
contacts: list.contacts
.filter((c) => !c.archived && c.balanceMinor !== 0)
.sort((a, b) => Math.abs(b.balanceMinor) - Math.abs(a.balanceMinor)),
totals: list.totals,
inKind: open.map((d) => ({
id: d.id,
contactId: d.contactId,
contactName: d.contactName,
direction: d.direction,
assetKey: d.assetKey,
remainingLabel: formatAssetQuantity(d.assetKey, d.progress.remainingQuantity),
remainingQuantity: d.progress.remainingQuantity,
valueMinor: d.progress.currentValueMinor,
date: d.date,
})),
inKindTotals: totals,
};
}
// --- Birikim kâr/zarar ---
export type AssetsReport = {
items: AssetView[];
totals: {
valueMinor: number;
costMinor: number;
unrealizedMinor: number;
realizedMinor: number;
missingPrice: number;
};
period: PeriodReport & { excluded: number };
range: ReportRange;
};
export async function getAssetsReport(
userId: string,
householdId: string,
range: ReportRange,
): Promise<AssetsReport | null> {
const [assets, period] = await Promise.all([
listAssets(userId, householdId),
getPeriodReport(userId, householdId, range),
]);
if (!assets || !period) return null;
return {
items: assets.items.filter((a) => a.summary.quantity > 0 || a.summary.realizedMinor !== 0),
totals: assets.totals,
period,
range,
};
}
// --- Alışveriş: liste vs. gerçekleşen, mağaza bazlı harcama ---
export type CompletedListRow = {
id: string;
name: string;
date: string;
summary: ComparisonSummary;
stores: string[];
};
export type StoreSpendRow = {
name: string;
amountMinor: number;
count: number;
/** Alışverişi tamamla ile gelen kısım. */
fromListsMinor: number;
sharePct: number;
};
export type ShoppingReport = {
period: ReportPeriod;
from: string;
to: string;
lists: CompletedListRow[];
listTotals: ComparisonSummary["reasons"] & {
plannedMinor: number;
actualMinor: number;
diffMinor: number;
};
stores: StoreSpendRow[];
storesTotalMinor: number;
};
export async function getShoppingReport(
userId: string,
householdId: string,
period: ReportPeriod,
): Promise<ShoppingReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const range = periodRange(b, period);
const hid = b.ctx.m.householdId;
const [lists, storeDocs, txs] = await Promise.all([
ShoppingListModel.find({
householdId: hid,
deletedAt: null,
status: "completed",
"completion.date": { $gte: range.from, $lte: range.to },
})
.select({ name: 1, completion: 1 })
.lean<{ _id: Types.ObjectId; name: string; completion: ShoppingCompletion }[]>(),
StoreModel.find({ householdId: hid })
.select({ name: 1, branch: 1 })
.lean<{ name: string; branch: string }[]>(),
TransactionModel.find({
householdId: hid,
type: "expense",
status: "posted",
deletedAt: null,
date: {
$gte: istanbulDayStart(range.from)!,
$lt: new Date(istanbulDayStart(range.to)!.getTime() + DAY_MS),
},
...(!b.s.includePrivate && b.ctx.hiddenAccountIds.length
? { accountId: { $nin: b.ctx.hiddenAccountIds } }
: {}),
})
.select({ payeeName: 1, amountMinor: 1, shoppingListId: 1 })
.lean<{ payeeName: string; amountMinor: number; shoppingListId: Types.ObjectId | null }[]>(),
]);
const rows: CompletedListRow[] = lists
.map((l) => ({
id: String(l._id),
name: l.name,
date: l.completion.date,
stores: l.completion.stores.map((s) => s.label),
summary: compareShopping(
l.completion.rows.map((r) => ({
match: r.match,
plan: r.plan,
actual:
r.amountMinor === null
? null
: { productId: r.productId, packages: r.packages, amountMinor: r.amountMinor },
})),
),
}))
.sort((a, c) => (a.date < c.date ? 1 : -1));
const listTotals = {
plannedMinor: 0,
actualMinor: 0,
diffMinor: 0,
price: 0,
quantity: 0,
substitute: 0,
skipped: 0,
extra: 0,
unplanned: 0,
};
for (const r of rows) {
listTotals.plannedMinor += r.summary.plannedMinor;
listTotals.actualMinor += r.summary.actualMinor;
listTotals.diffMinor += r.summary.diffMinor;
for (const k of ["price", "quantity", "substitute", "skipped", "extra", "unplanned"] as const)
listTotals[k] += r.summary.reasons[k];
}
// Mağaza adı bazında (şubeler birlikte): gider alıcısı mağaza adıyla başlıyorsa.
const names = [...new Set(storeDocs.map((s) => s.name))];
const byStore = new Map<string, StoreSpendRow>();
for (const t of txs) {
const name = matchStoreName(t.payeeName, names, foldTr);
if (!name) continue;
const row = byStore.get(name) ?? {
name,
amountMinor: 0,
count: 0,
fromListsMinor: 0,
sharePct: 0,
};
row.amountMinor += t.amountMinor;
row.count++;
if (t.shoppingListId) row.fromListsMinor += t.amountMinor;
byStore.set(name, row);
}
const storesTotal = [...byStore.values()].reduce((a, r) => a + r.amountMinor, 0);
const stores = [...byStore.values()]
.map((r) => ({ ...r, sharePct: sharePct(r.amountMinor, storesTotal) }))
.sort((a, c) => c.amountMinor - a.amountMinor);
return {
period,
from: range.from,
to: range.to,
lists: rows,
listTotals,
stores,
storesTotalMinor: storesTotal,
};
}
// --- Birim fiyat geçmişi ---
export type UnitPriceReport = {
types: { id: string; name: string; unit: string; records: number }[];
selected: {
id: string;
name: string;
unit: string;
points: UnitPricePoint[];
/** Mağaza başına dönemdeki en düşük birim fiyat. */
stores: { id: string; label: string; minMinor: number; lastDate: string }[];
} | null;
months: string[];
};
export async function getUnitPriceReport(
userId: string,
householdId: string,
typeId?: string,
): Promise<UnitPriceReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const hid = b.ctx.m.householdId;
const range = periodRange(b, 12);
const [types, counts] = await Promise.all([
ProductTypeModel.find({ householdId: hid, archivedAt: null })
.select({ name: 1, unit: 1 })
.lean<{ _id: Types.ObjectId; name: string; unit: string }[]>(),
ProductPriceModel.aggregate<{ _id: Types.ObjectId; n: number }>([
{ $match: { householdId: hid, deletedAt: null } },
{ $lookup: { from: "products", localField: "productId", foreignField: "_id", as: "p" } },
{ $unwind: "$p" },
{ $group: { _id: "$p.productTypeId", n: { $sum: 1 } } },
]),
]);
const count = new Map(counts.map((c) => [String(c._id), c.n]));
const options = types
.map((x) => ({
id: String(x._id),
name: x.name,
unit: x.unit,
records: count.get(String(x._id)) ?? 0,
}))
.filter((x) => x.records > 0)
.sort((a, c) => compareTr(a.name, c.name));
const chosen = options.find((x) => x.id === typeId) ?? options[0];
if (!chosen) return { types: options, selected: null, months: range.months };
const [history, storeDocs] = await Promise.all([
loadTypePriceHistory(hid, new Types.ObjectId(chosen.id)),
StoreModel.find({ householdId: hid })
.select({ name: 1, branch: 1 })
.lean<{ _id: Types.ObjectId; name: string; branch: string }[]>(),
]);
const inRange = history.filter((h) => h.date >= range.from && h.date <= range.to);
const points = monthlyUnitPrices(
inRange.map((h) => ({
month: periodOfDate(h.date, b.s.startDay),
unitPriceMinor: h.unitPriceMinor,
})),
range.months,
);
const labelOf = new Map(storeDocs.map((s) => [String(s._id), storeLabel(s)]));
const perStore = new Map<string, { minMinor: number; lastDate: string }>();
for (const h of inRange) {
const cur = perStore.get(h.storeId);
perStore.set(h.storeId, {
minMinor: cur ? Math.min(cur.minMinor, h.unitPriceMinor) : h.unitPriceMinor,
lastDate: cur && cur.lastDate > h.date ? cur.lastDate : h.date,
});
}
return {
types: options,
months: range.months,
selected: {
id: chosen.id,
name: chosen.name,
unit: chosen.unit,
points,
stores: [...perStore.entries()]
.map(([id, v]) => ({ id, label: labelOf.get(id) ?? "—", ...v }))
.sort((a, c) => a.minMinor - c.minMinor),
},
};
}
// --- Fire / zarar ---
export type WasteRow = {
productTypeId: string;
name: string;
unit: string;
wasted: number;
purchased: number;
/** Fire / alım (yüzde); alım yoksa null. */
wastePct: number | null;
byReason: Record<WasteReason, number>;
/** Tahmini maliyet: fire × son bilinen birim fiyat (fiyat yoksa null). */
costMinor: number | null;
};
export type WasteReport = {
period: ReportPeriod;
from: string;
to: string;
rows: WasteRow[];
/** Neden başına fire satırı sayısı ve tahmini maliyet. */
reasons: Record<WasteReason, { count: number; costMinor: number }>;
totalCostMinor: number;
unpriced: number;
};
export async function getWasteReport(
userId: string,
householdId: string,
period: ReportPeriod,
): Promise<WasteReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const range = periodRange(b, period);
const hid = b.ctx.m.householdId;
const moves = await StockMovementModel.find({
householdId: hid,
deletedAt: null,
kind: { $in: ["waste", "purchase"] },
date: { $gte: range.from, $lte: range.to },
})
.select({ productTypeId: 1, kind: 1, quantity: 1, wasteReason: 1 })
.lean<
{
productTypeId: Types.ObjectId;
kind: "waste" | "purchase";
quantity: number;
wasteReason: WasteReason | null;
}[]
>();
const wasteTypeIds = [
...new Set(moves.filter((m) => m.kind === "waste").map((m) => String(m.productTypeId))),
].map((id) => new Types.ObjectId(id));
const [types, prices] = await Promise.all([
ProductTypeModel.find({ householdId: hid, _id: { $in: wasteTypeIds } })
.select({ name: 1, unit: 1 })
.lean<{ _id: Types.ObjectId; name: string; unit: string }[]>(),
latestTypeUnitPrices(hid, wasteTypeIds),
]);
const emptyReasons = () =>
Object.fromEntries(WASTE_REASONS.map((r) => [r, 0])) as Record<WasteReason, number>;
const rows = new Map<string, WasteRow>();
for (const t of types)
rows.set(String(t._id), {
productTypeId: String(t._id),
name: t.name,
unit: t.unit,
wasted: 0,
purchased: 0,
wastePct: null,
byReason: emptyReasons(),
costMinor: null,
});
const reasons = Object.fromEntries(
WASTE_REASONS.map((r) => [r, { count: 0, costMinor: 0 }]),
) as WasteReport["reasons"];
for (const m of moves) {
const row = rows.get(String(m.productTypeId));
if (!row) continue;
if (m.kind === "purchase") {
row.purchased += m.quantity;
continue;
}
const reason = m.wasteReason ?? "other";
row.wasted += m.quantity;
row.byReason[reason] += m.quantity;
reasons[reason].count++;
const price = prices.get(row.productTypeId);
if (price) reasons[reason].costMinor += Math.round((m.quantity * price.unitPriceMinor) / 1000);
}
let total = 0;
let unpriced = 0;
const list = [...rows.values()].map((r) => {
const price = prices.get(r.productTypeId);
const costMinor = price ? Math.round((r.wasted * price.unitPriceMinor) / 1000) : null;
if (costMinor === null) unpriced++;
else total += costMinor;
return { ...r, costMinor, wastePct: r.purchased > 0 ? sharePct(r.wasted, r.purchased) : null };
});
list.sort((a, c) => (c.costMinor ?? -1) - (a.costMinor ?? -1) || compareTr(a.name, c.name));
return {
period,
from: range.from,
to: range.to,
rows: list,
reasons,
totalCostMinor: total,
unpriced,
};
}
+141
View File
@@ -0,0 +1,141 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { getBudget } from "@/features/budgets/service";
import { listCategories, updateCategory } from "@/features/categories/service";
import {
createTransaction,
getTransactionFormOptions,
setTransactionDeleted,
} from "@/features/transactions/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { todayIstanbul } from "@/shared/dates";
import { transactionFormSchema } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { getKakeiboReport } from "./kakeibo";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let fatma = "";
const catId = (defaultKey: string) =>
CategoryModel.findOne({ householdId: cakir, defaultKey })
.lean()
.then((c) => String(c!._id));
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
describe("varsayılan gruplar", () => {
it("varsayılan kategoriler gruplu; alt kategoriler devralır; banka maliyeti işaretli", async () => {
const cats = (await listCategories(ayse, cakir, { kind: "expense" }))!;
const by = (name: string) => cats.find((c) => c.name === name)!;
expect(by("Market").kakeibo).toEqual({ group: "ZORUNLU", inherited: false, bankCost: false });
expect(by("Gıda").kakeibo).toEqual({ group: "ZORUNLU", inherited: true, bankCost: false });
expect(by("Kişisel bakım").kakeibo.group).toBe("ISTEK");
expect(by("Dışarıda yemek").kakeibo.group).toBe("ISTEK");
expect(by("Eğitim").kakeibo.group).toBe("KULTUR");
expect(by("Faiz").kakeibo.bankCost).toBe(true);
expect(by("Diğer").kakeibo.group).toBeNull();
const opts = (await getTransactionFormOptions(ayse, cakir))!;
expect(opts.categoryKakeibo[by("Gıda").id]).toEqual({ group: "ZORUNLU", bankCost: false });
});
});
describe("Kakeibo raporu", () => {
it("harcama + banka maliyeti = bütçenin gerçekleşeni; başka hane göremez", async () => {
const r = (await getKakeiboReport(ayse, cakir))!;
const budget = (await getBudget(ayse, cakir))!;
const s = r.now.summary;
expect(s.spendingMinor + s.bankCostMinor).toBe(budget.totals.actualMinor);
const classSum = Object.values(r.now.byClass)
.flat()
.reduce((a, x) => a + x.amountMinor, 0);
expect(classSum).toBe(budget.totals.actualMinor);
expect(await getKakeiboReport(fatma, cakir)).toBeNull();
});
it("işlem bazında grup değiştirme tutarı taşır; banka maliyeti harcamaya girmez", async () => {
const before = (await getKakeiboReport(ayse, cakir))!.now.summary;
const account = String((await AccountModel.findOne({ name: "Ziraat Maaş" }).lean())!._id);
const form = (over: Record<string, unknown>) =>
transactionFormSchema.parse({
type: "expense",
amount: "100",
date: todayIstanbul(),
accountId: account,
installments: 1,
...over,
});
const gida = await catId("market.gida");
const faiz = await catId("banka.faiz");
// Market alışverişi ama amaç "istek" (ör. doğum günü pastası).
const a = await createTransaction(
ayse,
cakir,
form({ categoryId: gida, kakeiboGroup: "ISTEK" }),
);
// Bölünmüş: 60 ZORUNLU (kategoriden) + 40 KÜLTÜR (değiştirilmiş).
const b = await createTransaction(
ayse,
cakir,
form({
categoryId: "",
splits: [
{ categoryId: gida, amount: "60", note: "" },
{ categoryId: gida, amount: "40", note: "", kakeiboGroup: "KULTUR" },
],
}),
);
const c = await createTransaction(ayse, cakir, form({ categoryId: faiz, amount: "25" }));
expect([a.ok, b.ok, c.ok]).toEqual([true, true, true]);
const after = (await getKakeiboReport(ayse, cakir))!.now.summary;
expect(after.groups.ISTEK - before.groups.ISTEK).toBe(100_00);
expect(after.groups.ZORUNLU - before.groups.ZORUNLU).toBe(60_00);
expect(after.groups.KULTUR - before.groups.KULTUR).toBe(40_00);
expect(after.bankCostMinor - before.bankCostMinor).toBe(25_00);
expect(after.spendingMinor - before.spendingMinor).toBe(200_00);
for (const r of [a, b, c]) if (r.ok) await setTransactionDeleted(ayse, cakir, r.data.id, true);
});
it("kategoriye grup atanınca grupsuzdan çıkar", async () => {
const diger = await catId("diger-gider");
const cats = (await listCategories(ayse, cakir, { kind: "expense" }))!;
const d = cats.find((c) => c.id === diger)!;
const r = await updateCategory(ayse, cakir, diger, {
kind: "expense",
name: d.name,
parentId: null,
icon: d.icon,
color: d.color,
kakeiboGroup: "BEKLENMEYEN",
bankCost: false,
});
expect(r.ok).toBe(true);
const after = (await listCategories(ayse, cakir, { kind: "expense" }))!.find(
(c) => c.id === diger,
)!;
expect(after.kakeibo.group).toBe("BEKLENMEYEN");
});
});
describe("migration 016", () => {
it("geri alınır (alanlar kalkar) ve yeniden uygulanınca varsayılanlar dolar", async () => {
const { revertMigration, runMigrations } = await import("../../../scripts/migrations");
const log = () => {};
await revertMigration("016-kakeibo-groups", log);
expect(await CategoryModel.countDocuments({ kakeiboGroup: { $exists: true } })).toBe(0);
expect(await runMigrations(log)).toEqual(["016-kakeibo-groups"]);
const gida = await CategoryModel.findOne({ householdId: cakir, defaultKey: "market" }).lean();
expect(gida!.kakeiboGroup).toBe("ZORUNLU");
const banka = await CategoryModel.findOne({ householdId: cakir, defaultKey: "banka" }).lean();
expect(banka!.bankCost).toBe(true);
});
});
+138
View File
@@ -0,0 +1,138 @@
import "server-only";
import type { Types } from "mongoose";
import { tr } from "@/i18n/tr";
import { TransactionModel } from "@/models/transaction";
import { budgetPeriod, shiftMonth } from "@/shared/budget";
import { istanbulDayStart } from "@/shared/dates";
import {
classifyAmounts,
isKakeiboGroup,
KAKEIBO_GROUPS,
summarizeGroups,
type GroupSummary,
type KakeiboGroup,
type SpendingClass,
} from "@/shared/kakeibo";
import { changePct } from "@/shared/reports";
import { actualByCategory, base, monthInfo, ORPHAN, type Base, type MonthInfo } from "./service";
/**
* Kakeibo grup raporu (Faz 16). Kategori tutarları bütçeyle aynı kaynaktan (gerçekleşmiş
* giderler, bölünmüş kalemler, taksit modu, gizli hesap ayarı); işlem/kalem bazında grubu
* değiştirilen tutarlar seçilen gruba taşınır. Banka maliyeti ayrı, grupsuzlar listelenir.
*/
const DAY_MS = 86_400_000;
export type KakeiboCategoryRow = { id: string; path: string; amountMinor: number };
export type KakeiboMonth = {
summary: GroupSummary;
/** Sınıf başına kategori kırılımı (tutara göre büyükten küçüğe). */
byClass: Record<SpendingClass, KakeiboCategoryRow[]>;
};
export type KakeiboReport = MonthInfo & {
current: boolean;
previous: string;
now: KakeiboMonth;
prev: KakeiboMonth;
/** Grup başına önceki aya göre değişim (tutar ve yüzde). */
change: Record<KakeiboGroup | "BANK_COST", { minor: number; pct: number | null }>;
includesHidden: boolean;
};
/** Dönemde grubu işlem/kalem bazında değiştirilmiş gider tutarları (kategori × grup). */
async function overrides(b: Base, month: string) {
const { from, to } = budgetPeriod(month, b.s.startDay);
const match: Record<string, unknown> = {
householdId: b.ctx.m.householdId,
type: "expense",
status: "posted",
deletedAt: null,
date: {
$gte: istanbulDayStart(from)!,
$lt: new Date(istanbulDayStart(to)!.getTime() + DAY_MS),
},
$or: [{ kakeiboGroup: { $type: "string" } }, { "splits.kakeiboGroup": { $type: "string" } }],
};
if (!b.s.includePrivate && b.ctx.hiddenAccountIds.length)
match.accountId = { $nin: b.ctx.hiddenAccountIds };
// Tamamı alış ayına modunda taksitler bütçede alış ayına toplanır; değiştirme yalnızca
// taksitsiz işlemlere uygulanır (tutarlar kategori toplamıyla tutarlı kalsın).
if (b.s.installmentMode === "purchase_month") match["installment.planId"] = { $in: [null] };
const docs = await TransactionModel.find(match)
.select({ categoryId: 1, amountMinor: 1, kakeiboGroup: 1, splits: 1 })
.lean<
{
categoryId: Types.ObjectId | null;
amountMinor: number;
kakeiboGroup: string | null;
splits: { categoryId: Types.ObjectId; amountMinor: number; kakeiboGroup?: string | null }[];
}[]
>();
const sums = new Map<string, { categoryId: string; group: KakeiboGroup; amountMinor: number }>();
const add = (categoryId: string, group: unknown, amount: number) => {
if (!isKakeiboGroup(group)) return;
const key = `${categoryId}:${group}`;
const cur = sums.get(key) ?? { categoryId, group, amountMinor: 0 };
cur.amountMinor += amount;
sums.set(key, cur);
};
for (const d of docs) {
if (d.splits?.length)
for (const s of d.splits) add(String(s.categoryId), s.kakeiboGroup, s.amountMinor);
else if (d.categoryId) add(String(d.categoryId), d.kakeiboGroup, d.amountMinor);
}
return [...sums.values()];
}
async function kakeiboMonth(b: Base, month: string): Promise<KakeiboMonth> {
const [amounts, over] = await Promise.all([actualByCategory(b, month), overrides(b, month)]);
const items = classifyAmounts(amounts, over, b.ctx.kakeibo);
const byClass = Object.fromEntries(
[...KAKEIBO_GROUPS, "BANK_COST", "UNGROUPED"].map((c) => [c, [] as KakeiboCategoryRow[]]),
) as Record<SpendingClass, KakeiboCategoryRow[]>;
const merged = new Map<string, KakeiboCategoryRow & { cls: SpendingClass }>();
for (const it of items) {
const key = `${it.cls}:${it.categoryId}`;
const path =
it.categoryId === ORPHAN
? tr.reports.uncategorized
: (b.ctx.categoryMap.get(it.categoryId)?.path ?? "—");
const cur = merged.get(key) ?? { id: it.categoryId, path, amountMinor: 0, cls: it.cls };
cur.amountMinor += it.amountMinor;
merged.set(key, cur);
}
for (const r of merged.values())
byClass[r.cls].push({ id: r.id, path: r.path, amountMinor: r.amountMinor });
for (const list of Object.values(byClass)) list.sort((a, c) => c.amountMinor - a.amountMinor);
return { summary: summarizeGroups(items), byClass };
}
export async function getKakeiboReport(
userId: string,
householdId: string,
month?: string,
): Promise<KakeiboReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const m = month ?? b.currentMonth;
const previous = shiftMonth(m, -1);
const [now, prev] = await Promise.all([kakeiboMonth(b, m), kakeiboMonth(b, previous)]);
const change = Object.fromEntries(
[...KAKEIBO_GROUPS, "BANK_COST" as const].map((g) => {
const cur = g === "BANK_COST" ? now.summary.bankCostMinor : now.summary.groups[g];
const old = g === "BANK_COST" ? prev.summary.bankCostMinor : prev.summary.groups[g];
return [g, { minor: cur - old, pct: changePct(cur, old) }];
}),
) as KakeiboReport["change"];
return {
...monthInfo(b, m),
previous,
now,
prev,
change,
includesHidden: b.s.includePrivate && b.ctx.hiddenAccountIds.length > 0,
};
}
+114
View File
@@ -0,0 +1,114 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { getBudget } from "@/features/budgets/service";
import { getOverview } from "@/features/dashboard/service";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
getBudgetReport,
getCategoryReport,
getPeopleAccountsReport,
getTrendReport,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let zeynep = "";
let fatma = "";
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
describe("kategori dağılımı", () => {
it("toplam bütçenin gerçekleşeniyle aynı; oranlar ~%100; başka hane göremez", async () => {
const r = (await getCategoryReport(ayse, cakir))!;
const budget = (await getBudget(ayse, cakir))!;
expect(r.breakdown.totalMinor).toBe(budget.totals.actualMinor);
expect(r.breakdown.totalMinor).toBeGreaterThan(0);
const sum = r.breakdown.rows.reduce((a, x) => a + x.amountMinor, 0);
expect(sum).toBe(r.breakdown.totalMinor);
const pct = r.breakdown.rows.reduce((a, x) => a + x.sharePct, 0);
expect(Math.abs(pct - 100)).toBeLessThan(1);
// Alt kategori kırılımı: çocukların ve doğrudan tutarın toplamı üst satıra eşit.
for (const row of r.breakdown.rows) {
const kids = row.children.reduce((a, c) => a + c.amountMinor, 0);
expect(kids + row.ownMinor).toBe(row.amountMinor);
}
expect(r.appearance[r.breakdown.rows[0]!.id]).toBeDefined();
expect(await getCategoryReport(fatma, cakir)).toBeNull();
});
it("önceki ay seçilebilir", async () => {
const cur = (await getCategoryReport(ayse, cakir))!;
const prev = (await getCategoryReport(ayse, cakir, cur.previous))!;
expect(prev.current).toBe(false);
expect(prev.breakdown.totalMinor).toBe(cur.breakdown.prevTotalMinor);
});
});
describe("aylık trend", () => {
it("12 ay; içinde bulunulan ayın gideri bütçeyle aynı; tasarruf oranı tutarlı", async () => {
const r = (await getTrendReport(ayse, cakir))!;
expect(r.months).toHaveLength(12);
const last = r.months.at(-1)!;
expect(last.month).toBe(r.currentMonth);
expect(last.expenseMinor).toBe((await getBudget(ayse, cakir))!.totals.actualMinor);
for (const m of r.months) {
expect(m.netMinor).toBe(m.incomeMinor - m.expenseMinor);
if (m.incomeMinor === 0) expect(m.savingsPct).toBeNull();
}
expect(r.months.filter((m) => m.incomeMinor > 0).length).toBeGreaterThan(3);
});
});
describe("kişi ve hesap bazlı", () => {
it("kişi toplamları ve oranları; gizli hesap yalnızca sahibine görünür", async () => {
const own = (await getPeopleAccountsReport(ayse, cakir))!;
expect(own.people.reduce((a, p) => a + p.expenseMinor, 0)).toBe(own.peopleTotalMinor);
expect(own.people.every((p) => p.name !== "—")).toBe(true);
expect(own.accounts.map((a) => a.name)).toContain("Ayşe — Pluxee");
for (const a of own.accounts)
expect(a.netMinor).toBe(
a.incomeMinor + a.transferInMinor - a.expenseMinor - a.transferOutMinor,
);
const other = (await getPeopleAccountsReport(zeynep, cakir))!;
expect(other.accounts.map((a) => a.name)).not.toContain("Ayşe — Pluxee");
});
});
describe("bütçe ve gerçekleşen", () => {
it("son 6 ay; son satır seçilen ay", async () => {
const r = (await getBudgetReport(ayse, cakir))!;
expect(r.history).toHaveLength(6);
expect(r.history.at(-1)!.month).toBe(r.month);
expect(r.history.at(-1)!.actualMinor).toBe(r.budget.totals.actualMinor);
});
});
describe("dashboard ana grafik", () => {
it("periyotlar: hafta 7 gün, ay günleri, 6 ve 12 ay; gelecek günlerde gerçekleşen boş", async () => {
const week = (await getOverview(ayse, cakir, "week"))!;
expect(week.points).toHaveLength(7);
expect(week.points.filter((p) => p.key > week.today).every((p) => p.actual === null)).toBe(
true,
);
const month = (await getOverview(ayse, cakir, "month"))!;
const budget = (await getBudget(ayse, cakir))!;
const actual = month.points.reduce((a, p) => a + (p.actual ?? 0), 0);
expect(actual).toBe(budget.totals.actualMinor);
if (budget.hasBudget) {
const planned = month.points.reduce((a, p) => a + (p.budget ?? 0), 0);
expect(planned).toBe(budget.totals.limitMinor);
}
const half = (await getOverview(ayse, cakir, "half"))!;
expect(half.points).toHaveLength(6);
expect(half.points.at(-1)!.actual).toBe(budget.totals.actualMinor);
expect((await getOverview(ayse, cakir, "year"))!.points).toHaveLength(12);
expect(await getOverview(fatma, cakir, "month")).toBeNull();
});
});
+353
View File
@@ -0,0 +1,353 @@
import "server-only";
import { Types } from "mongoose";
import { incomePlan } from "@/features/budgets/plan";
import {
budgetFor,
expenseAmounts,
settingsOf,
type BudgetLineView,
type BudgetView,
type Settings,
} from "@/features/budgets/service";
import { loadContext, userNames, type Ctx } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { TransactionModel } from "@/models/transaction";
import type { AccountType } from "@/shared/accounts";
import type { IconKey, Swatch } from "@/shared/appearance";
import { budgetPeriod, periodOfDate, shiftMonth } from "@/shared/budget";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import { categoryBreakdown, savingsRate, sharePct, type CategoryBreakdown } from "@/shared/reports";
/**
* Raporlar (Bölüm 6.14). Okuma: viewer. "Ay" bütçe ayıdır (hane ayarı); gider kuralları bütçeyle
* aynı: gerçekleşmiş işlemler, bölünmüş işlemler kalem bazında, taksit modu ve başkasının
* "yalnızca ben" hesabındaki giderler hane ayarına göre (yalnızca tutar). Başkasının gizli
* hesabı hesap raporunda hiç görünmez.
*/
const DAY_MS = 86_400_000;
export const ORPHAN = "__none__";
export type Base = { ctx: Ctx; s: Settings; today: string; currentMonth: string };
export async function base(userId: string, householdId: string): Promise<Base | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const s = await settingsOf(ctx.m.householdId);
const today = todayIstanbul();
return { ctx, s, today, currentMonth: periodOfDate(today, s.startDay) };
}
/** Kategori bazında gerçekleşen gider (kendi tutarı); kategorisiz/bilinmeyen tek satırda. */
export async function actualByCategory(b: Base, month: string) {
const { from, to } = budgetPeriod(month, b.s.startDay);
const amounts = await expenseAmounts(b.ctx, b.s, from, to);
const out = new Map<string, number>();
for (const [id, a] of amounts) {
const v = a.fixedMinor + a.variableMinor;
if (!v) continue;
const known = id && b.ctx.categoryMap.get(id)?.kind === "expense";
const key = known ? id : ORPHAN;
out.set(key, (out.get(key) ?? 0) + v);
}
return out;
}
export type MonthInfo = {
month: string;
from: string;
to: string;
current: boolean;
currentMonth: string;
};
export const monthInfo = (b: Base, month: string): MonthInfo => ({
month,
...budgetPeriod(month, b.s.startDay),
current: month === b.currentMonth,
currentMonth: b.currentMonth,
});
// --- Kategori dağılımı ---
export type CategoryReport = MonthInfo & {
previous: string;
breakdown: CategoryBreakdown;
appearance: Record<string, { icon: IconKey; color: Swatch; path: string }>;
includesHidden: boolean;
};
export async function getCategoryReport(
userId: string,
householdId: string,
month?: string,
): Promise<CategoryReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const m = month ?? b.currentMonth;
const prev = shiftMonth(m, -1);
const [current, previous] = await Promise.all([
actualByCategory(b, m),
actualByCategory(b, prev),
]);
const cats = b.ctx.flatCategories
.filter((c) => c.kind === "expense")
.map((c) => ({ id: c.id, parentId: c.parentId, name: c.name, order: c.order }));
cats.push({ id: ORPHAN, parentId: null, name: tr.reports.uncategorized, order: 1e9 });
const appearance: CategoryReport["appearance"] = {
[ORPHAN]: { icon: "tag", color: "slate", path: tr.reports.uncategorized },
};
for (const c of b.ctx.categoryMap.values())
if (c.kind === "expense")
appearance[String(c.id)] = { icon: c.icon, color: c.color, path: c.path };
return {
...monthInfo(b, m),
previous: prev,
breakdown: categoryBreakdown(cats, current, previous),
appearance,
includesHidden: b.s.includePrivate && b.ctx.hiddenAccountIds.length > 0,
};
}
// --- Aylık trend ---
export type TrendRow = {
month: string;
incomeMinor: number;
expenseMinor: number;
netMinor: number;
savingsPct: number | null;
};
export type TrendReport = {
months: TrendRow[];
totals: {
incomeMinor: number;
expenseMinor: number;
netMinor: number;
savingsPct: number | null;
};
currentMonth: string;
};
/** Son `count` bütçe ayı (içinde bulunulan dahil): gerçekleşen gelir, gider, net, tasarruf oranı. */
export async function getTrendReport(
userId: string,
householdId: string,
count = 12,
): Promise<TrendReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const months = Array.from({ length: count }, (_, i) => shiftMonth(b.currentMonth, i - count + 1));
const rows = await Promise.all(
months.map(async (month) => {
const [income, expense] = await Promise.all([
incomePlan(b.ctx, b.s, month),
actualByCategory(b, month),
]);
const incomeMinor = income.actualMinor;
const expenseMinor = [...expense.values()].reduce((a, v) => a + v, 0);
return {
month,
incomeMinor,
expenseMinor,
netMinor: incomeMinor - expenseMinor,
savingsPct: savingsRate(incomeMinor, expenseMinor),
};
}),
);
const incomeMinor = rows.reduce((a, r) => a + r.incomeMinor, 0);
const expenseMinor = rows.reduce((a, r) => a + r.expenseMinor, 0);
return {
months: rows,
totals: {
incomeMinor,
expenseMinor,
netMinor: incomeMinor - expenseMinor,
savingsPct: savingsRate(incomeMinor, expenseMinor),
},
currentMonth: b.currentMonth,
};
}
// --- Kişi ve hesap bazlı ---
export type PersonRow = {
userId: string;
name: string;
expenseMinor: number;
count: number;
sharePct: number;
};
export type AccountRow = {
id: string;
name: string;
type: AccountType;
archived: boolean;
incomeMinor: number;
expenseMinor: number;
transferInMinor: number;
transferOutMinor: number;
netMinor: number;
count: number;
};
export type PeopleAccountsReport = MonthInfo & {
people: PersonRow[];
peopleTotalMinor: number;
accounts: AccountRow[];
includesHidden: boolean;
};
type TxLean = {
type: "income" | "expense" | "transfer";
amountMinor: number;
accountId: Types.ObjectId | null;
toAccountId: Types.ObjectId | null;
createdBy: Types.ObjectId;
};
export async function getPeopleAccountsReport(
userId: string,
householdId: string,
month?: string,
): Promise<PeopleAccountsReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const m = month ?? b.currentMonth;
const info = monthInfo(b, m);
const docs = await TransactionModel.find({
householdId: b.ctx.m.householdId,
deletedAt: null,
status: "posted",
date: {
$gte: istanbulDayStart(info.from)!,
$lt: new Date(istanbulDayStart(info.to)!.getTime() + DAY_MS),
},
})
.select({ type: 1, amountMinor: 1, accountId: 1, toAccountId: 1, createdBy: 1 })
.lean<TxLean[]>();
const hidden = new Set(b.ctx.hiddenAccountIds.map(String));
// Kişi: kaydı giren üye; gizli hesap giderleri hane ayarına göre (yalnızca tutar).
const people = new Map<string, { expense: number; count: number }>();
for (const d of docs) {
if (d.type !== "expense") continue;
if (d.accountId && hidden.has(String(d.accountId)) && !b.s.includePrivate) continue;
const key = String(d.createdBy);
const p = people.get(key) ?? { expense: 0, count: 0 };
p.expense += d.amountMinor;
p.count++;
people.set(key, p);
}
const names = await userNames([...people.keys()].map((id) => new Types.ObjectId(id)));
const peopleTotal = [...people.values()].reduce((a, p) => a + p.expense, 0);
// Hesap: başkasının gizli hesabı hiç görünmez.
const acc = new Map<string, Omit<AccountRow, "id" | "name" | "type" | "archived" | "netMinor">>();
const bump = (
id: Types.ObjectId | null,
k: "incomeMinor" | "expenseMinor" | "transferInMinor" | "transferOutMinor",
v: number,
) => {
if (!id || hidden.has(String(id))) return;
const key = String(id);
const row = acc.get(key) ?? {
incomeMinor: 0,
expenseMinor: 0,
transferInMinor: 0,
transferOutMinor: 0,
count: 0,
};
row[k] += v;
row.count++;
acc.set(key, row);
};
for (const d of docs) {
if (d.type === "income") bump(d.accountId, "incomeMinor", d.amountMinor);
else if (d.type === "expense") bump(d.accountId, "expenseMinor", d.amountMinor);
else {
bump(d.accountId, "transferOutMinor", d.amountMinor);
bump(d.toAccountId, "transferInMinor", d.amountMinor);
}
}
const accounts: AccountRow[] = [];
for (const a of b.ctx.accountMap.values()) {
if (a.hidden) continue;
const row = acc.get(String(a.id));
if (!row && a.archived) continue;
const r = row ?? {
incomeMinor: 0,
expenseMinor: 0,
transferInMinor: 0,
transferOutMinor: 0,
count: 0,
};
accounts.push({
id: String(a.id),
name: a.name,
type: a.type,
archived: a.archived,
...r,
netMinor: r.incomeMinor + r.transferInMinor - r.expenseMinor - r.transferOutMinor,
});
}
accounts.sort((x, y) => y.count - x.count || x.name.localeCompare(y.name, "tr"));
return {
...info,
people: [...people.entries()]
.map(([id, p]) => ({
userId: id,
name: names.get(id) ?? "—",
expenseMinor: p.expense,
count: p.count,
sharePct: sharePct(p.expense, peopleTotal),
}))
.sort((x, y) => y.expenseMinor - x.expenseMinor),
peopleTotalMinor: peopleTotal,
accounts,
includesHidden: b.s.includePrivate && b.ctx.hiddenAccountIds.length > 0,
};
}
// --- Bütçe vs. gerçekleşen ---
export type BudgetHistoryRow = {
month: string;
limitMinor: number | null;
actualMinor: number;
ratioBp: number | null;
};
export type BudgetReport = MonthInfo & {
budget: BudgetView;
lines: BudgetLineView[];
history: BudgetHistoryRow[];
};
/** Seçilen ayın kategori bazında bütçe/gerçekleşen tablosu ve son 6 ayın toplamları. */
export async function getBudgetReport(
userId: string,
householdId: string,
month?: string,
): Promise<BudgetReport | null> {
const b = await base(userId, householdId);
if (!b) return null;
const m = month ?? b.currentMonth;
const months = Array.from({ length: 6 }, (_, i) => shiftMonth(m, i - 5));
const budgets = await Promise.all(months.map((x) => budgetFor(b.ctx, b.s, x)));
const budget = budgets.at(-1)!;
return {
...monthInfo(b, m),
budget,
lines: budget.lines,
history: budgets.map((x) => ({
month: x.month,
limitMinor: x.hasBudget ? x.totals.limitMinor : null,
actualMinor: x.totals.actualMinor,
ratioBp: x.hasBudget ? x.totals.ratioBp : null,
})),
};
}
+128
View File
@@ -0,0 +1,128 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import { tr } from "@/i18n/tr";
import { fail, type ActionResult } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import {
shoppingCompletionSchema,
shoppingItemFormSchema,
shoppingItemUpdateSchema,
shoppingListFormSchema,
} from "@/shared/schemas/shopping";
import { completeShopping } from "./completion";
import {
addShoppingItem,
approveSuggestions,
createShoppingList,
deleteShoppingList,
dismissSuggestion,
moveShoppingItem,
removeShoppingItem,
setShoppingItemChecked,
updateShoppingItem,
updateShoppingList,
} from "./service";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
function fieldErrors(error: z.ZodError) {
const out: Record<string, string> = {};
for (const issue of error.issues) {
const key = issue.path.join(".");
if (key && !out[key]) out[key] = issue.message;
}
return out;
}
async function run<T, R>(
schema: z.ZodType<T>,
input: unknown,
fn: (userId: string, householdId: string, data: T) => Promise<ActionResult<R>>,
): Promise<ActionResult<R>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = schema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await fn(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
const ids = (...keys: string[]) => z.object(Object.fromEntries(keys.map((k) => [k, idSchema])));
export async function saveShoppingListAction(listId: string | null, input: unknown) {
if (listId === null)
return run(shoppingListFormSchema, input, (u, h, d) => createShoppingList(u, h, d));
const id = idSchema.safeParse(listId);
if (!id.success) return fail(tr.common.notFound);
return run(shoppingListFormSchema, input, (u, h, d) => updateShoppingList(u, h, id.data, d));
}
export async function deleteShoppingListAction(listId: unknown) {
const id = idSchema.safeParse(listId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => deleteShoppingList(u, h, id.data));
}
export async function addShoppingItemAction(listId: unknown, input: unknown) {
const id = idSchema.safeParse(listId);
if (!id.success) return fail(tr.common.notFound);
return run(shoppingItemFormSchema, input, (u, h, d) => addShoppingItem(u, h, id.data, d));
}
export async function updateShoppingItemAction(listId: unknown, itemId: unknown, input: unknown) {
const ref = ids("listId", "itemId").safeParse({ listId, itemId });
if (!ref.success) return fail(tr.common.notFound);
return run(shoppingItemUpdateSchema, input, (u, h, d) =>
updateShoppingItem(u, h, ref.data.listId!, ref.data.itemId!, d),
);
}
export async function removeShoppingItemAction(listId: unknown, itemId: unknown) {
const ref = ids("listId", "itemId").safeParse({ listId, itemId });
if (!ref.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) =>
removeShoppingItem(u, h, ref.data.listId!, ref.data.itemId!),
);
}
export async function setShoppingItemCheckedAction(
listId: unknown,
itemId: unknown,
checked: unknown,
) {
const ref = ids("listId", "itemId").safeParse({ listId, itemId });
if (!ref.success || typeof checked !== "boolean") return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) =>
setShoppingItemChecked(u, h, ref.data.listId!, ref.data.itemId!, checked),
);
}
export async function moveShoppingItemAction(listId: unknown, itemId: unknown, target: unknown) {
const ref = ids("listId", "itemId", "target").safeParse({ listId, itemId, target });
if (!ref.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) =>
moveShoppingItem(u, h, ref.data.listId!, ref.data.itemId!, ref.data.target!),
);
}
export async function approveSuggestionsAction(listId: unknown, productTypeIds: unknown) {
const id = idSchema.safeParse(listId);
const types = z.array(idSchema).min(1).max(200).safeParse(productTypeIds);
if (!id.success || !types.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => approveSuggestions(u, h, id.data, types.data));
}
export async function dismissSuggestionAction(productTypeId: unknown) {
const id = idSchema.safeParse(productTypeId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => dismissSuggestion(u, h, id.data));
}
export async function completeShoppingAction(listId: unknown, input: unknown) {
const id = idSchema.safeParse(listId);
if (!id.success) return fail(tr.common.notFound);
return run(shoppingCompletionSchema, input, (u, h, d) => completeShopping(u, h, id.data, d));
}
@@ -0,0 +1,250 @@
import { Types } from "mongoose";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { ProductModel } from "@/models/product";
import { ProductPriceModel } from "@/models/product-price";
import { ShoppingListModel } from "@/models/shopping-list";
import { StockMovementModel } from "@/models/stock-movement";
import { StoreModel } from "@/models/store";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import { addDays } from "@/shared/recurrence";
import { shoppingCompletionSchema } from "@/shared/schemas/shopping";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { completeShopping, getCompletionSheet } from "./completion";
import { getShoppingList } from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let zeynep = "";
let weekly = "";
let monthEnd = "";
const today = todayIstanbul();
const bySeed = (model: typeof ProductModel | typeof StoreModel, seedRef: string) =>
(model as typeof ProductModel)
.findOne({ seedRef })
.lean()
.then((x) => String(x!._id));
const accountId = (name: string) =>
AccountModel.findOne({ name })
.lean()
.then((x) => String(x!._id));
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
zeynep = ids.user("zeynep");
weekly = String((await ShoppingListModel.findOne({ seedRef: "haftalik" }).lean())!._id);
monthEnd = String((await ShoppingListModel.findOne({ seedRef: "ay-sonu" }).lean())!._id);
});
afterAll(teardownDb);
async function scenario() {
const sheet = (await getCompletionSheet(ayse, cakir, weekly))!;
const item = (label: string) => sheet.items.find((i) => i.label === label)!;
const milk = item("Süt");
const eggs = item("Yumurta");
const detergent = item("Toz Deterjan");
const candle = item("Doğum günü mumu");
const tomato = item("Domates");
const sok = await bySeed(StoreModel, "sok");
const migros = await bySeed(StoreModel, "migros");
const a101 = await bySeed(StoreModel, "a101");
const milkPlan = sheet.planned[milk.id]!;
const detPlan = sheet.planned[detergent.id]!;
const market = (await CategoryModel.findOne({
defaultKey: "market",
householdId: cakir,
}).lean())!;
const accounts = {
bank: await accountId("Ziraat Maaş"),
meal: await accountId("Ayşe — Pluxee"),
card: await accountId("Garanti Bonus"),
};
return {
sheet,
milk,
eggs,
detergent,
candle,
tomato,
stores: { sok, migros, a101 },
form: (over: Record<string, unknown> = {}) =>
shoppingCompletionSchema.parse({
date: today,
lines: [
// Planlanan ürün, planlanan mağaza; paket fiyatı plandan 1 TL fazla.
{
itemId: milk.id,
productId: milkPlan.productId,
storeId: milkPlan.storeId,
packages: String(milkPlan.packages),
amount: formatMoneyInput((milkPlan.priceMinor + 100) * milkPlan.packages),
},
// Muadil: 15'li köy yumurtası, A101.
{
itemId: eggs.id,
productId: sheet.products.find((p) => p.label.includes("Köy"))!.id,
storeId: a101,
packages: "2",
amount: "189,80",
},
// Planlanan ürün başka mağazada (Migros, yemek kartı).
{
itemId: detergent.id,
productId: detPlan.productId,
storeId: migros,
packages: "1",
amount: "549,00",
},
// Markasız ürün tipi (pazardan domates): 2,5 kg, fiyat kaydı yok.
{ itemId: tomato.id, productId: "", storeId: sok, packages: "2,5", amount: "60" },
// Serbest metin kalemi: yedek gider kategorisi.
{ itemId: candle.id, productId: "", storeId: sok, packages: "1", amount: "25" },
// Plansız ekstra.
{
itemId: "",
productId: sheet.products.find((p) => p.label.startsWith("Fairy"))!.id,
storeId: sok,
packages: "1",
amount: "84,50",
},
],
stores: [
{ storeId: sok, accountId: accounts.bank, attachmentIds: [] },
{ storeId: migros, accountId: accounts.meal, attachmentIds: [] },
{ storeId: a101, accountId: accounts.card, attachmentIds: [] },
],
fallbackCategoryId: String(market._id),
leftover: { action: "move", targetListId: monthEnd, newListName: "" },
...over,
}),
};
}
describe("tamamlama ekranı", () => {
it("plan, fiyatlar, hesaplar ve eşleme bilgisi; izleyici açamaz", async () => {
const s = await scenario();
expect(s.sheet.items).toHaveLength(9);
expect(Object.keys(s.sheet.planned).length).toBe(7);
expect(Object.keys(s.sheet.prices).length).toBeGreaterThan(20);
expect(s.sheet.accounts.map((a) => a.name)).toContain("Ayşe — Pluxee");
expect(s.sheet.defaultFallbackCategoryId).not.toBeNull();
expect(s.sheet.otherLists.map((l) => l.name)).toEqual(["Ay sonu toptan"]);
expect(await getCompletionSheet(zeynep, cakir, weekly)).toBeNull();
});
});
describe("alışverişi tamamla", () => {
it("doğrulama: muadil aynı tipten, gelecek tarih, izleyici, şema kuralları", async () => {
const s = await scenario();
const wrongType = s.form();
wrongType.lines[0]!.productId = await bySeed(ProductModel, "ariel-5kg");
expect((await completeShopping(ayse, cakir, weekly, wrongType)).ok).toBe(false);
expect(
(await completeShopping(ayse, cakir, weekly, s.form({ date: addDays(today, 1) }))).ok,
).toBe(false);
expect((await completeShopping(zeynep, cakir, weekly, s.form())).ok).toBe(false);
// Mağazası için ödeme hesabı girilmemiş satır.
expect(
shoppingCompletionSchema.safeParse({
date: today,
lines: [
{
itemId: "",
productId: s.milk.productTypeId,
storeId: s.stores.sok,
packages: "1",
amount: "1",
},
],
stores: [],
leftover: { action: "drop" },
}).success,
).toBe(false);
});
it("ek dosya hatasında hiçbir şey yazılmaz (transaction geri alınır)", async () => {
const s = await scenario();
const form = s.form();
form.stores[0]!.attachmentIds = [String(new Types.ObjectId())];
expect((await completeShopping(ayse, cakir, weekly, form)).ok).toBe(false);
expect(await TransactionModel.countDocuments({ shoppingListId: { $ne: null } })).toBe(0);
expect(await StockMovementModel.countDocuments({ shoppingListId: { $ne: null } })).toBe(0);
expect(await ProductPriceModel.countDocuments({ source: "receipt" })).toBe(0);
expect((await ShoppingListModel.findById(weekly).lean())!.status).toBe("active");
});
it("stok, fiyat, mağaza başına bölünmüş gider, kalanların taşınması ve rapor", async () => {
const s = await scenario();
const monthEndBefore = (await ShoppingListModel.findById(monthEnd).lean())!.items.length;
const r = await completeShopping(ayse, cakir, weekly, s.form());
expect(r).toMatchObject({ ok: true, data: { transactions: 3 } });
// Mağaza başına gider; Şok: gıda + temizlik + yedek (mum) bölünmüş.
const txs = await TransactionModel.find({ shoppingListId: new Types.ObjectId(weekly) }).lean();
expect(txs).toHaveLength(3);
const sokTx = txs.find((t) => t.payeeName.startsWith("Şok"))!;
expect(sokTx.splits).toHaveLength(3);
expect(sokTx.splits.reduce((a, x) => a + x.amountMinor, 0)).toBe(sokTx.amountMinor);
const migrosTx = txs.find((t) => t.payeeName.startsWith("Migros"))!;
expect(migrosTx).toMatchObject({ amountMinor: 549_00, splits: [] });
expect(String(migrosTx.accountId)).toBe(await accountId("Ayşe — Pluxee"));
// Stok alımları (serbest metin hariç 5 kalem) ve fiş kaynaklı fiyatlar (markasız domates hariç 4).
expect(
await StockMovementModel.countDocuments({
shoppingListId: new Types.ObjectId(weekly),
kind: "purchase",
}),
).toBe(5);
expect(await ProductPriceModel.countDocuments({ source: "receipt" })).toBe(4);
const eggPrice = await ProductPriceModel.findOne({ source: "receipt", priceMinor: 94_90 });
expect(eggPrice).not.toBeNull();
// Liste kapandı; alınmayan 5 kalem "Ay sonu toptan"a taşındı.
const after = (await getShoppingList(ayse, cakir, weekly))!;
expect(after.list.status).toBe("completed");
expect(after.canWrite).toBe(false);
expect(after.report!.completion.movedTo?.name).toBe("Ay sonu toptan");
expect((await ShoppingListModel.findById(monthEnd).lean())!.items.length).toBe(
monthEndBefore + 4,
);
// Süt alımı: paket × 1 lt.
const milkMove = await StockMovementModel.findOne({
shoppingListId: new Types.ObjectId(weekly),
productTypeId: new Types.ObjectId(s.milk.productTypeId!),
}).lean();
expect(milkMove!.quantity).toBe(s.sheet.planned[s.milk.id]!.packages * 1000);
// Markasız domates: tipin biriminde 2,5 kg.
const tomatoMove = await StockMovementModel.findOne({
shoppingListId: new Types.ObjectId(weekly),
productTypeId: new Types.ObjectId(s.tomato.productTypeId!),
}).lean();
expect(tomatoMove!.quantity).toBe(2500);
// Rapor: aynı/muadil/alınmadı/ekstra; nedenlerin toplamı farka eşit.
const { summary, completion } = after.report!;
expect(summary.counts).toEqual({ same: 4, substitute: 1, skipped: 4, extra: 1 });
const sum = Object.values(summary.reasons).reduce((a, b) => a + b, 0);
expect(sum).toBe(summary.diffMinor);
// Süt: paket başına +1 TL; deterjan: aynı ürün başka mağazada (Migros) farklı fiyat.
expect(summary.reasons.price).toBe(
100 * s.sheet.planned[s.milk.id]!.packages +
(549_00 - s.sheet.planned[s.detergent.id]!.priceMinor),
);
expect(summary.reasons.extra).toBe(84_50);
expect(summary.reasons.unplanned).toBe(25_00 + 60_00);
expect(summary.reasons.skipped).toBeLessThan(0);
expect(completion.stores).toHaveLength(3);
// Tamamlanan liste değiştirilemez, ikinci kez tamamlanamaz.
expect((await completeShopping(ayse, cakir, weekly, s.form())).ok).toBe(false);
});
});
+586
View File
@@ -0,0 +1,586 @@
import "server-only";
import { Types } from "mongoose";
import { syncOwnerAttachments } from "@/features/attachments/service";
import type { CategoryOption } from "@/features/categories/tree";
import { buildTree, toOptions } from "@/features/categories/tree";
import { loadTypeOffers } from "@/features/prices/service";
import { listProducts, type ProductView } from "@/features/products/service";
import { getStock } from "@/features/stock/service";
import { buildDoc, loadContext } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { connectMongoose } from "@/lib/db/mongoose";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { ProductPriceModel } from "@/models/product-price";
import { ShoppingListModel } from "@/models/shopping-list";
import { StoreModel } from "@/models/store";
import { StockMovementModel } from "@/models/stock-movement";
import { TransactionModel } from "@/models/transaction";
import { allowedAttachmentKinds } from "@/shared/attachments";
import type { MealCardProvider } from "@/shared/accounts";
import { todayIstanbul } from "@/shared/dates";
import { formatQuantity, QUANTITY_SCALE } from "@/shared/quantity";
import { formatStock } from "@/shared/stock";
import type { ShoppingCompletionForm } from "@/shared/schemas/shopping";
import type { CompletionRow, CompletionStore, ShoppingCompletion } from "@/shared/shopping";
import { matchKind, type PlannedPurchase } from "@/shared/shopping-compare";
import { MAX_SPLITS } from "@/shared/transactions";
import type { TransactionForm } from "@/shared/schemas/transaction";
import {
getShoppingList,
writableList,
type ItemLean,
type ShoppingItemView,
type ShoppingListSummary,
} from "./service";
/**
* "Alışverişi tamamla" (Bölüm 6.12). Tek MongoDB transaction içinde: stok alım hareketleri, fiyat
* kayıtları (kaynak: fiş), mağaza başına bölünmüş gider (stok → gider kategorisi eşlemesi), fiş
* görselleri ve alınmayan kalemlerin taşınması; liste kapanır ve karşılaştırma görüntüsü saklanır.
*/
const t = tr.shopping;
const v = t.validation;
export type CompletionSheet = {
list: ShoppingListSummary;
items: ShoppingItemView[];
/** Kalem başına akıllı önerinin planı (önerilen dağılım). */
planned: Record<
string,
{ productId: string; storeId: string; packages: number; priceMinor: number }
>;
products: {
id: string;
label: string;
packageLabel: string;
productTypeId: string;
typeName: string;
}[];
stores: { id: string; label: string; slot: number; mealCard: boolean; providers: string[] }[];
/** Geçerli paket fiyatları: `${productId}:${storeId}` → kuruş (tutar ön doldurması için). */
prices: Record<string, number>;
accounts: { id: string; name: string; type: string; mealCardProvider: MealCardProvider | null }[];
expenseCategories: CategoryOption[];
/** Gider kategorisine eşlenmemiş ürün tipleri (yedek kategori gerekir). */
unmappedTypeIds: string[];
defaultFallbackCategoryId: string | null;
otherLists: { id: string; name: string }[];
today: string;
};
async function expenseCategoryOptions(householdId: Types.ObjectId) {
const rows = await CategoryModel.find({ householdId, kind: "expense" }).lean<
{
_id: Types.ObjectId;
name: string;
parentId: Types.ObjectId | null;
order: number;
archivedAt: Date | null;
defaultKey: string | null;
}[]
>();
const options = toOptions(
buildTree(
rows.map((c) => ({
id: String(c._id),
kind: "expense" as const,
name: c.name,
parentId: c.parentId ? String(c.parentId) : null,
order: c.order,
archived: Boolean(c.archivedAt),
})),
),
);
const market = rows.find((c) => c.defaultKey === "market" && !c.archivedAt);
return { options, marketId: market ? String(market._id) : null };
}
/** Ürün tipi → etkin gider kategorisi (stok kategorisinden, üstten devralınarak). */
async function typeExpenseMap(userId: string, householdId: string) {
const stock = await getStock(userId, householdId);
if (!stock) return null;
const catExpense = new Map(stock.categories.map((c) => [c.id, c.expense?.id ?? null]));
return new Map(stock.items.map((i) => [i.id, catExpense.get(i.categoryId) ?? null]));
}
/** /alisveris/:id/tamamla — alınanları girme ekranının verisi. */
export async function getCompletionSheet(
userId: string,
householdId: string,
listId: string,
): Promise<CompletionSheet | null> {
const detail = await getShoppingList(userId, householdId, listId);
if (!detail || !detail.canWrite) return null;
const ctx = await loadContext(userId, householdId, "member");
if (!ctx) return null;
const [productList, expense, categories, accounts] = await Promise.all([
listProducts(userId, householdId),
typeExpenseMap(userId, householdId),
expenseCategoryOptions(ctx.m.householdId),
AccountModel.find({ householdId: ctx.m.householdId, archivedAt: null })
.select({ name: 1, type: 1, order: 1, isPrivate: 1, ownerUserId: 1, mealCardProvider: 1 })
.sort({ order: 1 })
.lean<
{
_id: Types.ObjectId;
name: string;
type: string;
isPrivate: boolean;
ownerUserId: Types.ObjectId | null;
mealCardProvider: MealCardProvider | null;
}[]
>(),
]);
if (!productList || !expense) return null;
const products = productList.products.filter((p) => p.inTypeUnit !== null);
const offers = await loadTypeOffers(
ctx.m.householdId,
[...new Set(products.map((p) => p.productTypeId))].map((x) => new Types.ObjectId(x)),
{ activeOnly: true },
);
const planned: CompletionSheet["planned"] = {};
for (const g of detail.plan.recommended?.stores ?? [])
for (const l of g.lines)
planned[l.itemId] = {
productId: l.productId,
storeId: l.storeId,
packages: l.packages,
priceMinor: l.priceMinor,
};
const { stores: storeRefs } = detail.plan;
const storeRows = await StoreModel.find({ householdId: ctx.m.householdId, archivedAt: null })
.select({ mealCardProviders: 1, mealCardAccepted: 1 })
.lean<{ _id: Types.ObjectId; mealCardAccepted: boolean; mealCardProviders: string[] }[]>();
return {
list: detail.list,
items: detail.items,
planned,
products: products.map((p) => ({
id: p.id,
label: p.label,
packageLabel: p.packageLabel,
productTypeId: p.productTypeId,
typeName: p.productTypeName,
})),
stores: storeRows
.map((s) => {
const ref = storeRefs[String(s._id)]!;
return {
id: ref.id,
label: ref.label,
slot: ref.slot,
mealCard: s.mealCardAccepted,
providers: s.mealCardAccepted ? s.mealCardProviders : [],
};
})
.sort((a, b) => a.label.localeCompare(b.label, "tr")),
prices: Object.fromEntries(offers.map((o) => [`${o.productId}:${o.storeId}`, o.priceMinor])),
accounts: accounts
.filter((a) => !a.isPrivate || String(a.ownerUserId) === userId)
.map((a) => ({
id: String(a._id),
name: a.name,
type: a.type,
mealCardProvider: a.mealCardProvider ?? null,
})),
expenseCategories: categories.options,
unmappedTypeIds: [...expense.entries()].filter(([, e]) => !e).map(([id]) => id),
defaultFallbackCategoryId: categories.marketId,
otherLists: detail.otherLists,
today: todayIstanbul(),
};
}
/** Transaction içindeki doğrulama hatası: geri alıp kullanıcıya döndürmek için. */
class CompletionError extends Error {
constructor(readonly result: ActionResult<never>) {
super(result.ok ? "" : result.error);
}
}
type ResolvedLine = {
item: ItemLean | null;
product: ProductView | null;
storeId: string;
/** Üründe paket adedi; markasız ürün tipi kaleminde tipin birimindeki miktar (binde bir). */
packages: number;
amountMinor: number;
categoryId: string;
/** Stoğa işlenecek ürün tipi ve miktar (serbest metinde null). */
stock: { productTypeId: string; quantity: number } | null;
};
export async function completeShopping(
actorId: string,
householdId: string,
listId: string,
input: ShoppingCompletionForm,
): Promise<ActionResult<{ transactions: number }>> {
const r = await writableList(actorId, householdId, listId);
if (r.error) return r.error;
const { m, list, actor } = r;
if (input.date > todayIstanbul()) return fail(v.futureDate, { date: v.futureDate });
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const [productList, expense, stockData, activeStores] = await Promise.all([
listProducts(actorId, householdId, { includeArchived: true }),
typeExpenseMap(actorId, householdId),
getShoppingList(actorId, householdId, listId),
StoreModel.find({ householdId: m.householdId, archivedAt: null })
.select({ _id: 1 })
.lean<{ _id: Types.ObjectId }[]>(),
]);
const activeStoreIds = new Set(activeStores.map((x) => String(x._id)));
if (!productList || !expense || !stockData) return fail(tr.common.notFound);
const products = new Map(productList.products.map((p) => [p.id, p]));
const views = new Map(stockData.items.map((i) => [i.id, i]));
const storeRefs = stockData.plan.stores;
const itemById = new Map(list.items.map((i) => [String(i._id), i]));
// Yedek gider kategorisi (eşlenmemiş ve serbest metin kalemleri için).
const fallback = input.fallbackCategoryId;
const fallbackOk =
fallback &&
ctx.categoryMap.get(fallback)?.kind === "expense" &&
!ctx.categoryMap.get(fallback)?.archived;
// --- Satırları doğrula ---
const lines: ResolvedLine[] = [];
for (const [i, l] of input.lines.entries()) {
const at = (field: string) => `lines.${i}.${field}`;
const item = l.itemId ? (itemById.get(l.itemId) ?? null) : null;
if (l.itemId && !item) return fail(v.itemGone);
if (!activeStoreIds.has(l.storeId))
return fail(tr.productPrices.validation.store, {
[at("storeId")]: tr.productPrices.validation.store,
});
let product: ProductView | null = null;
let typeId: string | null = null;
if (item?.kind === "text") {
if (l.productId) return fail(v.textNoProduct, { [at("productId")]: v.textNoProduct });
} else if (item?.kind === "type" && !l.productId) {
// Markasız (ör. pazardan domates): miktar tipin biriminde, fiyat kaydı yok.
typeId = String(item.productTypeId);
} else {
product = l.productId ? (products.get(l.productId) ?? null) : null;
if (!product || product.archived) return fail(v.product, { [at("productId")]: v.product });
if (product.inTypeUnit === null)
return fail(v.conversion(product.label), {
[at("productId")]: v.conversion(product.label),
});
const expectedType =
item?.kind === "type"
? String(item.productTypeId)
: item?.kind === "product"
? (products.get(String(item.productId))?.productTypeId ?? null)
: null;
if (expectedType && product.productTypeId !== expectedType)
return fail(v.substituteType, { [at("productId")]: v.substituteType });
typeId = product.productTypeId;
}
const mapped = typeId ? (expense.get(typeId) ?? null) : null;
const categoryId = mapped ?? (fallbackOk ? fallback : null);
if (!categoryId) return fail(v.fallbackCategory, { fallbackCategoryId: v.fallbackCategory });
lines.push({
item,
product,
storeId: l.storeId,
packages: l.packages,
amountMinor: l.amount,
categoryId,
stock: typeId
? {
productTypeId: typeId,
quantity: product
? Math.max(1, Math.round((l.packages * product.inTypeUnit!) / QUANTITY_SCALE))
: l.packages,
}
: null,
});
}
// --- Mağaza başına gider işlemleri (doğrulama buildDoc ile) ---
const accountOf = new Map(input.stores.map((s) => [s.storeId, s]));
const byStore = new Map<string, ResolvedLine[]>();
for (const l of lines) byStore.set(l.storeId, [...(byStore.get(l.storeId) ?? []), l]);
const txDocs: { storeId: string; doc: Record<string, unknown>; attachmentIds: string[] }[] = [];
for (const [storeId, group] of byStore) {
const entry = accountOf.get(storeId)!;
const amount = group.reduce((a, l) => a + l.amountMinor, 0);
const perCategory = new Map<string, { amount: number; count: number }>();
for (const l of group) {
const c = perCategory.get(l.categoryId) ?? { amount: 0, count: 0 };
c.amount += l.amountMinor;
c.count++;
perCategory.set(l.categoryId, c);
}
if (perCategory.size > MAX_SPLITS) return fail(v.tooManySplits);
const split = perCategory.size >= 2;
const form: TransactionForm = {
type: "expense",
amount,
date: input.date,
accountId: entry.accountId,
toAccountId: null,
categoryId: split ? null : [...perCategory.keys()][0]!,
splits: split
? [...perCategory.entries()].map(([categoryId, c]) => ({
categoryId,
amount: c.amount,
note: t.complete.splitNote(c.count),
}))
: [],
payee: storeRefs[storeId]!.label,
description: t.complete.txDescription(list.name),
tags: [],
installments: 1,
attachmentIds: entry.attachmentIds,
};
const built = buildDoc(ctx, form);
if (!built.ok) {
const msg = built.error;
return fail(msg, { [`stores.${input.stores.indexOf(entry)}.accountId`]: msg });
}
txDocs.push({ storeId, doc: built.data, attachmentIds: entry.attachmentIds });
}
// --- Alınmayanlar ---
const boughtIds = new Set(lines.flatMap((l) => (l.item ? [String(l.item._id)] : [])));
const leftover = list.items.filter((i) => !boughtIds.has(String(i._id)));
let target: { _id: Types.ObjectId; name: string; items: ItemLean[] } | null = null;
if (leftover.length && input.leftover.action === "move") {
const tl = await writableList(actorId, householdId, input.leftover.targetListId!);
if (tl.error || tl.list._id.equals(list._id))
return fail(v.targetList, { "leftover.targetListId": v.targetList });
target = tl.list;
}
// --- Plan ve karşılaştırma görüntüsü ---
// Kullanıcının gördüğü akıllı öneri (önerilen dağılım).
const plan = stockData.plan;
const planned = new Map<string, PlannedPurchase & { storeId: string }>();
for (const g of plan.recommended?.stores ?? [])
for (const l of g.lines)
planned.set(l.itemId, {
productId: l.productId,
storeId: l.storeId,
packages: l.packages * QUANTITY_SCALE,
priceMinor: l.priceMinor,
costMinor: l.costMinor,
});
const label = (id: string) => products.get(id)?.label ?? "—";
const pkgLabel = (id: string) => {
const p = products.get(id);
return p ? `${p.label} · ${p.packageLabel}` : "—";
};
const planOf = (itemId: string): CompletionRow["plan"] => {
const p = planned.get(itemId);
return p
? {
...p,
productLabel: pkgLabel(p.productId),
storeLabel: storeRefs[p.storeId]?.label ?? "—",
}
: null;
};
const rows: CompletionRow[] = [];
const lineByItem = new Map(lines.flatMap((l) => (l.item ? [[String(l.item._id), l]] : [])));
for (const item of list.items) {
const id = String(item._id);
const l = lineByItem.get(id) ?? null;
const p = planned.get(id) ?? null;
rows.push({
itemId: id,
match: matchKind(
{ kind: item.kind, productId: item.productId ? String(item.productId) : null },
p,
l
? { productId: l.product?.id ?? null, packages: l.packages, amountMinor: l.amountMinor }
: null,
),
label: views.get(id)?.label ?? item.text,
productId: l?.product?.id ?? null,
productLabel: l?.product ? pkgLabel(l.product.id) : "",
storeId: l?.storeId ?? null,
storeLabel: l ? (storeRefs[l.storeId]?.label ?? "—") : "",
packages: l?.packages ?? 0,
quantityLabel: !l
? ""
: l.product
? `${formatQuantity(l.packages)} ${t.packageUnit}`
: l.stock
? formatStock(l.packages, views.get(id)?.unit ?? "")
: "",
amountMinor: l?.amountMinor ?? null,
plan: planOf(id),
});
}
for (const l of lines.filter((x) => !x.item))
rows.push({
itemId: null,
match: "extra",
label: label(l.product!.id),
productId: l.product!.id,
productLabel: pkgLabel(l.product!.id),
storeId: l.storeId,
storeLabel: storeRefs[l.storeId]?.label ?? "—",
packages: l.packages,
quantityLabel: `${formatQuantity(l.packages)} ${t.packageUnit}`,
amountMinor: l.amountMinor,
plan: null,
});
// --- Yaz (tek transaction) ---
const mongoose = await connectMongoose();
const accountNames = new Map([...ctx.accountMap.values()].map((a) => [String(a.id), a.name]));
try {
const stores: CompletionStore[] = [];
await mongoose.connection.transaction(async (session) => {
stores.length = 0;
for (const { storeId, doc, attachmentIds } of txDocs) {
const [tx] = await TransactionModel.create(
[
{
...doc,
householdId: m.householdId,
status: "posted",
shoppingListId: list._id,
createdBy: actor,
updatedBy: actor,
},
],
{ session },
);
const synced = await syncOwnerAttachments({
householdId: m.householdId,
actorId,
ownerType: "transaction",
ownerId: tx!._id,
ids: attachmentIds,
allowedKinds: allowedAttachmentKinds("expense"),
session,
});
if (!synced.ok) throw new CompletionError(synced);
await TransactionModel.updateOne(
{ _id: tx!._id },
{ $set: { attachmentCount: synced.data } },
{ session },
);
const accountId = String(doc.accountId);
stores.push({
storeId,
label: storeRefs[storeId]!.label,
accountId,
accountName: accountNames.get(accountId) ?? "—",
transactionId: String(tx!._id),
amountMinor: doc.amountMinor as number,
attachmentCount: synced.data,
});
}
const stockLines = lines.filter((l) => l.stock);
if (stockLines.length)
await StockMovementModel.insertMany(
stockLines.map((l) => ({
householdId: m.householdId,
productTypeId: new Types.ObjectId(l.stock!.productTypeId),
kind: "purchase",
date: input.date,
quantity: l.stock!.quantity,
note: t.complete.txDescription(list.name),
shoppingListId: list._id,
createdBy: actor,
})),
{ session },
);
const productLines = lines.filter((l) => l.product);
if (productLines.length) {
// Fiyat kaydı: ürün × mağaza başına tek kayıt; paket fiyatı = tutar / paket adedi.
const prices = new Map<string, ResolvedLine[]>();
for (const l of productLines) {
const key = `${l.product!.id}:${l.storeId}`;
prices.set(key, [...(prices.get(key) ?? []), l]);
}
await ProductPriceModel.insertMany(
[...prices.values()].map((group) => {
const packages = group.reduce((a, l) => a + l.packages, 0);
const amount = group.reduce((a, l) => a + l.amountMinor, 0);
return {
householdId: m.householdId,
productId: new Types.ObjectId(group[0]!.product!.id),
storeId: new Types.ObjectId(group[0]!.storeId),
date: input.date,
priceMinor: Math.max(1, Math.round((amount * QUANTITY_SCALE) / packages)),
isPromo: false,
promoUntil: null,
source: "receipt",
note: "",
createdBy: actor,
};
}),
{ session },
);
}
let movedTo: ShoppingCompletion["movedTo"] = null;
const carry = leftover.map((i) => ({
...i,
checked: false,
checkedBy: null,
checkedAt: null,
}));
if (leftover.length && input.leftover.action === "move" && target) {
await ShoppingListModel.updateOne(
{ _id: target._id },
{ $push: { items: { $each: carry } }, $set: { updatedBy: actor } },
{ session },
);
movedTo = { listId: String(target._id), name: target.name };
} else if (leftover.length && input.leftover.action === "new") {
const [created] = await ShoppingListModel.create(
[
{
householdId: m.householdId,
name: input.leftover.newListName,
items: carry,
createdBy: actor,
updatedBy: actor,
},
],
{ session },
);
movedTo = { listId: String(created!._id), name: input.leftover.newListName };
}
const completion: ShoppingCompletion = {
date: input.date,
completedBy: actorId,
rows,
stores,
movedTo,
};
const res = await ShoppingListModel.updateOne(
{ _id: list._id, status: "active", deletedAt: null },
{
$set: {
status: "completed",
completedAt: new Date(),
completion,
updatedBy: actor,
},
},
{ session },
);
if (!res.modifiedCount) throw new CompletionError(fail(v.notActive));
});
return ok({ transactions: txDocs.length });
} catch (error) {
if (error instanceof CompletionError) return error.result;
throw error;
}
}
@@ -0,0 +1,660 @@
"use client";
import { ArrowLeft, Plus, Trash2 } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useMemo, useState } from "react";
import { toast } from "sonner";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Field, FieldDescription, FieldError, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { AttachmentPicker } from "@/features/attachments/components/attachment-picker";
import type { AttachmentInfo } from "@/features/attachments/service";
import { StoreDot } from "@/features/prices/components/offers-list";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import { formatMoneyInput, parseMoney } from "@/shared/money";
import { parseQuantity } from "@/shared/quantity";
import type { LeftoverAction } from "@/shared/shopping";
import { quantityInput } from "@/shared/stock";
import { completeShoppingAction } from "../actions";
import type { CompletionSheet } from "../completion";
import type { ShoppingItemView } from "../service";
const t = tr.shopping.complete;
/** Ürün tipi kaleminde marka belirtmeden alım (Radix Select boş değer kabul etmez). */
const GENERIC = "__generic__";
type Line = {
productId: string;
storeId: string;
packages: string;
amount: string;
/** Kullanıcı tutarı elle değiştirdi: fiyattan yeniden hesaplanmaz. */
touched: boolean;
};
type ItemLine = Line & { bought: boolean };
type Extra = Line & { key: number };
/** Paket fiyatı biliniyorsa tutar = fiyat × paket. */
function priceAmount(sheet: CompletionSheet, l: Pick<Line, "productId" | "storeId" | "packages">) {
const price = sheet.prices[`${l.productId}:${l.storeId}`];
const q = parseQuantity(l.packages);
return price && q ? formatMoneyInput(Math.round((price * q) / 1000)) : "";
}
function withPrice(sheet: CompletionSheet, l: Line, patch: Partial<Line>): Line {
const next = { ...l, ...patch };
if ("amount" in patch) return { ...next, touched: true };
if (next.touched) return next;
return { ...next, amount: priceAmount(sheet, next) || next.amount };
}
function initialLine(sheet: CompletionSheet, item: ShoppingItemView): Line {
const plan = sheet.planned[item.id];
const typeOf = (id: string | null) => sheet.products.find((p) => p.id === id)?.productTypeId;
const typeId = item.kind === "product" ? typeOf(item.productId) : item.productTypeId;
const productId =
item.kind === "text"
? ""
: (plan?.productId ??
item.productId ??
sheet.products.find((p) => p.productTypeId === typeId)?.id ??
GENERIC);
const packages = plan
? String(plan.packages)
: item.quantity && (item.kind === "product" || productId === GENERIC)
? quantityInput(item.quantity)
: "1";
const base = {
productId,
storeId: plan?.storeId ?? defaultStore(sheet),
packages,
amount: "",
touched: false,
};
return { ...base, amount: priceAmount(sheet, base) };
}
/** Planda en çok kalemin gittiği mağaza; plan yoksa ilk mağaza. */
function defaultStore(sheet: CompletionSheet) {
const count = new Map<string, number>();
for (const p of Object.values(sheet.planned))
count.set(p.storeId, (count.get(p.storeId) ?? 0) + 1);
return [...count.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] ?? sheet.stores[0]?.id ?? "";
}
/** Mağazaya uygun varsayılan hesap: geçerli yemek kartı, yoksa banka/nakit, yoksa ilk hesap. */
function defaultAccount(sheet: CompletionSheet, storeId: string) {
const store = sheet.stores.find((s) => s.id === storeId);
const meal = sheet.accounts.find(
(a) =>
a.type === "meal_card" && a.mealCardProvider && store?.providers.includes(a.mealCardProvider),
);
return (
meal?.id ??
sheet.accounts.find((a) => a.type === "bank" || a.type === "cash")?.id ??
sheet.accounts[0]?.id ??
""
);
}
function LineFields({
sheet,
line,
products,
text,
onChange,
errors,
idPrefix,
genericUnit,
}: {
sheet: CompletionSheet;
line: Line;
products: CompletionSheet["products"];
text: boolean;
onChange: (patch: Partial<Line>) => void;
errors: Record<string, string | undefined>;
idPrefix: string;
/** Ürün tipi kalemi: markasız seçeneği ve tipin birimi. */
genericUnit?: string;
}) {
const generic = line.productId === GENERIC;
return (
<div className="grid grid-cols-2 gap-3 sm:grid-cols-[minmax(0,2fr)_minmax(0,1.4fr)_5rem_7rem]">
{text ? (
<p className="col-span-2 self-center text-xs text-muted-foreground sm:col-span-1">
{tr.shopping.complete.textItem}
</p>
) : (
<Field data-invalid={Boolean(errors.productId)} className="col-span-2 sm:col-span-1">
<FieldLabel htmlFor={`${idPrefix}-p`} className="text-xs">
{t.product}
</FieldLabel>
<Select value={line.productId} onValueChange={(x) => onChange({ productId: x })}>
<SelectTrigger id={`${idPrefix}-p`} className="w-full">
<SelectValue placeholder={tr.shopping.validation.product} />
</SelectTrigger>
<SelectContent className="max-h-72">
{genericUnit ? (
<SelectItem value={GENERIC}>{t.generic(genericUnit)}</SelectItem>
) : null}
{products.map((p) => (
<SelectItem key={p.id} value={p.id}>
{p.label}{" "}
<span className="text-xs text-muted-foreground">({p.packageLabel})</span>
</SelectItem>
))}
</SelectContent>
</Select>
{errors.productId ? <FieldError>{errors.productId}</FieldError> : null}
</Field>
)}
<Field data-invalid={Boolean(errors.storeId)} className="col-span-2 sm:col-span-1">
<FieldLabel htmlFor={`${idPrefix}-s`} className="text-xs">
{t.store}
</FieldLabel>
<Select value={line.storeId} onValueChange={(x) => onChange({ storeId: x })}>
<SelectTrigger id={`${idPrefix}-s`} className="w-full">
<SelectValue />
</SelectTrigger>
<SelectContent className="max-h-72">
{sheet.stores.map((s) => (
<SelectItem key={s.id} value={s.id}>
<StoreDot slot={s.slot} />
{s.label}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
{text ? (
<span className="hidden sm:block" />
) : (
<Field data-invalid={Boolean(errors.packages)}>
<FieldLabel htmlFor={`${idPrefix}-q`} className="text-xs">
{generic && genericUnit ? `${t.quantity} (${genericUnit})` : t.packages}
</FieldLabel>
<Input
id={`${idPrefix}-q`}
inputMode="decimal"
value={line.packages}
onChange={(e) => onChange({ packages: e.target.value })}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.packages)}
/>
</Field>
)}
<Field
data-invalid={Boolean(errors.amount)}
className={text ? "col-span-2 sm:col-span-1" : ""}
>
<FieldLabel htmlFor={`${idPrefix}-a`} className="text-xs">
{t.amount}
</FieldLabel>
<Input
id={`${idPrefix}-a`}
inputMode="decimal"
value={line.amount}
onChange={(e) => onChange({ amount: e.target.value })}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.amount)}
/>
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
</div>
);
}
/** /alisveris/:id/tamamla — alınanları gir, mağaza başına hesap ve fiş, alınmayanlar. */
export function CompletionForm({ sheet }: { sheet: CompletionSheet }) {
const router = useRouter();
const anyChecked = sheet.items.some((i) => i.checked);
const [date, setDate] = useState(sheet.today);
const [rows, setRows] = useState<Record<string, ItemLine>>(() =>
Object.fromEntries(
sheet.items.map((i) => [
i.id,
{ ...initialLine(sheet, i), bought: anyChecked ? i.checked : !i.archived },
]),
),
);
const [extras, setExtras] = useState<Extra[]>([]);
const [accounts, setAccounts] = useState<Record<string, string>>({});
const [receipts, setReceipts] = useState<Record<string, AttachmentInfo[]>>({});
const [uploading, setUploading] = useState(0);
const [fallback, setFallback] = useState(sheet.defaultFallbackCategoryId ?? "");
const [leftover, setLeftover] = useState<{
action: LeftoverAction;
target: string;
name: string;
}>({
action: sheet.otherLists.length ? "move" : "new",
target: sheet.otherLists[0]?.id ?? "",
name: t.newListDefault(sheet.list.name),
});
const [errors, setErrors] = useState<Record<string, string | undefined>>({});
const [busy, setBusy] = useState(false);
const typeProducts = (item: ShoppingItemView) => {
const typeId =
item.kind === "product"
? sheet.products.find((p) => p.id === item.productId)?.productTypeId
: item.productTypeId;
return sheet.products.filter((p) => p.productTypeId === typeId);
};
const bought = sheet.items.filter((i) => rows[i.id]!.bought);
const unbought = sheet.items.filter((i) => !rows[i.id]!.bought);
const allLines: (Line & { itemId: string; text: boolean })[] = [
...bought.map((i) => ({ ...rows[i.id]!, itemId: i.id, text: i.kind === "text" })),
...extras.map((e) => ({ ...e, itemId: "", text: false })),
];
const storeIds = [...new Set(allLines.map((l) => l.storeId).filter(Boolean))];
const unmapped = new Set(sheet.unmappedTypeIds);
const needsFallback = allLines.some(
(l) =>
l.text || unmapped.has(sheet.products.find((p) => p.id === l.productId)?.productTypeId ?? ""),
);
const total = allLines.reduce((a, l) => a + (parseMoney(l.amount) ?? 0), 0);
const plannedTotal = useMemo(
() => Object.values(sheet.planned).reduce((a, p) => a + p.priceMinor * p.packages, 0),
[sheet.planned],
);
function setRow(id: string, patch: Partial<ItemLine>) {
setRows((s) => {
const cur = s[id]!;
const { bought: b, ...rest } = patch;
const next = Object.keys(rest).length ? { ...cur, ...withPrice(sheet, cur, rest) } : cur;
return { ...s, [id]: { ...next, bought: b ?? cur.bought } };
});
}
async function submit() {
setBusy(true);
const lineKeys = allLines.map((l, i) =>
l.itemId ? `item:${l.itemId}` : `extra:${extras[i - bought.length]?.key}`,
);
const r = await completeShoppingAction(sheet.list.id, {
date,
lines: allLines.map((l) => ({
itemId: l.itemId,
productId: l.text || l.productId === GENERIC ? "" : l.productId,
storeId: l.storeId,
packages: l.text ? "1" : l.packages,
amount: l.amount,
})),
stores: storeIds.map((id) => ({
storeId: id,
accountId: accounts[id] ?? defaultAccount(sheet, id),
attachmentIds: (receipts[id] ?? []).map((a) => a.id),
})),
fallbackCategoryId: needsFallback ? fallback : "",
leftover: unbought.length
? { action: leftover.action, targetListId: leftover.target, newListName: leftover.name }
: { action: "drop" },
});
setBusy(false);
if (r.ok) {
toast.success(t.saved);
router.push(`/alisveris/${sheet.list.id}`);
return;
}
// Satır hatalarını satır anahtarına çevir.
const mapped: Record<string, string | undefined> = {};
for (const [k, msg] of Object.entries(r.fieldErrors ?? {})) {
const m = /^lines\.(\d+)\.(\w+)$/.exec(k);
if (m) mapped[`${lineKeys[Number(m[1])]}.${m[2]}`] = msg;
else {
const s = /^stores\.(\d+)\.(\w+)$/.exec(k);
mapped[s ? `store:${storeIds[Number(s[1])]}` : k] = msg;
}
}
setErrors({ ...mapped, root: r.error });
toast.error(r.error);
}
const errs = (key: string) => ({
productId: errors[`${key}.productId`],
storeId: errors[`${key}.storeId`],
packages: errors[`${key}.packages`],
amount: errors[`${key}.amount`],
});
return (
<div className="mx-auto flex w-full max-w-4xl flex-col gap-5">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href={`/alisveris/${sheet.list.id}`}>
<ArrowLeft />
{tr.shopping.actions.backToList}
</Link>
</Button>
<div>
<h1 className="text-xl font-semibold">
{t.title}: {sheet.list.name}
</h1>
<p className="text-sm text-muted-foreground">{t.description}</p>
</div>
{sheet.stores.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm">{t.noStores}</p>
) : null}
<Field className="max-w-48" data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="sc-date">{t.date}</FieldLabel>
<Input
id="sc-date"
type="date"
value={date}
max={sheet.today}
onChange={(e) => setDate(e.target.value)}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
<section aria-labelledby="sc-items" className="flex flex-col gap-2">
<h2 id="sc-items" className="font-medium">
{t.itemsTitle}
</h2>
<ul className="divide-y rounded-xl border bg-card">
{sheet.items.map((item) => {
const row = rows[item.id]!;
const plan = sheet.planned[item.id];
const planProduct = plan ? sheet.products.find((p) => p.id === plan.productId) : null;
const planStore = plan ? sheet.stores.find((s) => s.id === plan.storeId) : null;
const substitute =
row.bought &&
item.kind !== "text" &&
(item.kind === "product"
? row.productId !== item.productId
: plan && row.productId !== plan.productId);
const key = `item:${item.id}`;
return (
<li
key={item.id}
className={cn("flex flex-col gap-3 p-3", !row.bought && "bg-muted/30")}
>
<div className="flex items-start gap-3">
<Checkbox
id={`b-${item.id}`}
checked={row.bought}
onCheckedChange={(x) => setRow(item.id, { bought: x === true })}
className="mt-0.5 size-5"
/>
<label htmlFor={`b-${item.id}`} className="min-w-0 flex-1 cursor-pointer">
<span
className={cn("block font-medium", !row.bought && "text-muted-foreground")}
>
{item.label}{" "}
{item.quantityLabel ? (
<span className="text-sm font-normal text-muted-foreground tabular-nums">
· {item.quantityLabel}
</span>
) : null}
</span>
<span className="block text-xs text-muted-foreground">
{plan && planProduct && planStore
? t.planned(
`${planProduct.label} · ${planStore.label} · ${formatMoney(plan.priceMinor * plan.packages)}`,
)
: item.kind === "text"
? null
: t.noPlan}
</span>
</label>
{substitute ? <Badge variant="outline">{t.substitute}</Badge> : null}
</div>
{row.bought ? (
<LineFields
sheet={sheet}
line={row}
products={typeProducts(item)}
text={item.kind === "text"}
genericUnit={item.kind === "type" ? item.unit : undefined}
onChange={(patch) => setRow(item.id, patch)}
errors={errs(key)}
idPrefix={`l-${item.id}`}
/>
) : null}
</li>
);
})}
</ul>
</section>
<section aria-labelledby="sc-extras" className="flex flex-col gap-2">
<h2 id="sc-extras" className="font-medium">
{t.extrasTitle}
</h2>
{extras.length ? (
<ul className="divide-y rounded-xl border bg-card">
{extras.map((e) => (
<li key={e.key} className="flex items-start gap-2 p-3">
<div className="min-w-0 flex-1">
<LineFields
sheet={sheet}
line={e}
products={sheet.products}
text={false}
onChange={(patch) =>
setExtras((s) =>
s.map((x) =>
x.key === e.key ? { ...x, ...withPrice(sheet, x, patch) } : x,
),
)
}
errors={errs(`extra:${e.key}`)}
idPrefix={`e-${e.key}`}
/>
</div>
<Button
size="icon-sm"
variant="ghost"
className="mt-6"
aria-label={t.removeExtra}
onClick={() => setExtras((s) => s.filter((x) => x.key !== e.key))}
>
<Trash2 />
</Button>
</li>
))}
</ul>
) : null}
<Button
variant="outline"
size="sm"
className="w-fit"
onClick={() =>
setExtras((s) => [
...s,
{
key: Date.now(),
productId: "",
storeId: storeIds[0] ?? defaultStore(sheet),
packages: "1",
amount: "",
touched: false,
},
])
}
>
<Plus />
{t.addExtra}
</Button>
</section>
{storeIds.length ? (
<section aria-labelledby="sc-stores" className="flex flex-col gap-2">
<div>
<h2 id="sc-stores" className="font-medium">
{t.storesTitle}
</h2>
<p className="text-sm text-muted-foreground">{t.storesDescription}</p>
</div>
<ul className="grid gap-3 md:grid-cols-2">
{storeIds.map((id) => {
const store = sheet.stores.find((s) => s.id === id);
const lines = allLines.filter((l) => l.storeId === id);
const sum = lines.reduce((a, l) => a + (parseMoney(l.amount) ?? 0), 0);
return (
<li key={id} className="flex flex-col gap-3 rounded-xl border bg-card p-3">
<div className="flex items-center gap-2">
<span className="flex min-w-0 items-center font-medium">
<StoreDot slot={store?.slot ?? 1} />
<span className="truncate">{store?.label}</span>
</span>
<span className="ml-auto text-sm tabular-nums">
{t.subtotal(lines.length)} · {formatMoney(sum)}
</span>
</div>
<Field data-invalid={Boolean(errors[`store:${id}`])}>
<FieldLabel htmlFor={`acc-${id}`}>{t.account}</FieldLabel>
<Select
value={accounts[id] ?? defaultAccount(sheet, id)}
onValueChange={(x) => setAccounts((s) => ({ ...s, [id]: x }))}
>
<SelectTrigger id={`acc-${id}`} className="w-full">
<SelectValue />
</SelectTrigger>
<SelectContent>
{sheet.accounts.map((a) => (
<SelectItem key={a.id} value={a.id}>
{a.name}
</SelectItem>
))}
</SelectContent>
</Select>
{errors[`store:${id}`] ? (
<FieldError>{errors[`store:${id}`]}</FieldError>
) : null}
</Field>
<Field>
<FieldLabel>{t.receipts}</FieldLabel>
<AttachmentPicker
value={receipts[id] ?? []}
onChange={(items) => setReceipts((s) => ({ ...s, [id]: items }))}
allowedKinds={["image"]}
onBusyChange={(b) => setUploading((n) => n + (b ? 1 : -1))}
addLabel={t.addReceipt}
hint={t.receiptHint}
/>
</Field>
</li>
);
})}
</ul>
</section>
) : null}
{needsFallback ? (
<Field data-invalid={Boolean(errors.fallbackCategoryId)} className="max-w-md">
<FieldLabel htmlFor="sc-fallback">{t.fallbackCategory}</FieldLabel>
<Select value={fallback} onValueChange={setFallback}>
<SelectTrigger id="sc-fallback" className="w-full">
<SelectValue placeholder={t.fallbackCategory} />
</SelectTrigger>
<SelectContent className="max-h-72">
{sheet.expenseCategories.map((c) => (
<SelectItem key={c.id} value={c.id}>
{c.path}
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription>{t.fallbackHint}</FieldDescription>
{errors.fallbackCategoryId ? <FieldError>{errors.fallbackCategoryId}</FieldError> : null}
</Field>
) : null}
{unbought.length ? (
<section aria-labelledby="sc-left" className="flex flex-col gap-2">
<div>
<h2 id="sc-left" className="font-medium">
{t.leftoverTitle}
</h2>
<p className="text-sm text-muted-foreground">
{t.leftoverDescription(unbought.length)} {unbought.map((i) => i.label).join(", ")}
</p>
</div>
<div role="radiogroup" aria-labelledby="sc-left" className="flex flex-col gap-2">
{(["move", "new", "drop"] as const)
.filter((a) => a !== "move" || sheet.otherLists.length)
.map((a) => (
<label key={a} className="flex items-center gap-2 text-sm">
<input
type="radio"
name="leftover"
value={a}
checked={leftover.action === a}
onChange={() => setLeftover((s) => ({ ...s, action: a }))}
className="size-4 accent-primary"
/>
{t.leftoverActions[a]}
</label>
))}
</div>
{leftover.action === "move" ? (
<Select
value={leftover.target}
onValueChange={(x) => setLeftover((s) => ({ ...s, target: x }))}
>
<SelectTrigger className="w-full max-w-md" aria-label={tr.shopping.moveTarget}>
<SelectValue />
</SelectTrigger>
<SelectContent>
{sheet.otherLists.map((l) => (
<SelectItem key={l.id} value={l.id}>
{l.name}
</SelectItem>
))}
</SelectContent>
</Select>
) : leftover.action === "new" ? (
<Input
aria-label={t.newListName}
value={leftover.name}
onChange={(e) => setLeftover((s) => ({ ...s, name: e.target.value }))}
className="max-w-md"
/>
) : null}
{errors["leftover.targetListId"] || errors["leftover.newListName"] ? (
<FieldError>
{errors["leftover.targetListId"] ?? errors["leftover.newListName"]}
</FieldError>
) : null}
</section>
) : null}
<div className="sticky bottom-[calc(4rem+env(safe-area-inset-bottom))] z-10 -mx-4 border-t bg-background/95 backdrop-blur md:bottom-0 md:mx-0 md:rounded-xl md:border">
<div className="flex items-center gap-3 px-4 py-3">
<div className="min-w-0 flex-1 text-sm">
<span className="font-medium tabular-nums">
{t.total}: {formatMoney(total)}
</span>
{plannedTotal ? (
<span className="text-muted-foreground tabular-nums">
{" · "}
{t.plannedTotal}: {formatMoney(plannedTotal)}
</span>
) : null}
{errors.root ? (
<span className="block text-xs text-destructive">{errors.root}</span>
) : null}
</div>
<Button onClick={submit} disabled={busy || uploading > 0 || allLines.length === 0}>
{t.submit}
</Button>
</div>
</div>
</div>
);
}
@@ -0,0 +1,222 @@
"use client";
import { useState } from "react";
import { toast } from "sonner";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Button } from "@/components/ui/button";
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { tr } from "@/i18n/tr";
import { SHOPPING_ITEM_KINDS, type ShoppingItemKind } from "@/shared/shopping";
import { quantityInput } from "@/shared/stock";
import { addShoppingItemAction, updateShoppingItemAction } from "../actions";
import type { ItemOptions, ShoppingItemView } from "../service";
const t = tr.shopping;
const f = t.fields;
type Errors = Record<string, string | undefined>;
/** Kalem ekle (ürün tipi / belirli marka / serbest metin) ya da düzenle (miktar, not). */
export function ShoppingItemDialog({
listId,
item,
options,
onClose,
}: {
listId: string;
item: ShoppingItemView | null;
options: ItemOptions;
onClose: () => void;
}) {
const [v, setV] = useState({
kind: (item?.kind ?? "type") as ShoppingItemKind,
productTypeId: item?.productTypeId ?? "",
productId: item?.productId ?? "",
text: item?.text ?? "",
quantity: item?.quantity != null ? quantityInput(item.quantity) : "",
unit: item?.kind === "text" ? item.unit : "",
note: item?.note ?? "",
});
const [errors, setErrors] = useState<Errors>({});
const [busy, setBusy] = useState(false);
const set = <K extends keyof typeof v>(k: K, x: (typeof v)[K]) => setV((s) => ({ ...s, [k]: x }));
const typeUnit = options.types.find((x) => x.id === v.productTypeId)?.unit ?? "";
const unitSuffix =
v.kind === "type" ? (item?.unit ?? typeUnit) : v.kind === "product" ? t.packageUnit : "";
const productGroups = new Map<string, ItemOptions["products"]>();
for (const p of options.products)
productGroups.set(p.typeName, [...(productGroups.get(p.typeName) ?? []), p]);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = item
? await updateShoppingItemAction(listId, item.id, {
quantity: v.quantity,
text: v.text,
unit: v.unit,
note: v.note,
})
: await addShoppingItemAction(listId, v);
setBusy(false);
if (r.ok) {
toast.success(item ? t.toast.itemSaved : t.toast.itemAdded);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={item ? t.editItemTitle : t.addItemTitle}
description={item && item.kind !== "text" ? item.label : undefined}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="shopping-item-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="shopping-item-form" onSubmit={submit} noValidate>
<FieldGroup>
{item ? null : (
<Field>
<FieldLabel>{f.kind}</FieldLabel>
<Tabs value={v.kind} onValueChange={(x) => set("kind", x as ShoppingItemKind)}>
<TabsList className="w-full">
{SHOPPING_ITEM_KINDS.map((k) => (
<TabsTrigger key={k} value={k}>
{t.kinds[k]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<FieldDescription>{t.kindHints[v.kind]}</FieldDescription>
</Field>
)}
{!item && v.kind === "type" ? (
<Field data-invalid={Boolean(errors.productTypeId)}>
<FieldLabel htmlFor="si-type">{f.productType}</FieldLabel>
<Select value={v.productTypeId} onValueChange={(x) => set("productTypeId", x)}>
<SelectTrigger
id="si-type"
className="w-full"
aria-invalid={Boolean(errors.productTypeId)}
>
<SelectValue placeholder={t.validation.productType} />
</SelectTrigger>
<SelectContent className="max-h-72">
{options.types.map((x) => (
<SelectItem key={x.id} value={x.id}>
{x.name} <span className="text-xs text-muted-foreground">({x.unit})</span>
</SelectItem>
))}
</SelectContent>
</Select>
{errors.productTypeId ? <FieldError>{errors.productTypeId}</FieldError> : null}
</Field>
) : null}
{!item && v.kind === "product" ? (
<Field data-invalid={Boolean(errors.productId)}>
<FieldLabel htmlFor="si-product">{f.product}</FieldLabel>
<Select value={v.productId} onValueChange={(x) => set("productId", x)}>
<SelectTrigger
id="si-product"
className="w-full"
aria-invalid={Boolean(errors.productId)}
>
<SelectValue placeholder={t.validation.product} />
</SelectTrigger>
<SelectContent className="max-h-72">
{[...productGroups.entries()].map(([group, rows]) => (
<SelectGroup key={group}>
<SelectLabel>{group}</SelectLabel>
{rows.map((p) => (
<SelectItem key={p.id} value={p.id}>
{p.label}{" "}
<span className="text-xs text-muted-foreground">({p.packageLabel})</span>
</SelectItem>
))}
</SelectGroup>
))}
</SelectContent>
</Select>
{errors.productId ? <FieldError>{errors.productId}</FieldError> : null}
</Field>
) : null}
{v.kind === "text" ? (
<Field data-invalid={Boolean(errors.text)}>
<FieldLabel htmlFor="si-text">{f.text}</FieldLabel>
<Input
id="si-text"
value={v.text}
placeholder={f.textPlaceholder}
onChange={(e) => set("text", e.target.value)}
aria-invalid={Boolean(errors.text)}
autoFocus={!item}
/>
{errors.text ? <FieldError>{errors.text}</FieldError> : null}
</Field>
) : null}
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.quantity)}>
<FieldLabel htmlFor="si-qty">
{v.kind === "product" ? f.packages : f.quantity}
{unitSuffix ? ` (${unitSuffix})` : ""}
</FieldLabel>
<Input
id="si-qty"
inputMode="decimal"
value={v.quantity}
onChange={(e) => set("quantity", e.target.value)}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.quantity)}
/>
{errors.quantity ? <FieldError>{errors.quantity}</FieldError> : null}
</Field>
{v.kind === "text" ? (
<Field>
<FieldLabel htmlFor="si-unit">{f.unit}</FieldLabel>
<Input
id="si-unit"
value={v.unit}
placeholder={f.unitPlaceholder}
onChange={(e) => set("unit", e.target.value)}
/>
</Field>
) : null}
</div>
{v.kind !== "text" ? (
<FieldDescription className="-mt-2">{f.quantityHint}</FieldDescription>
) : null}
<Field>
<FieldLabel htmlFor="si-note">{f.itemNote}</FieldLabel>
<Input
id="si-note"
value={v.note}
placeholder={f.itemNotePlaceholder}
onChange={(e) => set("note", e.target.value)}
/>
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,509 @@
"use client";
import {
ArrowLeft,
ArrowRightLeft,
Check,
ClipboardCheck,
EllipsisVertical,
Package,
Pencil,
Plus,
ShoppingCart,
Sparkles,
Tag,
Trash2,
X,
} from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { toast } from "sonner";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { PageHeader } from "@/components/page-header";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Field, FieldLabel } from "@/components/ui/field";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { useAutoRefresh } from "@/hooks/use-auto-refresh";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { SHOPPING_REFRESH_MS } from "@/shared/shopping";
import { formatStock } from "@/shared/stock";
import {
approveSuggestionsAction,
deleteShoppingListAction,
dismissSuggestionAction,
moveShoppingItemAction,
removeShoppingItemAction,
} from "../actions";
import type { ShoppingItemView, ShoppingListDetail, SuggestionView } from "../service";
import { ShoppingItemDialog } from "./item-dialog";
import { ShoppingListDialog } from "./list-dialog";
import { PlanPanel } from "./plan-panel";
import { ShoppingReport } from "./report-view";
const t = tr.shopping;
function SuggestionsPanel({
listId,
suggestions,
canWrite,
}: {
listId: string;
suggestions: SuggestionView[];
canWrite: boolean;
}) {
const [busy, setBusy] = useState<string | null>(null);
const s = t.suggestions;
async function approve(ids: string[]) {
setBusy(ids.length > 1 ? "all" : ids[0]!);
const r = await approveSuggestionsAction(listId, ids);
setBusy(null);
if (r.ok) toast.success(t.toast.suggestionsAdded(r.data.added));
else toast.error(r.error);
}
async function dismiss(id: string) {
setBusy(id);
const r = await dismissSuggestionAction(id);
setBusy(null);
if (r.ok) toast.success(t.toast.dismissed);
else toast.error(r.error);
}
return (
<section
aria-labelledby="sugg-h"
className="flex flex-col gap-3 rounded-xl border border-amber-500/40 bg-amber-500/5 p-4"
>
<div className="flex flex-wrap items-start gap-3">
<div className="min-w-0 flex-1">
<h2 id="sugg-h" className="flex items-center gap-1.5 font-medium">
<Sparkles className="size-4 text-amber-600" aria-hidden />
{s.title}
</h2>
<p className="text-sm text-muted-foreground">{s.description}</p>
</div>
{canWrite && suggestions.length > 1 ? (
<Button
size="sm"
variant="outline"
disabled={busy !== null}
onClick={() => approve(suggestions.map((x) => x.productTypeId))}
>
<Plus />
{s.addAll}
</Button>
) : null}
</div>
<ul className="divide-y rounded-lg border bg-card">
{suggestions.map((x) => {
const reasons = [
x.suggestion.waste
? tr.stock.suggestions.wasteReduced(
x.suggestion.waste.purchases,
x.suggestion.waste.pct,
)
: null,
].filter(Boolean);
return (
<li key={x.productTypeId} className="flex flex-wrap items-center gap-x-3 gap-y-2 p-3">
<div className="min-w-0 flex-1">
<p className="truncate font-medium">
<Link href={`/stok/${x.productTypeId}`} className="hover:underline">
{x.name}
</Link>
</p>
<p className="text-xs text-muted-foreground tabular-nums">
{s.line(
formatStock(Math.max(0, x.current), x.unit),
formatStock(x.target, x.unit),
x.pct,
)}
</p>
<p className="text-sm tabular-nums">
{s.suggested(formatStock(x.suggestedQuantity, x.unit))}
{reasons.length ? (
<span className="text-xs text-muted-foreground"> · {reasons.join(" · ")}</span>
) : null}
</p>
</div>
{canWrite ? (
<div className="flex gap-2">
<Button
size="sm"
variant="ghost"
disabled={busy !== null}
title={s.dismissHint}
onClick={() => dismiss(x.productTypeId)}
>
<X />
{s.dismiss}
</Button>
<Button
size="sm"
disabled={busy !== null}
onClick={() => approve([x.productTypeId])}
>
<Check />
{s.add}
</Button>
</div>
) : null}
</li>
);
})}
</ul>
</section>
);
}
const KIND_ICON = { type: Package, product: Tag, text: null } as const;
function ItemRow({
item,
canWrite,
onEdit,
onMove,
onRemove,
}: {
item: ShoppingItemView;
canWrite: boolean;
onEdit: () => void;
onMove: () => void;
onRemove: () => void;
}) {
const Icon = KIND_ICON[item.kind];
return (
<li className={cn("flex items-center gap-3 p-3", item.checked && "bg-muted/30")}>
<span
aria-hidden
className="flex size-8 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground"
>
{item.checked ? (
<Check className="size-4 text-income" />
) : Icon ? (
<Icon className="size-4" />
) : (
<span className="text-xs">Aa</span>
)}
</span>
<div className="min-w-0 flex-1">
<p
className={cn(
"truncate font-medium",
item.checked && "text-muted-foreground line-through",
)}
>
{item.kind === "type" && item.productTypeId ? (
<Link href={`/stok/${item.productTypeId}`} className="hover:underline">
{item.label}
</Link>
) : item.kind === "product" && item.productId ? (
<Link href={`/stok/urunler/${item.productId}`} className="hover:underline">
{item.label}
</Link>
) : (
item.label
)}
</p>
{item.detail || item.stock ? (
<p className="truncate text-xs text-muted-foreground">
{item.stock ? t.stockLine(item.stock.current, item.stock.target) : item.detail}
</p>
) : null}
<div className="mt-1 flex flex-wrap items-center gap-1.5">
{item.checked ? <Badge variant="secondary">{tr.shopping.mode.inCart}</Badge> : null}
{item.source === "suggestion" ? (
<Badge variant="outline" className="gap-1">
<Sparkles className="size-3" aria-hidden />
{t.fromSuggestion}
</Badge>
) : null}
{item.archived ? <Badge variant="secondary">{t.archivedRef}</Badge> : null}
{item.note ? <span className="text-xs text-muted-foreground">{item.note}</span> : null}
</div>
</div>
<span className="shrink-0 text-sm tabular-nums">{item.quantityLabel}</span>
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={`${item.label}: ${t.actions.more}`}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={onEdit}>
<Pencil />
{t.actions.edit}
</DropdownMenuItem>
<DropdownMenuItem onSelect={onMove}>
<ArrowRightLeft />
{t.actions.moveTo}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem variant="destructive" onSelect={onRemove}>
<Trash2 />
{t.actions.remove}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
);
}
function MoveDialog({
listId,
item,
lists,
onClose,
}: {
listId: string;
item: ShoppingItemView;
lists: { id: string; name: string }[];
onClose: () => void;
}) {
const [target, setTarget] = useState(lists[0]?.id ?? "");
const [busy, setBusy] = useState(false);
async function submit() {
setBusy(true);
const r = await moveShoppingItemAction(listId, item.id, target);
setBusy(false);
if (r.ok) {
toast.success(t.toast.moved);
onClose();
} else toast.error(r.error);
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={t.moveTitle}
description={t.moveDescription(item.label)}
footer={
<>
<Button variant="outline" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button onClick={submit} disabled={busy || !target}>
{t.actions.moveTo}
</Button>
</>
}
>
{lists.length ? (
<Field>
<FieldLabel htmlFor="sm-target">{t.moveTarget}</FieldLabel>
<Select value={target} onValueChange={setTarget}>
<SelectTrigger id="sm-target" className="w-full">
<SelectValue />
</SelectTrigger>
<SelectContent>
{lists.map((l) => (
<SelectItem key={l.id} value={l.id}>
{l.name}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
) : (
<p className="text-sm text-muted-foreground">{t.noOtherLists}</p>
)}
</ResponsiveDialog>
);
}
/** /alisveris/:id — kalemler, stok önerileri (onayla/reddet), akıllı mağaza önerisi. */
export function ShoppingListDetailView({ data }: { data: ShoppingListDetail }) {
const router = useRouter();
const { list, items, canWrite } = data;
const [adding, setAdding] = useState(false);
const [editing, setEditing] = useState<ShoppingItemView | null>(null);
const [moving, setMoving] = useState<ShoppingItemView | null>(null);
const [editingList, setEditingList] = useState(false);
const [deleting, setDeleting] = useState(false);
useAutoRefresh(SHOPPING_REFRESH_MS);
async function remove(item: ShoppingItemView) {
const r = await removeShoppingItemAction(list.id, item.id);
if (r.ok) toast.success(t.toast.itemRemoved);
else toast.error(r.error);
}
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/alisveris">
<ArrowLeft />
{t.actions.back}
</Link>
</Button>
<div className="flex items-start gap-3">
<div className="min-w-0 flex-1">
<PageHeader
title={list.name}
description={
<>
{t.itemCount(list.itemCount)}
{list.checkedCount ? ` · ${t.checkedCount(list.checkedCount, list.itemCount)}` : ""}
{list.note ? ` · ${list.note}` : ""}
</>
}
/>
</div>
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={t.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={() => setEditingList(true)}>
<Pencil />
{t.actions.editList}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem variant="destructive" onSelect={() => setDeleting(true)}>
<Trash2 />
{t.actions.deleteList}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null}
</div>
<div className="flex flex-wrap gap-2">
{canWrite ? (
<Button size="sm" onClick={() => setAdding(true)}>
<Plus />
{t.actions.addItem}
</Button>
) : null}
{items.length && list.status === "active" ? (
<Button size="sm" variant="outline" asChild>
<Link href={`/alisveris/${list.id}/mod`}>
<ShoppingCart />
{t.actions.goShopping}
</Link>
</Button>
) : null}
{items.length && canWrite ? (
<Button size="sm" variant="outline" asChild>
<Link href={`/alisveris/${list.id}/tamamla`}>
<ClipboardCheck />
{tr.shopping.complete.action}
</Link>
</Button>
) : null}
</div>
{data.report ? (
<ShoppingReport completion={data.report.completion} summary={data.report.summary} />
) : (
<div className="grid gap-4 xl:grid-cols-[minmax(0,1fr)_minmax(0,26rem)] xl:items-start">
<div className="flex flex-col gap-4">
{data.suggestions.length ? (
<SuggestionsPanel
listId={list.id}
suggestions={data.suggestions}
canWrite={canWrite}
/>
) : null}
{items.length ? (
<ul className="divide-y rounded-xl border bg-card">
{items.map((i) => (
<ItemRow
key={i.id}
item={i}
canWrite={canWrite}
onEdit={() => setEditing(i)}
onMove={() => setMoving(i)}
onRemove={() => remove(i)}
/>
))}
</ul>
) : (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.emptyList}
</p>
)}
</div>
<PlanPanel plan={data.plan} items={items} />
</div>
)}
{adding || editing ? (
<ShoppingItemDialog
listId={list.id}
item={editing}
options={data.options}
onClose={() => {
setAdding(false);
setEditing(null);
}}
/>
) : null}
{moving ? (
<MoveDialog
listId={list.id}
item={moving}
lists={data.otherLists}
onClose={() => setMoving(null)}
/>
) : null}
{editingList ? (
<ShoppingListDialog list={list} onClose={() => setEditingList(false)} />
) : null}
<AlertDialog open={deleting} onOpenChange={setDeleting}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.deleteTitle}</AlertDialogTitle>
<AlertDialogDescription>{t.deleteDescription(list.name)}</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
setDeleting(false);
const r = await deleteShoppingListAction(list.id);
if (r.ok) {
toast.success(t.toast.deleted);
router.push("/alisveris");
} else toast.error(r.error);
}}
>
{t.actions.deleteList}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}

Some files were not shown because too many files have changed in this diff Show More