44 Commits

Author SHA1 Message Date
suphicakir 0b7de17b5c feat: Faz 12b - fiyat kayıtları ve birim fiyat
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 12:27:51 +03:00
suphicakir d46869c644 chore(release): 0.12.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 12:27:51 +03:00
suphicakir 9e32f2988d feat(ui): ürün sayfası, fiyat geçmişi grafiği ve birim fiyat karşılaştırması
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 12:27:51 +03:00
suphicakir e67a1d5411 feat(prices): fiyat kayıtları, birim fiyat motoru ve analizde aylık maliyet
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 12:27:51 +03:00
suphicakir 78503b1787 feat: Faz 12a - mağazalar ve ürünler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 11:48:04 +03:00
suphicakir d52f41ab0c feat(ui): mağazalar sayfası, ürün kataloğu ve ürün tipi detayında ürünler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 11:48:04 +03:00
suphicakir f0b570284e feat(shopping): mağazalar, zahmet skoru ve ürünler (marka/paket, dönüşüm, görseller)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 11:48:04 +03:00
suphicakir 8e7e374778 feat: Faz 11b - periyodik sayım, fire ayarlı öneri ve tüketim analizi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 10:58:18 +03:00
suphicakir 6cc698f70b chore(release): 0.11.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 10:58:12 +03:00
suphicakir 07ba531d31 feat(ui): sayım ekranı, tüketim analizi ve sayım hatırlatmaları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 10:58:12 +03:00
suphicakir 814bdbbc2a feat(stock): sayım oturumları, fire ayarlı öneri motoru ve tüketim analizi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 10:58:12 +03:00
suphicakir 5e0f1b5901 feat: Faz 11a - ev stoğu
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 08:10:10 +03:00
suphicakir 868bb23fd9 feat(ui): ev stoğu sayfaları ve dashboard azalan stoklar kartı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 08:10:10 +03:00
suphicakir d9de29c18d feat(stock): stok kategorileri, ürün tipleri, hareketler ve FIFO SKT
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 08:10:10 +03:00
suphicakir abf2ea6dd7 feat: Faz 10b - gelir planı ve günlük plan
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:22:38 +03:00
suphicakir 0c5d959058 chore(release): 0.10.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:22:38 +03:00
suphicakir d8f442c1aa feat(ui): günlük plan kartı, gelir planı bölümü ve dashboard özet kartları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:22:38 +03:00
suphicakir 39aa19d168 feat(budget): gelir planı ve günlük plan
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:22:38 +03:00
suphicakir 21b3715d35 fix(budget): sabit gider ayrımı ve taban hızlı ay sonu tahmini
$ne ile eksik alan yolu her işlemi sabit sayıyordu; $ifNull ile düzeltildi.
Tahmin, bu ayın hızını önceki dönemin değişken hızıyla karıştırır.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 01:22:38 +03:00
suphicakir b5078d9251 feat: Faz 10a - aylık bütçe
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:58:51 +03:00
suphicakir a274d29728 feat(seed): örnek bütçeler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:58:51 +03:00
suphicakir 62023ef35d feat(ui): bütçe sayfası, limit düzenleyici ve dashboard uyarısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:58:51 +03:00
suphicakir 3fa1e949e2 feat(budget): aylık bütçe motoru, limitler ve ay sonu tahmini
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:58:51 +03:00
suphicakir 6de6d07c66 docs: Faz 9 kararları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:19:18 +03:00
suphicakir 660c6d5f2d feat: Faz 9b - dönemsel rapor ve net varlık
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:19:11 +03:00
suphicakir c53fe80241 chore(release): 0.9.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:19:05 +03:00
suphicakir b022c1c3b0 feat(ui): değer grafiği, net varlık kartı, dashboard kartları ve ödeme diyaloğunda varlık bağı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:19:05 +03:00
suphicakir 9a60085d14 feat(assets): dönemsel rapor, net varlık ve aynî kayıt bağlantısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 00:19:05 +03:00
suphicakir 20e5a90df4 feat: Faz 9a - varlık lotları ve kâr/zarar
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 23:17:44 +03:00
suphicakir b8306b3b5d feat(seed): örnek varlıklar ve hareketler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 23:17:44 +03:00
suphicakir a818c110cf feat(ui): birikim sayfası, varlık detayı ve hareket diyalogları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 23:17:44 +03:00
suphicakir 890ba9f521 feat(assets): varlık lotları, ortalama maliyet ve kâr/zarar servisi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 23:17:44 +03:00
suphicakir baec70d324 style: test dosyası biçimi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:57 +03:00
suphicakir 7a6414df7a feat: Faz 8b - aynî borç/alacak ve fiyat tablosu
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:48 +03:00
suphicakir 571bf7690d chore(release): 0.8.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:48 +03:00
suphicakir 380c9b3647 feat(seed): örnek fiyat geçmişi ve aynî kayıtlar
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:48 +03:00
suphicakir 3cd8d98324 feat(ui): aynî kayıt kartları, ödeme ve birikim diyalogları, fiyat tablosu sayfası
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:48 +03:00
suphicakir 9781cd9ed2 feat(in-kind): varlık türleri, fiyat tablosu, aynî borç/alacak, birikim planı ve ödeme akışı, 008 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 12:37:48 +03:00
suphicakir 1062b2d96c feat: Faz 8a - cari hesaplar
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
suphicakir 015906392c chore: CHANGELOG (Faz 8a)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
suphicakir 5648eafd7c feat(seed): örnek cariler ve hareketleri
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
suphicakir b6c6be5c97 feat(ui): cari hesaplar sayfaları, hareket formu ve vade uyarısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
suphicakir 5d370a062e feat(contacts): cari kişiler, hesap ↔ cari transferleri, cari ekstresi ve vade uyarısı, 007 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
suphicakir dfb83d6fd4 docs: Faz 8 kararlarını kaydet
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:58:37 +03:00
159 changed files with 23673 additions and 66 deletions
+167 -1
View File
@@ -6,6 +6,165 @@ Biçim [Keep a Changelog](https://keepachangelog.com/tr-TR/1.1.0/) esas alınır
## [Yayınlanmamış]
## [0.12.0] - 2026-11-06
Faz 12: mağazalar, ürünler, fiyatlar ve birim fiyat (12a ve 12b alt fazları).
### Eklendi — Faz 12b: fiyat kayıtları ve birim fiyat
- Fiyat kayıtları (`productPrices`): ürün × mağaza × tarih × paket fiyatı; kampanya/indirim işareti ve geçerlilik sonu; kaynak `manual` | `receipt` | `provider:<ad>` (şimdilik elle giriş). Gelecek tarihli fiyat ve arşivli ürün/mağazaya fiyat girilemez; kayıt silme denetim kaydına yazılır.
- Birim fiyat: her fiyat ürün tipinin birimine çevrilir (TL/kg, TL/lt, TL/adet, TL/yıkama; g ve ml gösterimde kg ve lt). Yuvarlama yalnızca gösterimde. Geçerli fiyat mağaza başına son kayıt; süresi biten kampanyada önceki normal fiyata dönülür ("Kampanya bitti, normal fiyat"), 90 günden eski fiyat işaretlenir.
- Ürün tipi detayında "Birim fiyat karşılaştırması": tüm marka/paket ve mağazalar birim fiyata göre sıralı, en uygun vurgulu, diğerleri "%X pahalı"; buradan fiyat girişi (birim fiyat anlık önizlemesiyle).
- Ürün sayfası (`/stok/urunler/:id`): görseller, mağazalardaki geçerli fiyatlar, mağaza başına fiyat geçmişi grafiği (basamaklı çizgi, bugüne uzanır) ve fiyat kayıtları listesi. Mağaza renkleri sabit kategorik paletten (mağazanın ekleniş sırası; açık/koyu tema için doğrulanmış `--series-1…8`).
- Tüketim analizinde aylık ortalama maliyet: aylık ortalama tüketim × ürün tipinin son bilinen birim fiyatı; fiyatı bilinen ürünlerin toplamı.
- Migration `014-product-prices`. Seed: 22 ürün için son 6 ayın 265 fiyat kaydı (mağaza farkları, aylık artış, süren ve biten kampanya, eski fiyat örneği).
- Testler: birim fiyat ve gösterim birimi, geçerli fiyat (biten kampanya, eski fiyat), sıralama ve eşitlik, renk yuvası (birim); karşılaştırma sırası, kampanya dönüşü, fiyat girişi kuralları, silme ve denetim, analiz maliyeti (entegrasyon).
### Değişti — Faz 12b
- Sayfa başlığı açıklaması bağlantı içerebilir; ek dosya seçicisine özel düğme metni ve ipucu.
### Eklendi — Faz 12a: mağazalar ve ürünler (marka/paket)
- Mağazalar (`stores`, `/magazalar`): ad, tür (fiziksel market / online platform / pazar), şube, eve uzaklık (km), taşıma güçlüğü (1–5), online ise teslimat ücreti ve ücretsiz teslimat alt limiti, yemek kartı geçerliliği ve geçerli sağlayıcılar, not. Zahmet skoru (0–100; uzaklık 20 km'ye kadar ve taşıma güçlüğü eşit ağırlıkla, online mağazada uzaklık sayılmaz) ve düzeyi; "ada göre / en yakın / en uzak / en zahmetli" sıralama. Aynı ad + şube tekil; arşivleme denetim kaydına yazılır. Kenar menüde "Mağazalar".
- Ürünler (`products`): ürün tipine bağlı marka, tanım, isteğe bağlı barkod (8–14 rakam, hanede tekil), paket miktarı ve birimi. Paket birimi ürün tipinin birimine kendiliğinden çevrilebiliyorsa (aynı birim, kg↔g, lt↔ml) dönüşüm otomatik; çevrilemiyorsa dönüşüm zorunlu ("5 kg = 33 yıkama", "1 paket = 50 tablet", "75 ml = 1 adet"). Ürün tipinin birimi sonradan değişirse "Dönüşüm gerekli" uyarısı.
- Ürün görselleri: birden çok görsel, mevcut ek dosya altyapısıyla (WebP'ye dönüştürme, küçük resim, yetkili okuma; hane üyeleri görür). Liste küçük resmi ve görüntüleyici.
- Ürün tipi detayında "Ürünler (marka / paket)" bölümü; `/stok/urunler` ürün kataloğu (ürün tipine göre gruplu, marka/tanım/barkodla arama, arşiv).
- Migration `013-stores-products` (index'ler). Seed: Çakır Ailesi için 8 mağaza ve 22 ürün.
- Testler: zahmet skoru, sıralama, uzaklık gösterimi, paket dönüşümü ve açıklaması (birim); mağaza şeması ve kuralları, ürün dönüşüm zorunluluğu, barkod tekilliği, görsel bağlama/sıralama/çıkarma ve okuma yetkisi, arşiv (entegrasyon).
## [0.11.0] - 2026-11-06
Faz 11: ev stoğu (11a ve 11b alt fazları).
### Eklendi — Faz 11b: periyodik sayım, fire ayarlı öneri, tüketim analizi
- Sayım oturumları (`stockCounts`): her sayımda ürün başına beklenen, sayılan ve fireye ayrılan miktar; fark sıfır olsa da kayıt tutulur ve oluşan hareketler oturuma bağlanır (`countId`). Ürün detayındaki tek ürün sayımı da oturum oluşturur.
- Periyodik sayım ekranı (`/stok/sayim?kategori=…`): kategori (alt ağacıyla) veya tüm stok; liste hâlinde beklenen → sayılan, anlık fark; eksiğin bir kısmı nedenle fire olarak işaretlenebilir (fire, eksikten fazla olamaz), kalan fark sayım düzeltmesi olur. "Yalnızca sayımı gelenler", "Beklenenle doldur", tek transaction'da kayıt.
- Sayım takvimi: sıklık ürün tipinden, yoksa stok kategorisinden (üstten devralınır); son sayımdan (hiç sayılmadıysa ilk hareketten) n gün sonra sayım gelir. `/stok`'ta "Sayımı gelenler" kartı (kategori, ürün sayısı, gecikme) ve dashboard hatırlatması.
- Önerilen alım miktarı motoru: hedef − mevcut; son 3 alımda fire varsa (fireler FIFO ile hangi alımdan düştüyse ona yazılır, ≥ %5) fire oranı kadar düşürülür; haftalık tüketim adımdan büyükse haftalık tüketimin katına, değilse adıma yuvarlanır; hedefi aşmaz. Gerekçe gösterilir ("Son 2 alımda %30 fire, miktar azaltıldı.", "Haftalık tüketime (0,3 kg) göre yuvarlandı.", "Mevcutla birlikte yaklaşık 46 gün yeter.").
- Tüketim hızı (son 90 gün; tüketim + sayımda çıkan eksik, fire hariç) ve periyodik sayım durumu ürün detayında.
- Tüketim analizi (`/stok/analiz`): ürün tipi başına son 6 ayın tüketim/fire çubukları, aylık ortalama tüketim ve fire, fire oranı (≥ %15 vurgulu), bu ayın tüketimi. Maliyet ürün fiyatlarıyla (Faz 12) eklenecek.
- Migration `012-stock-counts`: index'ler; Faz 11a'da oturumsuz kaydedilen sayım düzeltmeleri, beklenen miktar yeniden hesaplanarak sayım oturumlarına bağlanır.
- Seed: Çakır Ailesi'nde Mutfak 15, Genel Temizlik 30 günde bir sayılır; sayım oturumları ve ara sıra sayım farkı; Mutfak'ın sayımı gecikmiş.
- Testler: FIFO fire dağılımı, son alımların fire oranı, öneri (fire indirimi, tüketim hızına yuvarlama, hedef sınırı), sayım takvimi, aylık kullanım (birim); seed sayım takvimi, toplu sayım (fire + düzeltme, oturum, sıfır fark, yetki), tüketim analizi (entegrasyon).
### Değişti — Faz 11b
- Dashboard stok kartı "Stok uyarıları" oldu: azalan ürünler, SKT yaklaşan partiler ve sayımı gelen kategoriler.
- Seed'deki sayım farkları artık periyodik sayım oturumlarında oluşur.
### Eklendi — Faz 11a: ev stoğu
- Stok kategorileri (`stockCategories`): gider kategorilerinden ayrı, sınırsız derinlikte ağaç; varsayılan set (Mutfak › Manav, Şarküteri, Bakliyat; Genel Temizlik › Bulaşık, Çamaşır, Genel; Kişisel Temizlik › Şampuan, Tıraş, Kişisel Bakım) yeni hanede ve migration ile mevcut hanelere yüklenir. Her kategori bir gider kategorisine eşlenebilir (alt kategoriler üstten devralır; Faz 13'te alışveriş gideri için) ve sayım sıklığı tutar. Taşıma, arşiv (içinde aktif ürün yoksa) ve arşivden çıkarma; `/stok/kategoriler`.
- Ürün tipleri (`productTypes`): kategori, temel ölçü birimi (kg, lt, adet … veya özel birim: "yıkama", "tablet"), hedef stok, kritik eşik yüzdesi (varsayılan %20), saklama yeri, "1 azalt" miktarı, not; ilk kurulumda evdeki başlangıç miktarı.
- Stok hareketleri (`stockMovements`): alım (isteğe bağlı SKT), tüketim, fire/zarar (nedenli) ve sayım düzeltmesi (gerçek miktar girilir, fark işlenir). Mevcut miktar hareketlerden türetilir; stokta olandan fazla tüketim/fire reddedilir. Hareket silme denetim kaydına yazılır.
- SKT takibi FIFO partileriyle: çıkışlar en eski girişten düşer; evde kalan miktarın SKT'si 7 gün içinde dolan veya geçmiş partiler uyarılır.
- `/stok`: özet, "Alınması önerilenler" (eşiğin altındakiler ve hedefe tamamlayan miktar), SKT uyarıları, kategoriye göre ürün listesi (mevcut/hedef çubuğu ve eşik çizgisi, arama, "yalnızca azalanlar"), tek dokunuşla "1 azalt". `/stok/:id`: partiler ve hareket geçmişi.
- Dashboard "Azalan stoklar" kartı.
- Seed: Çakır Ailesi için 19 ürün tipi ve son 6 ayın haftalık alım/tüketim/fire/sayım simülasyonu.
- Testler: mevcut miktar, FIFO partileri, SKT durumu, eşik ve öneri (birim); görünüm, izolasyon, hareket kuralları, sayım, kategori kuralları (entegrasyon).
## [0.10.0] - 2026-11-06
Faz 10: aylık bütçe, gelir planı ve günlük plan (10a ve 10b alt fazları).
### Eklendi — Faz 10b: gelir planı ve günlük plan
- Gelir planı (`/butce` altında): gerçekleşen gelirler, henüz gerçekleşmemiş planlı (düzenli) gelirler ve elle eklenen beklenen gelirler (`budgets.incomeItems`, ör. prim); beklenen toplam. "Plana göre elde kalacak" (beklenen gelir − bütçe) ve "Bu tempoda elde kalacak" (beklenen gelir − ay sonu tahmini gider).
- Günlük plan (dashboard): ayın bütçesi günlere yayılır; tarihe bağlı giderler (düzenli işlemler, taksitler) kendi günlerine, kalan değişken bütçe günlere eşit veya hane ayarına göre önceki ayın günlük örüntüsüyle (kuruşu kuruşuna toplam korunur). "Bugün ayın %X'i geçti, bütçenin %Y'si harcandı", bugün için harcanabilir tutar (önceki günlerden kalan/aşan dahil), bugüne kadar planlanan ve harcanan, ay sonunda elde kalacak.
- Kümülatif planlanan / gerçekleşen gider grafiği, beklenen gelir referans çizgisi ve gün tablosu; sonraki ayın beklenen geliri ile bütçesi karşılaştırması.
- Dashboard özet kartları: "Bu ay gelir", "Bu ay gider" ve "Kalan" gerçek veriyle (bütçe ayına göre).
- Testler: dağıtım ve kuruş yuvarlama, örüntü uyarlama, günlük plan ve bugünkü pay, taban hızlı tahmin (birim); gelir planı, gizli hesap ayarı, elle kalemler, yetki, günlük plan tutarlılığı ve örüntü modu (entegrasyon).
### Değişti — Faz 10b
- Ay sonu tahmini: değişken giderin günlük hızı, bu ayın hızı ile önceki dönemin değişken harcama hızının karışımı (ay ilerledikçe bu ayın ağırlığı artar); ay başındaki tek bir büyük harcama artık tüm aya yayılmıyor. Geçmişi olmayan hanede yalnızca bu ayın hızı.
### Düzeltildi — Faz 10b
- Bütçede "sabit gider" (düzenli işlem / taksit) ayrımı her işlemi sabit sayıyordu (`installment` boşken alan yolu eksik değer verir ve `null`'a eşit sayılmaz); ay sonu tahmini değişken gideri hiç yansıtmıyordu. `$ifNull` ile düzeltildi, regresyon testi eklendi.
### Eklendi — Faz 10a: aylık bütçe
- Bütçe sayfası (`/butce?ay=YYYY-MM`): ay gezintisi, dönem sınırları hane ayarı `budgetMonthStartDay`'e göre (ör. 15'i → 15 Kasım – 14 Aralık).
- Kategori limitleri (`budgets`): her gider kategorisine limit; üst kategori limiti alt kategorileri kapsar, alt kategori limiti üstün içinde alt sınırdır ve toplam bütçede iki kez sayılmaz. Limitsiz alt kategoriler "Üst kategori limitinde" olarak gösterilir; hiçbir limitin kapsamadığı harcama "Bütçesiz harcama" toplamında.
- Gerçekleşen / limit / kalan, yüzde çubuğu (ayın geçen kısmı işaretli), %80'de uyarı, %100'de "Limit doldu", aşımda "Limit aşıldı".
- Ay sonu tahmini: sabit giderler (düzenli işlem, taksit) olduğu gibi + kalan planlı giderler + değişken giderin günlük hızıyla ay sonuna yansıtılması; tahmin limiti aşıyorsa işaret.
- Bölünmüş işlemler kalem bazında; taksitler hane ayarına göre her biri kendi ayına (varsayılan) veya tamamı alış ayına. Başkasının "yalnızca ben" hesabından giderler hane ayarına göre yalnızca tutar olarak sayılır.
- "Önceki aydan kopyala" ve "Önceki ayın harcamalarından oluştur" (ana kategori bazında, 100 TL'ye yukarı yuvarlanır); mevcut limitler varsa onay istenir.
- Limit düzenleyici: tüm etkin gider kategorileri ağaç sırasıyla, anlık toplam bütçe.
- Dashboard: %80'i geçilen veya aşılan kategori sayısıyla uygulama içi bütçe uyarısı.
- Seed: Çakır Ailesi'nde önceki ve bu ay için harcamalardan oluşturulmuş bütçeler (bu ay Market limiti düşük, Elektrik alt limiti).
- `010` migration'ı: `budgets` index'i (hane × ay benzersiz).
- Testler: dönem sınırları, eşikler, tahmin, üst/alt limit toplama, bütçesiz harcama, sıra (birim); limitler, bölünmüş işlem, planlı, gizli hesap ayarı, taksit modları, başlangıç günü, kopyala/oluştur, yetki (entegrasyon).
## [0.9.0] - 2026-11-06
Faz 9: birikim ve varlık takibi, fiyat tablosu (elle), kâr/zarar, net varlık (9a ve 9b alt fazları).
### Eklendi — Faz 9b: dönemsel rapor ve net varlık
- Dönemsel rapor (`/birikim` toplam, `/birikim/:id` varlık bazında): 3 ay / 6 ay / 12 ay / tümü (`?donem=`); dönem başı değer, yatırılan TL, dönem sonu değer, satış geliri, gelen/çıkan hediye ve dönem kâr/zararı (TL ve %, dönemde bağlanan sermayeye oranla). Formül sayfada yazılıdır.
- Aylık değer grafiği (shadcn charts / Recharts): güncel değer (düz çizgi) ve maliyet (kesikli, basamaklı), lejant, ipucu ve tablo görünümü. Fiyatı olmayan varlık toplam rapora katılmaz ve belirtilir.
- Net varlık (`/birikim` üstünde): hesap bakiyeleri + birikim (alış fiyatı) + cari alacaklar + aynî alacaklar (alış) − kart/KMH borçları − cari borçlar − aynî borçlar (satış). Gizli varlık ve cariler yalnızca sahibinin net varlığına girer; gizli hesap bakiyeleri hane ayarına göre.
- Dashboard: "Toplam hesap bakiyesi", "Kart borçları" ve "Net varlık" kartları gerçek veriyle (gelir/gider kartları Faz 14).
- Aynî kayıt ↔ varlık bağlantısı: "Ödeme gerçekleşti → Aynı varlıkla" diyaloğunda isteğe bağlı kutucuk. Borç ödemesi seçilen varlıktan ortalama maliyetle düşer; alacak tahsilatı varlığa borç tarihindeki birim fiyatla eklenir. Ödeme ve varlık hareketi tek transaction'da; varlık yetersizse hiçbir şey yazılmaz. Bağlı hareket Birikim'den tek başına silinemez; aynî kayıt silinince bağ çözülür.
- Fiyat okuma yardımcıları ayrı modülde (`features/in-kind/prices.ts`).
- Testler: dönem noktaları, örnek senaryo ("10 gr'ı 25.000'e aldım, her ay ekledim"), başlangıç değeri, fiyat yokluğu, toplam (birim); dönem raporu, gizli varlık ve fiyatsız varlık, net varlık formülü ve değişmezleri (makas, cari borç), aynî borç/alacak bağlantısı, yetersiz varlıkta geri alma, tür uyuşmazlığı (entegrasyon).
### Değişti — Faz 9b
- "Aynı varlıkla" alacak tahsilatında anlamsız olan "varlığı almak için harcanan" tutar alanı kaldırıldı (yalnızca borç ödemesinde gösterilir).
- `recharts` bağımlılığı ve `components/ui/chart.tsx` eklendi.
- CHANGELOG sürüm karşılaştırma bağlantıları 0.6.0–0.9.0 için tamamlandı.
### Eklendi — Faz 9a: varlık lotları ve kâr/zarar
- Birikim sayfası (`/birikim`): altın, döviz ve ziynet varlıkları (`assets`); toplam güncel değer, toplam maliyet, gerçekleşmemiş ve gerçekleşmiş kâr/zarar; elde kalmayan varlıklar ayrı grupta. Fiyatı olmayan varlık toplam değere katılmaz ve belirtilir.
- Varlık hareketleri (`assetMovements`): alım, gelen hediye/miras, satış, hediye/çıkış; tarih, miktar, tutar veya birim fiyat (ikisi de boşsa fiyat tablosundan: alımda satış, satış ve hediyede alış fiyatı), hesap, saklama yeri, not. Geçmiş tarihli satış/çıkış o tarihteki miktarla sınırlıdır.
- Hesap bağlantısı: alım hesaptan varlığa, satış varlıktan hesaba transfer olarak kaydedilir (bakiye değişir, gelir/gider raporlarına girmez). İşlem listesinde varlık adıyla görünür; bağlı işlem tek başına düzenlenemez/silinemez, hareket silinince birlikte silinir.
- Hesap motoru (`shared/portfolio.ts`): ağırlıklı ortalama maliyet, satışta ortalama maliyetle gerçekleşmiş K/Z, çıkışta K/Z yazılmaz, gelen hediyenin maliyeti o günkü değer (yatırım sayılmaz); güncel değer alış fiyatıyla (Faz 0), gerçekleşmemiş K/Z TL ve %.
- `/birikim/:id`: özet (eldeki miktar, ortalama maliyet, maliyet, güncel değer, K/Z, yatırılan, satış geliri), hareket geçmişi (kalan miktar, satış K/Z'si), hareket silme (sonraki çıkışı eksiye düşürecekse reddedilir).
- "Yalnızca ben" varlık: varlık, hareketleri ve bağlı hesap işlemleri yalnızca sahibine görünür.
- Seed: aylık alımlı ve bir satışlı gram altın birikimi, düğün ziynetleri (hediye giriş ve çıkış), Emre'nin "yalnızca ben" dolar varlığı, Annemler'de fiyatsız bilezikler.
- `009` migration'ı: `assets`, `assetMovements` index'leri, işlemlerde `assetId`. Denetim kaydı: `asset.delete`, `asset.movement.delete`.
- Testler: ortalama maliyet, satış/çıkış, hediye, eksi miktar, oran biçimi (birim); alım/satış transferleri ve bakiye, fiyat tablosundan tutar, gerçekleşmiş K/Z, kilitli işlem, hareket silme, gizli varlık, izleyici ve başka hane (entegrasyon).
## [0.8.0] - 2026-11-05
Faz 8: cari hesaplar ve aynî borç/alacak (8a ve 8b alt fazları).
### Eklendi — Faz 8b: aynî borç/alacak ve fiyat tablosu
- Varlık türleri: gram altın, çeyrek, yarım, tam, Cumhuriyet altını, 22 ayar bilezik, gümüş, USD, EUR, GBP (birim: gr / adet / birim; miktarlar binde bir hassasiyetle).
- Fiyat tablosu (`/fiyatlar`, `assetPrices`): varlık × tarih × alış/satış, elle giriş; tek fiyat girilirse ikisine de yazılır; gün başına tek kayıt; son fiyatlar ve geçmiş. Faz 9 varlık takibi aynı tabloyu kullanacak.
- Aynî borç/alacak (`inKindDebts`), cari sayfasında: cari, yön (ben borçluyum / bana borçlu), varlık, miktar, borç tarihi; o tarihteki birim fiyat ve TL karşılığı not olarak saklanır (boşsa fiyat tablosundan). Değerleme: borç satış, alacak alış fiyatıyla.
- Borca bağlı birikim planı: birikim hesabı ve aylık tutar; "Birikim ekle" kaynak hesaptan birikim hesabına transfer oluşturur, borç kapanmaz. Kartta güncel değer, biriken, kalan ihtiyaç ve tahmini kapanış ayı.
- "Ödeme gerçekleşti": aynı varlıkla veya TL karşılığıyla; tarih, miktar/tutar, hesap. TL ödemede miktar boşsa güncel fiyattan hesaplanır; kısmi ödeme miktarı düşürür, kalanı aşan ödeme kalana sınırlanır, tam ödemede kayıt kapanır. Borç ödemesi hesaptan çıkış, alacak tahsilatı hesaba giriş işlemi olarak aynı transaction'da oluşturulur; denetim kaydı (`inkind.payment`, `inkind.close`).
- Cari listesinde açık aynî kayıtlar rozet olarak.
- Aynî borç hareketleri cari TL bakiyesine ve gelir/gider toplamlarına girmez; "yalnızca ben" carinin aynî kayıtları ve hareketleri başkasına görünmez (hesap ekstresinde ad ve açıklama gizlenir). Ödeme işlemi tek başına silinemez.
- Seed: son 6 ayın örnek altın/döviz fiyatları (gerçek piyasa verisi değildir), birikim planlı 5 gr altın borcu (iki katkıyla), USD alacağı, Annemler'de çeyrek altın alacağı.
- `008` migration'ı: `assetPrices`, `inKindDebts` index'leri, işlemlerde aynî borç alanları.
- Testler: değer/miktar karşılığı, değerleme fiyatı, ilerleme ve tahmini kapanış (birim); fiyat tablosu, tarih fiyatı, birikim katkısı, kısmi/tam ödeme, kapanış, alacak tahsilatı, cari bakiye ve gelir/gider ayrımı, gizli cari ve yetki (entegrasyon).
### Eklendi — Faz 8a: cari hesaplar
- Cari kişiler (`contacts`): ad, yakınlık, telefon, not, açılış bakiyesi (+ bana borçlu / − ben borçluyum), vade tarihi ve hatırlatma günü; arşivleme; aynı adda iki aktif cari engellenir (Türkçe normalize).
- "Yalnızca ben" cari: kişi ve hareketleri yalnızca sahibine görünür; ortak hesabın ekstresinde bu hareketler görünür ama kişi adı "Gizli cari" olarak maskelenir.
- Cari hareketleri: "Borç verdim", "Borç ödedim" (hesaptan cariye), "Borç aldım", "Tahsilat" (cariden hesaba). Hepsi transferdir: hesap bakiyesi değişir, gelir/gider toplamlarına girmez. Kısmi ödeme bakiyeyle doğal olarak desteklenir.
- `/cari`: bana borçlu / ben borçluyum / net özeti, cari listesi (bakiye, son hareket, vade rozeti), yeni cari, hareket ekle, düzenle, arşivle.
- `/cari/:id`: cari ekstresi (tarih sıralı hareketler ve yürüyen bakiye, açılış satırı); hareketi düzenleme ve geri alınabilir silme.
- Vade uyarısı (uygulama içi): vade geçtiyse veya hatırlatma penceresindeyse cari listesinde rozet ve dashboard'da uyarı.
- İşlem listesi ve ayrıntısında cari hareketleri kişi adı ve hareket türüyle; ayrıntıdan cariye bağlantı. CSV'de kategori sütununda "Cari: Ad (tür)".
- Seed: 5 örnek cari (vadesi yaklaşan alacak, kısmen ödenen borç, vadesi geçmiş alacak, "yalnızca ben" cari, Annemler hanesinde bir borç).
- `007` migration'ı: `contacts` index'leri, işlemlerde cari alanları. Denetim kaydı: cari arşivleme.
- Testler: yön/bakiye ve vade durumu (birim); defter, bakiye ve gelir/gider ayrımı, açılış bakiyesi, ekstre, tür değiştirme, vade uyarısı, çift ad, arşiv, yetki, başka hanenin hesabı ve gizli cari izolasyonu (entegrasyon).
### Değişti — Faz 8a
- İşlemlerde kaynak hesap (`accountId`) artık boş olabilir: cariden girişte para yalnızca hedef hesaba (`toAccountId`) girer. Bakiye, ekstre, kart ve KMH hesapları ek kural olmadan doğru çalışır.
## [0.7.0] - 2026-11-05
Faz 7: planlı/düzenli işlemler, kredi kartı ve KMH dönemleri, taksitler (7a ve 7b alt fazları).
@@ -218,7 +377,14 @@ Faz 1: Framework, klasör yapısı ve altyapı.
- `.nvmrc` (Node 26), `engines.node`, `typecheck`, `test`, `format`, `db:up`, `seed` scriptleri.
- `docs/PROMPT.md` (ana prompt ve Faz 0 kararları), `README.md`, `CHANGELOG.md`.
[Yayınlanmamış]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.5.0...HEAD
[Yayınlanmamış]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.12.0...HEAD
[0.12.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.11.0...v0.12.0
[0.11.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.10.0...v0.11.0
[0.10.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.9.0...v0.10.0
[0.9.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.8.0...v0.9.0
[0.8.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.7.0...v0.8.0
[0.7.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.6.0...v0.7.0
[0.6.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.5.0...v0.6.0
[0.5.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.4.0...v0.5.0
[0.4.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.3.0...v0.4.0
[0.3.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.2.0...v0.3.0
+5
View File
@@ -319,6 +319,11 @@ Aşağıdakileri varsayılan olarak kabul ettim. Faz 0'da yalnızca bunlardan em
- **Canlı domain:** `butcem.ta1sph.website` (Gitea `gitea.ta1sph.info` üzerinde; fark kasıtlı).
- **Aktif hane varsayılanı:** tercih (cookie) yoksa kullanıcının en yüksek rolde olduğu hane açılır.
- **Faz 7 kararları (2026-11-05):** 7a planlı/düzenli işlemler, 7b kart/KMH dönemleri ve taksitler; `v0.7.0` 7b sonunda. Taksitli harcamada her taksit ayrı işlem ("Hepsiburada 4/9"); vadesi gelen taksit kendi döneminde otomatik gerçekleşir, gelecek taksitler kullanılabilir limitten düşer ama güncel borçta görünmez. Bitiş tarihi olmayan düzenli işlemler 12 ay ileriye üretilir (ufuk okuma sırasında ilerletilir). Asgari ödeme varsayılanı: limit 50.000 TL altı %20, üstü %40; kart bazında değiştirilebilir.
- **Faz 8 kararları (2026-11-05):** 8a cari hesaplar, 8b aynî borç/alacak; `v0.8.0` 8b sonunda. Varlık türleri ve elle fiyat tablosu (Bölüm 6.6) 8b'ye çekilir, Faz 9 yeniden kullanır. Cariler hane ortaktır; "yalnızca ben" işaretli cari yalnızca sahibine görünür. Vade hatırlatması uygulama içi uyarıdır (dashboard + cari sayfası); push/e-posta Faz 16'da değerlendirilir.
- **Faz 9 kararları (2026-11-05):** 9a varlık lotları ve kâr/zarar, 9b dönemsel rapor ve net varlık; `v0.9.0` 9b sonunda. Varlıklar hane ortaktır; "yalnızca ben" işaretli varlık ve hareketleri yalnızca sahibine görünür. Varlık alım/satışı hesaba bağlıysa transfer olarak kaydedilir (gelir/gider raporlarına girmez). Aynî kayıt "aynı varlıkla" kapanırken isteğe bağlı olarak varlıktan düşülür / varlığa eklenir.
- **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.
- **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir.
---
+372 -3
View File
@@ -1,12 +1,12 @@
{
"name": "butcem",
"version": "0.7.0",
"version": "0.12.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "butcem",
"version": "0.7.0",
"version": "0.12.0",
"dependencies": {
"@hookform/resolvers": "^7.0.2",
"@tanstack/react-table": "^9.3.1",
@@ -24,6 +24,7 @@
"react": "^19.3.1",
"react-dom": "^19.3.1",
"react-hook-form": "^7.91.0",
"recharts": "^3.8.0",
"server-only": "^0.0.1",
"shadcn": "^4.23.0",
"sharp": "^0.35.5",
@@ -4051,6 +4052,46 @@
"integrity": "sha512-JtyZR+mqgBibTo8xea3B6ZRmzZiM/YeVBtUkas6zMuXjAlfIFIW2FgqeM9eLyvEaYX66vr6DJMK+4U6LV0KhNw==",
"license": "MIT"
},
"node_modules/@reduxjs/toolkit": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.14.0.tgz",
"integrity": "sha512-m/PxMwRe0xLL6XUsAgy0YjInklHcfi9uMwFhJk+QINqjxqPvyc89T5cMjszA5bDmTE0gwGc7zr9LRO4gL+mhaw==",
"license": "MIT",
"dependencies": {
"@standard-schema/spec": "^1.0.0",
"@standard-schema/utils": "^0.3.0",
"immer": "^11.2.9",
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"reselect": "^5.1.0"
},
"peerDependencies": {
"@types/react": "*",
"react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
"react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"react": {
"optional": true
},
"react-redux": {
"optional": true
}
}
},
"node_modules/@reduxjs/toolkit/node_modules/immer": {
"version": "11.2.9",
"resolved": "https://registry.npmjs.org/immer/-/immer-11.2.9.tgz",
"integrity": "sha512-IQ4UEtXjZjyefyWjtLEDXUSrF6T2hwjKPi6BIJl3bY/2XXW24d6cNGdXJSBOA/+KNnuiXkZY6DR0C3efolhitA==",
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
}
},
"node_modules/@rolldown/binding-android-arm-eabi": {
"version": "1.2.16",
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.16.tgz",
@@ -4964,6 +5005,69 @@
"assertion-error": "^2.0.1"
}
},
"node_modules/@types/d3-array": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
"integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
"license": "MIT"
},
"node_modules/@types/d3-color": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
"license": "MIT"
},
"node_modules/@types/d3-ease": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
"license": "MIT"
},
"node_modules/@types/d3-interpolate": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
"license": "MIT",
"dependencies": {
"@types/d3-color": "*"
}
},
"node_modules/@types/d3-path": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
"integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
"license": "MIT"
},
"node_modules/@types/d3-scale": {
"version": "4.0.9",
"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
"integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
"license": "MIT",
"dependencies": {
"@types/d3-time": "*"
}
},
"node_modules/@types/d3-shape": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.2.0.tgz",
"integrity": "sha512-kVd74ta9eof3eJOvbNd1vGKS/XERRyQbT26Og63hIsvDO84cjD5gEOhsXf26w3FSoNlPVz84DOFcKv/oou+fMw==",
"license": "MIT",
"dependencies": {
"@types/d3-path": "*"
}
},
"node_modules/@types/d3-time": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
"integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
"license": "MIT"
},
"node_modules/@types/d3-timer": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
"license": "MIT"
},
"node_modules/@types/deep-eql": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
@@ -5022,6 +5126,12 @@
"@types/react": "^19.3.0"
}
},
"node_modules/@types/use-sync-external-store": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
"integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
"license": "MIT"
},
"node_modules/@types/validate-npm-package-name": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@types/validate-npm-package-name/-/validate-npm-package-name-4.0.2.tgz",
@@ -6573,6 +6683,127 @@
"devOptional": true,
"license": "MIT"
},
"node_modules/d3-array": {
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.5.tgz",
"integrity": "sha512-Th8qGXoBalmWsstpkuhmBuTsBQIFqYOJtjlBvNVvBfJ8E3uYusBUwUR8HU20U0qKKQkgCvKyR1YjiozWadk5QA==",
"license": "ISC",
"dependencies": {
"internmap": "1 - 2"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-color": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.1.tgz",
"integrity": "sha512-lfab8x0Bj0UO7SNsY8dZSbNIA6ipbkE3X0NG9nqjCu6CfCHZseuDnOSJY7hidKrjpP++i1M2qT+FlAdPKYRilA==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-ease": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.2.tgz",
"integrity": "sha512-B5znKqRmKROAN4oHWQ50W/qisVjA9GXh2WMsVKdFVp4DxWmcrOsweqgUOUVsv5th96kwaZlokU6SlV4J3gak1w==",
"license": "BSD-3-Clause",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-format": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.3.tgz",
"integrity": "sha512-+F+/49swqmGuQJmSKnVMIDH/QkEFV5li9QRj0xm/KhyAUBv099O5PrvpQFxBp24PYph17Mnvt9mjKQV0ii0nMA==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-interpolate": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.2.tgz",
"integrity": "sha512-IRzGU62DtxhvsnSTWMQIdnoZ6gA+BCWwBon1EJI6SjoN595799b6z/QRBzXfFhE8iupUPp3042yBNo0STPqnzQ==",
"license": "ISC",
"dependencies": {
"d3-color": "1 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-path": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.1.tgz",
"integrity": "sha512-jsbgV8zIT38ReB9O7X7gcLndTQRONSqNNd+oGIaTBdUug4r5jFmp0N6RY9R5GWbdUDucn0qoTGyfjapT4tDhcg==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-scale": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.3.tgz",
"integrity": "sha512-66cWobCNzcMvlfoaDHCxuIv9TBUWG1BLOWdv9kHHFuCr1JdqAWPvTmsaEYDD5NRMyWZ5+7u0GqiCDfMXMqh3hg==",
"license": "ISC",
"dependencies": {
"d3-array": "2.10.0 - 3",
"d3-format": "1 - 3",
"d3-interpolate": "1.2.0 - 3",
"d3-time": "2.1.1 - 3",
"d3-time-format": "2 - 4"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-shape": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.1.tgz",
"integrity": "sha512-dm2o+lbKdzg9tY7GEag/dB9hcbodLfwkE/DkvqbELJXaMz0yKzWWhZqhbI7CKubukA7HnRyz0avdtvi7EPxPvw==",
"license": "ISC",
"dependencies": {
"d3-path": "^3.1.1"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-time": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.1.tgz",
"integrity": "sha512-Ze7rjrhMzdeulh0/hjcfFj7XLAHOfowtEMfsoG6DU866HPynQNW7Wfen6hzXcqKTv8XzxvF6Hzr5XD6bMHr2ug==",
"license": "ISC",
"dependencies": {
"d3-array": "2 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-time-format": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.1.tgz",
"integrity": "sha512-22XaqjyCjpqgda20erhsOjGmC3vvYwTNYniKAd45W5UWLDF43moeOuV9qYpRqobIlsnK0UhnKZjUUJm3VgORUA==",
"license": "ISC",
"dependencies": {
"d3-time": "1 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-timer": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.2.tgz",
"integrity": "sha512-1Il1aliroVSErrv5aulRBxAY+7+DnaoLIWGd1C6SsBTWDeobWiP/V69vwb8vT6abR1kKwaNe1196pmaQ1fK90A==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/damerau-levenshtein": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -6666,6 +6897,12 @@
}
}
},
"node_modules/decimal.js-light": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
"integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
"license": "MIT"
},
"node_modules/dedent": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/dedent/-/dedent-1.7.2.tgz",
@@ -7140,6 +7377,18 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/es-toolkit": {
"version": "1.53.1",
"resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.53.1.tgz",
"integrity": "sha512-VhMc6IXmexu8iYFfL2aaAww6IvJTdHlqBLruLoEUs33YD4IcP5DdZcLOybMsMmmLsiy1c8PsiLsrM0DdIuuRUA==",
"license": "MIT",
"workspaces": [
"docs",
"benchmarks",
"tests/types",
"tests/browser-compat"
]
},
"node_modules/esbuild": {
"version": "0.28.2",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.2.tgz",
@@ -7658,6 +7907,12 @@
"node": ">=0.10.0"
}
},
"node_modules/eventemitter3": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
"integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
"license": "MIT"
},
"node_modules/execa": {
"version": "9.6.1",
"resolved": "https://registry.npmjs.org/execa/-/execa-9.6.1.tgz",
@@ -8282,6 +8537,16 @@
"node": ">= 4"
}
},
"node_modules/immer": {
"version": "10.2.0",
"resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
"integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
}
},
"node_modules/import-fresh": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -8324,6 +8589,15 @@
"node": ">= 0.4"
}
},
"node_modules/internmap": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/ip-address": {
"version": "10.7.6",
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.6.tgz",
@@ -10715,9 +10989,31 @@
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true,
"license": "MIT"
},
"node_modules/react-redux": {
"version": "9.3.1",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.3.1.tgz",
"integrity": "sha512-vxMLT0lalUjbZPkoTepWyKAZbjIIFssNx/CEL9lTfwQBU6XpkGSmCNdcCIrkOBUgB68uftZMnbXVb6DwGnhRKQ==",
"license": "MIT",
"dependencies": {
"@types/use-sync-external-store": "^0.0.6",
"use-sync-external-store": "^1.4.0"
},
"peerDependencies": {
"@types/react": "^18.2.25 || ^19",
"react": "^18.0 || ^19",
"redux": "^5.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"redux": {
"optional": true
}
}
},
"node_modules/react-remove-scroll": {
"version": "2.7.2",
"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
@@ -10803,6 +11099,51 @@
"node": ">= 4"
}
},
"node_modules/recharts": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/recharts/-/recharts-3.8.0.tgz",
"integrity": "sha512-Z/m38DX3L73ExO4Tpc9/iZWHmHnlzWG4njQbxsF5aSjwqmHNDDIm0rdEBArkwsBvR8U6EirlEHiQNYWCVh9sGQ==",
"license": "MIT",
"workspaces": [
"www"
],
"dependencies": {
"@reduxjs/toolkit": "^1.9.0 || 2.x.x",
"clsx": "^2.1.1",
"decimal.js-light": "^2.5.1",
"es-toolkit": "^1.39.3",
"eventemitter3": "^5.0.1",
"immer": "^10.1.1",
"react-redux": "8.x.x || 9.x.x",
"reselect": "5.1.1",
"tiny-invariant": "^1.3.3",
"use-sync-external-store": "^1.2.2",
"victory-vendor": "^37.0.2"
},
"engines": {
"node": ">=18"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
}
},
"node_modules/redux": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
"license": "MIT"
},
"node_modules/redux-thunk": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
"license": "MIT",
"peerDependencies": {
"redux": "^5.0.0"
}
},
"node_modules/reflect.getprototypeof": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -10856,6 +11197,12 @@
"node": ">=0.10.0"
}
},
"node_modules/reselect": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
"license": "MIT"
},
"node_modules/resolve": {
"version": "2.0.0-next.7",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.7.tgz",
@@ -12405,6 +12752,28 @@
"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc"
}
},
"node_modules/victory-vendor": {
"version": "37.4.1",
"resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.4.1.tgz",
"integrity": "sha512-geV4p2GVfVM9lgm9ZRS3pvsbAPS+BUGhM9W9nPzPHTKi+/+KjNrFXdgP6KkG+XspNZuvcXmchcrtklfuQ4gniw==",
"license": "MIT AND ISC AND BSD-3-Clause",
"dependencies": {
"@types/d3-array": "^3.0.3",
"@types/d3-ease": "^3.0.0",
"@types/d3-interpolate": "^3.0.1",
"@types/d3-scale": "^4.0.2",
"@types/d3-shape": "^3.1.0",
"@types/d3-time": "^3.0.0",
"@types/d3-timer": "^3.0.0",
"d3-array": "^3.1.6",
"d3-ease": "^3.0.1",
"d3-interpolate": "^3.0.1",
"d3-scale": "^4.0.2",
"d3-shape": "^3.1.0",
"d3-time": "^3.0.0",
"d3-timer": "^3.0.1"
}
},
"node_modules/vite": {
"version": "8.3.5",
"resolved": "https://registry.npmjs.org/vite/-/vite-8.3.5.tgz",
+2 -1
View File
@@ -1,6 +1,6 @@
{
"name": "butcem",
"version": "0.7.0",
"version": "0.12.0",
"private": true,
"description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması",
"engines": {
@@ -42,6 +42,7 @@
"react": "^19.3.1",
"react-dom": "^19.3.1",
"react-hook-form": "^7.91.0",
"recharts": "^3.8.0",
"server-only": "^0.0.1",
"shadcn": "^4.23.0",
"sharp": "^0.35.5",
+15
View File
@@ -0,0 +1,15 @@
import { ContactModel } from "@/models/contact";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "007-contacts",
description: "contacts index'leri; işlemlerde cari alanları ve cari index'i",
async up(db) {
await db
.collection("transactions")
.updateMany({ contactKind: { $exists: false } }, { $set: { contactKind: null } });
await ContactModel.createIndexes();
await TransactionModel.createIndexes();
},
};
+18
View File
@@ -0,0 +1,18 @@
import { AssetPriceModel } from "@/models/asset-price";
import { InKindDebtModel } from "@/models/in-kind-debt";
import type { Migration } from "./types";
export const migration: Migration = {
name: "008-in-kind",
description: "assetPrices ve inKindDebts index'leri; işlemlerde aynî borç alanları",
async up(db) {
await db
.collection("transactions")
.updateMany(
{ inKindDebtId: { $exists: false } },
{ $set: { inKindDebtId: null, inKindRole: null } },
);
await AssetPriceModel.createIndexes();
await InKindDebtModel.createIndexes();
},
};
+15
View File
@@ -0,0 +1,15 @@
import { AssetModel } from "@/models/asset";
import { AssetMovementModel } from "@/models/asset-movement";
import type { Migration } from "./types";
export const migration: Migration = {
name: "009-assets",
description: "assets ve assetMovements index'leri; işlemlerde varlık alanları",
async up(db) {
await db
.collection("transactions")
.updateMany({ assetId: { $exists: false } }, { $set: { assetId: null } });
await AssetModel.createIndexes();
await AssetMovementModel.createIndexes();
},
};
+10
View File
@@ -0,0 +1,10 @@
import { BudgetModel } from "@/models/budget";
import type { Migration } from "./types";
export const migration: Migration = {
name: "010-budgets",
description: "budgets index'i (hane × ay benzersiz)",
async up() {
await BudgetModel.createIndexes();
},
};
+20
View File
@@ -0,0 +1,20 @@
import type { Types } from "mongoose";
import { installDefaultStockCategories } from "@/features/stock/service";
import { HouseholdModel } from "@/models/household";
import { ProductTypeModel } from "@/models/product-type";
import { StockCategoryModel } from "@/models/stock-category";
import { StockMovementModel } from "@/models/stock-movement";
import type { Migration } from "./types";
export const migration: Migration = {
name: "011-stock",
description: "stok koleksiyonları index'leri; mevcut hanelere varsayılan stok kategorileri",
async up() {
await StockCategoryModel.createIndexes();
await ProductTypeModel.createIndexes();
await StockMovementModel.createIndexes();
const households = await HouseholdModel.find({}).select({ createdBy: 1 }).lean();
for (const h of households)
await installDefaultStockCategories(h._id as Types.ObjectId, h.createdBy as Types.ObjectId);
},
};
+92
View File
@@ -0,0 +1,92 @@
import { Types } from "mongoose";
import { StockCountModel } from "@/models/stock-count";
import { StockMovementModel } from "@/models/stock-movement";
import { signedDelta, type StockMovementKind } from "@/shared/stock";
import type { Migration } from "./types";
type Move = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
productTypeId: Types.ObjectId;
kind: StockMovementKind;
date: string;
quantity: number;
initial: boolean;
countId: Types.ObjectId | null;
createdBy: Types.ObjectId;
createdAt: Date;
};
/**
* Faz 11b: sayım oturumları. Faz 11a'da tek ürün sayımıyla oluşan (oturumsuz) sayım
* düzeltmeleri, o ana kadarki kayıtlardan beklenen miktar hesaplanarak hane + tarih + kişi
* başına bir sayım oturumuna bağlanır. Başlangıç miktarları sayım sayılmaz.
*/
export const migration: Migration = {
name: "012-stock-counts",
description: "stockCounts index'leri; oturumsuz sayım düzeltmelerini sayım oturumuna bağla",
async up() {
await StockCountModel.createIndexes();
const orphans = await StockMovementModel.find({
kind: "count_adjust",
initial: { $ne: true },
countId: null,
deletedAt: null,
}).lean<Move[]>();
if (orphans.length === 0) return;
const products = [...new Set(orphans.map((o) => String(o.productTypeId)))];
const all = await StockMovementModel.find({
productTypeId: { $in: products.map((id) => new Types.ObjectId(id)) },
deletedAt: null,
}).lean<Move[]>();
const byProduct = new Map<string, Move[]>();
for (const m of all) {
const list = byProduct.get(String(m.productTypeId)) ?? [];
list.push(m);
byProduct.set(String(m.productTypeId), list);
}
// Her düzeltme için beklenen = önceki hareketlerin toplamı (tarih, oluşturulma sırası).
const expectedOf = new Map<string, number>();
for (const list of byProduct.values()) {
list.sort((a, b) =>
a.date === b.date
? a.createdAt.getTime() - b.createdAt.getTime()
: a.date < b.date
? -1
: 1,
);
let running = 0;
for (const m of list) {
expectedOf.set(String(m._id), running);
running += signedDelta(m);
}
}
const sessions = new Map<string, Move[]>();
for (const o of orphans) {
const key = `${o.householdId}:${o.date}:${o.createdBy}`;
sessions.set(key, [...(sessions.get(key) ?? []), o]);
}
for (const moves of sessions.values()) {
const first = moves[0]!;
const count = await StockCountModel.create({
householdId: first.householdId,
date: first.date,
categoryId: null,
items: moves.map((m) => {
const expected = expectedOf.get(String(m._id)) ?? 0;
return {
productTypeId: m.productTypeId,
expected,
actual: expected + m.quantity,
wasted: 0,
};
}),
createdBy: first.createdBy,
});
await StockMovementModel.updateMany(
{ _id: { $in: moves.map((m) => m._id) } },
{ $set: { countId: count._id } },
);
}
},
};
+12
View File
@@ -0,0 +1,12 @@
import { ProductModel } from "@/models/product";
import { StoreModel } from "@/models/store";
import type { Migration } from "./types";
export const migration: Migration = {
name: "013-stores-products",
description: "mağaza ve ürün (marka/paket) koleksiyonlarının index'leri",
async up() {
await StoreModel.createIndexes();
await ProductModel.createIndexes();
},
};
+10
View File
@@ -0,0 +1,10 @@
import { ProductPriceModel } from "@/models/product-price";
import type { Migration } from "./types";
export const migration: Migration = {
name: "014-product-prices",
description: "ürün fiyat kayıtları (productPrices) index'leri",
async up() {
await ProductPriceModel.createIndexes();
},
};
+24 -1
View File
@@ -6,10 +6,33 @@ import { migration as m003 } from "./003-transactions";
import { migration as m004 } from "./004-attachments-reconciliation";
import { migration as m005 } from "./005-recurring";
import { migration as m006 } from "./006-card-statements";
import { migration as m007 } from "./007-contacts";
import { migration as m008 } from "./008-in-kind";
import { migration as m009 } from "./009-assets";
import { migration as m010 } from "./010-budgets";
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 type { Migration } from "./types";
/** Sıralı migration listesi. Yeni migration: dosyayı ekle ve buraya sırayla ekle. */
export const MIGRATIONS: Migration[] = [m001, m002, m003, m004, m005, m006];
export const MIGRATIONS: Migration[] = [
m001,
m002,
m003,
m004,
m005,
m006,
m007,
m008,
m009,
m010,
m011,
m012,
m013,
m014,
];
const COLLECTION = "migrations";
+162
View File
@@ -0,0 +1,162 @@
import type { Types } from "mongoose";
import { addMovement, createAsset } from "@/features/assets/service";
import { AccountModel } from "@/models/account";
import { AssetModel } from "@/models/asset";
import { AssetMovementModel } from "@/models/asset-movement";
import { TransactionModel } from "@/models/transaction";
import type { AssetKey } from "@/shared/assets";
import { todayIstanbul } from "@/shared/dates";
import type { MovementKind } from "@/shared/portfolio";
import { addDays } from "@/shared/recurrence";
import { assetFormSchema, movementFormSchema } from "@/shared/schemas/asset";
/**
* Örnek varlıklar (Faz 9a). Tutarı boş alımlar fiyat tablosundaki örnek fiyatlardan (seedInKind
* önce çalışır) hesaplanır. İdempotent: varlık `seedRef` ile bir kez oluşturulur.
*/
type SeedMovement = {
kind: MovementKind;
daysAgo: number;
quantity: string;
amount?: string;
account?: string;
storage?: string;
note?: string;
};
type SeedAsset = {
ref: string;
household: string;
by: string;
assetKey: AssetKey;
name: string;
isPrivate?: boolean;
note?: string;
movements: SeedMovement[];
};
const monthly = (from: number, to: number): SeedMovement[] =>
Array.from({ length: to - from + 1 }, (_, i) => ({
kind: "buy" as const,
daysAgo: (to - i) * 30 + 2,
quantity: "1",
account: "Ziraat Maaş",
storage: "Ev kasası",
}));
const ITEMS: SeedAsset[] = [
{
ref: "gram-altin",
household: "Çakır Ailesi",
by: "ayse",
assetKey: "gram_gold",
name: "Gram altın birikimi",
note: "Her ay maaştan 1 gr",
movements: [
{
kind: "buy",
daysAgo: 178,
quantity: "4",
account: "Birikim (Vadeli)",
storage: "Ev kasası",
note: "İlk alım",
},
...monthly(1, 5),
{ kind: "sell", daysAgo: 12, quantity: "2", account: "Birikim (Vadeli)", note: "Tatil için" },
],
},
{
ref: "ziynet",
household: "Çakır Ailesi",
by: "admin",
assetKey: "quarter_gold",
name: "Düğün ziynetleri",
movements: [
{
kind: "gift_in",
daysAgo: 175,
quantity: "6",
storage: "Banka kiralık kasa",
note: "Düğün takıları",
},
{ kind: "gift_out", daysAgo: 40, quantity: "1", note: "Yeğenin düğünü" },
],
},
{
ref: "emre-dolar",
household: "Çakır Ailesi",
by: "emre",
assetKey: "usd",
name: "Dolar",
isPrivate: true,
movements: [
{ kind: "buy", daysAgo: 120, quantity: "200", account: "Ziraat Maaş", storage: "Cüzdan" },
],
},
{
ref: "bilezik",
household: "Annemler",
by: "fatma",
assetKey: "bracelet_22k",
name: "Bilezikler",
note: "Fiyat tablosunda bilezik fiyatı yok (örnek: fiyatsız varlık)",
movements: [{ kind: "gift_in", daysAgo: 160, quantity: "40", amount: "120.000" }],
},
];
export async function seedAssets(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
let created = 0;
for (const x of ITEMS) {
const householdId = householdIds.get(x.household)!;
const seedRef = `asset:${x.ref}`;
if (await AssetModel.exists({ householdId, seedRef })) continue;
const by = userIds.get(x.by)!;
const hh = String(householdId);
const r = await createAsset(
by,
hh,
assetFormSchema.parse({
assetKey: x.assetKey,
name: x.name,
note: x.note ?? "",
isPrivate: x.isPrivate ?? false,
}),
);
if (!r.ok) throw new Error(`Seed varlığı oluşturulamadı (${x.ref}): ${r.error}`);
await AssetModel.updateOne({ _id: r.data.id }, { $set: { seedRef } });
for (const [i, m] of x.movements.entries()) {
const account = m.account
? String((await AccountModel.findOne({ householdId, name: m.account }).lean())!._id)
: "";
const res = await addMovement(
by,
hh,
r.data.id,
movementFormSchema.parse({
kind: m.kind,
date: addDays(today, -m.daysAgo),
quantity: m.quantity,
amount: m.amount ?? "",
accountId: account,
storage: m.storage ?? "",
note: m.note ?? "",
}),
);
if (!res.ok) throw new Error(`Seed varlık hareketi eklenemedi (${x.ref}): ${res.error}`);
const ref = `${seedRef}:${i}`;
const mv = await AssetMovementModel.findOneAndUpdate(
{ _id: res.data.id },
{ $set: { seedRef: ref } },
).lean();
if (mv?.transactionId)
await TransactionModel.updateOne({ _id: mv.transactionId }, { $set: { seedRef: ref } });
}
created++;
}
return created;
}
+50
View File
@@ -0,0 +1,50 @@
import type { Types } from "mongoose";
import { budgetFromActuals, saveBudget } from "@/features/budgets/service";
import { BudgetModel } from "@/models/budget";
import { CategoryModel } from "@/models/category";
import { HouseholdModel } from "@/models/household";
import { periodOfDate, shiftMonth } from "@/shared/budget";
import { todayIstanbul } from "@/shared/dates";
import { budgetLimitsSchema } from "@/shared/schemas/budget";
import { formatMoneyInput } from "@/shared/money";
/**
* Örnek bütçeler (Faz 10a): Çakır Ailesi'nde önceki ve bu ay, önceki ayların harcamalarından
* oluşturulur. Bu ay "Market" limiti biraz düşürülür ve "Elektrik" alt limiti eklenir; böylece
* uyarı ve alt limit örnekleri görünür. İdempotent: bütçesi olan aya dokunulmaz.
*/
export async function seedBudgets(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const householdId = householdIds.get("Çakır Ailesi")!;
const by = userIds.get("ayse")!;
const hh = String(householdId);
const h = await HouseholdModel.findById(householdId).select({ settings: 1 }).lean();
const current = periodOfDate(todayIstanbul(), h?.settings?.budgetMonthStartDay ?? 1);
let created = 0;
for (const month of [shiftMonth(current, -1), current]) {
if (await BudgetModel.exists({ householdId, month })) continue;
const r = await budgetFromActuals(by, hh, month);
if (!r.ok) continue;
created++;
}
if (created && (await BudgetModel.exists({ householdId, month: current }))) {
const doc = (await BudgetModel.findOne({ householdId, month: current }).lean())!;
const cats = await CategoryModel.find({
householdId,
defaultKey: { $in: ["market", "faturalar.elektrik"] },
}).lean();
const id = (key: string) => String(cats.find((c) => c.defaultKey === key)?._id ?? "");
const limits = doc.limits.map((l) => ({
categoryId: String(l.categoryId),
amount: formatMoneyInput(
String(l.categoryId) === id("market") ? Math.round(l.amountMinor * 0.7) : l.amountMinor,
),
}));
if (id("faturalar.elektrik"))
limits.push({ categoryId: id("faturalar.elektrik"), amount: "900" });
await saveBudget(by, hh, budgetLimitsSchema.parse({ month: current, limits }));
}
return created;
}
+158
View File
@@ -0,0 +1,158 @@
import type { Types } from "mongoose";
import { createContact, createContactEntry } from "@/features/contacts/service";
import { AccountModel } from "@/models/account";
import { ContactModel } from "@/models/contact";
import type { ContactEntryKind, ContactRelation } from "@/shared/contacts";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import { addDays } from "@/shared/recurrence";
import { contactEntrySchema, contactFormSchema } from "@/shared/schemas/contact";
/**
* Örnek cariler (Faz 8a): vadesi yaklaşan alacak, kısmen ödenen borç, vadesi geçmiş küçük alacak
* ve "yalnızca ben" cari. İdempotent: cari `seedRef` ile; hareketler yalnızca cari ilk
* oluşturulduğunda eklenir.
*/
type SeedContact = {
ref: string;
household: string;
by: string;
name: string;
relation: ContactRelation;
phone?: string;
isPrivate?: boolean;
dueInDays?: number;
reminderDays?: number;
entries: {
kind: ContactEntryKind;
account: string;
amountMinor: number;
daysAgo: number;
description?: string;
}[];
};
const CONTACTS: SeedContact[] = [
{
ref: "ahmet",
household: "Çakır Ailesi",
by: "admin",
name: "Ahmet Yılmaz",
relation: "friend",
phone: "0532 000 00 01",
dueInDays: 5,
reminderDays: 7,
entries: [
{
kind: "lend",
account: "Ziraat Maaş",
amountMinor: 5_000_00,
daysAgo: 70,
description: "Araba tamiri için",
},
{ kind: "collect", account: "Cüzdan", amountMinor: 2_000_00, daysAgo: 30 },
],
},
{
ref: "hasan",
household: "Çakır Ailesi",
by: "admin",
name: "Hasan Çakır",
relation: "family",
dueInDays: 60,
entries: [
{
kind: "borrow",
account: "Ziraat Maaş",
amountMinor: 20_000_00,
daysAgo: 120,
description: "Ev eşyası için",
},
{ kind: "repay", account: "Ziraat Maaş", amountMinor: 5_000_00, daysAgo: 60 },
{ kind: "repay", account: "Ziraat Maaş", amountMinor: 5_000_00, daysAgo: 10 },
],
},
{
ref: "elif",
household: "Çakır Ailesi",
by: "ayse",
name: "Elif (komşu)",
relation: "neighbor",
dueInDays: -2,
entries: [
{
kind: "lend",
account: "Cüzdan",
amountMinor: 300_00,
daysAgo: 12,
description: "Pazar alışverişi",
},
],
},
{
ref: "selin",
household: "Çakır Ailesi",
by: "ayse",
name: "Selin (iş arkadaşı)",
relation: "work",
isPrivate: true,
entries: [{ kind: "lend", account: "Cüzdan", amountMinor: 1_000_00, daysAgo: 8 }],
},
{
ref: "ali",
household: "Annemler",
by: "fatma",
name: "Ali Demir",
relation: "family",
dueInDays: 45,
entries: [{ kind: "borrow", account: "Vakıfbank Emekli", amountMinor: 3_000_00, daysAgo: 25 }],
},
];
export async function seedContacts(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
let created = 0;
for (const c of CONTACTS) {
const householdId = householdIds.get(c.household)!;
const seedRef = `contact:${c.ref}`;
if (await ContactModel.exists({ householdId, seedRef })) continue;
const by = userIds.get(c.by)!;
const oldest = Math.max(...c.entries.map((e) => e.daysAgo));
const r = await createContact(
by,
String(householdId),
contactFormSchema.parse({
name: c.name,
relation: c.relation,
phone: c.phone ?? "",
openingDate: addDays(today, -oldest - 1),
isPrivate: c.isPrivate ?? false,
dueDate: c.dueInDays !== undefined ? addDays(today, c.dueInDays) : null,
reminderDays: c.reminderDays ?? 3,
}),
);
if (!r.ok) throw new Error(`Seed carisi oluşturulamadı (${c.name}): ${r.error}`);
await ContactModel.updateOne({ _id: r.data.id }, { $set: { seedRef } });
for (const e of c.entries) {
const account = await AccountModel.findOne({ householdId, name: e.account }).lean();
const x = await createContactEntry(
by,
String(householdId),
r.data.id,
contactEntrySchema.parse({
kind: e.kind,
accountId: String(account!._id),
amount: formatMoneyInput(e.amountMinor),
date: addDays(today, -e.daysAgo),
description: e.description ?? "",
}),
);
if (!x.ok) throw new Error(`Seed cari hareketi oluşturulamadı (${c.name}): ${x.error}`);
}
created++;
}
return created;
}
+156
View File
@@ -0,0 +1,156 @@
import type { Types } from "mongoose";
import { addContribution, createInKind, savePrice } from "@/features/in-kind/service";
import { AccountModel } from "@/models/account";
import { AssetPriceModel } from "@/models/asset-price";
import { ContactModel } from "@/models/contact";
import { InKindDebtModel } from "@/models/in-kind-debt";
import type { AssetKey } from "@/shared/assets";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import { addDays, addMonths } from "@/shared/recurrence";
import {
assetPriceFormSchema,
contributionSchema,
inKindFormSchema,
} from "@/shared/schemas/in-kind";
/**
* Örnek fiyat tablosu ve aynî kayıtlar (Faz 8b). Fiyatlar örnek amaçlıdır (gerçek piyasa verisi
* değildir): son 6 ay, ayda bir kayıt, doğrusal artış. İdempotent.
*/
/** [6 ay önceki alış, bugünkü alış, satış farkı] — birim başına kuruş. */
const PRICE_PATH: Partial<Record<AssetKey, [number, number, number]>> = {
gram_gold: [4_900_00, 5_600_00, 100_00],
quarter_gold: [8_050_00, 9_200_00, 250_00],
usd: [40_20, 42_80, 30],
eur: [46_90, 49_50, 40],
};
async function seedPrices(householdId: Types.ObjectId, actorId: string, today: string) {
for (const [k, [from, to, spread]] of Object.entries(PRICE_PATH)) {
const key = k as AssetKey;
for (let i = 6; i >= 0; i--) {
const date = i === 0 ? today : addMonths(today, -i);
if (await AssetPriceModel.exists({ householdId, assetKey: key, date })) continue;
const buy = Math.round(to - ((to - from) * i) / 6);
await savePrice(
actorId,
String(householdId),
assetPriceFormSchema.parse({
assetKey: key,
date,
buy: formatMoneyInput(buy),
sell: formatMoneyInput(buy + spread),
}),
);
}
}
}
type SeedInKind = {
ref: string;
household: string;
contact: string;
by: string;
direction: "debt" | "receivable";
assetKey: AssetKey;
quantity: string;
daysAgo: number;
note?: string;
savings?: string;
monthlyPlanMinor?: number;
contributions?: { from: string; amountMinor: number; daysAgo: number }[];
};
const ITEMS: SeedInKind[] = [
{
ref: "hasan-altin",
household: "Çakır Ailesi",
contact: "contact:hasan",
by: "admin",
direction: "debt",
assetKey: "gram_gold",
quantity: "5",
daysAgo: 95,
note: "Düğün için ödünç alınan altın",
savings: "Birikim (Vadeli)",
monthlyPlanMinor: 4_000_00,
contributions: [
{ from: "Ziraat Maaş", amountMinor: 4_000_00, daysAgo: 60 },
{ from: "Ziraat Maaş", amountMinor: 4_000_00, daysAgo: 30 },
],
},
{
ref: "elif-usd",
household: "Çakır Ailesi",
contact: "contact:elif",
by: "ayse",
direction: "receivable",
assetKey: "usd",
quantity: "100",
daysAgo: 40,
},
{
ref: "ali-ceyrek",
household: "Annemler",
contact: "contact:ali",
by: "fatma",
direction: "receivable",
assetKey: "quarter_gold",
quantity: "2",
daysAgo: 150,
note: "Torun doğumunda verilen çeyrekler",
},
];
export async function seedInKind(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
await seedPrices(householdIds.get("Çakır Ailesi")!, userIds.get("admin")!, today);
await seedPrices(householdIds.get("Annemler")!, userIds.get("fatma")!, today);
let created = 0;
for (const x of ITEMS) {
const householdId = householdIds.get(x.household)!;
const seedRef = `inkind:${x.ref}`;
if (await InKindDebtModel.exists({ householdId, seedRef })) continue;
const contact = await ContactModel.findOne({ householdId, seedRef: x.contact }).lean();
if (!contact) continue;
const account = async (name: string) =>
String((await AccountModel.findOne({ householdId, name }).lean())!._id);
const by = userIds.get(x.by)!;
const r = await createInKind(
by,
String(householdId),
String(contact._id),
inKindFormSchema.parse({
direction: x.direction,
assetKey: x.assetKey,
quantity: x.quantity,
date: addDays(today, -x.daysAgo),
note: x.note ?? "",
savingsAccountId: x.savings ? await account(x.savings) : "",
monthlyPlan: x.monthlyPlanMinor ? formatMoneyInput(x.monthlyPlanMinor) : "",
}),
);
if (!r.ok) throw new Error(`Seed aynî kaydı oluşturulamadı (${x.ref}): ${r.error}`);
await InKindDebtModel.updateOne({ _id: r.data.id }, { $set: { seedRef } });
for (const c of x.contributions ?? []) {
const res = await addContribution(
by,
String(householdId),
r.data.id,
contributionSchema.parse({
fromAccountId: await account(c.from),
amount: formatMoneyInput(c.amountMinor),
date: addDays(today, -c.daysAgo),
}),
);
if (!res.ok) throw new Error(`Seed birikimi oluşturulamadı (${x.ref}): ${res.error}`);
}
created++;
}
return created;
}
+14
View File
@@ -32,6 +32,12 @@ describe("seed", () => {
expect(summary.created.categories).toBeGreaterThan(40);
expect(summary.created.accounts).toBe(7);
expect(summary.created.transactions).toBeGreaterThan(150);
expect(summary.created.assets).toBe(4);
expect(summary.created.budgets).toBe(2);
expect(summary.created.stock).toBe(19);
expect(summary.created.stores).toBe(8);
expect(summary.created.products).toBe(22);
expect(summary.created.prices).toBeGreaterThan(200);
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdMemberModel.countDocuments()).toBe(memberCount);
});
@@ -47,6 +53,14 @@ describe("seed", () => {
transactions: 0,
recurringRules: 0,
installmentPlans: 0,
contacts: 0,
inKind: 0,
assets: 0,
budgets: 0,
stock: 0,
stores: 0,
products: 0,
prices: 0,
});
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length);
+52
View File
@@ -10,6 +10,12 @@ import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import { storedEmail } from "@/shared/account-email";
import { runMigrations } from "../migrations";
import { seedContacts } from "./contacts";
import { seedAssets } from "./assets";
import { seedBudgets } from "./budgets";
import { seedProductPrices, seedShopping } from "./shopping";
import { seedStock } from "./stock";
import { seedInKind } from "./in-kind";
import { seedInstallments } from "./installments";
import { seedRecurring } from "./recurring";
import { seedTransactions } from "./transactions";
@@ -47,6 +53,14 @@ export type SeedSummary = {
transactions: number;
recurringRules: number;
installmentPlans: number;
contacts: number;
inKind: number;
assets: number;
budgets: number;
stock: number;
stores: number;
products: number;
prices: number;
};
accounts: SeedAccountRow[];
};
@@ -64,6 +78,19 @@ const DOMAIN_COLLECTIONS = [
"reconciliations",
"recurringRules",
"statements",
"contacts",
"assetPrices",
"inKindDebts",
"assets",
"assetMovements",
"budgets",
"stockCategories",
"productTypes",
"stockMovements",
"stockCounts",
"stores",
"products",
"productPrices",
];
type AuthApi = ReturnType<typeof getAuth>["api"];
@@ -115,6 +142,14 @@ export async function runSeed({
transactions: 0,
recurringRules: 0,
installmentPlans: 0,
contacts: 0,
inKind: 0,
assets: 0,
budgets: 0,
stock: 0,
stores: 0,
products: 0,
prices: 0,
},
accounts: [],
};
@@ -289,6 +324,23 @@ export async function runSeed({
);
if (summary.created.installmentPlans)
log(`✓ Örnek taksitli alışverişler: ${summary.created.installmentPlans}`);
summary.created.contacts = await seedContacts(householdIds, userIdMap);
if (summary.created.contacts) log(`✓ Örnek cariler: ${summary.created.contacts}`);
summary.created.inKind = await seedInKind(householdIds, userIdMap);
if (summary.created.inKind) log(`✓ Örnek aynî kayıtlar ve fiyatlar: ${summary.created.inKind}`);
summary.created.assets = await seedAssets(householdIds, userIdMap);
if (summary.created.assets) log(`✓ Örnek varlıklar: ${summary.created.assets}`);
summary.created.budgets = await seedBudgets(householdIds, userIdMap);
if (summary.created.budgets) log(`✓ Örnek bütçeler: ${summary.created.budgets}`);
summary.created.stock = await seedStock(householdIds, userIdMap);
if (summary.created.stock) log(`✓ Örnek stok ürün tipleri: ${summary.created.stock}`);
const shopping = await seedShopping(householdIds, userIdMap);
summary.created.stores = shopping.stores;
summary.created.products = shopping.products;
if (shopping.stores || shopping.products)
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}`);
// 7) Geliştirme hesapları tablosu
const all = [
+494
View File
@@ -0,0 +1,494 @@
import { Types } from "mongoose";
import { ProductModel } from "@/models/product";
import { ProductPriceModel } from "@/models/product-price";
import { ProductTypeModel } from "@/models/product-type";
import { StoreModel } from "@/models/store";
import type { MealCardProvider } from "@/shared/accounts";
import { autoConvertible } from "@/shared/products";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { foldTr } from "@/shared/search";
import type { StoreKind } from "@/shared/stores";
/**
* Örnek mağazalar ve ürünler (Faz 12). Çakır Ailesi (Kadıköy) için marketler, pazar ve online
* platform; stok ürün tiplerine bağlı marka/paketler. Elle dönüşüm gereken örnekler: deterjan
* (kg → yıkama), tablet paketi (paket → tablet), diş macunu/şampuan (ml → adet). Görsel yok.
* Idempotent (`seedRef`). Miktarlar binde bir, tutarlar kuruş.
*/
type SeedStore = {
ref: string;
name: string;
kind: StoreKind;
branch?: string;
distanceM?: number;
carry: number;
deliveryFee?: number;
freeDeliveryMin?: number;
mealCards?: MealCardProvider[];
note?: string;
};
export const STORES: SeedStore[] = [
{
ref: "migros",
name: "Migros",
kind: "market",
branch: "Bahariye",
distanceM: 1_200,
carry: 2,
mealCards: ["pluxee", "multinet", "edenred", "setcard"],
},
{ ref: "a101", name: "A101", kind: "market", branch: "Moda", distanceM: 400, carry: 1 },
{ ref: "bim", name: "BİM", kind: "market", branch: "Yeldeğirmeni", distanceM: 650, carry: 2 },
{
ref: "sok",
name: "Şok",
kind: "market",
branch: "Rasimpaşa",
distanceM: 300,
carry: 1,
mealCards: ["multinet", "pluxee"],
},
{
ref: "carrefoursa",
name: "CarrefourSA",
kind: "market",
branch: "Acıbadem",
distanceM: 3_800,
carry: 4,
mealCards: ["pluxee", "multinet", "edenred", "setcard", "metropol"],
note: "Hafta sonu arabayla; büyük alışveriş.",
},
{
ref: "sali-pazari",
name: "Salı Pazarı",
kind: "bazaar",
branch: "Kadıköy",
distanceM: 1_900,
carry: 4,
note: "Salı ve cuma; sebze-meyve.",
},
{
ref: "getir-buyuk",
name: "Getir Büyük",
kind: "online",
carry: 1,
deliveryFee: 39_90,
freeDeliveryMin: 750_00,
mealCards: ["multinet"],
},
{
ref: "metro",
name: "Metro Toptancı",
kind: "market",
branch: "Kozyatağı",
distanceM: 9_500,
carry: 5,
},
];
type SeedProduct = {
ref: string;
/** Stok seed'indeki ürün tipi `seedRef`'i. */
type: string;
brand: string;
name?: string;
barcode?: string;
qty: number;
unit: string;
/** Elle dönüşüm (bir paket = bu kadar ürün tipi birimi). */
typeQty?: number;
};
const K = 1000;
export const PRODUCTS: SeedProduct[] = [
{
ref: "ariel-5kg",
type: "toz-deterjan",
brand: "Ariel",
name: "Matik Dağ Esintisi",
qty: 5 * K,
unit: "kg",
typeQty: 33 * K,
barcode: "8690000100015",
},
{
ref: "omo-6kg",
type: "toz-deterjan",
brand: "Omo",
name: "Matik Active Fresh",
qty: 6 * K,
unit: "kg",
typeQty: 40 * K,
},
{
ref: "bingo-4kg",
type: "toz-deterjan",
brand: "Bingo",
name: "Matik",
qty: 4 * K,
unit: "kg",
typeQty: 26 * K,
},
{
ref: "fairy-50",
type: "tablet-deterjan",
brand: "Fairy",
name: "Platinum Plus",
qty: 1 * K,
unit: "paket",
typeQty: 50 * K,
barcode: "8690000100022",
},
{
ref: "finish-40",
type: "tablet-deterjan",
brand: "Finish",
name: "Quantum",
qty: 40 * K,
unit: "tablet",
},
{
ref: "yayla-mercimek",
type: "kirmizi-mercimek",
brand: "Yayla",
name: "Kırmızı Mercimek",
qty: 1 * K,
unit: "kg",
},
{
ref: "reis-mercimek",
type: "kirmizi-mercimek",
brand: "Reis",
name: "Kırmızı Mercimek",
qty: 1 * K,
unit: "kg",
},
{
ref: "duru-mercimek",
type: "kirmizi-mercimek",
brand: "Duru",
name: "Kırmızı Mercimek",
qty: 2_500,
unit: "kg",
},
{ ref: "yayla-baldo", type: "pirinc", brand: "Yayla", name: "Baldo", qty: 2_500, unit: "kg" },
{ ref: "reis-baldo", type: "pirinc", brand: "Reis", name: "Baldo", qty: 1 * K, unit: "kg" },
{
ref: "pinar-sut",
type: "sut",
brand: "Pınar",
name: "Tam Yağlı Süt",
qty: 1 * K,
unit: "lt",
barcode: "8690000100039",
},
{ ref: "sutas-sut", type: "sut", brand: "Sütaş", name: "Tam Yağlı Süt", qty: 1 * K, unit: "lt" },
{
ref: "icim-sut-500",
type: "sut",
brand: "İçim",
name: "Yarım Yağlı Süt",
qty: 500 * K,
unit: "ml",
},
{
ref: "keskinoglu-30",
type: "yumurta",
brand: "Keskinoğlu",
name: "L Boy 30'lu",
qty: 30 * K,
unit: "adet",
},
{
ref: "koy-yumurta-15",
type: "yumurta",
brand: "Köy Yumurtası",
name: "15'li",
qty: 15 * K,
unit: "adet",
},
{
ref: "pinar-peynir",
type: "beyaz-peynir",
brand: "Pınar",
name: "Beyaz Peynir",
qty: 500 * K,
unit: "g",
},
{
ref: "yumos-1440",
type: "yumusatici",
brand: "Yumoş",
name: "Extra Lilyum",
qty: 1_440 * K,
unit: "ml",
},
{
ref: "selpak-32",
type: "tuvalet-kagidi",
brand: "Selpak",
name: "32'li",
qty: 32 * K,
unit: "rulo",
},
{
ref: "solo-24",
type: "tuvalet-kagidi",
brand: "Solo",
name: "24'lü",
qty: 24 * K,
unit: "rulo",
},
{
ref: "colgate-75",
type: "dis-macunu",
brand: "Colgate",
name: "Total 75 ml",
qty: 75 * K,
unit: "ml",
typeQty: 1 * K,
},
{
ref: "sensodyne-75",
type: "dis-macunu",
brand: "Sensodyne",
name: "Repair 75 ml",
qty: 75 * K,
unit: "ml",
typeQty: 1 * K,
},
{
ref: "elidor-500",
type: "sampuan",
brand: "Elidor",
name: "500 ml",
qty: 500 * K,
unit: "ml",
typeQty: 1 * K,
},
];
export async function seedShopping(
householdIds: Map<string, Types.ObjectId>,
users: Map<string, string>,
): Promise<{ stores: number; products: number }> {
const actor = new Types.ObjectId(users.get("ayse")!);
const householdId = householdIds.get("Çakır Ailesi")!;
let stores = 0;
for (const s of STORES) {
if (await StoreModel.exists({ householdId, seedRef: s.ref })) continue;
await StoreModel.create({
householdId,
name: s.name,
nameKey: foldTr(s.name),
kind: s.kind,
branch: s.branch ?? "",
distanceM: s.kind === "online" ? null : (s.distanceM ?? null),
carryDifficulty: s.carry,
deliveryFeeMinor: s.kind === "online" ? (s.deliveryFee ?? null) : null,
freeDeliveryMinMinor: s.kind === "online" ? (s.freeDeliveryMin ?? null) : null,
mealCardAccepted: Boolean(s.mealCards?.length),
mealCardProviders: s.mealCards ?? [],
note: s.note ?? "",
seedRef: s.ref,
createdBy: actor,
updatedBy: actor,
});
stores++;
}
const types = await ProductTypeModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1, unit: 1 })
.lean<{ _id: Types.ObjectId; seedRef: string; unit: string }[]>();
const typeByRef = new Map(types.map((x) => [x.seedRef, x]));
let products = 0;
for (const p of PRODUCTS) {
const type = typeByRef.get(p.type);
if (!type || (await ProductModel.exists({ householdId, seedRef: p.ref }))) continue;
if (!autoConvertible(p.unit, type.unit) && !p.typeQty)
throw new Error(`Seed ürünü ${p.ref}: ${p.unit} → ${type.unit} dönüşümü eksik`);
await ProductModel.create({
householdId,
productTypeId: type._id,
brand: p.brand,
name: p.name ?? "",
searchKey: foldTr(`${p.brand} ${p.name ?? ""}`),
barcode: p.barcode ?? null,
packageQuantity: p.qty,
packageUnit: p.unit,
typeQuantity: autoConvertible(p.unit, type.unit) ? null : p.typeQty,
seedRef: p.ref,
createdBy: actor,
updatedBy: actor,
});
products++;
}
return { stores, products };
}
// --- Fiyatlar (Faz 12b) ---
/** Bugünkü paket fiyatı (kuruş, Kasım 2026 tahmini). */
const CURRENT_PRICE: Record<string, number> = {
"ariel-5kg": 519_90,
"omo-6kg": 559_90,
"bingo-4kg": 329_90,
"fairy-50": 479_90,
"finish-40": 419_90,
"yayla-mercimek": 84_90,
"reis-mercimek": 79_90,
"duru-mercimek": 189_90,
"yayla-baldo": 259_90,
"reis-baldo": 109_90,
"pinar-sut": 41_90,
"sutas-sut": 39_90,
"icim-sut-500": 23_90,
"keskinoglu-30": 174_90,
"koy-yumurta-15": 119_90,
"pinar-peynir": 209_90,
"yumos-1440": 139_90,
"selpak-32": 329_90,
"solo-24": 229_90,
"colgate-75": 84_90,
"sensodyne-75": 159_90,
"elidor-500": 119_90,
};
/** Mağaza fiyat çarpanı (indirim marketi ucuz, online pahalı). */
const STORE_FACTOR: Record<string, number> = {
migros: 1.06,
a101: 0.94,
bim: 0.91,
sok: 0.96,
carrefoursa: 1.0,
"getir-buyuk": 1.12,
metro: 0.88,
};
const PRICE_STORES = Object.keys(STORE_FACTOR);
/** Aylık fiyat artışı. */
const MONTHLY_INFLATION = 0.025;
/** x,90 biçimine yuvarla (ör. 87,34 → 86,90 / 87,90). */
const ninety = (minor: number) => Math.max(90, Math.round((minor - 90) / 100) * 100 + 90);
type SeedPrice = {
ref: string;
product: string;
store: string;
daysAgo: number;
priceMinor: number;
isPromo?: boolean;
promoUntilDaysAgo?: number;
};
/**
* Her ürün 3 mağazada (ürün sırasına göre dönüşümlü), son 6 ayda ~45 günde bir fiyat.
* Kampanyalar: Ariel @ Migros hâlâ süren (%20), Pınar süt @ A101 süresi bitmiş (önceki normal
* fiyata dönülür). Reis mercimek @ Metro yalnızca eski kayıtlarla ("eski fiyat").
*/
export function seedPrices(): SeedPrice[] {
const out: SeedPrice[] = [];
PRODUCTS.forEach((p, i) => {
const current = CURRENT_PRICE[p.ref]!;
const stores = [0, 2, 4].map((k) => PRICE_STORES[(i + k) % PRICE_STORES.length]!);
stores.forEach((store, si) => {
for (let step = 0; step < 4; step++) {
const daysAgo = 170 - step * 45 - si * 7 - (i % 5);
if (daysAgo < 0) continue;
if (p.ref === "reis-mercimek" && store === "metro" && daysAgo < 100) continue;
const months = daysAgo / 30;
const price = (current * STORE_FACTOR[store]!) / (1 + MONTHLY_INFLATION) ** months;
out.push({
ref: `${p.ref}:${store}:${step}`,
product: p.ref,
store,
daysAgo,
priceMinor: ninety(price),
});
}
});
});
out.push(
{
ref: "ariel-5kg:migros:promo",
product: "ariel-5kg",
store: "migros",
daysAgo: 4,
priceMinor: ninety(CURRENT_PRICE["ariel-5kg"]! * 1.06 * 0.8),
isPromo: true,
promoUntilDaysAgo: -6,
},
{
ref: "pinar-sut:a101:normal",
product: "pinar-sut",
store: "a101",
daysAgo: 30,
priceMinor: ninety(CURRENT_PRICE["pinar-sut"]! * 0.94),
},
{
ref: "pinar-sut:a101:promo",
product: "pinar-sut",
store: "a101",
daysAgo: 12,
priceMinor: ninety(CURRENT_PRICE["pinar-sut"]! * 0.75),
isPromo: true,
promoUntilDaysAgo: 3,
},
);
return out;
}
export async function seedProductPrices(
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 [products, stores] = await Promise.all([
ProductModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1 })
.lean<{ _id: Types.ObjectId; seedRef: string }[]>(),
StoreModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1 })
.lean<{ _id: Types.ObjectId; seedRef: string }[]>(),
]);
const productByRef = new Map(products.map((p) => [p.seedRef, p._id]));
const storeByRef = new Map(stores.map((x) => [x.seedRef, x._id]));
const existing = new Set(
(
await ProductPriceModel.find({ householdId, seedRef: { $type: "string" } })
.select({ seedRef: 1 })
.lean<{ seedRef: string }[]>()
).map((x) => x.seedRef),
);
const today = todayIstanbul();
const base = Date.now() - 200 * 86_400_000;
const docs = seedPrices()
.filter((x) => !existing.has(x.ref) && productByRef.has(x.product) && storeByRef.has(x.store))
.sort((a, b) => b.daysAgo - a.daysAgo)
.map((x, i) => {
const at = new Date(base + i * 1000);
return {
householdId,
productId: productByRef.get(x.product)!,
storeId: storeByRef.get(x.store)!,
date: addDays(today, -x.daysAgo),
priceMinor: x.priceMinor,
isPromo: x.isPromo ?? false,
promoUntil: x.promoUntilDaysAgo === undefined ? null : addDays(today, -x.promoUntilDaysAgo),
source: "manual",
note: "",
deletedAt: null,
seedRef: x.ref,
createdBy: actor,
createdAt: at,
updatedAt: at,
};
});
if (docs.length) await ProductPriceModel.collection.insertMany(docs);
return docs.length;
}
+428
View File
@@ -0,0 +1,428 @@
import { Types } from "mongoose";
import { installDefaultStockCategories } from "@/features/stock/service";
import { ProductTypeModel } from "@/models/product-type";
import { StockCategoryModel } from "@/models/stock-category";
import { StockCountModel } from "@/models/stock-count";
import { StockMovementModel } from "@/models/stock-movement";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { foldTr } from "@/shared/search";
/**
* Örnek ev stoğu (Faz 11). Varsayılan stok kategorileri her haneye; Çakır Ailesi'ne ürün tipleri
* ve son 6 ayın haftalık tüketim simülasyonu (alım, tüketim, fire, periyodik sayım, SKT).
* Sayım: Mutfak 15 günde bir (son sayım 21 gün önce → gecikmiş), Genel Temizlik 30 günde bir
* (son sayım 14 gün önce). Deterministik; idempotent: ürün tipi `seedRef` ile bir kez
* oluşturulur, sayım oturumları `seedRef` ile paylaşılır. Miktarlar binde bir.
*/
type SeedProduct = {
ref: string;
category: string;
name: string;
unit: string;
target: number;
/** Alımda paket miktarı (alım = hedefe tamamlayan paket sayısı × paket). */
pack: number;
perDay: number;
location: string;
step?: number;
threshold?: number;
shelfDays?: number;
/** Her n. alımdan sonra fire (oran %). */
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;
/** Her n. sayımda küçük eksik (−%, hedefin yüzdesi). */
countDrift?: { everyCounts: number; pct: number };
};
const K = 1000;
export const PRODUCTS: SeedProduct[] = [
// Mutfak › Bakliyat
{
ref: "kirmizi-mercimek",
category: "mutfak.bakliyat",
name: "Kırmızı Mercimek",
unit: "kg",
target: 2 * K,
pack: 1 * K,
perDay: 40,
location: "Kiler",
step: 100,
stopRefillDaysAgo: 40,
},
{
ref: "kuru-fasulye",
category: "mutfak.bakliyat",
name: "Kuru Fasulye",
unit: "kg",
target: 2 * K,
pack: 1 * K,
perDay: 25,
location: "Kiler",
step: 250,
},
{
ref: "nohut",
category: "mutfak.bakliyat",
name: "Nohut",
unit: "kg",
target: 2 * K,
pack: 1 * K,
perDay: 20,
location: "Kiler",
step: 250,
},
{
ref: "pirinc",
category: "mutfak.bakliyat",
name: "Baldo Pirinç",
unit: "kg",
target: 5 * K,
pack: 2_500,
perDay: 90,
location: "Kiler",
step: 500,
},
// Mutfak › Manav
{
ref: "domates",
category: "mutfak.manav",
name: "Domates",
unit: "kg",
target: 3 * K,
pack: 1 * K,
perDay: 300,
location: "Buzdolabı",
step: 500,
shelfDays: 8,
waste: { every: 2, pct: 30, reason: "spoiled" },
},
{
ref: "patates",
category: "mutfak.manav",
name: "Patates",
unit: "kg",
target: 5 * K,
pack: 1 * K,
perDay: 250,
location: "Kiler",
step: 500,
waste: { every: 4, pct: 10, reason: "spoiled" },
},
{
ref: "sogan",
category: "mutfak.manav",
name: "Kuru Soğan",
unit: "kg",
target: 3 * K,
pack: 1 * K,
perDay: 120,
location: "Kiler",
step: 500,
},
// Mutfak › Şarküteri
{
ref: "beyaz-peynir",
category: "mutfak.sarkuteri",
name: "Beyaz Peynir",
unit: "kg",
target: 1 * K,
pack: 500,
perDay: 30,
location: "Buzdolabı",
step: 100,
shelfDays: 45,
},
{
ref: "yumurta",
category: "mutfak.sarkuteri",
name: "Yumurta",
unit: "adet",
target: 30 * K,
pack: 15 * K,
perDay: 3 * K,
location: "Buzdolabı",
shelfDays: 25,
},
{
ref: "sut",
category: "mutfak.sarkuteri",
name: "Süt",
unit: "lt",
target: 6 * K,
pack: 1 * K,
perDay: 700,
location: "Buzdolabı",
shelfDays: 12,
waste: { every: 6, pct: 15, reason: "expired" },
},
// Genel Temizlik
{
ref: "tablet-deterjan",
category: "genel-temizlik.bulasik",
name: "Tablet Deterjan",
unit: "tablet",
target: 60 * K,
pack: 40 * K,
perDay: 720,
location: "Lavabo altı",
stopRefillDaysAgo: 40,
},
{
ref: "elde-yikama",
category: "genel-temizlik.bulasik",
name: "Elde Yıkama Deterjanı",
unit: "lt",
target: 1_500,
pack: 750,
perDay: 15,
location: "Lavabo altı",
step: 100,
},
{
ref: "toz-deterjan",
category: "genel-temizlik.camasir",
name: "Toz Deterjan",
unit: "yıkama",
target: 80 * K,
pack: 50 * K,
perDay: 700,
location: "Banyo dolabı",
countDrift: { everyCounts: 2, pct: 4 },
},
{
ref: "yumusatici",
category: "genel-temizlik.camasir",
name: "Yumuşatıcı",
unit: "lt",
target: 3 * K,
pack: 1_440,
perDay: 40,
location: "Banyo dolabı",
step: 100,
},
{
ref: "camasir-suyu",
category: "genel-temizlik.genel",
name: "Çamaşır Suyu",
unit: "lt",
target: 3 * K,
pack: 1 * K,
perDay: 25,
location: "Balkon",
step: 250,
},
{
ref: "tuvalet-kagidi",
category: "genel-temizlik.genel",
name: "Tuvalet Kağıdı",
unit: "rulo",
target: 32 * K,
pack: 16 * K,
perDay: 600,
location: "Banyo dolabı",
countDrift: { everyCounts: 3, pct: 6 },
},
// Kişisel Temizlik
{
ref: "sampuan",
category: "kisisel-temizlik.sampuan",
name: "Şampuan",
unit: "adet",
target: 3 * K,
pack: 1 * K,
perDay: 50,
location: "Banyo dolabı",
},
{
ref: "tiras-bicagi",
category: "kisisel-temizlik.tiras",
name: "Tıraş Bıçağı",
unit: "adet",
target: 8 * K,
pack: 4 * K,
perDay: 150,
location: "Banyo dolabı",
},
{
ref: "dis-macunu",
category: "kisisel-temizlik.kisisel-bakim",
name: "Diş Macunu",
unit: "adet",
target: 4 * K,
pack: 2 * K,
perDay: 70,
location: "Banyo dolabı",
stopRefillDaysAgo: 60,
},
];
const START_DAYS_AGO = 182;
/** Sayım sıklığı (gün) ve sayım günü kuralı (gün önce), ana stok kategorisine göre. */
const COUNT_PLANS: Record<string, { everyDays: number; on: (daysAgo: number) => boolean }> = {
mutfak: { everyDays: 15, on: (d) => d >= 21 && d % 14 === 7 },
"genel-temizlik": { everyDays: 30, on: (d) => d % 28 === 14 },
};
type Row = {
kind: "purchase" | "consume" | "waste" | "count_adjust";
daysAgo: number;
quantity: number;
expiryDate?: string | null;
wasteReason?: string | null;
note?: string;
initial?: boolean;
/** Bu satır hangi sayıma ait (gün önce). */
countDaysAgo?: number;
};
export type SeedCount = { daysAgo: number; expected: number; actual: number };
/**
* Haftalık simülasyon: tüketim, periyodik sayım (farkı nadiren), eşikte alım ve fire. Stok asla
* eksiye düşmez.
*/
export function simulate(p: SeedProduct, today: string): { rows: Row[]; counts: SeedCount[] } {
const rows: Row[] = [];
const counts: SeedCount[] = [];
const plan = COUNT_PLANS[p.category.split(".")[0]!];
let stock = p.target;
let purchases = 0;
rows.push({ kind: "count_adjust", daysAgo: START_DAYS_AGO, quantity: stock, initial: true });
for (let d = START_DAYS_AGO - 7; d >= 0; d -= 7) {
// Haftalık tüketim azaltma adımının katı (ör. tam tablet, 0,25 kg).
const step = p.step ?? K;
const consume = Math.min(stock, Math.max(step, Math.round((p.perDay * 7) / step) * step));
if (consume > 0) {
rows.push({ kind: "consume", daysAgo: d, quantity: consume });
stock -= consume;
}
if (plan?.on(d)) {
const expected = stock;
const nth = counts.length + 1;
if (p.countDrift && nth % p.countDrift.everyCounts === 0 && stock > 0) {
const drift = Math.min(stock, Math.round((p.target * p.countDrift.pct) / 100));
rows.push({
kind: "count_adjust",
daysAgo: d,
quantity: -drift,
note: "Sayım",
countDaysAgo: d,
});
stock -= drift;
}
counts.push({ daysAgo: d, expected, actual: stock });
}
const canRefill = p.stopRefillDaysAgo === undefined || d > p.stopRefillDaysAgo;
if (canRefill && stock < (p.target * 35) / 100) {
const packs = Math.max(1, Math.ceil((p.target - stock) / p.pack));
const quantity = packs * p.pack;
purchases++;
rows.push({
kind: "purchase",
daysAgo: d,
quantity,
expiryDate: p.shelfDays ? addDays(addDays(today, -d), p.shelfDays) : null,
});
stock += quantity;
if (p.waste && purchases % p.waste.every === 0 && d >= 3) {
const w = Math.min(stock, Math.round((quantity * p.waste.pct) / 100));
rows.push({ kind: "waste", daysAgo: d - 3, quantity: w, wasteReason: p.waste.reason });
stock -= w;
}
}
}
return { rows, counts };
}
export async function seedStock(
householdIds: Map<string, Types.ObjectId>,
users: Map<string, string>,
): Promise<number> {
const actor = new Types.ObjectId(users.get("ayse")!);
for (const [, id] of householdIds) await installDefaultStockCategories(id, actor);
const householdId = householdIds.get("Çakır Ailesi")!;
// Periyodik sayım sıklığı (kullanıcı ayarladıysa dokunulmaz).
for (const [key, plan] of Object.entries(COUNT_PLANS))
await StockCategoryModel.updateOne(
{ householdId, defaultKey: key, countEveryDays: null },
{ $set: { countEveryDays: plan.everyDays } },
);
const cats = await StockCategoryModel.find({ householdId, defaultKey: { $type: "string" } })
.select({ defaultKey: 1 })
.lean<{ _id: Types.ObjectId; defaultKey: string }[]>();
const catByKey = new Map(cats.map((c) => [c.defaultKey, c._id]));
const today = todayIstanbul();
let created = 0;
for (const p of PRODUCTS) {
if (await ProductTypeModel.exists({ householdId, seedRef: p.ref })) continue;
const doc = await ProductTypeModel.create({
householdId,
categoryId: catByKey.get(p.category)!,
name: p.name,
nameKey: foldTr(p.name),
unit: p.unit,
targetQuantity: p.target,
thresholdPct: p.threshold ?? 20,
location: p.location,
step: p.step ?? K,
seedRef: p.ref,
createdBy: actor,
updatedBy: actor,
});
const base = Date.now() - START_DAYS_AGO * 86_400_000;
const { rows, counts } = simulate(p, today);
// Sayım oturumu kategori başına ortak: ürün satırı oturuma eklenir.
const root = p.category.split(".")[0]!;
const countIds = new Map<number, Types.ObjectId>();
for (const c of counts) {
const session = await StockCountModel.findOneAndUpdate(
{ householdId, seedRef: `${root}:${c.daysAgo}` },
{
$setOnInsert: {
householdId,
date: addDays(today, -c.daysAgo),
categoryId: catByKey.get(root) ?? null,
note: "",
seedRef: `${root}:${c.daysAgo}`,
createdBy: actor,
},
$push: {
items: { productTypeId: doc._id, expected: c.expected, actual: c.actual, wasted: 0 },
},
},
{ upsert: true, returnDocument: "after" },
).lean<{ _id: Types.ObjectId }>();
countIds.set(c.daysAgo, session!._id);
}
// Ham ekleme: aynı tarihli hareketlerin sırası (createdAt) korunur.
await StockMovementModel.collection.insertMany(
rows.map((r, i) => {
const at = new Date(base + i * 1000);
return {
householdId,
productTypeId: doc._id,
kind: r.kind,
date: addDays(today, -r.daysAgo),
quantity: r.quantity,
wasteReason: r.wasteReason ?? null,
expiryDate: r.expiryDate ?? null,
note: r.note ?? "",
initial: r.initial ?? false,
countId: r.countDaysAgo === undefined ? null : (countIds.get(r.countDaysAgo) ?? null),
deletedAt: null,
seedRef: `${p.ref}:${i}`,
createdBy: actor,
createdAt: at,
updatedAt: at,
};
}),
);
created++;
}
return created;
}
+36
View File
@@ -0,0 +1,36 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AssetDetailView } from "@/features/assets/components/asset-detail-view";
import { PeriodReportView } from "@/features/assets/components/period-report";
import {
getAsset,
getPeriodReport,
REPORT_RANGES,
type ReportRange,
} from "@/features/assets/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.assets.history };
/** /birikim/:id — varlık hareketleri ve dönemsel rapor (gizli varlık yalnızca sahibine; aksi 404). */
export default async function AssetPage({ params, searchParams }: PageProps<"/birikim/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const { id } = await params;
const donem = (await searchParams).donem;
const range: ReportRange = REPORT_RANGES.includes(donem as ReportRange)
? (donem as ReportRange)
: "6";
const [data, report] = await Promise.all([
getAsset(user.id, household.id, id),
getPeriodReport(user.id, household.id, range, id),
]);
if (!data || !report) notFound();
return (
<AssetDetailView
key={id}
data={data}
report={<PeriodReportView report={report} range={range} basePath={`/birikim/${id}`} />}
/>
);
}
+46
View File
@@ -0,0 +1,46 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { AssetsView } from "@/features/assets/components/assets-view";
import { PeriodReportView } from "@/features/assets/components/period-report";
import {
getPeriodReport,
listAssets,
REPORT_RANGES,
type ReportRange,
} from "@/features/assets/service";
import { NetWorthCard } from "@/features/net-worth/components/net-worth-card";
import { getNetWorth } from "@/features/net-worth/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.assets.title };
function parseRange(value: string | string[] | undefined): ReportRange {
return REPORT_RANGES.includes(value as ReportRange) ? (value as ReportRange) : "6";
}
/** /birikim — net varlık, varlıklar (ortalama maliyet, K/Z) ve dönemsel rapor. */
export default async function AssetsPage({ searchParams }: PageProps<"/birikim">) {
const { user, household } = await requireActiveHousehold("viewer");
const range = parseRange((await searchParams).donem);
const [data, report, netWorth] = await Promise.all([
listAssets(user.id, household.id),
getPeriodReport(user.id, household.id, range),
getNetWorth(user.id, household.id),
]);
if (!data || !report || !netWorth) notFound();
return (
<>
<PageHeader title={tr.assets.title} description={tr.assets.description} />
<section aria-labelledby="net-worth-title" className="flex flex-col gap-2">
<h2 id="net-worth-title" className="text-base font-medium">
{tr.assets.netWorth.title}
</h2>
<NetWorthCard data={netWorth} />
</section>
<AssetsView items={data.items} totals={data.totals} canWrite={data.canWrite} />
<PeriodReportView report={report} range={range} basePath="/birikim" />
</>
);
}
+43
View File
@@ -0,0 +1,43 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
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 { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { budgetMonthSchema } from "@/shared/schemas/budget";
export const metadata: Metadata = { title: tr.budget.title };
/** /butce?ay=YYYY-MM — aylık bütçe (varsayılan: içinde bulunulan bütçe ayı). */
export default async function BudgetPage({ searchParams }: PageProps<"/butce">) {
const { user, household } = await requireActiveHousehold("viewer");
const ay = budgetMonthSchema.safeParse((await searchParams).ay);
const data = await getBudget(user.id, household.id, ay.success ? ay.data : undefined);
if (!data) notFound();
const income = await getIncomePlan(user.id, household.id, data.month);
if (!income) notFound();
const monthLabel = new Intl.DateTimeFormat("tr-TR", {
month: "long",
year: "numeric",
timeZone: "Europe/Istanbul",
}).format(new Date(`${data.month}-15T12:00:00+03:00`));
return (
<>
<PageHeader title={tr.budget.title} description={tr.budget.description} />
<BudgetView key={data.month} data={data} />
<IncomePlanSection
key={`income-${data.month}`}
month={data.month}
monthLabel={monthLabel}
income={income}
limitMinor={data.totals.limitMinor}
forecastMinor={data.totals.forecastMinor}
hasBudget={data.hasBudget}
canWrite={data.canWrite}
/>
</>
);
}
+21
View File
@@ -0,0 +1,21 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ContactStatementView } from "@/features/contacts/components/contact-statement-view";
import { getContactStatement } from "@/features/contacts/service";
import { listInKind } from "@/features/in-kind/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.contacts.statement };
/** /cari/:id — cari ekstresi (gizli cari yalnızca sahibine; aksi 404). */
export default async function ContactPage({ params }: PageProps<"/cari/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const { id } = await params;
const [data, inKind] = await Promise.all([
getContactStatement(user.id, household.id, id),
listInKind(user.id, household.id, id),
]);
if (!data) notFound();
return <ContactStatementView key={id} data={data} inKind={inKind ?? []} />;
}
+30
View File
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { ContactsView } from "@/features/contacts/components/contacts-view";
import { listContacts } from "@/features/contacts/service";
import { openInKindByContact } from "@/features/in-kind/service";
import { hasHouseholdRole } from "@/features/households/roles";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.contacts.title };
export default async function ContactsPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [data, inKind] = await Promise.all([
listContacts(user.id, household.id),
openInKindByContact(user.id, household.id),
]);
if (!data) notFound();
return (
<>
<PageHeader title={tr.contacts.title} description={tr.contacts.description} />
<ContactsView
data={data}
inKind={Object.fromEntries(inKind)}
canWrite={hasHouseholdRole(household.role, "member")}
/>
</>
);
}
+55 -12
View File
@@ -1,9 +1,17 @@
import type { Metadata } from "next";
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 { 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";
import { getIncomePlan } from "@/features/budgets/plan";
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 { LowStockCard } from "@/features/stock/components/low-stock-card";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { cn } from "@/lib/utils";
@@ -15,22 +23,37 @@ type SummaryCard = {
key: keyof typeof tr.dashboard.cards;
tone?: string;
amountMinor: number | null;
href?: string;
};
/** FAZ 14: gerçek özet verisi (gelir, gider, bakiye, kart borcu, net varlık). */
async function getSummary(): Promise<SummaryCard[]> {
/**
* Özet kartları (içinde bulunulan bütçe ayı): gerçekleşen gelir, gider ve farkı; hesap bakiyesi,
* kart borcu ve net varlık.
*/
async function getSummary(userId: string, householdId: string): Promise<SummaryCard[]> {
const [nw, budget] = await Promise.all([
getNetWorth(userId, householdId),
getBudget(userId, householdId),
]);
const income = budget ? await getIncomePlan(userId, householdId, budget.month) : null;
const inc = income?.actualMinor ?? null;
const exp = budget?.totals.actualMinor ?? null;
return [
{ key: "monthIncome", tone: "text-income", amountMinor: null },
{ key: "monthExpense", tone: "text-expense", amountMinor: null },
{ key: "monthRemaining", tone: "text-budget", amountMinor: null },
{ key: "totalBalance", amountMinor: null },
{ key: "cardDebt", tone: "text-expense", amountMinor: null },
{ key: "netWorth", amountMinor: null },
{ key: "monthIncome", tone: "text-income", amountMinor: inc, href: "/butce" },
{ key: "monthExpense", tone: "text-expense", amountMinor: exp, href: "/butce" },
{
key: "monthRemaining",
tone: "text-budget",
amountMinor: inc !== null && exp !== null ? inc - exp : null,
},
{ key: "totalBalance", amountMinor: nw?.accountsMinor ?? null, href: "/hesaplar" },
{ key: "cardDebt", tone: "text-expense", amountMinor: nw?.cardDebtMinor ?? null },
{ key: "netWorth", amountMinor: nw?.totalMinor ?? null, href: "/birikim" },
];
}
async function SummaryCards() {
const cards = await getSummary();
async function SummaryCards({ userId, householdId }: { userId: string; householdId: string }) {
const cards = await getSummary(userId, householdId);
return (
<div className="grid grid-cols-2 gap-3 lg:grid-cols-3 xl:grid-cols-6">
{cards.map((c) => (
@@ -38,7 +61,15 @@ async function SummaryCards() {
<CardHeader>
<CardDescription>{tr.dashboard.cards[c.key]}</CardDescription>
<CardTitle className={cn("text-lg tabular-nums", c.tone)}>
{c.amountMinor === null ? "—" : formatMoney(c.amountMinor)}
{c.amountMinor === null ? (
"—"
) : c.href ? (
<Link href={c.href} className="hover:underline">
{formatMoney(c.amountMinor)}
</Link>
) : (
formatMoney(c.amountMinor)
)}
</CardTitle>
</CardHeader>
{c.amountMinor === null ? (
@@ -63,8 +94,20 @@ export default async function DashboardPage() {
<Suspense fallback={null}>
<OverdueBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<BudgetWarningBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<ContactsDueBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={<SummaryCardsSkeleton />}>
<SummaryCards />
<SummaryCards userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<DailyPlanCard userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<LowStockCard userId={user.id} householdId={household.id} />
</Suspense>
</>
);
+22
View File
@@ -0,0 +1,22 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { PricesView } from "@/features/in-kind/components/prices-view";
import { listPrices } from "@/features/in-kind/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.prices.title };
/** /fiyatlar — altın ve döviz fiyat tablosu (elle; Faz 9 varlık takibi de kullanır). */
export default async function PricesPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await listPrices(user.id, household.id);
if (!data) notFound();
return (
<>
<PageHeader title={tr.prices.title} description={tr.prices.description} />
<PricesView rows={data.rows} canWrite={data.canWrite} />
</>
);
}
+25
View File
@@ -0,0 +1,25 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { StoresView } from "@/features/stores/components/stores-view";
import { listStores } from "@/features/stores/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stores.title };
/** /magazalar — marketler, online platformlar ve pazarlar; uzaklık, taşıma ve zahmet skoru. */
export default async function StoresPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await listStores(user.id, household.id);
if (!data) notFound();
return (
<>
<PageHeader title={tr.stores.title} description={tr.stores.description} />
{!data.canWrite ? (
<p className="text-sm text-muted-foreground">{tr.stores.readOnly}</p>
) : null}
<StoresView stores={data.stores} canWrite={data.canWrite} />
</>
);
}
+43
View File
@@ -0,0 +1,43 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { TypePriceComparison } from "@/features/prices/components/type-price-comparison";
import { getTypePriceComparison } from "@/features/prices/service";
import { ProductsSection } from "@/features/products/components/products-section";
import { listProducts, listProductTypeOptions } from "@/features/products/service";
import { ProductDetailView } from "@/features/stock/components/product-detail-view";
import { getProductType, getStockOptions } from "@/features/stock/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stock.detail.movements };
/** /stok/:id — ürün tipi: mevcut durum, partiler ve hareketler (başka hanenin kaydı → 404). */
export default async function ProductTypePage({ params }: PageProps<"/stok/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const { id } = await params;
const [data, options, products, types, prices] = await Promise.all([
getProductType(user.id, household.id, id),
getStockOptions(user.id, household.id),
listProducts(user.id, household.id, { productTypeId: id, includeArchived: true }),
listProductTypeOptions(user.id, household.id),
getTypePriceComparison(user.id, household.id, id),
]);
if (!data || !options || !products || !types || !prices) notFound();
return (
<ProductDetailView
data={data}
categories={options.categories}
products={
<>
<TypePriceComparison data={prices} />
<ProductsSection
productTypeId={data.id}
products={products.products}
types={types}
canWrite={products.canWrite}
/>
</>
}
/>
);
}
+16
View File
@@ -0,0 +1,16 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { StockAnalysisView } from "@/features/stock/components/stock-analysis-view";
import { getStockAnalysis } from "@/features/stock/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stock.analysis.title };
/** /stok/analiz — ürün tipi başına aylık ortalama tüketim ve fire. */
export default async function StockAnalysisPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await getStockAnalysis(user.id, household.id);
if (!data) notFound();
return <StockAnalysisView data={data} />;
}
+29
View File
@@ -0,0 +1,29 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { StockCategoriesManager } from "@/features/stock/components/stock-categories-manager";
import { getStockOptions, listStockCategories } from "@/features/stock/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stock.categories.title };
/** /stok/kategoriler — stok kategori ağacı, gider eşlemesi ve sayım sıklığı. */
export default async function StockCategoriesPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [data, options] = await Promise.all([
listStockCategories(user.id, household.id),
getStockOptions(user.id, household.id),
]);
if (!data || !options) notFound();
return (
<>
<PageHeader title={tr.stock.categories.title} description={tr.stock.categories.description} />
<StockCategoriesManager
categories={data.categories}
expenseCategories={options.expenseCategories}
canWrite={data.canWrite}
/>
</>
);
}
+26
View File
@@ -0,0 +1,26 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { StockView } from "@/features/stock/components/stock-view";
import { getStock, getStockOptions } from "@/features/stock/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stock.title };
/** /stok — ev stoğu: özet, alınması önerilenler, SKT uyarıları, kategoriye göre ürünler. */
export default async function StockPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [data, options] = await Promise.all([
getStock(user.id, household.id),
getStockOptions(user.id, household.id),
]);
if (!data || !options) notFound();
return (
<>
<PageHeader title={tr.stock.title} description={tr.stock.description} />
{!data.canWrite ? <p className="text-sm text-muted-foreground">{tr.stock.readOnly}</p> : null}
<StockView data={data} options={options.categories} />
</>
);
}
+19
View File
@@ -0,0 +1,19 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { CountSheet } from "@/features/stock/components/count-sheet";
import { getCountSheet } from "@/features/stock/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.stock.count.title };
/** /stok/sayim?kategori=<id> — periyodik sayım: beklenen → sayılan (kategori alt ağacıyla). */
export default async function StockCountPage({ searchParams }: PageProps<"/stok/sayim">) {
const { user, household } = await requireActiveHousehold("viewer");
const sp = await searchParams;
const kategori =
typeof sp.kategori === "string" && /^[a-f0-9]{24}$/i.test(sp.kategori) ? sp.kategori : null;
const data = await getCountSheet(user.id, household.id, kategori);
if (!data) notFound();
return <CountSheet key={`${kategori ?? "all"}-${data.today}`} data={data} />;
}
+17
View File
@@ -0,0 +1,17 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ProductPriceView } from "@/features/prices/components/product-price-view";
import { getProductPrices } from "@/features/prices/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.products.title };
/** /stok/urunler/:id — ürün (marka/paket): mağaza fiyatları, birim fiyat, fiyat geçmişi. */
export default async function ProductPage({ params }: PageProps<"/stok/urunler/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const { id } = await params;
const data = await getProductPrices(user.id, household.id, id);
if (!data) notFound();
return <ProductPriceView data={data} />;
}
+19
View File
@@ -0,0 +1,19 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { ProductsCatalog } from "@/features/products/components/products-catalog";
import { listProducts, listProductTypeOptions } from "@/features/products/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.products.title };
/** /stok/urunler — ürün kataloğu (marka/paket), ürün tipine göre gruplu. */
export default async function ProductsPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [data, types] = await Promise.all([
listProducts(user.id, household.id, { includeArchived: true }),
listProductTypeOptions(user.id, household.id),
]);
if (!data || !types) notFound();
return <ProductsCatalog products={data.products} types={types} canWrite={data.canWrite} />;
}
+29
View File
@@ -31,6 +31,14 @@
--color-chart-3: var(--chart-3);
--color-chart-2: var(--chart-2);
--color-chart-1: var(--chart-1);
--color-series-1: var(--series-1);
--color-series-2: var(--series-2);
--color-series-3: var(--series-3);
--color-series-4: var(--series-4);
--color-series-5: var(--series-5);
--color-series-6: var(--series-6);
--color-series-7: var(--series-7);
--color-series-8: var(--series-8);
--color-ring: var(--ring);
--color-input: var(--input);
--color-border: var(--border);
@@ -95,6 +103,17 @@
--chart-3: var(--expense);
--chart-4: var(--warning);
--chart-5: oklch(0.65 0.08 230);
/* Kategorik seriler (mağaza vb. kimlik; sabit sıra, döngü yok). dataviz doğrulayıcısından
geçti (açık: kart #fff; 3 yuva 3:1 altında → lejant + tablo zorunlu). */
--series-1: #2a78d6;
--series-2: #eb6834;
--series-3: #1baf7a;
--series-4: #eda100;
--series-5: #e87ba4;
--series-6: #008300;
--series-7: #6250d6;
--series-8: #e34948;
--radius: 0.625rem;
/* Kullanıcı verisi renkleri (kategori/hesap): anahtar → değişken (shared/appearance.ts) */
@@ -156,6 +175,16 @@
--chart-4: var(--warning);
--chart-5: oklch(0.7 0.07 230);
/* Koyu yüzey (#101a2f) için aynı tonların koyu adımları; hepsi ≥ 3:1. */
--series-1: #3987e5;
--series-2: #d95926;
--series-3: #199e70;
--series-4: #c98500;
--series-5: #d55181;
--series-6: #008300;
--series-7: #9085e9;
--series-8: #e66767;
--swatch-blue: oklch(0.74 0.13 258);
--swatch-sky: oklch(0.74 0.13 230);
--swatch-teal: oklch(0.74 0.13 185);
+7 -5
View File
@@ -8,6 +8,7 @@ import {
Package,
Settings,
ShoppingCart,
Store,
Tags,
Target,
UserCog,
@@ -27,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 = 7.2;
export const CURRENT_PHASE = 12.2;
export const isAvailable = (item: NavItem) => item.phase <= CURRENT_PHASE;
@@ -37,10 +38,11 @@ export const MAIN_NAV: NavItem[] = [
{ href: "/hesaplar", label: tr.nav.accounts, icon: Wallet, phase: 6.1 },
{ href: "/kategoriler", label: tr.nav.categories, icon: Tags, phase: 6.1 },
{ href: "/planli", label: tr.nav.planned, icon: CalendarClock, phase: 7.1 },
{ href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8 },
{ href: "/birikim", label: tr.nav.savings, icon: Coins, phase: 9 },
{ href: "/butce", label: tr.nav.budget, icon: Target, phase: 10 },
{ href: "/stok", label: tr.nav.stock, icon: Package, phase: 11 },
{ href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8.1 },
{ href: "/birikim", label: tr.nav.savings, icon: Coins, phase: 9.1 },
{ 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: "/ayarlar", label: tr.nav.settings, icon: Settings, phase: 5 },
+1 -1
View File
@@ -5,7 +5,7 @@ export function PageHeader({
actions,
}: {
title: string;
description?: string;
description?: React.ReactNode;
actions?: React.ReactNode;
}) {
return (
+338
View File
@@ -0,0 +1,338 @@
"use client";
import * as React from "react";
import { cn } from "@/lib/utils";
import * as RechartsPrimitive from "recharts";
import type { TooltipValueType } from "recharts";
// Format: { THEME_NAME: CSS_SELECTOR }
const THEMES = { light: "", dark: ".dark" } as const;
const INITIAL_DIMENSION = { width: 320, height: 200 } as const;
type TooltipNameType = number | string;
export type ChartConfig = Record<
string,
{
label?: React.ReactNode;
icon?: React.ComponentType;
} & (
| { color?: string; theme?: never }
| { color?: never; theme: Record<keyof typeof THEMES, string> }
)
>;
type ChartContextProps = {
config: ChartConfig;
};
const ChartContext = React.createContext<ChartContextProps | null>(null);
function useChart() {
const context = React.useContext(ChartContext);
if (!context) {
throw new Error("useChart must be used within a <ChartContainer />");
}
return context;
}
function ChartContainer({
id,
className,
children,
config,
initialDimension = INITIAL_DIMENSION,
...props
}: React.ComponentProps<"div"> & {
config: ChartConfig;
children: React.ComponentProps<typeof RechartsPrimitive.ResponsiveContainer>["children"];
initialDimension?: {
width: number;
height: number;
};
}) {
const uniqueId = React.useId();
const chartId = `chart-${id ?? uniqueId.replace(/:/g, "")}`;
return (
<ChartContext.Provider value={{ config }}>
<div
data-slot="chart"
data-chart={chartId}
className={cn(
"flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-hidden [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border [&_.recharts-sector]:outline-hidden [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-surface]:outline-hidden",
className,
)}
{...props}
>
<ChartStyle id={chartId} config={config} />
<RechartsPrimitive.ResponsiveContainer initialDimension={initialDimension}>
{children}
</RechartsPrimitive.ResponsiveContainer>
</div>
</ChartContext.Provider>
);
}
const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
const colorConfig = Object.entries(config).filter(([, config]) => config.theme ?? config.color);
if (!colorConfig.length) {
return null;
}
return (
<style
dangerouslySetInnerHTML={{
__html: Object.entries(THEMES)
.map(
([theme, prefix]) => `
${prefix} [data-chart=${id}] {
${colorConfig
.map(([key, itemConfig]) => {
const color = itemConfig.theme?.[theme as keyof typeof itemConfig.theme] ?? itemConfig.color;
return color ? ` --color-${key}: ${color};` : null;
})
.join("\n")}
}
`,
)
.join("\n"),
}}
/>
);
};
const ChartTooltip = RechartsPrimitive.Tooltip;
function ChartTooltipContent({
active,
payload,
className,
indicator = "dot",
hideLabel = false,
hideIndicator = false,
label,
labelFormatter,
labelClassName,
formatter,
color,
nameKey,
labelKey,
}: React.ComponentProps<typeof RechartsPrimitive.Tooltip> &
React.ComponentProps<"div"> & {
hideLabel?: boolean;
hideIndicator?: boolean;
indicator?: "line" | "dot" | "dashed";
nameKey?: string;
labelKey?: string;
} & Omit<
RechartsPrimitive.DefaultTooltipContentProps<TooltipValueType, TooltipNameType>,
"accessibilityLayer"
>) {
const { config } = useChart();
const tooltipLabel = React.useMemo(() => {
if (hideLabel || !payload?.length) {
return null;
}
const [item] = payload;
const key = `${labelKey ?? item?.dataKey ?? item?.name ?? "value"}`;
const itemConfig = getPayloadConfigFromPayload(config, item, key);
const value =
!labelKey && typeof label === "string" ? (config[label]?.label ?? label) : itemConfig?.label;
if (labelFormatter) {
return (
<div className={cn("font-medium", labelClassName)}>{labelFormatter(value, payload)}</div>
);
}
if (!value) {
return null;
}
return <div className={cn("font-medium", labelClassName)}>{value}</div>;
}, [label, labelFormatter, payload, hideLabel, labelClassName, config, labelKey]);
if (!active || !payload?.length) {
return null;
}
const nestLabel = payload.length === 1 && indicator !== "dot";
return (
<div
className={cn(
"grid min-w-32 items-start gap-1.5 rounded-lg border border-border/50 bg-background px-2.5 py-1.5 text-xs shadow-xl",
className,
)}
>
{!nestLabel ? tooltipLabel : null}
<div className="grid gap-1.5">
{payload
.filter((item) => item.type !== "none")
.map((item, index) => {
const key = `${nameKey ?? item.name ?? item.dataKey ?? "value"}`;
const itemConfig = getPayloadConfigFromPayload(config, item, key);
const indicatorColor = color ?? item.payload?.fill ?? item.color;
return (
<div
key={index}
className={cn(
"flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5 [&>svg]:text-muted-foreground",
indicator === "dot" && "items-center",
)}
>
{formatter && item?.value !== undefined && item.name ? (
formatter(item.value, item.name, item, index, item.payload)
) : (
<>
{itemConfig?.icon ? (
<itemConfig.icon />
) : (
!hideIndicator && (
<div
className={cn(
"shrink-0 rounded-[2px] border-(--color-border) bg-(--color-bg)",
{
"h-2.5 w-2.5": indicator === "dot",
"w-1": indicator === "line",
"w-0 border-[1.5px] border-dashed bg-transparent":
indicator === "dashed",
"my-0.5": nestLabel && indicator === "dashed",
},
)}
style={
{
"--color-bg": indicatorColor,
"--color-border": indicatorColor,
} as React.CSSProperties
}
/>
)
)}
<div
className={cn(
"flex flex-1 justify-between leading-none",
nestLabel ? "items-end" : "items-center",
)}
>
<div className="grid gap-1.5">
{nestLabel ? tooltipLabel : null}
<span className="text-muted-foreground">
{itemConfig?.label ?? item.name}
</span>
</div>
{item.value != null && (
<span className="font-mono font-medium text-foreground tabular-nums">
{typeof item.value === "number"
? item.value.toLocaleString()
: String(item.value)}
</span>
)}
</div>
</>
)}
</div>
);
})}
</div>
</div>
);
}
const ChartLegend = RechartsPrimitive.Legend;
function ChartLegendContent({
className,
hideIcon = false,
payload,
verticalAlign = "bottom",
nameKey,
}: React.ComponentProps<"div"> & {
hideIcon?: boolean;
nameKey?: string;
} & RechartsPrimitive.DefaultLegendContentProps) {
const { config } = useChart();
if (!payload?.length) {
return null;
}
return (
<div
className={cn(
"flex items-center justify-center gap-4",
verticalAlign === "top" ? "pb-3" : "pt-3",
className,
)}
>
{payload
.filter((item) => item.type !== "none")
.map((item, index) => {
const key = `${nameKey ?? item.dataKey ?? "value"}`;
const itemConfig = getPayloadConfigFromPayload(config, item, key);
return (
<div
key={index}
className={cn(
"flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-muted-foreground",
)}
>
{itemConfig?.icon && !hideIcon ? (
<itemConfig.icon />
) : (
<div
className="h-2 w-2 shrink-0 rounded-[2px]"
style={{
backgroundColor: item.color,
}}
/>
)}
{itemConfig?.label}
</div>
);
})}
</div>
);
}
function getPayloadConfigFromPayload(config: ChartConfig, payload: unknown, key: string) {
if (typeof payload !== "object" || payload === null) {
return undefined;
}
const payloadPayload =
"payload" in payload && typeof payload.payload === "object" && payload.payload !== null
? payload.payload
: undefined;
let configLabelKey: string = key;
if (key in payload && typeof payload[key as keyof typeof payload] === "string") {
configLabelKey = payload[key as keyof typeof payload] as string;
} else if (
payloadPayload &&
key in payloadPayload &&
typeof payloadPayload[key as keyof typeof payloadPayload] === "string"
) {
configLabelKey = payloadPayload[key as keyof typeof payloadPayload] as string;
}
return configLabelKey in config ? config[configLabelKey] : config[key];
}
export {
ChartContainer,
ChartTooltip,
ChartTooltipContent,
ChartLegend,
ChartLegendContent,
ChartStyle,
};
+87
View File
@@ -0,0 +1,87 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import { assetFormSchema, movementFormSchema } from "@/shared/schemas/asset";
import {
addMovement,
createAsset,
deleteAsset,
deleteMovement,
listAssets,
updateAsset,
} 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>(
schema: z.ZodType<T>,
input: unknown,
fn: (userId: string, householdId: string, data: T) => Promise<ActionResult<unknown>>,
): Promise<ActionResult<unknown>> {
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;
}
/** Yeni varlık (assetId boş) veya mevcut varlığı düzenle. */
export async function saveAssetAction(assetId: unknown, input: unknown) {
if (assetId) {
const id = idSchema.safeParse(assetId);
if (!id.success) return fail(tr.common.notFound);
return run(assetFormSchema, input, (u, h, d) => updateAsset(u, h, id.data, d));
}
return run(assetFormSchema, input, createAsset);
}
export async function deleteAssetAction(assetId: unknown) {
const id = idSchema.safeParse(assetId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => deleteAsset(u, h, id.data));
}
export async function addMovementAction(assetId: unknown, input: unknown) {
const id = idSchema.safeParse(assetId);
if (!id.success) return fail(tr.common.notFound);
return run(movementFormSchema, input, (u, h, d) => addMovement(u, h, id.data, d));
}
export async function deleteMovementAction(movementId: unknown) {
const id = idSchema.safeParse(movementId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => deleteMovement(u, h, id.data));
}
export type AssetOption = { id: string; name: string; assetKey: string; quantity: number };
/** Aynî ödeme diyaloğu için görünür varlıklar (ad, tür, eldeki miktar). */
export async function getAssetOptionsAction(): Promise<ActionResult<AssetOption[]>> {
const ctx = await getHouseholdActionContext("viewer");
if (!ctx) return fail(tr.common.unauthorized);
const data = await listAssets(ctx.user.id, ctx.household.id);
if (!data) return fail(tr.common.unauthorized);
return ok(
data.items.map((a) => ({
id: a.id,
name: a.name,
assetKey: a.assetKey,
quantity: a.summary.quantity,
})),
);
}
@@ -0,0 +1,316 @@
"use client";
import {
ArrowLeft,
EllipsisVertical,
Gift,
HandCoins,
Lock,
Pencil,
ShoppingBag,
Trash2,
} from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { toast } from "sonner";
import { PageHeader } from "@/components/page-header";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { tr } from "@/i18n/tr";
import { ASSETS, formatAssetQuantity } from "@/shared/assets";
import { formatDate, formatMoney } from "@/shared/format";
import { isInflow, type MovementKind } from "@/shared/portfolio";
import { deleteAssetAction, deleteMovementAction } from "../actions";
import type { AssetDetail, MovementRow } from "../service";
import { AssetFormDialog, MovementDialog } from "./asset-dialogs";
import { ProfitLoss, Stat } from "./assets-view";
const t = tr.assets;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
type Pending =
| { kind: "edit" }
| { kind: "movement"; movement: MovementKind }
| { kind: "deleteMovement"; row: MovementRow }
| { kind: "deleteAsset" }
| null;
/** /birikim/:id — özet, hareket ekleme ve hareket geçmişi. */
export function AssetDetailView({
data,
report,
}: {
data: AssetDetail;
/** Dönemsel rapor (sunucuda hazırlanır). */
report?: React.ReactNode;
}) {
const router = useRouter();
const [pending, setPending] = useState<Pending>(null);
const close = () => setPending(null);
const s = data.summary;
const unit = ASSETS[data.assetKey].unit;
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/birikim">
<ArrowLeft />
{t.back}
</Link>
</Button>
<PageHeader
title={data.name}
description={ASSETS[data.assetKey].label}
actions={
data.canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon" variant="outline" aria-label={tr.recurring.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={() => setPending({ kind: "edit" })}>
<Pencil />
{tr.common.edit}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
disabled={data.movementCount > 0}
onSelect={() => setPending({ kind: "deleteAsset" })}
>
<Trash2 />
{t.delete}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null
}
/>
{data.isPrivate ? (
<Badge variant="outline" className="-mt-2 w-fit gap-1">
<Lock className="size-3" />
{t.privateBadge}
</Badge>
) : null}
<Card size="sm">
<CardContent className="flex flex-col gap-3">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={t.stats.quantity}>{formatAssetQuantity(data.assetKey, s.quantity)}</Stat>
<Stat label={t.stats.avgCost}>
{s.avgCostMinor !== null
? `${formatMoney(s.avgCostMinor)} ${t.stats.perUnit(unit)}`
: "—"}
</Stat>
<Stat label={t.stats.cost}>{formatMoney(s.costMinor)}</Stat>
<Stat label={t.stats.currentValue}>
{s.currentValueMinor !== null ? formatMoney(s.currentValueMinor) : t.stats.noPrice}
</Stat>
<Stat label={t.stats.unrealized}>
<ProfitLoss minor={s.unrealizedMinor} bp={s.unrealizedBp} />
</Stat>
<Stat label={t.stats.realized}>
<ProfitLoss minor={s.realizedMinor} />
</Stat>
<Stat label={t.stats.invested}>{formatMoney(s.investedMinor)}</Stat>
<Stat label={t.stats.proceeds}>{formatMoney(s.proceedsMinor)}</Stat>
</div>
{data.price ? (
<p className="text-xs text-muted-foreground">
{t.stats.price(formatMoney(data.price.buyMinor), d(data.price.date))} ·{" "}
<Link href="/fiyatlar" className="underline-offset-2 hover:underline">
{t.prices}
</Link>
</p>
) : null}
{data.storage ? (
<p className="text-sm">
<span className="text-muted-foreground">{t.movement.storage}:</span> {data.storage}
</p>
) : null}
{data.note ? <p className="text-sm text-muted-foreground">{data.note}</p> : null}
{data.canWrite ? (
<div className="flex flex-wrap justify-end gap-2">
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "movement", movement: "gift_in" })}
>
<Gift />
{t.kinds.gift_in}
</Button>
{s.quantity > 0 ? (
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "movement", movement: "sell" })}
>
<HandCoins />
{t.kinds.sell}
</Button>
) : null}
<Button size="sm" onClick={() => setPending({ kind: "movement", movement: "buy" })}>
<ShoppingBag />
{t.kinds.buy}
</Button>
</div>
) : null}
</CardContent>
</Card>
{report}
<section className="flex flex-col gap-2" aria-labelledby="movements-title">
<h2 id="movements-title" className="text-base font-medium">
{t.history}
</h2>
{data.movements.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.noMovements}
</p>
) : (
<ul className="divide-y rounded-xl border bg-card">
{data.movements.map((row) => (
<MovementItem
key={row.id}
row={row}
data={data}
canWrite={data.canWrite}
onDelete={() => setPending({ kind: "deleteMovement", row })}
/>
))}
</ul>
)}
</section>
{pending?.kind === "edit" ? <AssetFormDialog item={data} onClose={close} /> : null}
{pending?.kind === "movement" ? (
<MovementDialog item={data} initialKind={pending.movement} onClose={close} />
) : null}
<AlertDialog
open={pending?.kind === "deleteMovement" || pending?.kind === "deleteAsset"}
onOpenChange={(o) => !o && close()}
>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{pending?.kind === "deleteAsset" ? t.deleteTitle : t.deleteMovementTitle}
</AlertDialogTitle>
<AlertDialogDescription>
{pending?.kind === "deleteAsset" ? t.deleteDescription : t.deleteMovementDescription}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
if (pending?.kind === "deleteAsset") {
const r = await deleteAssetAction(data.id);
close();
if (r.ok) {
toast.success(t.toast.deleted);
router.push("/birikim");
} else toast.error(r.error);
} else if (pending?.kind === "deleteMovement") {
const r = await deleteMovementAction(pending.row.id);
close();
if (r.ok) toast.success(t.toast.movementDeleted);
else toast.error(r.error);
}
}}
>
{pending?.kind === "deleteAsset" ? t.delete : t.deleteMovement}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
function MovementItem({
row,
data,
canWrite,
onDelete,
}: {
row: MovementRow;
data: AssetDetail;
canWrite: boolean;
onDelete: () => void;
}) {
const inflow = isInflow(row.kind);
const qty = formatAssetQuantity(data.assetKey, row.quantity);
const unit = ASSETS[data.assetKey].unit;
return (
<li className="flex items-start gap-3 p-3">
<div className="min-w-0 flex-1">
<p className="flex flex-wrap items-center gap-x-2 text-sm font-medium">
<span>{t.kinds[row.kind]}</span>
<span className={inflow ? "text-income" : "text-expense"}>
{inflow ? "+" : "−"}
{qty}
</span>
</p>
<p className="text-xs text-muted-foreground">
{d(row.date)}
{row.unitPriceMinor !== null
? ` · ${formatMoney(row.unitPriceMinor)} ${t.stats.perUnit(unit)}`
: ""}
{row.account ? ` · ${row.account}` : ""}
{row.storage ? ` · ${row.storage}` : ""}
</p>
{row.note ? <p className="text-xs text-muted-foreground">{row.note}</p> : null}
<p className="text-xs text-muted-foreground">
{t.table.balance}: {formatAssetQuantity(data.assetKey, row.quantityAfter)}
</p>
</div>
<div className="flex shrink-0 flex-col items-end text-sm">
{row.kind !== "gift_out" ? (
<span className="tabular-nums">{formatMoney(row.amountMinor)}</span>
) : (
<span className="text-xs text-muted-foreground tabular-nums">
{t.stats.cost} {formatMoney(row.costOutMinor)}
</span>
)}
{row.kind === "sell" ? (
<span className="text-xs">
{t.table.result}: <ProfitLoss minor={row.realizedMinor} />
</span>
) : null}
</div>
{canWrite && !row.fromInKind ? (
<Button
size="icon-sm"
variant="ghost"
aria-label={t.deleteMovement}
onClick={onDelete}
className="shrink-0"
>
<Trash2 />
</Button>
) : null}
</li>
);
}
@@ -0,0 +1,315 @@
"use client";
import { useState } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
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 {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { useAccounts } from "@/features/in-kind/components/in-kind-section";
import { tr } from "@/i18n/tr";
import { ASSET_KEYS, ASSETS, formatAssetQuantity, type AssetKey } from "@/shared/assets";
import { todayIstanbul } from "@/shared/dates";
import { MOVEMENT_KINDS, type MovementKind } from "@/shared/portfolio";
import { addMovementAction, saveAssetAction } from "../actions";
import type { AssetView } from "../service";
const t = tr.assets;
type Errors = Record<string, string | undefined>;
const NONE = "__none__";
function Footer({ busy, formId, onClose }: { busy: boolean; formId: string; onClose: () => void }) {
return (
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form={formId} disabled={busy}>
{tr.common.save}
</Button>
</>
);
}
/** Yeni varlık / varlığı düzenle. */
export function AssetFormDialog({
item,
onClose,
onCreated,
}: {
item: AssetView | null;
onClose: () => void;
onCreated?: (id: string) => void;
}) {
const [v, setV] = useState({
assetKey: (item?.assetKey ?? "gram_gold") as AssetKey,
name: item?.name ?? "",
note: item?.note ?? "",
isPrivate: item?.isPrivate ?? false,
});
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 locked = Boolean(item?.movementCount);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveAssetAction(item?.id ?? null, {
...v,
name: v.name.trim() || ASSETS[v.assetKey].label,
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.saved);
onClose();
if (!item) onCreated?.((r.data as { id: string }).id);
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
const f = t.fields;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={item ? t.editTitle : t.createTitle}
footer={<Footer busy={busy} formId="asset-form" onClose={onClose} />}
>
<form id="asset-form" onSubmit={submit} noValidate>
<FieldGroup>
<Field data-invalid={Boolean(errors.assetKey)}>
<FieldLabel htmlFor="as-key">{f.asset}</FieldLabel>
<Select
value={v.assetKey}
onValueChange={(x) => set("assetKey", x as AssetKey)}
disabled={locked}
>
<SelectTrigger id="as-key" className="w-full">
<SelectValue>{ASSETS[v.assetKey].label}</SelectValue>
</SelectTrigger>
<SelectContent>
{ASSET_KEYS.map((k) => (
<SelectItem key={k} value={k}>
{ASSETS[k].label}
</SelectItem>
))}
</SelectContent>
</Select>
{errors.assetKey ? <FieldError>{errors.assetKey}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.name)}>
<FieldLabel htmlFor="as-name">{f.name}</FieldLabel>
<Input
id="as-name"
value={v.name}
placeholder={ASSETS[v.assetKey].label}
onChange={(e) => set("name", e.target.value)}
aria-invalid={Boolean(errors.name)}
/>
{errors.name ? <FieldError>{errors.name}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="as-note">{f.note}</FieldLabel>
<Input id="as-note" value={v.note} onChange={(e) => set("note", e.target.value)} />
</Field>
<label className="flex items-start gap-2 text-sm">
<Checkbox
checked={v.isPrivate}
onCheckedChange={(x) => set("isPrivate", x === true)}
className="mt-0.5"
/>
<span>
{f.isPrivate}
<span className="block text-xs text-muted-foreground">{f.isPrivateHint}</span>
</span>
</label>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
/** Alım, gelen hediye, satış veya çıkış hareketi. */
export function MovementDialog({
item,
initialKind,
onClose,
}: {
item: AssetView;
initialKind: MovementKind;
onClose: () => void;
}) {
const accounts = useAccounts();
const [kind, setKind] = useState<MovementKind>(initialKind);
const [v, setV] = useState({
date: todayIstanbul(),
quantity: "",
amount: "",
unitPrice: "",
accountId: "",
storage: item.storage,
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 withAccount = kind === "buy" || kind === "sell";
const priced = kind !== "gift_out";
const inflow = kind === "buy" || kind === "gift_in";
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await addMovementAction(item.id, {
kind,
date: v.date,
quantity: v.quantity,
amount: priced ? v.amount : "",
unitPrice: priced ? v.unitPrice : "",
accountId: withAccount ? v.accountId : "",
storage: inflow ? v.storage : "",
note: v.note,
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.movement);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
const m = t.movement;
const unit = ASSETS[item.assetKey].unit;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={m.title(t.kinds[kind], item.name)}
description={m.held(formatAssetQuantity(item.assetKey, item.summary.quantity))}
footer={<Footer busy={busy} formId="movement-form" onClose={onClose} />}
>
<form id="movement-form" onSubmit={submit} noValidate>
<FieldGroup>
<Tabs
value={kind}
onValueChange={(x) => {
setKind(x as MovementKind);
setErrors({});
}}
>
<TabsList className="grid h-auto w-full grid-cols-2 sm:grid-cols-4">
{MOVEMENT_KINDS.map((k) => (
<TabsTrigger key={k} value={k}>
{t.kinds[k]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<p className="-mt-2 text-xs text-muted-foreground">{t.kindHints[kind]}</p>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.quantity)}>
<FieldLabel htmlFor="mv-qty">
{m.quantity} ({unit})
</FieldLabel>
<Input
id="mv-qty"
inputMode="decimal"
value={v.quantity}
onChange={(e) => set("quantity", e.target.value)}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.quantity)}
autoFocus
/>
{errors.quantity ? <FieldError>{errors.quantity}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="mv-date">{m.date}</FieldLabel>
<Input
id="mv-date"
type="date"
value={v.date}
max={todayIstanbul()}
onChange={(e) => set("date", e.target.value)}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
</div>
{priced ? (
<>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.amount)}>
<FieldLabel htmlFor="mv-amount">{m.amount}</FieldLabel>
<MoneyInput id="mv-amount" value={v.amount} onChange={(x) => set("amount", x)} />
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.unitPrice)}>
<FieldLabel htmlFor="mv-unit">{m.unitPrice}</FieldLabel>
<MoneyInput
id="mv-unit"
value={v.unitPrice}
onChange={(x) => set("unitPrice", x)}
/>
{errors.unitPrice ? <FieldError>{errors.unitPrice}</FieldError> : null}
</Field>
</div>
<FieldDescription className="-mt-2">
{kind === "gift_in" ? m.giftValueHint : m.priceHint}
</FieldDescription>
</>
) : null}
{withAccount ? (
<Field data-invalid={Boolean(errors.accountId)}>
<FieldLabel htmlFor="mv-account">{m.account}</FieldLabel>
<Select
value={v.accountId || NONE}
onValueChange={(x) => set("accountId", x === NONE ? "" : x)}
>
<SelectTrigger id="mv-account" className="w-full">
<SelectValue>
{accounts?.find((a) => a.id === v.accountId)?.name ?? m.accountNone}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
<SelectItem value={NONE}>{m.accountNone}</SelectItem>
{(accounts ?? []).map((a) => (
<SelectItem key={a.id} value={a.id}>
{a.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription>{m.accountHint}</FieldDescription>
{errors.accountId ? <FieldError>{errors.accountId}</FieldError> : null}
</Field>
) : null}
{inflow ? (
<Field>
<FieldLabel htmlFor="mv-storage">{m.storage}</FieldLabel>
<Input
id="mv-storage"
value={v.storage}
placeholder={m.storagePlaceholder}
onChange={(e) => set("storage", e.target.value)}
/>
</Field>
) : null}
<Field>
<FieldLabel htmlFor="mv-note">{m.note}</FieldLabel>
<Input id="mv-note" value={v.note} onChange={(e) => set("note", e.target.value)} />
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,191 @@
"use client";
import { ChevronRight, Coins, Lock, Plus } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import { formatBp } from "@/shared/portfolio";
import type { AssetTotals, AssetView } from "../service";
import { AssetFormDialog } from "./asset-dialogs";
const t = tr.assets;
/** Kâr/zarar tutarı: + yeşil, − kırmızı. */
export function ProfitLoss({
minor,
bp,
compact,
}: {
minor: number | null;
bp?: number | null;
/** Mobilde oranı gizle (dar satırlar). */
compact?: boolean;
}) {
if (minor === null) return <span className="text-muted-foreground">—</span>;
return (
<span
className={cn(
"font-semibold whitespace-nowrap tabular-nums",
minor > 0 ? "text-income" : minor < 0 ? "text-expense" : undefined,
)}
>
{minor > 0 ? "+" : minor < 0 ? "−" : ""}
{formatMoney(Math.abs(minor))}
{bp !== undefined && bp !== null ? (
<span className={cn("ml-1 text-xs font-normal", compact && "hidden sm:inline")}>
({formatBp(bp)})
</span>
) : null}
</span>
);
}
export function Stat({ label, children }: { label: string; children: React.ReactNode }) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<div className="font-semibold tabular-nums">{children}</div>
</div>
);
}
/** /birikim: toplamlar ve varlık kartları. */
export function AssetsView({
items,
totals,
canWrite,
}: {
items: AssetView[];
totals: AssetTotals;
canWrite: boolean;
}) {
const router = useRouter();
const [creating, setCreating] = useState(false);
const held = items.filter((i) => i.summary.quantity > 0 || i.movementCount === 0);
const closed = items.filter((i) => i.summary.quantity === 0 && i.movementCount > 0);
const unrealizedBp =
totals.costMinor > 0 ? Math.round((totals.unrealizedMinor * 10_000) / totals.costMinor) : null;
return (
<div className="flex flex-col gap-4">
<div className="flex flex-wrap justify-end gap-2">
<Button variant="ghost" size="sm" asChild>
<Link href="/fiyatlar">
<Coins />
{t.prices}
</Link>
</Button>
{canWrite ? (
<Button size="sm" onClick={() => setCreating(true)}>
<Plus />
{t.new}
</Button>
) : null}
</div>
<Card size="sm">
<CardContent className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={t.totals.value}>{formatMoney(totals.valueMinor)}</Stat>
<Stat label={t.totals.cost}>{formatMoney(totals.costMinor)}</Stat>
<Stat label={t.totals.unrealized}>
<ProfitLoss minor={totals.unrealizedMinor} bp={unrealizedBp} />
</Stat>
<Stat label={t.totals.realized}>
<ProfitLoss minor={totals.realizedMinor} />
</Stat>
{totals.missingPrice ? (
<p className="col-span-full text-xs text-muted-foreground">
{t.totals.missingPrice(totals.missingPrice)}
</p>
) : null}
</CardContent>
</Card>
{items.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
) : null}
<ul className="flex flex-col gap-2">
{held.map((item) => (
<AssetRow key={item.id} item={item} />
))}
</ul>
{closed.length ? (
<section className="flex flex-col gap-2">
<h2 className="text-sm font-medium text-muted-foreground">{t.closedGroup}</h2>
<ul className="flex flex-col gap-2 opacity-70">
{closed.map((item) => (
<AssetRow key={item.id} item={item} />
))}
</ul>
</section>
) : null}
{creating ? (
<AssetFormDialog
item={null}
onClose={() => setCreating(false)}
onCreated={(id) => router.push(`/birikim/${id}`)}
/>
) : null}
</div>
);
}
function AssetRow({ item }: { item: AssetView }) {
const s = item.summary;
return (
<li>
<Link
href={`/birikim/${item.id}`}
className="flex items-center gap-3 rounded-xl border bg-card p-3 transition-colors hover:bg-muted/50"
>
<span className="inline-flex size-9 shrink-0 items-center justify-center rounded-full bg-amber-500/15 text-amber-600 dark:text-amber-400">
<Coins className="size-4.5" />
</span>
<div className="flex min-w-0 flex-1 flex-col gap-0.5">
<div className="flex items-center justify-between gap-2">
<p className="flex min-w-0 items-center gap-1.5 font-medium">
<span className="truncate">{item.name}</span>
{item.isPrivate ? (
<Badge variant="outline" className="shrink-0 gap-1" title={t.privateBadge}>
<Lock className="size-3" />
<span className="hidden sm:inline">{t.privateBadge}</span>
</Badge>
) : null}
</p>
<span className="shrink-0 text-sm font-semibold tabular-nums">
{s.currentValueMinor !== null ? formatMoney(s.currentValueMinor) : t.stats.noPrice}
</span>
</div>
<div className="flex items-center justify-between gap-2 text-xs">
<p className="min-w-0 truncate text-muted-foreground">
{item.label}
{s.avgCostMinor !== null
? ` · ${t.stats.avgCost} ${formatMoney(s.avgCostMinor)}`
: ""}
</p>
<span className="shrink-0">
{s.quantity > 0 ? (
<ProfitLoss minor={s.unrealizedMinor} bp={s.unrealizedBp} compact />
) : (
<>
{t.stats.realized}: <ProfitLoss minor={s.realizedMinor} />
</>
)}
</span>
</div>
</div>
<ChevronRight className="size-4 shrink-0 text-muted-foreground" />
</Link>
</li>
);
}
@@ -0,0 +1,204 @@
"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 type { PeriodReport } from "@/shared/portfolio";
import type { ReportRange } from "../service";
import { ProfitLoss, Stat } from "./assets-view";
const t = tr.assets.report;
const RANGES: ReportRange[] = ["3", "6", "12", "tum"];
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
const tickFmt = new Intl.DateTimeFormat("tr-TR", {
day: "numeric",
month: "short",
timeZone: "Europe/Istanbul",
});
const compact = new Intl.NumberFormat("tr-TR", { notation: "compact", maximumFractionDigits: 1 });
const config = {
value: { label: t.value, color: "var(--budget)" },
cost: { label: t.cost, color: "var(--muted-foreground)" },
} satisfies ChartConfig;
/** Dönem seçici + özet + aylık değer/maliyet grafiği + tablo görünümü. */
export function PeriodReportView({
report,
range,
basePath,
}: {
report: PeriodReport & { excluded: number };
range: ReportRange;
basePath: string;
}) {
const data = report.points.map((p) => ({
date: p.date,
label: tickFmt.format(new Date(`${p.date}T12:00:00+03:00`)),
// Kuruş → TL (eksen ve ipucu TL gösterir).
value: p.valueMinor === null ? null : p.valueMinor / 100,
cost: p.costMinor / 100,
}));
const hasData = report.points.some((p) => p.costMinor > 0 || (p.valueMinor ?? 0) > 0);
return (
<Card size="sm">
<CardHeader>
<div className="flex flex-wrap items-start justify-between gap-2">
<div>
<CardTitle className="text-base">{t.title}</CardTitle>
<CardDescription>{t.period(d(report.from), d(report.to))}</CardDescription>
</div>
<nav aria-label={t.rangeLabel} className="flex rounded-lg bg-muted p-0.5 text-sm">
{RANGES.map((r) => (
<Link
key={r}
href={`${basePath}?donem=${r}`}
scroll={false}
aria-current={r === range ? "page" : undefined}
className={cn(
"rounded-md px-2.5 py-1 text-muted-foreground transition-colors",
r === range && "bg-background font-medium text-foreground shadow-sm",
)}
>
{t.ranges[r]}
</Link>
))}
</nav>
</div>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={t.startValue}>
{report.startValueMinor !== null ? formatMoney(report.startValueMinor) : t.noPrice}
</Stat>
<Stat label={t.invested}>{formatMoney(report.investedMinor)}</Stat>
<Stat label={t.endValue}>
{report.endValueMinor !== null ? formatMoney(report.endValueMinor) : t.noPrice}
</Stat>
<Stat label={t.profit}>
<ProfitLoss minor={report.profitMinor} bp={report.profitBp} />
</Stat>
{report.proceedsMinor ? (
<Stat label={t.proceeds}>{formatMoney(report.proceedsMinor)}</Stat>
) : null}
{report.giftInMinor ? (
<Stat label={t.giftIn}>{formatMoney(report.giftInMinor)}</Stat>
) : null}
{report.giftOutMinor ? (
<Stat label={t.giftOut}>{formatMoney(report.giftOutMinor)}</Stat>
) : null}
</div>
<p className="text-xs text-muted-foreground">{t.formula}</p>
{report.excluded ? (
<p className="text-xs text-muted-foreground">{t.excluded(report.excluded)}</p>
) : null}
{hasData ? (
<>
<ChartContainer
config={config}
className="aspect-auto h-56 w-full sm:h-64"
aria-label={t.chartLabel}
role="img"
>
<LineChart data={data} 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
cursor
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="cost"
type="stepAfter"
stroke="var(--color-cost)"
strokeWidth={2}
strokeDasharray="4 4"
dot={false}
isAnimationActive={false}
/>
<Line
dataKey="value"
type="linear"
stroke="var(--color-value)"
strokeWidth={2}
dot={false}
activeDot={{ r: 4 }}
connectNulls={false}
isAnimationActive={false}
/>
</LineChart>
</ChartContainer>
<details className="text-sm">
<summary className="cursor-pointer text-xs text-muted-foreground">{t.table}</summary>
<table className="mt-2 w-full text-right tabular-nums">
<thead className="text-xs text-muted-foreground">
<tr>
<th className="py-1 text-left font-normal">{t.date}</th>
<th className="py-1 font-normal">{t.value}</th>
<th className="py-1 font-normal">{t.cost}</th>
</tr>
</thead>
<tbody className="divide-y">
{report.points.map((p) => (
<tr key={p.date}>
<td className="py-1 text-left">{d(p.date)}</td>
<td className="py-1">
{p.valueMinor !== null ? formatMoney(p.valueMinor) : t.noPrice}
</td>
<td className="py-1">{formatMoney(p.costMinor)}</td>
</tr>
))}
</tbody>
</table>
</details>
</>
) : (
<p className="text-sm text-muted-foreground">{t.empty}</p>
)}
</CardContent>
</Card>
);
}
+328
View File
@@ -0,0 +1,328 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { listAccounts } from "@/features/accounts/service";
import { savePrice } from "@/features/in-kind/service";
import {
listTransactions,
setTransactionDeleted,
updateTransaction,
} from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { AccountModel } from "@/models/account";
import { AssetModel } from "@/models/asset";
import { AssetMovementModel } from "@/models/asset-movement";
import { AssetPriceModel } from "@/models/asset-price";
import { AuditLogModel } from "@/models/audit-log";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { assetFormSchema, movementFormSchema } from "@/shared/schemas/asset";
import { assetPriceFormSchema } from "@/shared/schemas/in-kind";
import { transactionFilterSchema, transactionFormSchema } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
addMovement,
createAsset,
deleteAsset,
deleteMovement,
getAsset,
listAssets,
updateAsset,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
const today = todayIstanbul();
const daysAgo = (n: number) => addDays(today, -n);
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
// Seed örnekleri bu testin senaryolarını etkilemesin.
await Promise.all([
AssetPriceModel.deleteMany({}),
AssetModel.deleteMany({}),
AssetMovementModel.deleteMany({}),
TransactionModel.deleteMany({ assetId: { $ne: null } }),
]);
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => String(a!._id));
async function balance(accountId: string) {
return (await listAccounts(ayse, cakir))!.accounts.find((a) => a.id === accountId)!.balanceMinor!;
}
const mv = (input: Record<string, unknown>) => movementFormSchema.parse({ date: today, ...input });
async function asset(name: string, assetKey = "gram_gold", isPrivate = false, by = ayse) {
const r = await createAsset(by, cakir, assetFormSchema.parse({ assetKey, name, isPrivate }));
return r.ok ? r.data.id : "";
}
describe("varlık lotları ve ortalama maliyet", () => {
let gold = "";
it("alım hesaptan transfer olarak çıkar; gelir/gider toplamları değişmez", async () => {
gold = await asset("Altın birikimi");
const ziraat = await acc("Ziraat Maaş");
const z0 = await balance(ziraat);
const sums0 = (await listTransactions(ayse, cakir, transactionFilterSchema.parse({})))!.sums;
const r = await addMovement(
ayse,
cakir,
gold,
mv({
kind: "buy",
date: daysAgo(60),
quantity: "10",
amount: "25.000",
accountId: ziraat,
storage: "Ev kasası",
}),
);
expect(r.ok).toBe(true);
expect(await balance(ziraat)).toBe(z0 - 25_000_00);
expect((await listTransactions(ayse, cakir, transactionFilterSchema.parse({})))!.sums).toEqual(
sums0,
);
// İşlem listesinde varlık adıyla görünür.
const page = (await listTransactions(
ayse,
cakir,
transactionFilterSchema.parse({ q: "Varlık alımı" }),
))!;
expect(page.items[0]).toMatchObject({ asset: { id: gold, name: "Altın birikimi" } });
});
it("birim fiyatla alım ve fiyat tablosundan (satış fiyatı) alım; özet", async () => {
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "buy", date: daysAgo(30), quantity: "2", unitPrice: "2.600" }),
);
// Fiyat yok → reddedilir.
expect(
(await addMovement(ayse, cakir, gold, mv({ kind: "buy", date: daysAgo(10), quantity: "2" })))
.ok,
).toBe(false);
await savePrice(
ayse,
cakir,
assetPriceFormSchema.parse({
assetKey: "gram_gold",
date: daysAgo(10),
buy: "2.650",
sell: "2.700",
}),
);
expect(
(await addMovement(ayse, cakir, gold, mv({ kind: "buy", date: daysAgo(10), quantity: "2" })))
.ok,
).toBe(true);
await savePrice(
ayse,
cakir,
assetPriceFormSchema.parse({
assetKey: "gram_gold",
date: today,
buy: "3.000",
sell: "3.100",
}),
);
const v = (await getAsset(ayse, cakir, gold))!;
// 14 gr, 25.000 + 5.200 + 5.400 = 35.600; değer alış 3.000 ile 42.000.
expect(v.summary).toMatchObject({
quantity: 14_000,
costMinor: 35_600_00,
investedMinor: 35_600_00,
avgCostMinor: 2_542_86,
currentValueMinor: 42_000_00,
unrealizedMinor: 6_400_00,
unrealizedBp: 1798,
});
expect(v.storage).toBe("Ev kasası");
expect(v.movements[0]!.kind).toBe("buy");
});
it("satış: hesaba girer, ortalama maliyetle gerçekleşmiş K/Z; eldekinden fazlası reddedilir", async () => {
const cuzdan = await acc("Cüzdan");
const c0 = await balance(cuzdan);
expect(
(await addMovement(ayse, cakir, gold, mv({ kind: "sell", quantity: "15", amount: "1" }))).ok,
).toBe(false);
// Geçmiş tarihli satış o tarihteki miktarla sınırlı (60 gün önce yalnızca 10 gr vardı).
expect(
(
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "sell", date: daysAgo(45), quantity: "11", amount: "1" }),
)
).ok,
).toBe(false);
const r = await addMovement(
ayse,
cakir,
gold,
mv({ kind: "sell", quantity: "4", amount: "12.000", accountId: cuzdan }),
);
expect(r.ok).toBe(true);
expect(await balance(cuzdan)).toBe(c0 + 12_000_00);
const v = (await getAsset(ayse, cakir, gold))!;
// 4 gr maliyeti: 35.600 × 4/14 = 10.171,43 → K/Z 1.828,57
expect(v.movements[0]).toMatchObject({
kind: "sell",
costOutMinor: 10_171_43,
realizedMinor: 1_828_57,
quantityAfter: 10_000,
});
expect(v.summary.realizedMinor).toBe(1_828_57);
expect(v.summary.proceedsMinor).toBe(12_000_00);
});
it("hediye çıkışı K/Z yazmaz, hesap hareketi oluşturmaz", async () => {
const before = (await getAsset(ayse, cakir, gold))!.summary;
const r = await addMovement(
ayse,
cakir,
gold,
mv({ kind: "gift_out", quantity: "1", note: "Yeğene" }),
);
expect(r.ok).toBe(true);
const m = await AssetMovementModel.findById(r.ok ? r.data.id : "").lean();
expect(m).toMatchObject({ amountMinor: 0, transactionId: null });
const after = (await getAsset(ayse, cakir, gold))!.summary;
expect(after.quantity).toBe(9_000);
expect(after.realizedMinor).toBe(before.realizedMinor);
expect(after.avgCostMinor).toBe(before.avgCostMinor);
});
it("bağlı işlem tek başına düzenlenemez/silinemez; hareket silinince işlem de silinir", async () => {
const tx = (await AssetMovementModel.findOne({ assetId: gold, kind: "sell" }).lean())!;
const txId = String(tx.transactionId);
const locked = { ok: false, error: tr.transactions.assetLocked };
expect(await setTransactionDeleted(ayse, cakir, txId, true)).toMatchObject(locked);
const edit = transactionFormSchema.parse({
type: "transfer",
date: today,
amount: "1",
accountId: await acc("Cüzdan"),
toAccountId: await acc("Ziraat Maaş"),
});
expect(await updateTransaction(ayse, cakir, txId, edit)).toMatchObject(locked);
const cuzdan = await acc("Cüzdan");
const c0 = await balance(cuzdan);
expect((await deleteMovement(ayse, cakir, String(tx._id))).ok).toBe(true);
expect(await balance(cuzdan)).toBe(c0 - 12_000_00);
expect(
await AuditLogModel.exists({ action: "asset.movement.delete", targetId: String(tx._id) }),
).toBeTruthy();
expect((await getAsset(ayse, cakir, gold))!.summary.realizedMinor).toBe(0);
});
it("silinince sonraki çıkış eldekini aşacaksa reddedilir; hareketli varlık silinemez", async () => {
const first = (await AssetMovementModel.findOne({ assetId: gold, kind: "buy" })
.sort({ date: 1 })
.lean())!;
// Kalan: 10 + 2 + 2 alım, bugün 1 gr çıkış. Sonraki alımlar silinebilir; ilk alım silinirse
// çıkış eldekini aşar → reddedilir.
const buys = await AssetMovementModel.find({ assetId: gold, kind: "buy", deletedAt: null })
.sort({ date: -1 })
.lean();
expect(buys.at(-1)!._id.equals(first._id)).toBe(true);
for (const b of buys.slice(0, -1))
expect((await deleteMovement(ayse, cakir, String(b._id))).ok).toBe(true);
expect((await deleteMovement(ayse, cakir, String(first._id))).ok).toBe(false);
expect((await deleteAsset(ayse, cakir, gold)).ok).toBe(false);
expect(
(await updateAsset(ayse, cakir, gold, assetFormSchema.parse({ assetKey: "usd", name: "X" })))
.ok,
).toBe(false);
});
it("gelen hediye: maliyet o günkü alış fiyatı, yatırım sayılmaz", async () => {
const z = await asset("Düğün ziynetleri", "quarter_gold");
await savePrice(
ayse,
cakir,
assetPriceFormSchema.parse({ assetKey: "quarter_gold", date: daysAgo(100), buy: "5.000" }),
);
expect(
movementFormSchema.safeParse({
kind: "gift_in",
date: today,
quantity: "1",
accountId: await acc("Cüzdan"),
}).success,
).toBe(false);
expect(
(await addMovement(ayse, cakir, z, mv({ kind: "gift_in", date: daysAgo(90), quantity: "4" })))
.ok,
).toBe(true);
const v = (await getAsset(ayse, cakir, z))!;
expect(v.summary).toMatchObject({ quantity: 4_000, costMinor: 20_000_00, investedMinor: 0 });
// Güncel değer: bugünden önceki en yakın fiyat.
expect(v.summary.currentValueMinor).toBe(20_000_00);
});
});
describe("görünürlük ve yetki", () => {
it("gizli varlık ve bağlı işlemi başkasına görünmez; izleyici yazamaz; başka hane göremez", async () => {
const secret = await asset("Emre dolar", "usd", true, emre);
await savePrice(
emre,
cakir,
assetPriceFormSchema.parse({ assetKey: "usd", date: today, buy: "40" }),
);
const r = await addMovement(
emre,
cakir,
secret,
mv({ kind: "buy", quantity: "100", amount: "4.000", accountId: await acc("Cüzdan") }),
);
expect(r.ok).toBe(true);
expect((await listAssets(emre, cakir))!.items.some((a) => a.id === secret)).toBe(true);
expect((await listAssets(ayse, cakir))!.items.some((a) => a.id === secret)).toBe(false);
expect(await getAsset(ayse, cakir, secret)).toBeNull();
const ayseTx = (await listTransactions(
ayse,
cakir,
transactionFilterSchema.parse({ q: "Emre dolar" }),
))!;
expect(ayseTx.total).toBe(0);
expect(
(await addMovement(ayse, cakir, secret, mv({ kind: "gift_out", quantity: "1" }))).ok,
).toBe(false);
const shared = (await listAssets(ayse, cakir))!.items[0]!.id;
expect(
(await addMovement(zeynep, cakir, shared, mv({ kind: "gift_out", quantity: "1" }))).ok,
).toBe(false);
expect((await listAssets(zeynep, cakir))!.canWrite).toBe(false);
expect(await listAssets(fatma, cakir)).toBeNull();
expect(await getAsset(fatma, cakir, shared)).toBeNull();
});
it("toplamlar: fiyatı olmayan varlık toplam değere katılmaz", async () => {
const eur = await asset("Euro kumbara", "eur");
await addMovement(ayse, cakir, eur, mv({ kind: "gift_in", quantity: "50", amount: "2.400" }));
const data = (await listAssets(ayse, cakir))!;
expect(data.totals.missingPrice).toBe(1);
const withPrice = data.items.filter((i) => i.summary.currentValueMinor !== null);
expect(data.totals.valueMinor).toBe(
withPrice.reduce((a, i) => a + (i.summary.currentValueMinor ?? 0), 0),
);
});
});
+543
View File
@@ -0,0 +1,543 @@
import "server-only";
import mongoose, { Types } from "mongoose";
import { hasHouseholdRole } from "@/features/households/roles";
import { buyPriceLookup, priceOn, type PriceQuote } from "@/features/in-kind/prices";
import { loadContext, type Ctx } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { AssetModel } from "@/models/asset";
import { AssetMovementModel } from "@/models/asset-movement";
import { TransactionModel } from "@/models/transaction";
import { formatAssetQuantity, valueOf, type AssetKey } from "@/shared/assets";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import {
holdingSummary,
periodReport,
runMovements,
sumReports,
type HoldingSummary,
type MovementKind,
type PeriodReport,
} from "@/shared/portfolio";
import { addDays, addMonths } from "@/shared/recurrence";
import { QUANTITY_SCALE } from "@/shared/quantity";
import type { AssetForm, MovementForm } from "@/shared/schemas/asset";
import { compareTr, foldTr } from "@/shared/search";
/**
* Birikim ve varlık takibi (Bölüm 6.6). Okuma: viewer; yazma: member. Varlıklar hane ortaktır;
* "yalnızca ben" işaretli varlık ve hareketleri (bağlı hesap işlemleri dahil) yalnızca sahibine
* görünür. Değerleme alış fiyatıyla (Faz 0). Alım/satış hesaba bağlıysa transfer işlemi oluşur.
*/
const t = tr.assets;
type AssetDoc = {
_id: Types.ObjectId;
assetKey: AssetKey;
name: string;
note: string;
isPrivate: boolean;
ownerUserId?: Types.ObjectId | null;
};
type MovementDoc = {
_id: Types.ObjectId;
assetId: Types.ObjectId;
kind: MovementKind;
date: string;
quantity: number;
unitPriceMinor?: number | null;
amountMinor: number;
accountId?: Types.ObjectId | null;
transactionId?: Types.ObjectId | null;
storage: string;
note: string;
inKindDebtId?: Types.ObjectId | null;
createdAt: Date;
};
export type AssetView = {
id: string;
assetKey: AssetKey;
name: string;
note: string;
isPrivate: boolean;
label: string;
price: PriceQuote | null;
summary: HoldingSummary;
/** Son alımın saklama yeri. */
storage: string;
movementCount: number;
};
export type AssetTotals = {
valueMinor: number;
costMinor: number;
unrealizedMinor: number;
realizedMinor: number;
/** Fiyatı olmadığı için toplam değere katılmayan (elde miktarı olan) varlık sayısı. */
missingPrice: number;
};
export type MovementRow = {
id: string;
kind: MovementKind;
date: string;
quantity: number;
unitPriceMinor: number | null;
amountMinor: number;
account: string | null;
storage: string;
note: string;
costOutMinor: number;
realizedMinor: number;
quantityAfter: number;
fromInKind: boolean;
};
export type AssetDetail = AssetView & { movements: MovementRow[]; canWrite: boolean };
const sortMovements = (a: MovementDoc, b: MovementDoc) =>
a.date === b.date ? a.createdAt.getTime() - b.createdAt.getTime() : a.date < b.date ? -1 : 1;
function visibleAsset(ctx: Ctx, id: Types.ObjectId | string) {
const a = ctx.assetMap.get(String(id));
return a && !a.hidden && !a.deleted ? a : null;
}
async function loadMovements(householdId: Types.ObjectId, assetIds: Types.ObjectId[]) {
const docs = await AssetMovementModel.find({
householdId,
assetId: { $in: assetIds },
deletedAt: null,
}).lean<MovementDoc[]>();
const by = new Map<string, MovementDoc[]>();
for (const m of docs) {
const list = by.get(String(m.assetId)) ?? [];
list.push(m);
by.set(String(m.assetId), list);
}
for (const list of by.values()) list.sort(sortMovements);
return by;
}
function toView(a: AssetDoc, movements: MovementDoc[], price: PriceQuote | null): AssetView {
const run = runMovements(movements);
const summary = holdingSummary(run, price?.buyMinor ?? null);
const storage = [...movements].reverse().find((m) => m.storage)?.storage ?? "";
return {
id: String(a._id),
assetKey: a.assetKey,
name: a.name,
note: a.note,
isPrivate: a.isPrivate,
label: formatAssetQuantity(a.assetKey, summary.quantity),
price,
summary,
storage,
movementCount: movements.length,
};
}
/** Görünür varlıklar ve toplamlar (net varlık ve dashboard da kullanır). */
export async function listAssets(
userId: string,
householdId: string,
): Promise<{ items: AssetView[]; totals: AssetTotals; canWrite: boolean } | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
return { ...(await assetViews(ctx)), canWrite: hasHouseholdRole(ctx.m.role, "member") };
}
export async function assetViews(ctx: Ctx, date = todayIstanbul()) {
const docs = (
await AssetModel.find({ householdId: ctx.m.householdId, deletedAt: null }).lean<AssetDoc[]>()
).filter((a) => visibleAsset(ctx, a._id));
const movements = await loadMovements(
ctx.m.householdId,
docs.map((a) => a._id),
);
const prices = new Map<string, PriceQuote | null>();
for (const key of new Set(docs.map((a) => a.assetKey)))
prices.set(key, await priceOn(ctx.m.householdId, key, date));
const items = docs
.map((a) => toView(a, movements.get(String(a._id)) ?? [], prices.get(a.assetKey) ?? null))
.sort(
(x, y) =>
Number(y.summary.quantity > 0) - Number(x.summary.quantity > 0) ||
(y.summary.currentValueMinor ?? 0) - (x.summary.currentValueMinor ?? 0) ||
compareTr(x.name, y.name),
);
const totals: AssetTotals = {
valueMinor: 0,
costMinor: 0,
unrealizedMinor: 0,
realizedMinor: 0,
missingPrice: 0,
};
for (const v of items) {
totals.realizedMinor += v.summary.realizedMinor;
if (v.summary.quantity === 0) continue;
if (v.summary.currentValueMinor === null) {
totals.missingPrice++;
continue;
}
totals.valueMinor += v.summary.currentValueMinor;
totals.costMinor += v.summary.costMinor;
totals.unrealizedMinor += v.summary.unrealizedMinor ?? 0;
}
return { items, totals };
}
async function loadAsset(ctx: Ctx, assetId: string) {
const id = toObjectId(assetId);
if (!id || !visibleAsset(ctx, id)) return null;
return AssetModel.findOne({
_id: id,
householdId: ctx.m.householdId,
deletedAt: null,
}).lean<AssetDoc>();
}
export async function getAsset(
userId: string,
householdId: string,
assetId: string,
): Promise<AssetDetail | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const a = await loadAsset(ctx, assetId);
if (!a) return null;
const movements = (await loadMovements(ctx.m.householdId, [a._id])).get(String(a._id)) ?? [];
const price = await priceOn(ctx.m.householdId, a.assetKey, todayIstanbul());
const run = runMovements(movements);
const rows = movements.map((m, i): MovementRow => {
const acc = m.accountId ? ctx.accountMap.get(String(m.accountId)) : undefined;
const step = run.steps[i]!;
return {
id: String(m._id),
kind: m.kind,
date: m.date,
quantity: m.quantity,
unitPriceMinor: m.unitPriceMinor ?? null,
amountMinor: m.amountMinor,
account: acc ? (acc.hidden ? tr.transactions.list.hiddenAccount : acc.name) : null,
storage: m.storage,
note: m.note,
costOutMinor: step.costOutMinor,
realizedMinor: step.realizedMinor,
quantityAfter: step.quantityAfter,
fromInKind: Boolean(m.inKindDebtId),
};
});
return {
...toView(a, movements, price),
movements: rows.reverse(),
canWrite: hasHouseholdRole(ctx.m.role, "member"),
};
}
// --- Varlık kaydı ---
export async function createAsset(
actorId: string,
householdId: string,
input: AssetForm,
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const actor = new Types.ObjectId(actorId);
const doc = await AssetModel.create({
householdId: ctx.m.householdId,
assetKey: input.assetKey,
name: input.name,
note: input.note,
isPrivate: input.isPrivate,
ownerUserId: input.isPrivate ? actor : null,
createdBy: actor,
updatedBy: actor,
});
return ok({ id: String(doc._id) });
}
export async function updateAsset(
actorId: string,
householdId: string,
assetId: string,
input: AssetForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const a = await loadAsset(ctx, assetId);
if (!a) return fail(tr.common.notFound);
if (
input.assetKey !== a.assetKey &&
(await AssetMovementModel.exists({ assetId: a._id, deletedAt: null }))
)
return fail(t.errors.assetKeyLocked, { assetKey: t.errors.assetKeyLocked });
const actor = new Types.ObjectId(actorId);
const owner = a.ownerUserId ?? (input.isPrivate ? actor : null);
await AssetModel.updateOne(
{ _id: a._id, householdId: ctx.m.householdId },
{
$set: {
assetKey: input.assetKey,
name: input.name,
note: input.note,
isPrivate: input.isPrivate,
ownerUserId: input.isPrivate ? owner : null,
updatedBy: actor,
},
},
);
return ok(undefined);
}
export async function deleteAsset(
actorId: string,
householdId: string,
assetId: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const a = await loadAsset(ctx, assetId);
if (!a) return fail(tr.common.notFound);
if (await AssetMovementModel.exists({ assetId: a._id, deletedAt: null }))
return fail(t.errors.hasMovements);
const actor = new Types.ObjectId(actorId);
await AssetModel.updateOne({ _id: a._id }, { $set: { deletedAt: new Date(), updatedBy: actor } });
await writeAudit({
action: "asset.delete",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "asset",
targetId: String(a._id),
diff: { name: a.name, assetKey: a.assetKey },
});
return ok(undefined);
}
// --- Hareketler ---
function checkAccount(ctx: Ctx, id: string | null) {
if (!id) return null;
const a = ctx.accountMap.get(id);
return a && !a.hidden && !a.archived ? a : null;
}
/** Tutar ve birim fiyatı tamamlar (bkz. movementFormSchema). */
async function resolveAmount(
householdId: Types.ObjectId,
assetKey: AssetKey,
input: MovementForm,
): Promise<{ unitPriceMinor: number | null; amountMinor: number } | null> {
if (input.kind === "gift_out") return { unitPriceMinor: null, amountMinor: 0 };
if (input.amount !== null)
return {
amountMinor: input.amount,
unitPriceMinor:
input.unitPrice ?? Math.round((input.amount * QUANTITY_SCALE) / input.quantity),
};
let unit = input.unitPrice;
if (unit === null) {
const p = await priceOn(householdId, assetKey, input.date);
// Alımda kurumun satış fiyatı ödenir; satış ve hediye değeri alış fiyatıyla.
unit = p ? (input.kind === "buy" ? p.sellMinor : p.buyMinor) : null;
}
if (unit === null) return null;
return { unitPriceMinor: unit, amountMinor: valueOf(input.quantity, unit) };
}
export async function addMovement(
actorId: string,
householdId: string,
assetId: string,
input: MovementForm,
opts: { inKindDebtId?: Types.ObjectId; session?: mongoose.ClientSession } = {},
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const a = await loadAsset(ctx, assetId);
if (!a) return fail(tr.common.notFound);
if (input.date > todayIstanbul()) return fail(t.errors.futureDate, { date: t.errors.futureDate });
const date = istanbulDayStart(input.date);
if (!date) return fail(tr.validation.date, { date: tr.validation.date });
const account = checkAccount(ctx, input.accountId);
if (input.accountId && !account)
return fail(tr.transactions.validation.accountInvalid, {
accountId: tr.transactions.validation.accountInvalid,
});
const amount = await resolveAmount(ctx.m.householdId, a.assetKey, input);
if (!amount) return fail(t.errors.noPrice, { amount: t.errors.noPrice });
// Eldeki miktar: yeni hareket aynı günün sonuna eklenmiş gibi doğrulanır.
const existing = (await loadMovements(ctx.m.householdId, [a._id])).get(String(a._id)) ?? [];
const now = new Date();
const candidate = [
...existing,
{ kind: input.kind, date: input.date, quantity: input.quantity, createdAt: now } as MovementDoc,
]
.map((m) => ({ ...m, amountMinor: m.amountMinor ?? 0 }))
.sort(sortMovements);
if (runMovements(candidate).negativeAt !== null)
return fail(t.errors.insufficient, { quantity: t.errors.insufficient });
const actor = new Types.ObjectId(actorId);
const movementId = new Types.ObjectId();
const label = formatAssetQuantity(a.assetKey, input.quantity);
const write = async (session: mongoose.ClientSession) => {
let transactionId: Types.ObjectId | null = null;
if (account && amount.amountMinor > 0 && (input.kind === "buy" || input.kind === "sell")) {
const out = input.kind === "buy";
const description = t.txDescription[input.kind](label, a.name);
const [tx] = await TransactionModel.create(
[
{
householdId: ctx.m.householdId,
type: "transfer",
status: "posted",
date,
// Alım hesaptan çıkar (varlığa); satış hesaba girer (varlıktan).
accountId: out ? account.id : null,
toAccountId: out ? null : account.id,
amountMinor: amount.amountMinor,
description,
searchText: foldTr(description),
assetId: a._id,
createdBy: actor,
updatedBy: actor,
},
],
{ session },
);
transactionId = tx!._id;
}
await AssetMovementModel.create(
[
{
_id: movementId,
householdId: ctx.m.householdId,
assetId: a._id,
kind: input.kind,
date: input.date,
quantity: input.quantity,
unitPriceMinor: amount.unitPriceMinor,
amountMinor: amount.amountMinor,
accountId: account && transactionId ? account.id : null,
transactionId,
storage: input.storage,
note: input.note,
inKindDebtId: opts.inKindDebtId ?? null,
createdBy: actor,
createdAt: now,
},
],
{ session },
);
};
if (opts.session) await write(opts.session);
else await mongoose.connection.transaction(write);
return ok({ id: String(movementId) });
}
export async function deleteMovement(
actorId: string,
householdId: string,
movementId: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const id = toObjectId(movementId);
if (!id) return fail(tr.common.notFound);
const m = await AssetMovementModel.findOne({
_id: id,
householdId: ctx.m.householdId,
deletedAt: null,
}).lean<MovementDoc>();
if (!m || !visibleAsset(ctx, m.assetId)) return fail(tr.common.notFound);
const rest = (
(await loadMovements(ctx.m.householdId, [m.assetId])).get(String(m.assetId)) ?? []
).filter((x) => !x._id.equals(m._id));
if (runMovements(rest).negativeAt !== null) return fail(t.errors.deleteBreaks);
const actor = new Types.ObjectId(actorId);
await mongoose.connection.transaction(async (session) => {
const now = new Date();
await AssetMovementModel.updateOne({ _id: m._id }, { $set: { deletedAt: now } }, { session });
if (m.transactionId)
await TransactionModel.updateOne(
{ _id: m.transactionId, householdId: ctx.m.householdId },
{ $set: { deletedAt: now, updatedBy: actor } },
{ session },
);
await writeAudit(
{
action: "asset.movement.delete",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "assetMovement",
targetId: String(m._id),
diff: { kind: m.kind, quantity: m.quantity, amountMinor: m.amountMinor, date: m.date },
},
session,
);
});
return ok(undefined);
}
// --- Dönemsel rapor ---
export const REPORT_RANGES = ["3", "6", "12", "tum"] as const;
export type ReportRange = (typeof REPORT_RANGES)[number];
/**
* Seçilen aralıkta (son N ay veya ilk hareketten bugüne) yatırılan TL, dönem sonu değer,
* kâr/zarar ve aylık değer noktaları. `assetId` verilirse yalnızca o varlık, yoksa tüm görünür
* varlıkların toplamı.
*/
export async function getPeriodReport(
userId: string,
householdId: string,
range: ReportRange,
assetId?: string,
): Promise<(PeriodReport & { excluded: number }) | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
let docs: AssetDoc[];
if (assetId) {
const a = await loadAsset(ctx, assetId);
if (!a) return null;
docs = [a];
} else {
docs = (
await AssetModel.find({ householdId: ctx.m.householdId, deletedAt: null }).lean<AssetDoc[]>()
).filter((a) => visibleAsset(ctx, a._id));
}
const movements = await loadMovements(
ctx.m.householdId,
docs.map((a) => a._id),
);
const to = todayIstanbul();
let from: string;
if (range === "tum") {
const first = [...movements.values()]
.flat()
.map((m) => m.date)
.sort()[0];
from = first && first < to ? first : addDays(to, -1);
} else from = addMonths(to, -Number(range));
const price = await buyPriceLookup(
ctx.m.householdId,
[...new Set(docs.map((a) => a.assetKey))],
to,
);
const reports = docs.map((a) =>
periodReport(movements.get(String(a._id)) ?? [], (date) => price(a.assetKey, date), from, to),
);
if (assetId) return { ...reports[0]!, excluded: 0 };
// Toplamda fiyatı eksik varlıklar (kâr hesaplanamayan) dışarıda bırakılır ve sayılır.
const priced = reports.filter((r) => r.profitMinor !== null);
return { ...sumReports(priced, from, to), excluded: reports.length - priced.length };
}
@@ -38,11 +38,17 @@ export function AttachmentPicker({
onChange,
allowedKinds,
onBusyChange,
hint,
addLabel,
}: {
value: AttachmentInfo[];
onChange: (items: AttachmentInfo[]) => void;
allowedKinds: readonly AttachmentKind[];
onBusyChange?: (busy: boolean) => void;
/** Boşken gösterilen ipucu (varsayılan: fiş/fatura). */
hint?: string;
/** Düğme metni (varsayılan: "Ek ekle"). */
addLabel?: string;
}) {
const inputRef = useRef<HTMLInputElement>(null);
const [uploading, setUploading] = useState(0);
@@ -91,14 +97,16 @@ export function AttachmentPicker({
disabled={room <= 0 || uploading > 0}
>
{uploading > 0 ? <Loader2 className="animate-spin" /> : <Paperclip />}
{uploading > 0 ? t.uploading : t.add}
{uploading > 0 ? t.uploading : (addLabel ?? t.add)}
</Button>
<span className="text-xs text-muted-foreground">
{value.length
? t.count(value.length)
: allowedKinds.includes("pdf")
? t.addHint.imagePdf
: t.addHint.image}
: hint
? hint
: allowedKinds.includes("pdf")
? t.addHint.imagePdf
: t.addHint.image}
</span>
<input
ref={inputRef}
+1 -1
View File
@@ -245,7 +245,7 @@ describe("işleme bağlama", () => {
cakir,
txId,
await form({
accountId: detail!.account.id,
accountId: detail!.account!.id,
categoryId: detail!.categoryId,
attachmentIds: [a3.id, a4.id],
}),
+4
View File
@@ -11,6 +11,7 @@ import { getStorage } from "@/lib/storage";
import { isPlausiblePdf, processImage, UnreadableImageError } from "@/lib/uploads/process";
import { AccountModel } from "@/models/account";
import { AttachmentModel, type AttachmentOwnerType } from "@/models/attachment";
import { ProductModel } from "@/models/product";
import { TransactionModel } from "@/models/transaction";
import {
detectFileType,
@@ -267,6 +268,9 @@ export async function readAttachmentForUser(
ownerUserId: { $ne: new Types.ObjectId(userId) },
});
if (hidden) return null;
} else if (a.ownerType === "product") {
// Ürün görselleri hane ortaktır (arşivli ürün dahil).
if (!(await ProductModel.exists({ _id: a.ownerId, householdId: a.householdId }))) return null;
} else {
return null;
}
+49
View File
@@ -0,0 +1,49 @@
"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 { budgetLimitsSchema, budgetMonthSchema, incomeItemsSchema } from "@/shared/schemas/budget";
import { saveIncomeItems } from "./plan";
import { budgetFromActuals, copyPreviousBudget, saveBudget } from "./service";
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>(
schema: z.ZodType<T>,
input: unknown,
fn: (userId: string, householdId: string, data: T) => Promise<ActionResult<unknown>>,
): Promise<ActionResult<unknown>> {
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;
}
export async function saveBudgetAction(input: unknown) {
return run(budgetLimitsSchema, input, saveBudget);
}
export async function copyPreviousBudgetAction(month: unknown) {
return run(budgetMonthSchema, month, copyPreviousBudget);
}
export async function budgetFromActualsAction(month: unknown) {
return run(budgetMonthSchema, month, budgetFromActuals);
}
export async function saveIncomeItemsAction(input: unknown) {
return run(incomeItemsSchema, input, saveIncomeItems);
}
@@ -0,0 +1,480 @@
"use client";
import {
AlertTriangle,
ChevronLeft,
ChevronRight,
Copy,
EllipsisVertical,
History,
Pencil,
} from "lucide-react";
import Link from "next/link";
import { useState } from "react";
import { toast } from "sonner";
import { IconBadge } from "@/components/appearance/swatch";
import { MoneyInput } from "@/components/money-input";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { shiftMonth, type BudgetStatus } from "@/shared/budget";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput, parseMoney } from "@/shared/money";
import { budgetFromActualsAction, copyPreviousBudgetAction, saveBudgetAction } from "../actions";
import type { BudgetLineView, BudgetView as Data } from "../service";
const t = tr.budget;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
const monthFmt = new Intl.DateTimeFormat("tr-TR", {
month: "long",
year: "numeric",
timeZone: "Europe/Istanbul",
});
const monthLabel = (m: string) => monthFmt.format(new Date(`${m}-15T12:00:00+03:00`));
const BAR: Record<BudgetStatus, string> = {
ok: "bg-budget",
warning: "bg-amber-500",
over: "bg-expense",
none: "bg-muted-foreground/40",
};
/** Yüzde çubuğu; `marker` ayın geçen kısmını (yüzde) gösterir. */
function Bar({
ratioBp,
status,
marker,
label,
}: {
ratioBp: number | null;
status: BudgetStatus;
marker?: number;
label: string;
}) {
const pct = ratioBp === null ? 0 : Math.min(100, ratioBp / 100);
return (
<div
className="relative h-2 w-full overflow-hidden rounded-full bg-muted"
role="progressbar"
aria-label={label}
aria-valuemin={0}
aria-valuemax={100}
aria-valuenow={Math.round(ratioBp === null ? 0 : ratioBp / 100)}
>
<div className={cn("h-full rounded-full", BAR[status])} style={{ width: `${pct}%` }} />
{marker !== undefined && marker > 0 && marker < 100 ? (
<span
aria-hidden
className="absolute top-0 h-full w-0.5 bg-foreground/60"
style={{ left: `${marker}%` }}
/>
) : null}
</div>
);
}
function StatusBadge({
status,
forecastOver,
exceeded,
}: {
status: BudgetStatus;
forecastOver: boolean;
/** Limit aşıldı mı (tam %100'de "doldu"). */
exceeded: boolean;
}) {
if (status === "over")
return (
<Badge variant="destructive" className="gap-1">
<AlertTriangle className="size-3" />
{exceeded ? t.status.over : t.status.full}
</Badge>
);
if (status === "warning")
return (
<Badge
variant="outline"
className="gap-1 border-amber-500/50 text-amber-700 dark:text-amber-400"
>
<AlertTriangle className="size-3" />
{t.status.warning}
</Badge>
);
if (forecastOver)
return (
<Badge variant="outline" className="text-muted-foreground">
{t.status.forecastOver}
</Badge>
);
return null;
}
function Stat({ label, value, tone }: { label: string; value: string; tone?: string }) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("text-lg font-semibold tabular-nums", tone)}>{value}</p>
</div>
);
}
type Pending = { kind: "edit" } | { kind: "replace"; source: "copy" | "actuals" } | null;
export function BudgetView({ data }: { data: Data }) {
const [pending, setPending] = useState<Pending>(null);
const [busy, setBusy] = useState(false);
const close = () => setPending(null);
const tt = data.totals;
const monthPct = Math.round((data.elapsedDays * 100) / data.totalDays);
const warnings = data.lines.filter((l) => l.status === "warning" || l.status === "over");
async function generate(source: "copy" | "actuals") {
setBusy(true);
const r =
source === "copy"
? await copyPreviousBudgetAction(data.month)
: await budgetFromActualsAction(data.month);
setBusy(false);
close();
if (r.ok) toast.success(source === "copy" ? t.toast.copied : t.toast.created);
else toast.error(r.error);
}
const askOrRun = (source: "copy" | "actuals") =>
data.hasBudget ? setPending({ kind: "replace", source }) : generate(source);
return (
<div className="flex flex-col gap-4">
<div className="flex flex-wrap items-center justify-between gap-2">
<div className="flex items-center gap-1">
<Button variant="ghost" size="icon" asChild>
<Link href={`/butce?ay=${shiftMonth(data.month, -1)}`} aria-label={t.prevMonth}>
<ChevronLeft />
</Link>
</Button>
<div className="min-w-36 text-center">
<p className="font-medium capitalize">{monthLabel(data.month)}</p>
<p className="text-xs text-muted-foreground">
{t.period(d(data.period.from), d(data.period.to))}
</p>
</div>
<Button variant="ghost" size="icon" asChild>
<Link href={`/butce?ay=${shiftMonth(data.month, 1)}`} aria-label={t.nextMonth}>
<ChevronRight />
</Link>
</Button>
{data.month !== data.currentMonth ? (
<Button variant="link" size="sm" asChild>
<Link href="/butce">{t.thisMonth}</Link>
</Button>
) : null}
</div>
{data.canWrite ? (
<div className="flex gap-2">
<Button size="sm" onClick={() => setPending({ kind: "edit" })}>
<Pencil />
{t.edit}
</Button>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="outline" aria-label={tr.recurring.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem
disabled={!data.hasPrevious || busy}
onSelect={() => askOrRun("copy")}
>
<Copy />
{t.copyPrevious}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem disabled={busy} onSelect={() => askOrRun("actuals")}>
<History />
{t.fromActuals}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
) : null}
</div>
<Card size="sm">
<CardContent className="flex flex-col gap-3">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat
label={t.totals.limit}
value={data.hasBudget ? formatMoney(tt.limitMinor) : "—"}
/>
<Stat label={t.totals.actual} value={formatMoney(tt.actualMinor)} tone="text-expense" />
<Stat
label={tt.remainingMinor < 0 ? t.totals.over : t.totals.remaining}
value={data.hasBudget ? formatMoney(Math.abs(tt.remainingMinor)) : "—"}
tone={tt.remainingMinor < 0 ? "text-expense" : "text-budget"}
/>
<Stat
label={t.totals.forecast}
value={formatMoney(tt.forecastMinor)}
tone={tt.forecastOver ? "text-expense" : undefined}
/>
</div>
{data.hasBudget ? (
<Bar
ratioBp={tt.ratioBp}
status={tt.status}
marker={monthPct}
label={`${t.totals.actual} / ${t.totals.limit}`}
/>
) : null}
<div className="flex flex-wrap justify-between gap-x-4 gap-y-1 text-xs text-muted-foreground">
<span>
{t.totals.monthProgress(data.elapsedDays, data.totalDays, String(monthPct))}
{tt.ratioBp !== null ? ` · %${Math.round(tt.ratioBp / 100)}` : ""}
</span>
{tt.plannedMinor ? <span>{t.totals.planned(formatMoney(tt.plannedMinor))}</span> : null}
{data.hasBudget && tt.unbudgetedMinor ? (
<span>
{t.totals.unbudgeted}: {formatMoney(tt.unbudgetedMinor)}
</span>
) : null}
</div>
{data.includesHidden ? (
<p className="text-xs text-muted-foreground">{t.includesHidden}</p>
) : null}
</CardContent>
</Card>
{warnings.length ? (
<div
role="status"
className="flex items-center gap-2 rounded-lg border border-amber-500/40 bg-amber-500/10 p-3 text-sm"
>
<AlertTriangle className="size-4 shrink-0 text-amber-600 dark:text-amber-400" />
{t.warnings(warnings.length)}
</div>
) : null}
{!data.hasBudget ? (
<div className="flex flex-col items-center gap-3 rounded-lg border border-dashed p-6 text-center">
<p className="font-medium">{t.empty}</p>
<p className="max-w-md text-sm text-muted-foreground">{t.emptyHint}</p>
{data.canWrite ? (
<div className="flex flex-wrap justify-center gap-2">
<Button size="sm" onClick={() => setPending({ kind: "edit" })}>
<Pencil />
{t.edit}
</Button>
<Button
size="sm"
variant="outline"
disabled={!data.hasPrevious || busy}
onClick={() => generate("copy")}
>
<Copy />
{t.copyPrevious}
</Button>
<Button
size="sm"
variant="outline"
disabled={busy}
onClick={() => generate("actuals")}
>
<History />
{t.fromActuals}
</Button>
</div>
) : null}
</div>
) : null}
{data.lines.length ? (
<ul className="flex flex-col divide-y rounded-xl border bg-card">
{data.lines.map((l) => (
<Line key={l.categoryId} line={l} marker={monthPct} />
))}
</ul>
) : data.hasBudget ? (
<p className="text-sm text-muted-foreground">{t.noSpending}</p>
) : null}
{pending?.kind === "edit" ? <EditDialog data={data} onClose={close} /> : null}
<AlertDialog open={pending?.kind === "replace"} onOpenChange={(o) => !o && close()}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.replaceTitle}</AlertDialogTitle>
<AlertDialogDescription>
{t.replaceDescription}
{pending?.kind === "replace" && pending.source === "actuals"
? ` ${t.fromActualsHint}`
: ""}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
disabled={busy}
onClick={() => pending?.kind === "replace" && generate(pending.source)}
>
{t.replace}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
function Line({ line: l, marker }: { line: BudgetLineView; marker: number }) {
const hasLimit = l.limitMinor !== null;
return (
<li
className="flex items-start gap-3 p-3"
style={{ paddingLeft: `${0.75 + l.depth * 1.25}rem` }}
>
<IconBadge icon={l.icon} color={l.color} />
<div className="flex min-w-0 flex-1 flex-col gap-1.5">
<div className="flex flex-wrap items-center justify-between gap-x-2 gap-y-1">
<p className="flex min-w-0 items-center gap-2 font-medium">
<span className="truncate">{l.name}</span>
<StatusBadge
status={l.status}
forecastOver={l.forecastOver}
exceeded={(l.remainingMinor ?? 0) < 0}
/>
</p>
<p className="text-sm tabular-nums">
{hasLimit
? t.line.ofLimit(formatMoney(l.actualMinor), formatMoney(l.limitMinor!))
: formatMoney(l.actualMinor)}
</p>
</div>
{hasLimit ? (
<Bar
ratioBp={l.ratioBp}
status={l.status}
marker={marker}
label={`${l.name}: ${t.line.ofLimit(formatMoney(l.actualMinor), formatMoney(l.limitMinor!))}`}
/>
) : null}
<p className="flex flex-wrap gap-x-3 text-xs text-muted-foreground">
{hasLimit ? (
<span className={cn(l.remainingMinor! < 0 && "text-expense")}>
{l.remainingMinor! < 0
? t.line.over(formatMoney(-l.remainingMinor!))
: t.line.remaining(formatMoney(l.remainingMinor!))}
</span>
) : (
<span>{l.covered ? t.status.covered : t.status.none}</span>
)}
{l.plannedMinor ? <span>{t.line.planned(formatMoney(l.plannedMinor))}</span> : null}
{l.forecastMinor !== l.actualMinor ? (
<span className={cn(l.forecastOver && "text-expense")}>
{t.line.forecast(formatMoney(l.forecastMinor))}
</span>
) : null}
</p>
</div>
</li>
);
}
function EditDialog({ data, onClose }: { data: Data; onClose: () => void }) {
const [values, setValues] = useState<Record<string, string>>(() =>
Object.fromEntries(
data.editor.categories.map((c) => {
const v = data.editor.limits[c.id];
return [c.id, v ? formatMoneyInput(v) : ""];
}),
),
);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
// Toplam: limiti olan ve üstünde limit olmayan kategoriler (alt limitler iki kez sayılmaz).
let total = 0;
const stack: { depth: number; limited: boolean }[] = [];
for (const c of data.editor.categories) {
while (stack.length && stack.at(-1)!.depth >= c.depth) stack.pop();
const covered = stack.some((s) => s.limited);
const v = parseMoney(values[c.id] ?? "") ?? 0;
if (v > 0 && !covered) total += v;
stack.push({ depth: c.depth, limited: v > 0 });
}
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveBudgetAction({
month: data.month,
limits: Object.entries(values).map(([categoryId, amount]) => ({ categoryId, amount })),
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.saved);
onClose();
} else setError(r.error);
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={t.editTitle(monthLabel(data.month))}
description={t.editHint}
footer={
<>
<span className="mr-auto self-center text-sm font-medium tabular-nums">
{t.editTotal(formatMoney(total))}
</span>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="budget-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="budget-form" onSubmit={submit} noValidate className="flex flex-col">
{data.editor.categories.map((c) => (
<label
key={c.id}
className="flex items-center justify-between gap-3 border-b py-1.5 last:border-b-0"
style={{ paddingLeft: `${c.depth * 1.25}rem` }}
>
<span className={cn("min-w-0 truncate text-sm", c.depth === 0 && "font-medium")}>
{c.name}
</span>
<div className="w-36 shrink-0">
<MoneyInput
id={`limit-${c.id}`}
value={values[c.id] ?? ""}
onChange={(x) => setValues((s) => ({ ...s, [c.id]: x }))}
aria-label={c.name}
/>
</div>
</label>
))}
{error ? <p className="pt-2 text-sm text-destructive">{error}</p> : null}
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,15 @@
import { getDailyPlan } from "../plan";
import { DailyPlanView } from "./daily-plan-view";
/** Dashboard günlük plan kartı (sunucu): veriyi yükler, görünümü istemciye verir. */
export async function DailyPlanCard({
userId,
householdId,
}: {
userId: string;
householdId: string;
}) {
const data = await getDailyPlan(userId, householdId);
if (!data) return null;
return <DailyPlanView data={data} />;
}
@@ -0,0 +1,257 @@
"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";
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,
tone,
hint,
}: {
label: string;
value: string;
tone?: string;
hint?: string;
}) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("text-lg font-semibold tabular-nums", tone)}>{value}</p>
{hint ? <p className="text-[11px] leading-tight text-muted-foreground">{hint}</p> : null}
</div>
);
}
/** Dashboard: ayın günlük planı, kümülatif grafik ve gelirle karşılaştırma. */
export function DailyPlanView({ data }: { data: Data }) {
const p = data.plan;
if (!data.hasBudget) {
return (
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.title}</CardTitle>
<CardDescription>{t.noBudget}</CardDescription>
</CardHeader>
<CardContent>
<Button size="sm" variant="outline" asChild>
<Link href="/butce">{tr.budget.goToBudget}</Link>
</Button>
</CardContent>
</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;
return (
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.title}</CardTitle>
<CardDescription>
{p.spentPct !== null ? t.headline(p.monthPct, p.spentPct) : null}
</CardDescription>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="grid grid-cols-2 gap-3 lg:grid-cols-4">
<Stat
label={t.today}
value={signed(p.todayAllowanceMinor)}
tone={p.todayAllowanceMinor < 0 ? "text-expense" : "text-budget"}
hint={t.todayHint}
/>
<Stat label={t.plannedToDate} value={formatMoney(p.plannedToDateMinor)} />
<Stat
label={t.actualToDate}
value={formatMoney(p.actualToDateMinor)}
tone={p.actualToDateMinor > p.plannedToDateMinor ? "text-expense" : undefined}
/>
<Stat
label={t.projectedLeft}
value={signed(data.projectedLeftMinor)}
tone={data.projectedLeftMinor < 0 ? "text-expense" : "text-income"}
hint={tr.budget.income.projectedLeftHint}
/>
</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>
<div className="rounded-lg border p-3 text-sm">
<p className="mb-2 font-medium capitalize">
{t.next(monthFmt.format(new Date(`${data.next.month}-15T12:00:00+03:00`)))}
</p>
<div className="grid grid-cols-3 gap-2">
<Stat label={t.nextIncome} value={formatMoney(data.next.expectedIncomeMinor)} />
<Stat
label={t.nextBudget}
value={
data.next.budgetMinor === null ? t.nextNoBudget : formatMoney(data.next.budgetMinor)
}
/>
<Stat
label={t.nextDiff}
value={nextDiff === null ? "—" : signed(nextDiff)}
tone={nextDiff !== null && nextDiff < 0 ? "text-expense" : undefined}
/>
</div>
</div>
<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.day}</th>
<th className="py-1 font-normal">{t.planned}</th>
<th className="py-1 font-normal">{t.actual}</th>
<th className="py-1 font-normal">{t.cumPlanned}</th>
<th className="py-1 font-normal">{t.cumActual}</th>
</tr>
</thead>
<tbody className="divide-y">
{p.days.map((day, i) => (
<tr key={day.date} className={cn(i === p.todayIndex && "bg-muted font-medium")}>
<td className="py-1 text-left">{d(day.date)}</td>
<td className="py-1">{formatMoney(day.plannedMinor)}</td>
<td className="py-1">
{p.todayIndex === -1 || i <= p.todayIndex
? formatMoney(day.actualMinor)
: "—"}
</td>
<td className="py-1">{formatMoney(day.cumPlannedMinor)}</td>
<td className="py-1">
{p.todayIndex === -1 || i <= p.todayIndex
? formatMoney(day.cumActualMinor)
: "—"}
</td>
</tr>
))}
</tbody>
</table>
</div>
</details>
</CardContent>
</Card>
);
}
@@ -0,0 +1,250 @@
"use client";
import { Plus, Trash2 } from "lucide-react";
import { useState } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/ui/input";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import { saveIncomeItemsAction } from "../actions";
import type { IncomePlan } from "../plan";
const t = tr.budget.income;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
function Stat({
label,
value,
tone,
hint,
}: {
label: string;
value: string;
tone?: string;
hint?: string;
}) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("font-semibold tabular-nums", tone)}>{value}</p>
{hint ? <p className="text-[11px] text-muted-foreground">{hint}</p> : null}
</div>
);
}
const signed = (minor: number) => `${minor < 0 ? "−" : ""}${formatMoney(Math.abs(minor))}`;
/** /butce: ayın gelir planı ve gelir − gider karşılaştırması. */
export function IncomePlanSection({
month,
monthLabel,
income,
limitMinor,
forecastMinor,
hasBudget,
canWrite,
}: {
month: string;
monthLabel: string;
income: IncomePlan;
limitMinor: number;
forecastMinor: number;
hasBudget: boolean;
canWrite: boolean;
}) {
const [editing, setEditing] = useState(false);
const projected = income.expectedMinor - forecastMinor;
const planned = income.expectedMinor - limitMinor;
return (
<Card size="sm">
<CardHeader>
<div className="flex flex-wrap items-start justify-between gap-2">
<div>
<CardTitle className="text-base">{t.title}</CardTitle>
<CardDescription>{t.description}</CardDescription>
</div>
{canWrite ? (
<Button size="sm" variant="outline" onClick={() => setEditing(true)}>
<Plus />
{t.edit}
</Button>
) : null}
</div>
</CardHeader>
<CardContent className="flex flex-col gap-3">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={t.actual} value={formatMoney(income.actualMinor)} tone="text-income" />
<Stat label={t.pending} value={formatMoney(income.pendingMinor)} />
<Stat label={t.manual} value={formatMoney(income.manualMinor)} />
<Stat label={t.expected} value={formatMoney(income.expectedMinor)} tone="text-income" />
{hasBudget ? (
<Stat
label={t.plannedLeft}
value={signed(planned)}
tone={planned < 0 ? "text-expense" : undefined}
hint={t.plannedLeftHint}
/>
) : null}
<Stat
label={t.projectedLeft}
value={signed(projected)}
tone={projected < 0 ? "text-expense" : undefined}
hint={t.projectedLeftHint}
/>
</div>
{income.entries.length || income.manual.length ? (
<ul className="divide-y rounded-lg border text-sm">
{income.entries.map((e) => (
<li key={e.id} className="flex items-center justify-between gap-2 p-2">
<span className="min-w-0 truncate">
{d(e.date)} · {e.label}
</span>
<span className="flex shrink-0 items-center gap-2">
<Badge variant={e.status === "posted" ? "secondary" : "outline"}>
{e.status === "posted" ? t.received : t.planned}
</Badge>
<span className="tabular-nums">{formatMoney(e.amountMinor)}</span>
</span>
</li>
))}
{income.manual.map((m) => (
<li key={m.id} className="flex items-center justify-between gap-2 p-2">
<span className="min-w-0 truncate">{m.name}</span>
<span className="flex shrink-0 items-center gap-2">
<Badge variant="outline">{t.manual}</Badge>
<span className="tabular-nums">{formatMoney(m.amountMinor)}</span>
</span>
</li>
))}
</ul>
) : (
<p className="text-sm text-muted-foreground">{t.empty}</p>
)}
</CardContent>
{editing ? (
<ManualDialog
month={month}
monthLabel={monthLabel}
items={income.manual}
onClose={() => setEditing(false)}
/>
) : null}
</Card>
);
}
function ManualDialog({
month,
monthLabel,
items,
onClose,
}: {
month: string;
monthLabel: string;
items: IncomePlan["manual"];
onClose: () => void;
}) {
const [rows, setRows] = useState(() =>
items.length
? items.map((i) => ({ key: i.id, name: i.name, amount: formatMoneyInput(i.amountMinor) }))
: [{ key: "new-0", name: "", amount: "" }],
);
const [errors, setErrors] = useState<Record<string, string>>({});
const [busy, setBusy] = useState(false);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveIncomeItemsAction({
month,
items: rows
.filter((x) => x.name.trim() || x.amount.trim())
.map((x) => ({ name: x.name, amount: x.amount })),
});
setBusy(false);
if (r.ok) {
toast.success(t.saved);
onClose();
} else setErrors({ ...(r.fieldErrors ?? {}), root: r.fieldErrors ? "" : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={t.editTitle(monthLabel)}
description={t.editHint}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="income-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="income-form" onSubmit={submit} noValidate className="flex flex-col gap-2">
{rows.map((row, i) => (
<div key={row.key} className="flex items-start gap-2">
<div className="min-w-0 flex-1">
<Input
value={row.name}
placeholder={t.itemName}
aria-label={t.itemName}
aria-invalid={Boolean(errors[`items.${i}.name`])}
onChange={(e) =>
setRows((s) => s.map((x, j) => (j === i ? { ...x, name: e.target.value } : x)))
}
/>
{errors[`items.${i}.name`] ? (
<p className="text-xs text-destructive">{errors[`items.${i}.name`]}</p>
) : null}
</div>
<div className="w-36 shrink-0">
<MoneyInput
value={row.amount}
aria-label={t.itemAmount}
onChange={(v) =>
setRows((s) => s.map((x, j) => (j === i ? { ...x, amount: v } : x)))
}
/>
{errors[`items.${i}.amount`] ? (
<p className="text-xs text-destructive">{errors[`items.${i}.amount`]}</p>
) : null}
</div>
<Button
type="button"
size="icon"
variant="ghost"
aria-label={t.removeItem}
onClick={() => setRows((s) => s.filter((_, j) => j !== i))}
>
<Trash2 />
</Button>
</div>
))}
<Button
type="button"
variant="outline"
size="sm"
className="w-fit"
disabled={rows.length >= 30}
onClick={() => setRows((s) => [...s, { key: `new-${Date.now()}`, name: "", amount: "" }])}
>
<Plus />
{t.addItem}
</Button>
{errors.root ? <p className="text-sm text-destructive">{errors.root}</p> : null}
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,29 @@
import { AlertTriangle } from "lucide-react";
import Link from "next/link";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import { countBudgetWarnings } from "../service";
/** Dashboard: bu ay %80'i geçilen veya aşılan bütçe kategorileri (uygulama içi uyarı). */
export async function BudgetWarningBanner({
userId,
householdId,
}: {
userId: string;
householdId: string;
}) {
const n = await countBudgetWarnings(userId, householdId);
if (!n) return null;
return (
<div
role="status"
className="flex flex-wrap items-center gap-3 rounded-xl border border-amber-500/40 bg-amber-500/10 p-3 text-sm"
>
<AlertTriangle className="size-4 shrink-0 text-amber-600 dark:text-amber-400" aria-hidden />
<span className="flex-1">{tr.budget.warnings(n)}</span>
<Button asChild size="sm" variant="outline">
<Link href="/butce">{tr.budget.goToBudget}</Link>
</Button>
</div>
);
}
+157
View File
@@ -0,0 +1,157 @@
import { Types } from "mongoose";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { AccountModel } from "@/models/account";
import { HouseholdModel } from "@/models/household";
import { TransactionModel } from "@/models/transaction";
import { budgetPeriod, periodOfDate, shiftMonth } from "@/shared/budget";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import { incomeItemsSchema } from "@/shared/schemas/budget";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { getDailyPlan, getIncomePlan, saveIncomeItems } from "./plan";
import { getBudget } from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
const today = todayIstanbul();
const month = periodOfDate(today);
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
async function income(
date: string,
amountMinor: number,
status: "posted" | "planned",
accountId?: Types.ObjectId,
) {
const actor = new Types.ObjectId(ayse);
const acc =
accountId ??
(await AccountModel.findOne({ householdId: cakir, name: "Ziraat Maaş" }).lean())!._id;
await TransactionModel.create({
householdId: new Types.ObjectId(cakir),
type: "income",
status,
date: istanbulDayStart(date)!,
accountId: acc,
amountMinor,
description: "Test gelir",
recurringRuleId: status === "planned" ? new Types.ObjectId() : null,
occurrenceIndex: status === "planned" ? 0 : null,
createdBy: actor,
updatedBy: actor,
});
}
describe("gelir planı", () => {
it("gerçekleşen + bekleyen planlı + elle eklenen = beklenen", async () => {
const p0 = (await getIncomePlan(ayse, cakir, month))!;
const { to } = budgetPeriod(month);
await income(to, 3_000_00, "planned");
expect(
(
await saveIncomeItems(
ayse,
cakir,
incomeItemsSchema.parse({ month, items: [{ name: "Prim", amount: "5.000" }] }),
)
).ok,
).toBe(true);
const p = (await getIncomePlan(ayse, cakir, month))!;
expect(p.pendingMinor).toBe(p0.pendingMinor + 3_000_00);
expect(p.manual).toEqual([expect.objectContaining({ name: "Prim", amountMinor: 5_000_00 })]);
expect(p.expectedMinor).toBe(p.actualMinor + p.pendingMinor + 5_000_00);
expect(p.entries.some((e) => e.status === "planned" && e.amountMinor === 3_000_00)).toBe(true);
// Elle eklenenler bütçe limitlerini bozmaz.
expect((await getBudget(ayse, cakir, month))!.editor.limits).toBeTruthy();
});
it("gizli hesaba gelen gelir hane ayarına göre; izleyici yazamaz; başka hane göremez", async () => {
const actor = new Types.ObjectId(emre);
const secret = await AccountModel.create({
householdId: new Types.ObjectId(cakir),
name: "Emre Gizli Gelir",
type: "bank",
openingBalanceMinor: 0,
openingDate: istanbulDayStart(shiftMonth(month, -2) + "-01")!,
isPrivate: true,
ownerUserId: actor,
createdBy: actor,
updatedBy: actor,
});
const a0 = (await getIncomePlan(ayse, cakir, month))!.actualMinor;
await income(today, 1_000_00, "posted", secret._id);
expect((await getIncomePlan(ayse, cakir, month))!.actualMinor).toBe(a0 + 1_000_00);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": false } },
);
expect((await getIncomePlan(ayse, cakir, month))!.actualMinor).toBe(a0);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": true } },
);
// Sahibi kendi gizli hesabını her zaman görür.
expect((await getIncomePlan(emre, cakir, month))!.actualMinor).toBe(a0 + 1_000_00);
expect(
(await saveIncomeItems(zeynep, cakir, incomeItemsSchema.parse({ month, items: [] }))).ok,
).toBe(false);
expect(await getIncomePlan(fatma, cakir, month)).toBeNull();
expect(incomeItemsSchema.safeParse({ month, items: [{ name: "", amount: "1" }] }).success).toBe(
false,
);
expect(
incomeItemsSchema.safeParse({ month, items: [{ name: "X", amount: "0" }] }).success,
).toBe(false);
});
});
describe("günlük plan", () => {
it("plan toplamı bütçeye eşit; bugüne kadarki gerçekleşen bütçe motoruyla tutarlı; elde kalacak", async () => {
const v = (await getDailyPlan(ayse, cakir))!;
const b = (await getBudget(ayse, cakir))!;
expect(v.month).toBe(month);
expect(v.hasBudget).toBe(true);
const last = v.plan.days.at(-1)!;
expect(last.cumPlannedMinor).toBe(Math.max(b.totals.limitMinor, v.plan.fixedMinor));
expect(v.plan.days).toHaveLength(b.totalDays);
expect(v.plan.todayIndex).toBe(b.elapsedDays - 1);
// Bugünden sonraki gerçekleşmiş işlem yok: bugüne kadar harcanan = ayın gerçekleşeni.
expect(v.plan.actualToDateMinor).toBe(b.totals.actualMinor);
expect(v.projectedLeftMinor).toBe(v.income.expectedMinor - b.totals.forecastMinor);
expect(v.plannedLeftMinor).toBe(v.income.expectedMinor - b.totals.limitMinor);
expect(v.next.month).toBe(shiftMonth(month, 1));
});
it("önceki ay örüntüsü modu: dağılım değişir, toplam korunur; bütçesiz hane", async () => {
const even = (await getDailyPlan(ayse, cakir))!;
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.dailyPlanMode": "previous_month_pattern" } },
);
const pattern = (await getDailyPlan(ayse, cakir))!;
await HouseholdModel.updateOne({ _id: cakir }, { $set: { "settings.dailyPlanMode": "even" } });
expect(pattern.mode).toBe("previous_month_pattern");
expect(pattern.plan.days.at(-1)!.cumPlannedMinor).toBe(even.plan.days.at(-1)!.cumPlannedMinor);
expect(pattern.plan.days.map((d) => d.plannedMinor)).not.toEqual(
even.plan.days.map((d) => d.plannedMinor),
);
const annemler = ids.household("Annemler");
const a = (await getDailyPlan(fatma, annemler))!;
expect(a.hasBudget).toBe(false);
expect(await getDailyPlan(fatma, cakir)).toBeNull();
});
});
+261
View File
@@ -0,0 +1,261 @@
import "server-only";
import { Types, type PipelineStage } from "mongoose";
import { hasHouseholdRole } from "@/features/households/roles";
import { loadContext, type Ctx } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { BudgetModel } from "@/models/budget";
import { TransactionModel } from "@/models/transaction";
import { budgetPeriod, daysBetween, periodOfDate, shiftMonth } from "@/shared/budget";
import { dailyPlan, patternWeights, type DailyPlan } from "@/shared/daily-plan";
import { istanbulDayStart, todayIstanbul, toIstanbulYmd } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import type { IncomeItemsForm } from "@/shared/schemas/budget";
import { getBudget, settingsOf, type Settings } from "./service";
/**
* Gelir planı ve günlük plan (Bölüm 6.9).
*
* Gelir planı: dönemdeki gerçekleşmiş gelirler + henüz gerçekleşmemiş planlı gelirler (düzenli
* işlem tekrarları) + elle eklenen beklenen gelirler. Elle eklenen kalem gelir işlemi olarak
* girildiğinde kullanıcı kalemi kaldırır (aksi halde iki kez sayılır).
*/
const DAY_MS = 86_400_000;
function baseMatch(ctx: Ctx, s: Settings, type: "income" | "expense", from: string, to: string) {
const m: Record<string, unknown> = {
householdId: ctx.m.householdId,
type,
deletedAt: null,
status: { $in: ["posted", "planned"] },
date: {
$gte: istanbulDayStart(from)!,
$lt: new Date(istanbulDayStart(to)!.getTime() + DAY_MS),
},
};
if (!s.includePrivate && ctx.hiddenAccountIds.length)
m.accountId = { $nin: ctx.hiddenAccountIds };
return m;
}
export type IncomeEntry = {
id: string;
date: string;
label: string;
amountMinor: number;
status: "posted" | "planned";
};
export type IncomePlan = {
/** Gerçekleşen gelir. */
actualMinor: number;
/** Henüz gerçekleşmemiş planlı gelir. */
pendingMinor: number;
manualMinor: number;
/** Beklenen toplam = gerçekleşen + planlı + elle. */
expectedMinor: number;
/** Planlı/düzenli gelir kalemleri (gerçekleşmiş düzenli gelirler dahil). */
entries: IncomeEntry[];
manual: { id: string; name: string; amountMinor: number }[];
};
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))
.select({
date: 1,
status: 1,
amountMinor: 1,
description: 1,
payeeName: 1,
categoryId: 1,
recurringRuleId: 1,
})
.sort({ date: 1 })
.lean(),
BudgetModel.findOne({ householdId: ctx.m.householdId, month }).lean(),
]);
let actual = 0;
let pending = 0;
const entries: IncomeEntry[] = [];
for (const d of docs) {
if (d.status === "posted") actual += d.amountMinor;
else pending += d.amountMinor;
if (d.status === "planned" || d.recurringRuleId) {
const cat = d.categoryId ? ctx.categoryMap.get(String(d.categoryId)) : undefined;
entries.push({
id: String(d._id),
date: toIstanbulYmd(d.date),
label: d.payeeName || d.description || cat?.name || tr.transactions.types.income,
amountMinor: d.amountMinor,
status: d.status === "posted" ? "posted" : "planned",
});
}
}
const manual = (budget?.incomeItems ?? []).map((i) => ({
id: String(i._id),
name: i.name,
amountMinor: i.amountMinor,
}));
const manualMinor = manual.reduce((a, i) => a + i.amountMinor, 0);
return {
actualMinor: actual,
pendingMinor: pending,
manualMinor,
expectedMinor: actual + pending + manualMinor,
entries,
manual,
};
}
export async function getIncomePlan(
userId: string,
householdId: string,
month: string,
): Promise<IncomePlan | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
return incomePlan(ctx, await settingsOf(ctx.m.householdId), month);
}
export async function saveIncomeItems(
actorId: string,
householdId: string,
input: IncomeItemsForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const actor = new Types.ObjectId(actorId);
await BudgetModel.updateOne(
{ householdId: ctx.m.householdId, month: input.month },
{
$set: {
incomeItems: input.items.map((i) => ({ name: i.name, amountMinor: i.amount })),
updatedBy: actor,
},
$setOnInsert: { createdBy: actor, limits: [] },
},
{ upsert: true },
);
return ok(undefined);
}
// --- 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) {
const pipeline: PipelineStage[] = [
{ $match: baseMatch(ctx, s, "expense", from, to) },
{
$group: {
_id: {
d: { $dateToString: { date: "$date", format: "%Y-%m-%d", timezone: "Europe/Istanbul" } },
s: "$status",
f: {
$or: [
{ $ne: [{ $ifNull: ["$recurringRuleId", null] }, null] },
{ $ne: [{ $ifNull: ["$installment.planId", null] }, null] },
],
},
},
sum: { $sum: "$amountMinor" },
},
},
];
const rows = await TransactionModel.aggregate<{
_id: { d: string; s: string; f: boolean };
sum: number;
}>(pipeline);
const fixed = new Map<string, number>();
const actual = new Map<string, number>();
const variable = new Map<string, number>();
const add = (m: Map<string, number>, k: string, v: number) => m.set(k, (m.get(k) ?? 0) + v);
for (const r of rows) {
if (r._id.f) add(fixed, r._id.d, r.sum);
if (r._id.s === "posted") {
add(actual, r._id.d, r.sum);
if (!r._id.f) add(variable, r._id.d, r.sum);
}
}
return { fixed, actual, variable };
}
export type DailyPlanView = {
month: string;
period: { from: string; to: string };
hasBudget: boolean;
plan: DailyPlan;
mode: "even" | "previous_month_pattern";
income: IncomePlan;
/** Bütçe ayı sonu tahmini gider (bütçe motorundan). */
forecastExpenseMinor: number;
/** Bu tempoda ay sonunda elde kalacak: beklenen gelir − tahmini gider. */
projectedLeftMinor: number;
/** Plana göre elde kalacak: beklenen gelir − bütçe. */
plannedLeftMinor: number;
next: { month: string; expectedIncomeMinor: number; budgetMinor: number | null };
canWrite: boolean;
};
/** Dashboard günlük planı: içinde bulunulan bütçe ayı. */
export async function getDailyPlan(
userId: string,
householdId: string,
): Promise<DailyPlanView | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const s = await settingsOf(ctx.m.householdId);
const today = todayIstanbul();
const month = periodOfDate(today, s.startDay);
const period = budgetPeriod(month, s.startDay);
const nextMonth = shiftMonth(month, 1);
const mode = s.dailyMode;
const [budget, byDay, 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 forecastExpense = budget.totals.forecastMinor;
return {
month,
period,
hasBudget: budget.hasBudget,
plan,
mode,
income,
forecastExpenseMinor: forecastExpense,
projectedLeftMinor: income.expectedMinor - forecastExpense,
plannedLeftMinor: income.expectedMinor - budget.totals.limitMinor,
next: {
month: nextMonth,
expectedIncomeMinor: nextIncome.expectedMinor,
budgetMinor: nextBudget?.hasBudget ? nextBudget.totals.limitMinor : null,
},
canWrite: hasHouseholdRole(ctx.m.role, "member"),
};
}
+267
View File
@@ -0,0 +1,267 @@
import { Types } from "mongoose";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { createCategory } from "@/features/categories/service";
import { AccountModel } from "@/models/account";
import { BudgetModel } from "@/models/budget";
import { HouseholdModel } from "@/models/household";
import { TransactionModel } from "@/models/transaction";
import { budgetPeriod, shiftMonth } from "@/shared/budget";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { budgetLimitsSchema } from "@/shared/schemas/budget";
import { categoryFormSchema } from "@/shared/schemas/category";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { budgetFromActuals, copyPreviousBudget, getBudget, saveBudget } from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
// Seed verisinin olmadığı geçmiş bir ay: toplamlar yalnızca bu testin işlemlerinden oluşur.
const M = shiftMonth(todayIstanbul().slice(0, 7), -24);
const P = shiftMonth(M, -1);
const cat = { ev: "", kira: "", aidat: "", keyif: "" };
type CatKey = keyof typeof cat;
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
const mk = async (key: CatKey, name: string, parent = "") => {
const r = await createCategory(
ayse,
cakir,
categoryFormSchema.parse({
kind: "expense",
name,
parentId: parent,
icon: "tag",
color: "blue",
}),
);
cat[key] = r.ok ? r.data.id : "";
};
await mk("ev", "Test Ev");
await mk("kira", "Test Kira", cat.ev);
await mk("aidat", "Test Aidat", cat.ev);
await mk("keyif", "Test Keyif");
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => a!._id);
async function expense(input: {
date: string;
amountMinor: number;
category?: string;
splits?: { category: string; amountMinor: number }[];
account?: string;
status?: "posted" | "planned";
recurring?: boolean;
installment?: { planId: Types.ObjectId; index: number; count: number };
}) {
const actor = new Types.ObjectId(ayse);
const splits = (input.splits ?? []).map((s) => ({
categoryId: new Types.ObjectId(s.category),
amountMinor: s.amountMinor,
}));
await TransactionModel.create({
householdId: new Types.ObjectId(cakir),
type: "expense",
status: input.status ?? "posted",
date: istanbulDayStart(input.date)!,
accountId: await acc(input.account ?? "Cüzdan"),
amountMinor: input.amountMinor,
categoryId: input.category ? new Types.ObjectId(input.category) : null,
splits,
effectiveCategoryIds: input.category
? [new Types.ObjectId(input.category)]
: splits.map((s) => s.categoryId),
recurringRuleId: input.recurring ? new Types.ObjectId() : null,
occurrenceIndex: input.recurring ? 0 : null,
installment: input.installment ?? null,
createdBy: actor,
updatedBy: actor,
});
}
const limits = (month: string, list: Partial<Record<CatKey, string>>) =>
budgetLimitsSchema.parse({
month,
limits: Object.entries(list).map(([k, amount]) => ({ categoryId: cat[k as CatKey], amount })),
});
const line = async (key: CatKey, month = M, user = ayse) =>
(await getBudget(user, cakir, month))!.lines.find((l) => l.categoryId === cat[key]);
describe("aylık bütçe", () => {
const { from, to } = budgetPeriod(M);
it("limitler; üst limit alt kategorileri kapsar; bölünmüş işlem kalem bazında; planlı ayrı", async () => {
await expense({ date: from, amountMinor: 15_000_00, category: cat.kira, recurring: true });
await expense({
date: addDays(from, 5),
amountMinor: 3_000_00,
splits: [
{ category: cat.aidat, amountMinor: 1_200_00 },
{ category: cat.keyif, amountMinor: 1_800_00 },
],
});
await expense({ date: to, amountMinor: 500_00, category: cat.aidat, status: "planned" });
expect((await saveBudget(ayse, cakir, limits(M, { ev: "17.000", kira: "15.000" }))).ok).toBe(
true,
);
const b = (await getBudget(ayse, cakir, M))!;
expect(b.hasBudget).toBe(true);
// Geçmiş ay: tüm günler geçti.
expect(b.elapsedDays).toBe(b.totalDays);
expect(b.totals.limitMinor).toBe(17_000_00);
expect(b.totals.actualMinor).toBe(18_000_00);
expect(b.totals.unbudgetedMinor).toBe(1_800_00);
expect(await line("ev")).toMatchObject({
actualMinor: 16_200_00,
plannedMinor: 500_00,
forecastMinor: 16_700_00,
status: "warning",
forecastOver: false,
});
expect(await line("kira")).toMatchObject({ status: "over", remainingMinor: 0 });
expect(await line("keyif")).toMatchObject({ limitMinor: null, actualMinor: 1_800_00 });
// Boş limit kaldırılır.
await saveBudget(ayse, cakir, limits(M, { ev: "17.000", kira: "" }));
expect((await line("kira"))!.limitMinor).toBeNull();
});
it("gizli hesap harcaması hane ayarına göre", async () => {
const actor = new Types.ObjectId(emre);
const secret = await AccountModel.create({
householdId: new Types.ObjectId(cakir),
name: "Emre Gizli Test",
type: "cash",
openingBalanceMinor: 0,
openingDate: istanbulDayStart(addDays(from, -10))!,
isPrivate: true,
ownerUserId: actor,
createdBy: actor,
updatedBy: actor,
});
await expense({
date: addDays(from, 2),
amountMinor: 700_00,
category: cat.keyif,
account: "Emre Gizli Test",
});
expect((await line("keyif"))!.actualMinor).toBe(2_500_00);
const b = (await getBudget(ayse, cakir, M))!;
expect(b.includesHidden).toBe(true);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": false } },
);
expect((await line("keyif"))!.actualMinor).toBe(1_800_00);
// Sahibi her zaman görür.
expect((await line("keyif", M, emre))!.actualMinor).toBe(2_500_00);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": true } },
);
expect(secret).toBeTruthy();
});
it("taksit modu: her taksit kendi ayına veya tamamı alış ayına", async () => {
const planId = new Types.ObjectId();
const next = budgetPeriod(shiftMonth(M, 1));
await expense({
date: addDays(from, 10),
amountMinor: 1_000_00,
category: cat.aidat,
installment: { planId, index: 1, count: 2 },
});
await expense({
date: addDays(next.from, 10),
amountMinor: 1_000_00,
category: cat.aidat,
installment: { planId, index: 2, count: 2 },
status: "planned",
});
const before = (await line("aidat"))!.actualMinor;
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.installmentBudgetMode": "purchase_month" } },
);
expect((await line("aidat"))!.actualMinor).toBe(before + 1_000_00);
// Tamamı alış ayında sayıldığı için sonraki ayda görünmez.
expect((await line("aidat", shiftMonth(M, 1)))?.actualMinor ?? 0).toBe(0);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.installmentBudgetMode": "per_installment" } },
);
// Her taksit kendi ayında (geçmiş ay olduğu için vadesi gelen taksit gerçekleşmiştir).
expect((await line("aidat", shiftMonth(M, 1)))!.actualMinor).toBe(1_000_00);
});
it("tahmin: değişken gider tempoyla, sabit gider olduğu gibi (gelecek ayda değişken sayılmaz)", async () => {
const F = shiftMonth(todayIstanbul().slice(0, 7), 24);
const f = budgetPeriod(F);
await expense({ date: f.from, amountMinor: 900_00, category: cat.keyif });
await expense({ date: f.from, amountMinor: 4_000_00, category: cat.kira, recurring: true });
const keyif = (await line("keyif", F))!;
expect(keyif.actualMinor).toBe(900_00);
// Henüz başlamamış dönem, geçmiş yok: gerçekleşen değişken olduğu gibi, tempo eklenmez.
expect(keyif.forecastMinor).toBe(900_00);
expect((await line("kira", F))!.forecastMinor).toBe(4_000_00);
});
it("içinde bulunulan ayda değişken gider tempoyla büyür, sabit gider büyümez", async () => {
const today = todayIstanbul();
const cur = today.slice(0, 7);
if (budgetPeriod(cur).to === today) return; // ayın son günü: kalan gün yok
await expense({ date: today, amountMinor: 1_000_00, category: cat.keyif });
await expense({ date: today, amountMinor: 2_000_00, category: cat.kira, recurring: true });
const keyif = (await line("keyif", cur))!;
expect(keyif.actualMinor).toBe(1_000_00);
expect(keyif.forecastMinor).toBeGreaterThan(1_000_00);
expect((await line("kira", cur))!.forecastMinor).toBe(2_000_00);
});
it("bütçe ayı başlangıç günü dönemi kaydırır", async () => {
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.budgetMonthStartDay": 15 } },
);
const b = (await getBudget(ayse, cakir, M))!;
expect(b.period).toEqual(budgetPeriod(M, 15));
// Ayın 1'indeki kira artık önceki bütçe ayında.
expect((await line("kira"))?.actualMinor ?? 0).toBe(0);
await HouseholdModel.updateOne({ _id: cakir }, { $set: { "settings.budgetMonthStartDay": 1 } });
});
it("önceki aydan kopyala ve önceki ayın harcamalarından oluştur", async () => {
const N = shiftMonth(M, 1);
expect((await copyPreviousBudget(ayse, cakir, P)).ok).toBe(false);
expect((await copyPreviousBudget(ayse, cakir, N)).ok).toBe(true);
expect((await getBudget(ayse, cakir, N))!.editor.limits[cat.ev]).toBe(17_000_00);
// M'nin harcamaları: Ev kökü 16.200 + taksit 1.000 → 17.200; Keyif 2.500 (gizli dahil).
expect((await budgetFromActuals(ayse, cakir, N)).ok).toBe(true);
const l = (await BudgetModel.findOne({ householdId: cakir, month: N }).lean())!.limits;
const get = (k: CatKey) => l.find((x) => String(x.categoryId) === cat[k])?.amountMinor;
expect(get("ev")).toBe(17_200_00);
expect(get("keyif")).toBe(2_500_00);
expect(get("kira")).toBeUndefined();
expect((await budgetFromActuals(ayse, cakir, shiftMonth(M, -5))).ok).toBe(false);
});
it("yetki: izleyici yazamaz; başka hane göremez; geçersiz kategori reddedilir", async () => {
expect((await getBudget(zeynep, cakir, M))!.canWrite).toBe(false);
expect((await saveBudget(zeynep, cakir, limits(M, { ev: "1" }))).ok).toBe(false);
expect(await getBudget(fatma, cakir, M)).toBeNull();
const annemler = ids.household("Annemler");
expect((await saveBudget(fatma, annemler, limits(M, { ev: "1" }))).ok).toBe(false);
});
});
+413
View File
@@ -0,0 +1,413 @@
import "server-only";
import { Types, type PipelineStage } from "mongoose";
import { hasHouseholdRole } from "@/features/households/roles";
import { loadContext, type Ctx } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { BudgetModel } from "@/models/budget";
import { HouseholdModel } from "@/models/household";
import { TransactionModel } from "@/models/transaction";
import type { IconKey, Swatch } from "@/shared/appearance";
import {
budgetPeriod,
computeBudget,
daysBetween,
periodOfDate,
roundUpLimit,
shiftMonth,
type BudgetLine,
type BudgetTotals,
type CategoryAmounts,
} from "@/shared/budget";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import type { BudgetLimitsForm } from "@/shared/schemas/budget";
/**
* Aylık bütçe (Bölüm 6.9). Okuma: viewer; yazma: member.
*
* Gerçekleşen: dönemdeki gerçekleşmiş (posted) giderler; bölünmüş işlemler kalem bazında.
* Planlı: dönemdeki planlı giderler (düzenli işlem tekrarları, gelecek taksitler).
* Taksit modu (hane ayarı): her taksit kendi ayına (varsayılan) veya tamamı alış ayına.
* Başkasının "yalnızca ben" hesabından giderler hane ayarına göre (yalnızca tutar) sayılır.
*/
const t = tr.budget;
const DAY_MS = 86_400_000;
export type Settings = {
startDay: number;
installmentMode: "per_installment" | "purchase_month";
includePrivate: boolean;
dailyMode: "even" | "previous_month_pattern";
};
export async function settingsOf(householdId: Types.ObjectId): Promise<Settings> {
const h = await HouseholdModel.findById(householdId).select({ settings: 1 }).lean();
return {
startDay: h?.settings?.budgetMonthStartDay ?? 1,
installmentMode: h?.settings?.installmentBudgetMode ?? "per_installment",
includePrivate: h?.settings?.includePrivateAccountsInTotals ?? true,
dailyMode: h?.settings?.dailyPlanMode ?? "even",
};
}
/** Kategori bazında (kendi) sabit/değişken gerçekleşen ve planlı gider. */
export async function expenseAmounts(
ctx: Ctx,
s: Settings,
from: string,
to: string,
): Promise<Map<string, CategoryAmounts>> {
const start = istanbulDayStart(from)!;
const end = new Date(istanbulDayStart(to)!.getTime() + DAY_MS);
const base: Record<string, unknown> = {
householdId: ctx.m.householdId,
type: "expense",
deletedAt: null,
};
if (!s.includePrivate && ctx.hiddenAccountIds.length)
base.accountId = { $nin: ctx.hiddenAccountIds };
const itemsStage: PipelineStage = {
$project: {
status: 1,
fixed: {
$or: [
{ $ne: [{ $ifNull: ["$recurringRuleId", null] }, null] },
{ $ne: [{ $ifNull: ["$installment.planId", null] }, null] },
],
},
items: {
$cond: [
{ $gt: [{ $size: { $ifNull: ["$splits", []] } }, 0] },
"$splits",
[{ categoryId: "$categoryId", amountMinor: "$amountMinor" }],
],
},
},
};
const group: PipelineStage[] = [
itemsStage,
{ $unwind: "$items" },
{
$group: {
_id: { c: "$items.categoryId", s: "$status", f: "$fixed" },
sum: { $sum: "$items.amountMinor" },
},
},
];
const match: Record<string, unknown> = {
...base,
status: { $in: ["posted", "planned"] },
date: { $gte: start, $lt: end },
};
if (s.installmentMode === "purchase_month") match["installment.planId"] = { $in: [null] };
const rows = await TransactionModel.aggregate<{
_id: { c: Types.ObjectId | null; s: string; f: boolean };
sum: number;
}>([{ $match: match }, ...group]);
const out = new Map<string, CategoryAmounts>();
const add = (cat: string, k: keyof CategoryAmounts, v: number) => {
const cur = out.get(cat) ?? { fixedMinor: 0, variableMinor: 0, plannedMinor: 0 };
cur[k] += v;
out.set(cat, cur);
};
for (const r of rows) {
const cat = r._id.c ? String(r._id.c) : "";
if (r._id.s === "planned") add(cat, "plannedMinor", r.sum);
else add(cat, r._id.f ? "fixedMinor" : "variableMinor", r.sum);
}
// Tamamı alış ayına: ilk taksiti bu dönemde olan planların tüm taksitleri gerçekleşmiş sayılır.
if (s.installmentMode === "purchase_month") {
const plans = await TransactionModel.aggregate<{
_id: Types.ObjectId;
first: Date;
items: { categoryId: Types.ObjectId | null; amountMinor: number }[][];
}>([
{
$match: {
...base,
status: { $in: ["posted", "planned"] },
"installment.planId": { $ne: null },
},
},
{
$group: {
_id: "$installment.planId",
first: { $min: "$date" },
items: {
$push: {
$cond: [
{ $gt: [{ $size: { $ifNull: ["$splits", []] } }, 0] },
"$splits",
[{ categoryId: "$categoryId", amountMinor: "$amountMinor" }],
],
},
},
},
},
{ $match: { first: { $gte: start, $lt: end } } },
]);
for (const p of plans)
for (const list of p.items)
for (const it of list)
add(it.categoryId ? String(it.categoryId) : "", "fixedMinor", it.amountMinor);
}
return out;
}
export type BudgetLineView = BudgetLine & { icon: IconKey; color: Swatch; path: string };
export type BudgetView = {
month: string;
currentMonth: string;
period: { from: string; to: string };
elapsedDays: number;
totalDays: number;
lines: BudgetLineView[];
totals: BudgetTotals;
hasBudget: boolean;
/** Limit düzenleyici: etkin gider kategorileri (ağaç sırası) ve mevcut limitler. */
editor: {
categories: { id: string; name: string; depth: number }[];
limits: Record<string, number>;
};
hasPrevious: boolean;
includesHidden: boolean;
canWrite: boolean;
};
function expenseCategories(ctx: Ctx) {
return ctx.flatCategories.filter((c) => c.kind === "expense");
}
export async function getBudget(
userId: string,
householdId: string,
month?: string,
): Promise<BudgetView | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const s = await settingsOf(ctx.m.householdId);
const today = todayIstanbul();
const currentMonth = periodOfDate(today, s.startDay);
const m = month ?? currentMonth;
const period = budgetPeriod(m, s.startDay);
const totalDays = daysBetween(period.from, period.to);
const elapsedDays =
today < period.from ? 0 : today > period.to ? totalDays : daysBetween(period.from, today);
const [doc, prev, amounts] = await Promise.all([
BudgetModel.findOne({ householdId: ctx.m.householdId, month: m }).lean(),
BudgetModel.exists({
householdId: ctx.m.householdId,
month: shiftMonth(m, -1),
"limits.0": { $exists: true },
}),
expenseAmounts(ctx, s, period.from, period.to),
]);
const limits = new Map((doc?.limits ?? []).map((l) => [String(l.categoryId), l.amountMinor]));
// Taban hız (bitmemiş aylar için): önceki dönemin değişken gideri, kategori bazında.
let baselineDays: number | undefined;
if (elapsedDays < totalDays) {
const prev = budgetPeriod(shiftMonth(m, -1), s.startDay);
const prevAmounts = await expenseAmounts(ctx, s, prev.from, prev.to);
let any = 0;
for (const [id, a] of prevAmounts) {
if (a.variableMinor <= 0) continue;
any += a.variableMinor;
const cur = amounts.get(id) ?? { fixedMinor: 0, variableMinor: 0, plannedMinor: 0 };
amounts.set(id, { ...cur, baselineMinor: a.variableMinor });
}
if (any > 0) baselineDays = daysBetween(prev.from, prev.to);
}
const cats = expenseCategories(ctx);
// Arşivli kategori yalnızca limiti veya harcaması varsa görünür.
const visibleCats = cats.filter((c) => !c.archived || limits.has(c.id) || amounts.has(c.id));
const known = new Set(visibleCats.map((c) => c.id));
// Kategorisiz / bilinmeyen kategorideki gider "Kategorisiz" satırında toplanır.
const orphan = { fixedMinor: 0, variableMinor: 0, plannedMinor: 0, baselineMinor: 0 };
for (const [id, a] of amounts)
if (!known.has(id)) {
orphan.fixedMinor += a.fixedMinor;
orphan.variableMinor += a.variableMinor;
orphan.plannedMinor += a.plannedMinor;
orphan.baselineMinor += a.baselineMinor ?? 0;
}
const ORPHAN = "__none__";
const inputCats = visibleCats.map((c) => ({
id: c.id,
parentId: c.parentId,
name: c.name,
order: c.order,
}));
if (orphan.fixedMinor + orphan.variableMinor + orphan.plannedMinor > 0) {
inputCats.push({ id: ORPHAN, parentId: null, name: t.uncategorized, order: 1e9 });
amounts.set(ORPHAN, orphan);
}
const { lines, totals } = computeBudget({
categories: inputCats,
limits,
amounts,
elapsedDays,
totalDays,
baselineDays,
});
const editorCats = cats.filter((c) => !c.archived);
// Düzenleyici için ağaç sırası ve derinlik (tüm etkin kategoriler, limit 0 ile).
const ordered = computeBudget({
categories: editorCats.map((c) => ({
id: c.id,
parentId: c.parentId,
name: c.name,
order: c.order,
})),
limits: new Map(editorCats.map((c) => [c.id, 0])),
amounts: new Map(),
elapsedDays: 0,
totalDays: 1,
}).lines;
return {
month: m,
currentMonth,
period,
elapsedDays,
totalDays,
lines: lines.map((l) => {
const c = ctx.categoryMap.get(l.categoryId);
return {
...l,
icon: (c?.icon ?? "tag") as IconKey,
color: (c?.color ?? "slate") as Swatch,
path: c?.path ?? l.name,
};
}),
totals,
hasBudget: limits.size > 0,
editor: {
categories: ordered.map((l) => ({ id: l.categoryId, name: l.name, depth: l.depth })),
limits: Object.fromEntries(limits),
},
hasPrevious: Boolean(prev),
includesHidden: s.includePrivate && ctx.hiddenAccountIds.length > 0,
canWrite: hasHouseholdRole(ctx.m.role, "member"),
};
}
async function writeLimits(
ctx: Ctx,
actorId: string,
month: string,
limits: { categoryId: string; amountMinor: number }[],
): Promise<ActionResult> {
const valid = new Set(
expenseCategories(ctx)
.filter((c) => !c.archived)
.map((c) => c.id),
);
const seen = new Set<string>();
for (const l of limits) {
if (!valid.has(l.categoryId) || seen.has(l.categoryId)) return fail(t.errors.category);
seen.add(l.categoryId);
}
const actor = new Types.ObjectId(actorId);
await BudgetModel.updateOne(
{ householdId: ctx.m.householdId, month },
{
$set: {
limits: limits.map((l) => ({
categoryId: new Types.ObjectId(l.categoryId),
amountMinor: l.amountMinor,
})),
updatedBy: actor,
},
$setOnInsert: { createdBy: actor },
},
{ upsert: true },
);
return ok(undefined);
}
export async function saveBudget(
actorId: string,
householdId: string,
input: BudgetLimitsForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
return writeLimits(ctx, actorId, input.month, input.limits);
}
/** Önceki ayın limitlerini kopyalar (arşivlenmiş kategoriler atlanır). */
export async function copyPreviousBudget(
actorId: string,
householdId: string,
month: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const prev = await BudgetModel.findOne({
householdId: ctx.m.householdId,
month: shiftMonth(month, -1),
}).lean();
if (!prev?.limits.length) return fail(t.errors.noPrevious);
const active = new Set(
expenseCategories(ctx)
.filter((c) => !c.archived)
.map((c) => c.id),
);
return writeLimits(
ctx,
actorId,
month,
prev.limits
.map((l) => ({ categoryId: String(l.categoryId), amountMinor: l.amountMinor }))
.filter((l) => active.has(l.categoryId)),
);
}
/**
* Önceki ayın gerçekleşen giderlerinden limit: ana kategori (kök) bazında toplam, 100 TL'ye
* yukarı yuvarlanır. Kategorisiz gider atlanır.
*/
export async function budgetFromActuals(
actorId: string,
householdId: string,
month: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const s = await settingsOf(ctx.m.householdId);
const period = budgetPeriod(shiftMonth(month, -1), s.startDay);
const amounts = await expenseAmounts(ctx, s, period.from, period.to);
const cats = expenseCategories(ctx);
const byId = new Map(cats.map((c) => [c.id, c]));
const rootOf = (id: string) => {
let cur = byId.get(id);
let guard = 0;
while (cur?.parentId && byId.has(cur.parentId) && guard++ < 6) cur = byId.get(cur.parentId);
return cur;
};
const totals = new Map<string, number>();
for (const [id, a] of amounts) {
const root = rootOf(id);
if (!root || root.archived) continue;
totals.set(root.id, (totals.get(root.id) ?? 0) + a.fixedMinor + a.variableMinor);
}
const limits = [...totals]
.filter(([, v]) => v > 0)
.map(([categoryId, v]) => ({ categoryId, amountMinor: roundUpLimit(v) }));
if (!limits.length) return fail(t.errors.noPreviousSpending);
return writeLimits(ctx, actorId, month, limits);
}
/** Dashboard uyarısı: bu ayın %80'i geçilmiş veya aşılmış limitli kategori sayısı. */
export async function countBudgetWarnings(userId: string, householdId: string): Promise<number> {
const b = await getBudget(userId, householdId);
if (!b?.hasBudget) return 0;
return b.lines.filter((l) => l.status === "warning" || l.status === "over").length;
}
+88
View File
@@ -0,0 +1,88 @@
"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 { contactEntrySchema, contactFormSchema } from "@/shared/schemas/contact";
import {
createContact,
createContactEntry,
setContactArchived,
updateContact,
updateContactEntry,
} 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;
}
function revalidate() {
revalidatePath("/", "layout");
}
export async function saveContactAction(
contactId: unknown,
input: unknown,
): Promise<ActionResult<unknown>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = contactFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
let result: ActionResult<unknown>;
if (contactId === null || contactId === undefined) {
result = await createContact(ctx.user.id, ctx.household.id, parsed.data);
} else {
const id = idSchema.safeParse(contactId);
if (!id.success) return fail(tr.common.notFound);
result = await updateContact(ctx.user.id, ctx.household.id, id.data, parsed.data);
}
if (result.ok) revalidate();
return result;
}
export async function setContactArchivedAction(
contactId: unknown,
archived: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(contactId);
const a = z.boolean().safeParse(archived);
if (!id.success || !a.success) return fail(tr.common.notFound);
const result = await setContactArchived(ctx.user.id, ctx.household.id, id.data, a.data);
if (result.ok) revalidate();
return result;
}
/** Yeni hareket (transactionId boş) veya mevcut hareketi düzenle. */
export async function saveContactEntryAction(
contactId: unknown,
transactionId: unknown,
input: unknown,
): Promise<ActionResult<unknown>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = contactEntrySchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
let result: ActionResult<unknown>;
if (transactionId) {
const tid = idSchema.safeParse(transactionId);
if (!tid.success) return fail(tr.common.notFound);
result = await updateContactEntry(ctx.user.id, ctx.household.id, tid.data, parsed.data);
} else {
const cid = idSchema.safeParse(contactId);
if (!cid.success) return fail(tr.common.notFound);
result = await createContactEntry(ctx.user.id, ctx.household.id, cid.data, parsed.data);
}
if (result.ok) revalidate();
return result;
}
@@ -0,0 +1,434 @@
"use client";
import { Loader2, Trash2 } from "lucide-react";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
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 {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Textarea } from "@/components/ui/textarea";
import {
getTransactionFormOptionsAction,
setTransactionDeletedAction,
} from "@/features/transactions/actions";
import { AccountSelect } from "@/features/transactions/components/transaction-form";
import type { TransactionFormOptions, TransactionListItem } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import {
CONTACT_ENTRY_KINDS,
CONTACT_RELATIONS,
isOutgoing,
type ContactEntryKind,
type ContactRelation,
} from "@/shared/contacts";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import { saveContactAction, saveContactEntryAction } from "../actions";
import type { ContactView } from "../service";
const t = tr.contacts;
type Errors = Record<string, string | undefined>;
/** Cari oluştur / düzenle. */
export function ContactFormDialog({
open,
contact,
onOpenChange,
}: {
open: boolean;
contact: ContactView | null;
onOpenChange: (open: boolean) => void;
}) {
return open ? (
<ContactForm key={contact?.id ?? "new"} contact={contact} onClose={() => onOpenChange(false)} />
) : null;
}
function ContactForm({ contact, onClose }: { contact: ContactView | null; onClose: () => void }) {
const [v, setV] = useState({
name: contact?.name ?? "",
relation: (contact?.relation ?? "friend") as ContactRelation,
phone: contact?.phone ?? "",
note: contact?.note ?? "",
openingBalance: contact?.openingBalanceMinor
? formatMoneyInput(contact.openingBalanceMinor)
: "",
openingDate: contact?.openingDate ?? todayIstanbul(),
dueDate: contact?.dueDate ?? "",
reminderDays: String(contact?.reminderDays ?? 3),
isPrivate: contact?.isPrivate ?? false,
});
const [errors, setErrors] = useState<Errors>({});
const [busy, setBusy] = useState(false);
const set = <K extends keyof typeof v>(k: K, value: (typeof v)[K]) =>
setV((x) => ({ ...x, [k]: value }));
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveContactAction(contact?.id ?? null, v);
setBusy(false);
if (r.ok) {
toast.success(contact ? t.toast.updated : t.toast.created);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
const f = t.fields;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={contact ? t.editTitle : t.createTitle}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="contact-form" disabled={busy}>
{busy ? <Loader2 className="animate-spin" /> : null}
{tr.common.save}
</Button>
</>
}
>
<form id="contact-form" onSubmit={submit} noValidate>
<FieldGroup>
<Field data-invalid={Boolean(errors.name)}>
<FieldLabel htmlFor="ct-name">{f.name}</FieldLabel>
<Input
id="ct-name"
value={v.name}
onChange={(e) => set("name", e.target.value)}
aria-invalid={Boolean(errors.name)}
autoFocus
/>
{errors.name ? <FieldError>{errors.name}</FieldError> : null}
</Field>
<div className="grid grid-cols-2 gap-3">
<Field>
<FieldLabel htmlFor="ct-relation">{f.relation}</FieldLabel>
<Select
value={v.relation}
onValueChange={(x) => set("relation", x as ContactRelation)}
>
<SelectTrigger id="ct-relation" className="w-full">
<SelectValue>{t.relations[v.relation]}</SelectValue>
</SelectTrigger>
<SelectContent>
{CONTACT_RELATIONS.map((r) => (
<SelectItem key={r} value={r}>
{t.relations[r]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
<Field data-invalid={Boolean(errors.phone)}>
<FieldLabel htmlFor="ct-phone">{f.phone}</FieldLabel>
<Input
id="ct-phone"
type="tel"
inputMode="tel"
value={v.phone}
onChange={(e) => set("phone", e.target.value)}
aria-invalid={Boolean(errors.phone)}
/>
{errors.phone ? <FieldError>{errors.phone}</FieldError> : null}
</Field>
</div>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.openingBalance)}>
<FieldLabel htmlFor="ct-opening">{f.openingBalance}</FieldLabel>
<MoneyInput
id="ct-opening"
value={v.openingBalance}
onChange={(x) => set("openingBalance", x)}
allowNegative
/>
{errors.openingBalance ? <FieldError>{errors.openingBalance}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="ct-opening-date">{tr.transactions.fields.date}</FieldLabel>
<Input
id="ct-opening-date"
type="date"
value={v.openingDate}
onChange={(e) => set("openingDate", e.target.value)}
/>
</Field>
</div>
<FieldDescription className="-mt-2">{f.openingHint}</FieldDescription>
<DueFields
dueDate={v.dueDate}
reminderDays={v.reminderDays}
onChange={(d, r) => setV((x) => ({ ...x, dueDate: d, reminderDays: r }))}
errors={errors}
/>
<Field>
<FieldLabel htmlFor="ct-note">{f.note}</FieldLabel>
<Textarea
id="ct-note"
rows={2}
value={v.note}
onChange={(e) => set("note", e.target.value)}
/>
</Field>
<label className="flex items-start gap-2 text-sm">
<Checkbox
checked={v.isPrivate}
onCheckedChange={(x) => set("isPrivate", x === true)}
className="mt-0.5"
/>
{f.isPrivate}
</label>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
function DueFields({
dueDate,
reminderDays,
onChange,
errors,
}: {
dueDate: string;
reminderDays: string;
onChange: (dueDate: string, reminderDays: string) => void;
errors: Errors;
}) {
const f = t.fields;
return (
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.dueDate)}>
<FieldLabel htmlFor="ct-due">{f.dueDate}</FieldLabel>
<Input
id="ct-due"
type="date"
value={dueDate}
onChange={(e) => onChange(e.target.value, reminderDays)}
aria-describedby="ct-due-hint"
/>
<FieldDescription id="ct-due-hint">{f.dueHint}</FieldDescription>
{errors.dueDate ? <FieldError>{errors.dueDate}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.reminderDays)}>
<FieldLabel htmlFor="ct-remind">{f.reminderDays}</FieldLabel>
<Input
id="ct-remind"
type="number"
inputMode="numeric"
min={0}
max={60}
value={reminderDays}
onChange={(e) => onChange(dueDate, e.target.value)}
disabled={!dueDate}
/>
</Field>
</div>
);
}
export type EntryMode = {
contact: ContactView;
entry?: TransactionListItem;
kind?: ContactEntryKind;
};
/** Cari hareketi ekle / düzenle (düzenlemede sil). */
export function ContactEntryDialog({
mode,
onClose,
}: {
mode: EntryMode | null;
onClose: () => void;
}) {
return mode ? (
<EntryForm key={mode.entry?.id ?? `new-${mode.kind ?? ""}`} mode={mode} onClose={onClose} />
) : null;
}
function EntryForm({ mode, onClose }: { mode: EntryMode; onClose: () => void }) {
const { contact, entry } = mode;
const [options, setOptions] = useState<TransactionFormOptions | null>(null);
const [kind, setKind] = useState<ContactEntryKind>(
entry?.contact?.kind ?? mode.kind ?? (contact.balanceMinor < 0 ? "repay" : "lend"),
);
const [v, setV] = useState({
accountId: entry?.account?.id ?? entry?.toAccount?.id ?? "",
amount: entry ? formatMoneyInput(entry.amountMinor) : "",
date: entry?.date ?? todayIstanbul(),
description: entry?.description ?? "",
dueDate: contact.dueDate ?? "",
reminderDays: String(contact.reminderDays),
});
const [errors, setErrors] = useState<Errors>({});
const [busy, setBusy] = useState(false);
useEffect(() => {
let cancelled = false;
getTransactionFormOptionsAction().then((r) => {
if (cancelled || !r.ok) return;
setOptions(r.data);
setV((x) => (x.accountId ? x : { ...x, accountId: r.data.accounts[0]?.id ?? "" }));
});
return () => {
cancelled = true;
};
}, []);
const accounts = (() => {
const list = [...(options?.accounts ?? [])];
const current = entry?.account ?? entry?.toAccount;
if (current && !list.some((a) => a.id === current.id))
list.push({ ...current, type: "bank", icon: "wallet", color: "slate" });
return list;
})();
const createsDebt = kind === "lend" || kind === "borrow";
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const payload = {
kind,
accountId: v.accountId,
amount: v.amount,
date: v.date,
description: v.description,
// Vade yalnızca borç veren/alan harekette güncellenir.
...(createsDebt ? { dueDate: v.dueDate, reminderDays: v.reminderDays } : {}),
};
const r = await saveContactEntryAction(contact.id, entry?.id ?? null, payload);
setBusy(false);
if (r.ok) {
toast.success(t.toast.entrySaved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
async function remove() {
if (!entry) return;
const r = await setTransactionDeletedAction(entry.id, true);
if (!r.ok) return void toast.error(r.error);
onClose();
toast.success(tr.transactions.toast.deleted, {
duration: 10_000,
action: {
label: tr.transactions.actions.restore,
onClick: async () => {
const x = await setTransactionDeletedAction(entry.id, false);
if (x.ok) toast.success(tr.transactions.toast.restored);
else toast.error(x.error);
},
},
});
}
const f = t.fields;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={`${entry ? t.editEntryTitle : t.entryTitle} · ${contact.name}`}
footer={
<>
{entry ? (
<Button variant="destructive" type="button" onClick={remove} className="sm:mr-auto">
<Trash2 />
{tr.transactions.actions.delete}
</Button>
) : null}
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="contact-entry-form" disabled={busy || !options}>
{busy ? <Loader2 className="animate-spin" /> : null}
{tr.common.save}
</Button>
</>
}
>
<form id="contact-entry-form" onSubmit={submit} noValidate>
<FieldGroup>
<Tabs value={kind} onValueChange={(x) => setKind(x as ContactEntryKind)}>
<TabsList className="grid h-auto w-full grid-cols-2 sm:grid-cols-4">
{CONTACT_ENTRY_KINDS.map((k) => (
<TabsTrigger key={k} value={k}>
{t.kinds[k]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<p className="-mt-2 text-xs text-muted-foreground">{t.kindHints[kind]}</p>
<div className="grid grid-cols-[1fr_auto] gap-3">
<Field data-invalid={Boolean(errors.amount)}>
<FieldLabel htmlFor="ce-amount">{tr.transactions.fields.amount}</FieldLabel>
<MoneyInput
id="ce-amount"
value={v.amount}
onChange={(x) => setV((s) => ({ ...s, amount: x }))}
aria-invalid={Boolean(errors.amount)}
autoFocus
/>
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="ce-date">{tr.transactions.fields.date}</FieldLabel>
<Input
id="ce-date"
type="date"
value={v.date}
onChange={(e) => setV((s) => ({ ...s, date: e.target.value }))}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
</div>
<Field data-invalid={Boolean(errors.accountId)}>
<FieldLabel htmlFor="ce-account">
{isOutgoing(kind) ? f.fromAccount : f.toAccount}
</FieldLabel>
<AccountSelect
id="ce-account"
value={v.accountId}
onChange={(x) => setV((s) => ({ ...s, accountId: x }))}
accounts={accounts}
invalid={Boolean(errors.accountId)}
/>
{errors.accountId ? <FieldError>{errors.accountId}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="ce-description">{tr.transactions.fields.description}</FieldLabel>
<Input
id="ce-description"
value={v.description}
onChange={(e) => setV((s) => ({ ...s, description: e.target.value }))}
/>
</Field>
{createsDebt ? (
<DueFields
dueDate={v.dueDate}
reminderDays={v.reminderDays}
onChange={(d, r) => setV((s) => ({ ...s, dueDate: d, reminderDays: r }))}
errors={errors}
/>
) : null}
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,165 @@
"use client";
import { ArrowLeft, Lock, Pencil, Phone, Plus } from "lucide-react";
import Link from "next/link";
import { useState } from "react";
import { PageHeader } from "@/components/page-header";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { InKindSection } from "@/features/in-kind/components/in-kind-section";
import type { InKindView } from "@/features/in-kind/service";
import type { ContactStatement } from "../service";
import { ContactEntryDialog, ContactFormDialog, type EntryMode } from "./contact-dialogs";
import { ContactBalance, DueBadge } from "./contacts-view";
const t = tr.contacts;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
function Delta({ minor }: { minor: number }) {
return (
<span
className={cn(
"font-semibold whitespace-nowrap tabular-nums",
minor > 0 ? "text-income" : "text-expense",
)}
>
{minor > 0 ? "+" : "−"}
{formatMoney(Math.abs(minor))}
</span>
);
}
/** Cari ekstresi: hareketler (yeniden eskiye) ve yürüyen bakiye (+ bana borçlu, − ben borçluyum). */
export function ContactStatementView({
data,
inKind,
}: {
data: ContactStatement;
inKind: InKindView[];
}) {
const c = data.contact;
const [entry, setEntry] = useState<EntryMode | null>(null);
const [editing, setEditing] = useState(false);
const canWrite = data.canWrite && !c.archived;
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/cari">
<ArrowLeft />
{t.title}
</Link>
</Button>
<PageHeader
title={c.name}
description={t.relations[c.relation]}
actions={
data.canWrite ? (
<>
<Button variant="outline" onClick={() => setEditing(true)}>
<Pencil />
<span className="hidden sm:inline">{tr.common.edit}</span>
</Button>
{canWrite ? (
<Button onClick={() => setEntry({ contact: c })}>
<Plus />
{t.newEntry}
</Button>
) : null}
</>
) : null
}
/>
<Card>
<CardContent className="flex flex-wrap items-center justify-between gap-3">
<div className="flex flex-col gap-1 text-sm">
<DueBadge contact={c} />
{c.phone ? (
<a
href={`tel:${c.phone}`}
className="inline-flex items-center gap-1.5 hover:underline"
>
<Phone className="size-3.5" aria-hidden />
{c.phone}
</a>
) : null}
{c.isPrivate ? (
<span className="inline-flex items-center gap-1.5 text-xs text-muted-foreground">
<Lock className="size-3.5" aria-hidden />
{t.privateBadge}
</span>
) : null}
{c.note ? <p className="text-muted-foreground">{c.note}</p> : null}
</div>
<ContactBalance minor={c.balanceMinor} className="text-lg" />
</CardContent>
</Card>
<InKindSection contactId={c.id} items={inKind} canWrite={canWrite} />
<h2 className="text-base font-medium">{t.statement}</h2>
{data.rows.length === 0 && c.openingBalanceMinor === 0 ? (
<Card>
<CardHeader>
<CardDescription>{t.emptyEntries}</CardDescription>
</CardHeader>
</Card>
) : (
<ul className="divide-y rounded-xl border bg-card">
{data.rows.map((r) => {
const content = (
<>
<span className="min-w-0 flex-1">
<span className="block truncate font-medium">
{tr.contacts.kinds[r.item.contact!.kind]}
</span>
<span className="block truncate text-xs text-muted-foreground">
{d(r.item.date)} · {r.item.account?.name ?? r.item.toAccount?.name ?? "—"}
{r.item.description ? ` · ${r.item.description}` : ""}
</span>
</span>
<span className="flex flex-col items-end">
<Delta minor={r.deltaMinor} />
<span
className="text-xs text-muted-foreground tabular-nums"
title={t.runningBalance}
>
{formatMoney(r.balanceMinor)}
</span>
</span>
</>
);
const cls = "flex w-full items-center gap-3 p-3 text-left";
return (
<li key={r.item.id}>
{canWrite ? (
<button
type="button"
className={cn(cls, "outline-none hover:bg-muted/50 focus-visible:bg-muted")}
onClick={() => setEntry({ contact: c, entry: r.item })}
>
{content}
</button>
) : (
<div className={cls}>{content}</div>
)}
</li>
);
})}
<li className="flex items-center gap-3 p-3 text-sm text-muted-foreground">
<span className="flex-1">
{t.opening} · {d(c.openingDate)}
</span>
<span className="tabular-nums">{formatMoney(c.openingBalanceMinor)}</span>
</li>
</ul>
)}
<ContactEntryDialog mode={entry} onClose={() => setEntry(null)} />
<ContactFormDialog open={editing} contact={c} onOpenChange={setEditing} />
</div>
);
}
@@ -0,0 +1,200 @@
"use client";
import {
Archive,
ArchiveRestore,
ChevronDown,
EllipsisVertical,
Lock,
Pencil,
Plus,
Users,
} from "lucide-react";
import Link from "next/link";
import { useState, useTransition } from "react";
import { toast } from "sonner";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { setContactArchivedAction } from "../actions";
import type { ContactList, ContactView } from "../service";
import { ContactEntryDialog, ContactFormDialog, type EntryMode } from "./contact-dialogs";
const t = tr.contacts;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
export function ContactBalance({ minor, className }: { minor: number; className?: string }) {
const label = minor > 0 ? t.balance.owesMe : minor < 0 ? t.balance.iOwe : t.balance.settled;
return (
<span className={cn("flex flex-col items-end", className)}>
<span className="text-xs text-muted-foreground">{label}</span>
<span
className={cn(
"font-semibold whitespace-nowrap tabular-nums",
minor > 0 && "text-income",
minor < 0 && "text-expense",
)}
>
{formatMoney(Math.abs(minor))}
</span>
</span>
);
}
export function DueBadge({ contact }: { contact: ContactView }) {
if (!contact.dueDate || contact.balanceMinor === 0) return null;
if (contact.due === "overdue")
return <Badge variant="destructive">{t.due.overdue(d(contact.dueDate))}</Badge>;
if (contact.due === "upcoming")
return <Badge variant="secondary">{t.due.upcoming(d(contact.dueDate))}</Badge>;
return <Badge variant="outline">{t.due.on(d(contact.dueDate))}</Badge>;
}
export function ContactsView({
data,
inKind,
canWrite,
}: {
data: ContactList;
/** Açık aynî kayıtlar (cari kimliği → yön ve kalan miktar). */
inKind: Record<string, { direction: "debt" | "receivable"; label: string }[]>;
canWrite: boolean;
}) {
const [form, setForm] = useState<{ contact: ContactView | null } | null>(null);
const [entry, setEntry] = useState<EntryMode | null>(null);
const [archivedOpen, setArchivedOpen] = useState(false);
const [, startTransition] = useTransition();
const active = data.contacts.filter((c) => !c.archived);
const archived = data.contacts.filter((c) => c.archived);
function archive(c: ContactView, value: boolean) {
startTransition(async () => {
const r = await setContactArchivedAction(c.id, value);
if (r.ok) toast.success(value ? t.toast.archived : t.toast.unarchived);
else toast.error(r.error);
});
}
const row = (c: ContactView) => (
<li key={c.id} className={cn("flex items-center gap-3 p-3", c.archived && "opacity-60")}>
<span className="inline-flex size-9 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
<Users className="size-4.5" />
</span>
<div className="min-w-0 flex-1">
<span className="flex items-center gap-1.5">
<Link href={`/cari/${c.id}`} className="truncate font-medium hover:underline">
{c.name}
</Link>
{c.isPrivate ? (
<Lock className="size-3.5 shrink-0 text-muted-foreground" aria-label={t.privateBadge} />
) : null}
</span>
<span className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
<span>{t.relations[c.relation]}</span>
{c.lastActivity ? <span>· {t.lastActivity(d(c.lastActivity))}</span> : null}
<DueBadge contact={c} />
{(inKind[c.id] ?? []).map((x, i) => (
<Badge key={i} variant={x.direction === "debt" ? "destructive" : "secondary"}>
{x.label}
</Badge>
))}
</span>
</div>
<ContactBalance minor={c.balanceMinor} />
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={tr.recurring.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{!c.archived ? (
<DropdownMenuItem onSelect={() => setEntry({ contact: c })}>
<Plus />
{t.newEntry}
</DropdownMenuItem>
) : null}
<DropdownMenuItem onSelect={() => setForm({ contact: c })}>
<Pencil />
{tr.common.edit}
</DropdownMenuItem>
<DropdownMenuItem onSelect={() => archive(c, !c.archived)}>
{c.archived ? <ArchiveRestore /> : <Archive />}
{c.archived ? t.unarchive : t.archive}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
);
return (
<div className="flex flex-col gap-4">
<div className="grid grid-cols-3 gap-3">
{(
[
[t.summary.owesMe, data.totals.owesMeMinor, "text-income"],
[t.summary.iOwe, data.totals.iOweMinor, "text-expense"],
[t.summary.net, data.totals.owesMeMinor - data.totals.iOweMinor, ""],
] as const
).map(([label, value, tone]) => (
<Card key={label} size="sm">
<CardHeader>
<CardDescription>{label}</CardDescription>
<CardTitle className={cn("text-base tabular-nums", tone)}>
{formatMoney(value)}
</CardTitle>
</CardHeader>
</Card>
))}
</div>
{canWrite ? (
<div className="flex justify-end">
<Button onClick={() => setForm({ contact: null })}>
<Plus />
{t.new}
</Button>
</div>
) : null}
{active.length === 0 ? (
<Card>
<CardHeader>
<CardDescription>{t.empty}</CardDescription>
</CardHeader>
</Card>
) : (
<ul className="divide-y rounded-xl border bg-card">{active.map(row)}</ul>
)}
{archived.length ? (
<Collapsible open={archivedOpen} onOpenChange={setArchivedOpen}>
<CollapsibleTrigger asChild>
<Button variant="ghost" size="sm" className="-ml-2 w-fit">
<ChevronDown className={cn("transition-transform", archivedOpen && "rotate-180")} />
{t.archivedSection(archived.length)}
</Button>
</CollapsibleTrigger>
<CollapsibleContent className="pt-2">
<ul className="divide-y rounded-xl border bg-card">{archived.map(row)}</ul>
</CollapsibleContent>
</Collapsible>
) : null}
<ContactFormDialog
open={Boolean(form)}
contact={form?.contact ?? null}
onOpenChange={(o) => !o && setForm(null)}
/>
<ContactEntryDialog mode={entry} onClose={() => setEntry(null)} />
</div>
);
}
@@ -0,0 +1,29 @@
import { HandCoins } from "lucide-react";
import Link from "next/link";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import { countDueContacts } from "../service";
/** Dashboard: vadesi geçmiş veya yaklaşan cari borç/alacak uyarısı (Faz 8 kararı: uygulama içi). */
export async function ContactsDueBanner({
userId,
householdId,
}: {
userId: string;
householdId: string;
}) {
const n = await countDueContacts(userId, householdId);
if (!n) return null;
return (
<div
role="status"
className="flex flex-wrap items-center gap-3 rounded-xl border border-budget/30 bg-budget/10 p-3 text-sm"
>
<HandCoins className="size-4 shrink-0 text-budget" aria-hidden />
<span className="flex-1">{tr.contacts.dueBanner(n)}</span>
<Button asChild size="sm" variant="outline">
<Link href="/cari">{tr.contacts.dueLink}</Link>
</Button>
</div>
);
}
+270
View File
@@ -0,0 +1,270 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { listAccounts } from "@/features/accounts/service";
import {
getTransaction,
listTransactions,
updateTransaction,
} from "@/features/transactions/service";
import { currentMonth, getAccountStatement } from "@/features/transactions/statement";
import { AccountModel } from "@/models/account";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import {
contactEntrySchema,
contactFormSchema,
type ContactEntryInput,
type ContactFormInput,
} from "@/shared/schemas/contact";
import { transactionFilterSchema } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
countDueContacts,
createContact,
createContactEntry,
getContactStatement,
listContacts,
setContactArchived,
updateContact,
updateContactEntry,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
const today = todayIstanbul();
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => String(a!._id));
const contactForm = (over: Partial<ContactFormInput> = {}) =>
contactFormSchema.parse({ name: "Test Kişi", openingDate: today, ...over });
const entry = (over: Partial<ContactEntryInput>) =>
contactEntrySchema.parse({ kind: "lend", amount: "1000", date: today, ...over });
async function balance(userId: string, accountId: string) {
return (await listAccounts(userId, cakir))!.accounts.find((a) => a.id === accountId)!
.balanceMinor!;
}
async function contactBalance(userId: string, id: string) {
return (await listContacts(userId, cakir))!.contacts.find((c) => c.id === id)!.balanceMinor;
}
const sums = async () =>
(await listTransactions(ayse, cakir, transactionFilterSchema.parse({})))!.sums;
describe("cari defteri", () => {
let ahmet = "";
let lendId = "";
it("borç verme ve tahsilat: hesap bakiyeleri değişir, gelir/gider toplamlarına girmez", async () => {
const ziraat = await acc("Ziraat Maaş");
const cuzdan = await acc("Cüzdan");
const [zBefore, cBefore, sBefore] = [
await balance(ayse, ziraat),
await balance(ayse, cuzdan),
await sums(),
];
const c = await createContact(
ayse,
cakir,
contactForm({ name: "Kemal Test", relation: "friend" }),
);
expect(c.ok).toBe(true);
ahmet = c.ok ? c.data.id : "";
const l = await createContactEntry(
ayse,
cakir,
ahmet,
entry({ accountId: ziraat, amount: "5.000" }),
);
expect(l.ok).toBe(true);
lendId = l.ok ? l.data.id : "";
await createContactEntry(
emre,
cakir,
ahmet,
entry({ kind: "collect", accountId: cuzdan, amount: "2.000" }),
);
expect(await balance(ayse, ziraat)).toBe(zBefore - 5_000_00);
expect(await balance(ayse, cuzdan)).toBe(cBefore + 2_000_00);
expect(await contactBalance(ayse, ahmet)).toBe(3_000_00);
expect(await sums()).toEqual(sBefore);
const detail = (await getTransaction(ayse, cakir, lendId))!;
expect(detail).toMatchObject({
type: "transfer",
contact: { kind: "lend", name: "Kemal Test" },
});
expect(detail.toAccount).toBeNull();
});
it("borç alma ve geri ödeme; açılış bakiyesi; ekstre yürüyen bakiye", async () => {
const ziraat = await acc("Ziraat Maaş");
const c = await createContact(
ayse,
cakir,
contactForm({ name: "Hasan Amca", relation: "family", openingBalance: "-1.000" }),
);
const hasan = c.ok ? c.data.id : "";
await createContactEntry(
ayse,
cakir,
hasan,
entry({ kind: "borrow", accountId: ziraat, amount: "10.000" }),
);
await createContactEntry(
ayse,
cakir,
hasan,
entry({ kind: "repay", accountId: ziraat, amount: "4.000" }),
);
expect(await contactBalance(ayse, hasan)).toBe(-7_000_00);
const s = (await getContactStatement(ayse, cakir, hasan))!;
expect(s.rows).toHaveLength(2);
expect(s.rows[0]!.balanceMinor).toBe(-7_000_00);
expect(s.rows[1]!.balanceMinor).toBe(-11_000_00);
expect(s.contact.balanceMinor).toBe(-7_000_00);
const list = (await listContacts(ayse, cakir))!;
expect(list.totals.iOweMinor).toBeGreaterThanOrEqual(7_000_00);
expect(list.totals.owesMeMinor).toBeGreaterThanOrEqual(3_000_00);
});
it("hareket düzenleme: tür değişince yön ve bakiyeler değişir; işlem formuyla düzenlenemez", async () => {
const ziraat = await acc("Ziraat Maaş");
const before = await balance(ayse, ziraat);
const u = await updateContactEntry(
ayse,
cakir,
lendId,
entry({ kind: "borrow", accountId: ziraat, amount: "5.000" }),
);
expect(u.ok).toBe(true);
expect(await balance(ayse, ziraat)).toBe(before + 10_000_00);
expect(await contactBalance(ayse, ahmet)).toBe(-7_000_00);
const d = (await getTransaction(ayse, cakir, lendId))!;
expect(d.account).toBeNull();
expect(d.toAccount?.id).toBe(ziraat);
const viaForm = await updateTransaction(ayse, cakir, lendId, {
type: "transfer",
amount: 1,
date: today,
accountId: ziraat,
toAccountId: await acc("Cüzdan"),
categoryId: null,
splits: [],
payee: "",
description: "",
tags: [],
installments: 1,
attachmentIds: [],
});
expect(viaForm.ok).toBe(false);
});
it("vade uyarısı: yaklaşan, geçmiş, kapalı bakiye", async () => {
const c = await createContact(
ayse,
cakir,
contactForm({
name: "Vade Kişi",
openingBalance: "500",
dueDate: addDays(today, 2),
reminderDays: 3,
}),
);
const id = c.ok ? c.data.id : "";
const before = await countDueContacts(ayse, cakir);
let v = (await listContacts(ayse, cakir))!.contacts.find((x) => x.id === id)!;
expect(v.due).toBe("upcoming");
await updateContact(
ayse,
cakir,
id,
contactForm({ name: "Vade Kişi", openingBalance: "500", dueDate: addDays(today, -1) }),
);
v = (await listContacts(ayse, cakir))!.contacts.find((x) => x.id === id)!;
expect(v.due).toBe("overdue");
await updateContact(
ayse,
cakir,
id,
contactForm({ name: "Vade Kişi", openingBalance: "0", dueDate: addDays(today, -1) }),
);
v = (await listContacts(ayse, cakir))!.contacts.find((x) => x.id === id)!;
expect(v.due).toBe("none");
expect(await countDueContacts(ayse, cakir)).toBe(before - 1);
});
it("aynı ad engellenir; arşivli cariye hareket eklenmez", async () => {
expect((await createContact(ayse, cakir, contactForm({ name: "kemal TEST" }))).ok).toBe(false);
expect((await setContactArchived(ayse, cakir, ahmet, true)).ok).toBe(true);
expect(
(await createContactEntry(ayse, cakir, ahmet, entry({ accountId: await acc("Cüzdan") }))).ok,
).toBe(false);
expect((await setContactArchived(ayse, cakir, ahmet, false)).ok).toBe(true);
});
});
describe("yetki ve gizlilik", () => {
it("izleyici yazamaz; hane dışı göremez; başka hanenin hesabı kullanılamaz", async () => {
expect((await createContact(zeynep, cakir, contactForm({ name: "X" }))).ok).toBe(false);
expect(await listContacts(fatma, cakir)).toBeNull();
const c = await createContact(ayse, cakir, contactForm({ name: "Hesap Testi" }));
const id = c.ok ? c.data.id : "";
const otherHousehold = String(
(await AccountModel.findOne({ name: "Vakıfbank Emekli" }).lean())!._id,
);
expect(
(await createContactEntry(ayse, cakir, id, entry({ accountId: otherHousehold }))).ok,
).toBe(false);
});
it("yalnızca ben cari: başkası listede, ekstrede ve işlemlerde görmez; hesap ekstresinde ad gizlenir", async () => {
const ziraat = await acc("Ziraat Maaş");
const c = await createContact(
ayse,
cakir,
contactForm({ name: "Gizli Kişi", isPrivate: true }),
);
const id = c.ok ? c.data.id : "";
const e = await createContactEntry(
ayse,
cakir,
id,
entry({ accountId: ziraat, amount: "750" }),
);
const txId = e.ok ? e.data.id : "";
expect((await listContacts(emre, cakir))!.contacts.some((x) => x.id === id)).toBe(false);
expect(await getContactStatement(emre, cakir, id)).toBeNull();
expect(await getTransaction(emre, cakir, txId)).toBeNull();
expect((await createContactEntry(emre, cakir, id, entry({ accountId: ziraat }))).ok).toBe(
false,
);
const st = (await getAccountStatement(emre, cakir, ziraat, currentMonth()))!;
const row = st.rows.find((r) => r.item.id === txId)!;
expect(row.restricted).toBe(true);
expect(row.item.contact!.name).not.toBe("Gizli Kişi");
// Ortak hesabın bakiyesi herkes için aynı.
expect(await balance(emre, ziraat)).toBe(await balance(ayse, ziraat));
});
});
+444
View File
@@ -0,0 +1,444 @@
import "server-only";
import { Types, type PipelineStage } from "mongoose";
import {
loadContext,
loadOwnTransaction,
toItem,
userNames,
type Ctx,
type LeanTx,
type TransactionListItem,
} from "@/features/transactions/service";
import { hasHouseholdRole } from "@/features/households/roles";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { ContactModel } from "@/models/contact";
import { TransactionModel } from "@/models/transaction";
import {
contactDelta,
dueState,
isOutgoing,
type ContactRelation,
type DueState,
} from "@/shared/contacts";
import { istanbulDayStart, todayIstanbul, toIstanbulYmd } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import type { ContactEntry, ContactForm } from "@/shared/schemas/contact";
import { compareTr, foldTr } from "@/shared/search";
/**
* Cari hesaplar (Bölüm 6.4). Okuma: viewer; yazma: member. Hareketler `transactions` içinde
* transferdir (`contactId`, `contactKind`): cariye çıkışta `accountId` dolu/`toAccountId` boş,
* cariden girişte tersi. Böylece hesap bakiyesi, ekstre ve mutabakat ek kural gerektirmez;
* gelir/gider raporlarına girmez.
*/
const t = tr.contacts;
type ContactDoc = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
name: string;
relation: ContactRelation;
phone: string;
note: string;
openingBalanceMinor: number;
openingDate: Date;
dueDate?: string | null;
reminderDays: number;
isPrivate: boolean;
ownerUserId?: Types.ObjectId | null;
archivedAt?: Date | null;
updatedAt: Date;
};
const visible = (c: ContactDoc, userId: string) => !c.isPrivate || String(c.ownerUserId) === userId;
/** Cari bazında hareket toplamı (+ çıkış, − giriş) ve son hareket tarihi. */
async function contactTotals(householdId: Types.ObjectId, contactIds?: Types.ObjectId[]) {
const pipeline: PipelineStage[] = [
{
$match: {
householdId,
status: "posted",
deletedAt: null,
contactId: contactIds ? { $in: contactIds } : { $type: "objectId" },
// Aynî borç hareketleri cari TL bakiyesine girmez.
contactKind: { $ne: null },
},
},
{
$group: {
_id: "$contactId",
delta: {
$sum: {
$cond: [
{ $in: ["$contactKind", ["lend", "repay"]] },
"$amountMinor",
{ $multiply: ["$amountMinor", -1] },
],
},
},
last: { $max: "$date" },
},
},
];
const rows = await TransactionModel.aggregate<{ _id: Types.ObjectId; delta: number; last: Date }>(
pipeline,
);
return new Map(rows.map((r) => [String(r._id), r]));
}
export type ContactView = {
id: string;
name: string;
relation: ContactRelation;
phone: string;
note: string;
/** + bana borçlu, − ben borçluyum. */
balanceMinor: number;
openingBalanceMinor: number;
openingDate: string;
dueDate: string | null;
reminderDays: number;
due: DueState;
isPrivate: boolean;
archived: boolean;
lastActivity: string | null;
};
function toView(
c: ContactDoc,
totals: Map<string, { delta: number; last: Date }>,
today: string,
): ContactView {
const x = totals.get(String(c._id));
const balanceMinor = c.openingBalanceMinor + (x?.delta ?? 0);
return {
id: String(c._id),
name: c.name,
relation: c.relation,
phone: c.phone,
note: c.note,
balanceMinor,
openingBalanceMinor: c.openingBalanceMinor,
openingDate: toIstanbulYmd(c.openingDate),
dueDate: c.dueDate ?? null,
reminderDays: c.reminderDays,
due: dueState(balanceMinor, c.dueDate ?? null, c.reminderDays, today, addDays),
isPrivate: c.isPrivate,
archived: Boolean(c.archivedAt),
lastActivity: x?.last ? toIstanbulYmd(x.last) : null,
};
}
export type ContactList = {
contacts: ContactView[];
totals: { owesMeMinor: number; iOweMinor: number };
};
export async function listContacts(
userId: string,
householdId: string,
): Promise<ContactList | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const docs = (await ContactModel.find({ householdId: ctx.m.householdId }).lean<ContactDoc[]>())
.filter((c) => visible(c, userId))
.sort((a, b) => compareTr(a.name, b.name));
const totals = await contactTotals(
ctx.m.householdId,
docs.map((d) => d._id),
);
const today = todayIstanbul();
const contacts = docs.map((c) => toView(c, totals, today));
let owesMeMinor = 0;
let iOweMinor = 0;
for (const c of contacts) {
if (c.archived) continue;
if (c.balanceMinor > 0) owesMeMinor += c.balanceMinor;
else iOweMinor += -c.balanceMinor;
}
return { contacts, totals: { owesMeMinor, iOweMinor } };
}
async function loadContact(ctx: Ctx, contactId: string, userId: string) {
const id = toObjectId(contactId);
if (!id) return null;
const c = await ContactModel.findOne({
_id: id,
householdId: ctx.m.householdId,
}).lean<ContactDoc>();
return c && visible(c, userId) ? c : null;
}
async function nameTaken(householdId: Types.ObjectId, name: string, exceptId?: Types.ObjectId) {
const key = foldTr(name);
const others = await ContactModel.find(
{ householdId, archivedAt: null, ...(exceptId ? { _id: { $ne: exceptId } } : {}) },
{ name: 1 },
).lean();
return others.some((o) => foldTr(o.name) === key);
}
// --- Cari yazma ---
export async function createContact(
actorId: string,
householdId: string,
input: ContactForm,
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
if (await nameTaken(ctx.m.householdId, input.name))
return fail(t.errors.duplicate, { name: t.errors.duplicate });
const actor = new Types.ObjectId(actorId);
const doc = await ContactModel.create({
householdId: ctx.m.householdId,
name: input.name,
relation: input.relation,
phone: input.phone,
note: input.note,
openingBalanceMinor: input.openingBalance,
openingDate: istanbulDayStart(input.openingDate)!,
dueDate: input.dueDate,
reminderDays: input.reminderDays,
isPrivate: input.isPrivate,
ownerUserId: input.isPrivate ? actor : null,
createdBy: actor,
updatedBy: actor,
});
return ok({ id: String(doc._id) });
}
export async function updateContact(
actorId: string,
householdId: string,
contactId: string,
input: ContactForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const c = await loadContact(ctx, contactId, actorId);
if (!c) return fail(tr.common.notFound);
if (await nameTaken(ctx.m.householdId, input.name, c._id))
return fail(t.errors.duplicate, { name: t.errors.duplicate });
// Gizlilik yalnızca sahibince (veya ortak cariyi gizlerken işlemi yapanca) belirlenir.
const owner = c.ownerUserId ?? (input.isPrivate ? new Types.ObjectId(actorId) : null);
await ContactModel.updateOne(
{ _id: c._id, householdId: ctx.m.householdId },
{
$set: {
name: input.name,
relation: input.relation,
phone: input.phone,
note: input.note,
openingBalanceMinor: input.openingBalance,
openingDate: istanbulDayStart(input.openingDate)!,
dueDate: input.dueDate,
reminderDays: input.reminderDays,
isPrivate: input.isPrivate,
ownerUserId: input.isPrivate ? owner : null,
updatedBy: new Types.ObjectId(actorId),
},
},
);
return ok(undefined);
}
export async function setContactArchived(
actorId: string,
householdId: string,
contactId: string,
archived: boolean,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const c = await loadContact(ctx, contactId, actorId);
if (!c) return fail(tr.common.notFound);
if (!archived && (await nameTaken(ctx.m.householdId, c.name, c._id)))
return fail(t.errors.duplicate);
await ContactModel.updateOne(
{ _id: c._id, householdId: ctx.m.householdId },
{ $set: { archivedAt: archived ? new Date() : null, updatedBy: new Types.ObjectId(actorId) } },
);
await writeAudit({
action: archived ? "contact.archive" : "contact.unarchive",
actorId: new Types.ObjectId(actorId),
householdId: ctx.m.householdId,
targetType: "contact",
targetId: String(c._id),
diff: { name: c.name },
});
return ok(undefined);
}
// --- Cari hareketleri ---
function entryFields(ctx: Ctx, contact: ContactDoc, input: ContactEntry, keepAccount?: string) {
const info = ctx.accountMap.get(input.accountId);
if (!info || info.hidden || (info.archived && input.accountId !== keepAccount)) {
return fail(tr.transactions.validation.accountInvalid, {
accountId: tr.transactions.validation.accountInvalid,
});
}
const date = istanbulDayStart(input.date);
if (!date) return fail(tr.validation.date, { date: tr.validation.date });
const out = isOutgoing(input.kind);
return ok({
type: "transfer" as const,
date,
accountId: out ? info.id : null,
toAccountId: out ? null : info.id,
contactId: contact._id,
contactKind: input.kind,
amountMinor: input.amount,
categoryId: null,
splits: [],
effectiveCategoryIds: [],
payeeName: "",
description: input.description,
searchText: foldTr(`${contact.name} ${input.description}`),
});
}
async function applyDue(contact: ContactDoc, input: ContactEntry, actor: Types.ObjectId) {
if (input.dueDate === undefined) return;
await ContactModel.updateOne(
{ _id: contact._id },
{
$set: {
dueDate: input.dueDate,
...(input.reminderDays !== undefined ? { reminderDays: input.reminderDays } : {}),
updatedBy: actor,
},
},
);
}
export async function createContactEntry(
actorId: string,
householdId: string,
contactId: string,
input: ContactEntry,
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const contact = await loadContact(ctx, contactId, actorId);
if (!contact) return fail(tr.common.notFound);
if (contact.archivedAt) return fail(t.errors.archived);
const fields = entryFields(ctx, contact, input);
if (!fields.ok) return fields;
const actor = new Types.ObjectId(actorId);
const doc = await TransactionModel.create({
...fields.data,
householdId: ctx.m.householdId,
status: "posted",
createdBy: actor,
updatedBy: actor,
});
await applyDue(contact, input, actor);
return ok({ id: String(doc._id) });
}
export async function updateContactEntry(
actorId: string,
householdId: string,
transactionId: string,
input: ContactEntry,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const tx = await loadOwnTransaction(ctx, transactionId);
if (!tx?.contactId) return fail(tr.common.notFound);
const contact = await loadContact(ctx, String(tx.contactId), actorId);
if (!contact) return fail(tr.common.notFound);
const keep = String(tx.accountId ?? tx.toAccountId ?? "");
const fields = entryFields(ctx, contact, input, keep);
if (!fields.ok) return fields;
const d = fields.data;
const balanceChanged =
d.amountMinor !== tx.amountMinor ||
d.date.getTime() !== new Date(tx.date).getTime() ||
String(d.accountId ?? "") !== String(tx.accountId ?? "") ||
String(d.toAccountId ?? "") !== String(tx.toAccountId ?? "");
const actor = new Types.ObjectId(actorId);
await TransactionModel.updateOne(
{ _id: tx._id, householdId: ctx.m.householdId },
{
$set: {
...d,
updatedBy: actor,
...(balanceChanged ? { reconciledAccountIds: [] } : {}),
},
},
);
await applyDue(contact, input, actor);
return ok(undefined);
}
// --- Ekstre ---
export type ContactStatementRow = {
item: TransactionListItem;
deltaMinor: number;
balanceMinor: number;
};
export type ContactStatement = {
contact: ContactView;
/** Yeniden eskiye. */
rows: ContactStatementRow[];
canWrite: boolean;
};
export async function getContactStatement(
userId: string,
householdId: string,
contactId: string,
): Promise<ContactStatement | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const contact = await loadContact(ctx, contactId, userId);
if (!contact) return null;
const txs = (await TransactionModel.find({
householdId: ctx.m.householdId,
contactId: contact._id,
contactKind: { $ne: null },
status: "posted",
deletedAt: null,
})
.sort({ date: 1, createdAt: 1 })
.limit(5000)
.lean()) as unknown as LeanTx[];
const names = await userNames(txs.map((x) => x.createdBy as Types.ObjectId));
let balance = contact.openingBalanceMinor;
const rows = txs.map((x): ContactStatementRow => {
const deltaMinor = contactDelta(x.contactKind!, x.amountMinor);
balance += deltaMinor;
const item = toItem(ctx, x, names);
// Başkasının gizli hesabıyla yapılan hareket: hesap adı gizlenir.
for (const a of [item.account, item.toAccount])
if (a && ctx.accountMap.get(a.id)?.hidden) a.name = tr.transactions.list.hiddenAccount;
return { item, deltaMinor, balanceMinor: balance };
});
const totals = new Map([
[
String(contact._id),
{ delta: balance - contact.openingBalanceMinor, last: txs.at(-1)?.date ?? null },
],
]) as Map<string, { delta: number; last: Date }>;
return {
contact: toView(contact, totals, todayIstanbul()),
rows: rows.reverse(),
canWrite: hasHouseholdRole(ctx.m.role, "member"),
};
}
/** Dashboard: vadesi geçmiş veya yaklaşan (hatırlatma penceresindeki) cari sayısı. */
export async function countDueContacts(userId: string, householdId: string): Promise<number> {
const list = await listContacts(userId, householdId);
return list?.contacts.filter((c) => !c.archived && c.due !== "none").length ?? 0;
}
+3
View File
@@ -7,6 +7,7 @@ import { getDb } from "@/lib/db/mongo";
import { connectMongoose } from "@/lib/db/mongoose";
import { toObjectId } from "@/lib/object-id";
import { installDefaultCategories } from "@/features/categories/service";
import { installDefaultStockCategories } from "@/features/stock/service";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import type { HouseholdSettings } from "@/shared/schemas/household";
@@ -324,6 +325,8 @@ export async function adminCreateHousehold(
);
// Varsayılan Türkçe kategori seti aynı transaction'da (Bölüm 6.2).
await installDefaultCategories(household!._id, actor, session);
// Varsayılan stok kategorileri (gider eşlemesi yukarıdaki kategorilerden).
await installDefaultStockCategories(household!._id, actor, session);
});
return ok({ id: createdId });
}
+82
View File
@@ -0,0 +1,82 @@
"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 {
assetPriceFormSchema,
contributionSchema,
inKindFormSchema,
paymentFormSchema,
} from "@/shared/schemas/in-kind";
import {
addContribution,
createInKind,
deleteInKind,
recordPayment,
savePrice,
updateInKind,
} 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;
}
const revalidate = () => revalidatePath("/", "layout");
async function run<T>(
schema: z.ZodType<T>,
input: unknown,
fn: (userId: string, householdId: string, data: T) => Promise<ActionResult<unknown>>,
): Promise<ActionResult<unknown>> {
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) revalidate();
return result;
}
export async function savePriceAction(input: unknown) {
return run(assetPriceFormSchema, input, savePrice);
}
/** Yeni aynî kayıt (debtId boş, contactId dolu) veya mevcut kaydı düzenle. */
export async function saveInKindAction(contactId: unknown, debtId: unknown, input: unknown) {
if (debtId) {
const id = idSchema.safeParse(debtId);
if (!id.success) return fail(tr.common.notFound);
return run(inKindFormSchema, input, (u, h, d) => updateInKind(u, h, id.data, d));
}
const cid = idSchema.safeParse(contactId);
if (!cid.success) return fail(tr.common.notFound);
return run(inKindFormSchema, input, (u, h, d) => createInKind(u, h, cid.data, d));
}
export async function deleteInKindAction(debtId: unknown): Promise<ActionResult<unknown>> {
const id = idSchema.safeParse(debtId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => deleteInKind(u, h, id.data));
}
export async function addContributionAction(debtId: unknown, input: unknown) {
const id = idSchema.safeParse(debtId);
if (!id.success) return fail(tr.common.notFound);
return run(contributionSchema, input, (u, h, d) => addContribution(u, h, id.data, d));
}
export async function recordPaymentAction(debtId: unknown, input: unknown) {
const id = idSchema.safeParse(debtId);
if (!id.success) return fail(tr.common.notFound);
return run(paymentFormSchema, input, (u, h, d) => recordPayment(u, h, id.data, d));
}
@@ -0,0 +1,781 @@
"use client";
import { Coins, EllipsisVertical, HandCoins, Pencil, PiggyBank, Plus, Trash2 } from "lucide-react";
import Link from "next/link";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Checkbox } from "@/components/ui/checkbox";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Field, FieldDescription, FieldError, FieldGroup, 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 { getAssetOptionsAction, type AssetOption } from "@/features/assets/actions";
import { getTransactionFormOptionsAction } from "@/features/transactions/actions";
import { AccountSelect } from "@/features/transactions/components/transaction-form";
import type { TransactionFormOptions } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { ASSET_KEYS, ASSETS, formatAssetQuantity, type AssetKey } from "@/shared/assets";
import { todayIstanbul } from "@/shared/dates";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import { QUANTITY_SCALE } from "@/shared/quantity";
import {
addContributionAction,
deleteInKindAction,
recordPaymentAction,
saveInKindAction,
} from "../actions";
import type { InKindView } from "../service";
const t = tr.inKind;
type Errors = Record<string, string | undefined>;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
const monthFmt = new Intl.DateTimeFormat("tr-TR", {
month: "long",
year: "numeric",
timeZone: "Europe/Istanbul",
});
const qtyInput = (q: number) =>
(q / QUANTITY_SCALE).toLocaleString("tr-TR", { maximumFractionDigits: 3, useGrouping: false });
/** Hesap seçenekleri (diyaloglar açıldığında). */
export function useAccounts() {
const [options, setOptions] = useState<TransactionFormOptions | null>(null);
useEffect(() => {
let cancelled = false;
getTransactionFormOptionsAction().then((r) => {
if (!cancelled && r.ok) setOptions(r.data);
});
return () => {
cancelled = true;
};
}, []);
return options?.accounts ?? null;
}
/** Kaydın varlık türündeki birikim varlıkları (ödeme diyaloğu açıldığında). */
function useAssetOptions(assetKey: AssetKey) {
const [options, setOptions] = useState<AssetOption[] | null>(null);
useEffect(() => {
let cancelled = false;
getAssetOptionsAction().then((r) => {
if (!cancelled && r.ok) setOptions(r.data.filter((a) => a.assetKey === assetKey));
});
return () => {
cancelled = true;
};
}, [assetKey]);
return options;
}
function Stat({ label, value, tone }: { label: string; value: string; tone?: string }) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("font-semibold tabular-nums", tone)}>{value}</p>
</div>
);
}
type Pending =
| { kind: "form"; item: InKindView | null }
| { kind: "contribute"; item: InKindView }
| { kind: "pay"; item: InKindView }
| { kind: "delete"; item: InKindView }
| null;
/** Cari sayfasında aynî borç/alacak bölümü. */
export function InKindSection({
contactId,
items,
canWrite,
}: {
contactId: string;
items: InKindView[];
canWrite: boolean;
}) {
const [pending, setPending] = useState<Pending>(null);
const close = () => setPending(null);
return (
<section className="flex flex-col gap-3" aria-labelledby="in-kind-title">
<div className="flex flex-wrap items-end justify-between gap-2">
<div>
<h2 id="in-kind-title" className="text-base font-medium">
{t.title}
</h2>
<p className="text-xs text-muted-foreground">{t.description}</p>
</div>
<div className="flex gap-2">
<Button variant="ghost" size="sm" asChild>
<Link href="/fiyatlar">
<Coins />
{t.prices}
</Link>
</Button>
{canWrite ? (
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "form", item: null })}
>
<Plus />
{t.new}
</Button>
) : null}
</div>
</div>
{items.map((item) => (
<InKindCard key={item.id} item={item} canWrite={canWrite} onAction={setPending} />
))}
{pending?.kind === "form" ? (
<InKindForm contactId={contactId} item={pending.item} onClose={close} />
) : null}
{pending?.kind === "contribute" ? (
<ContributionForm item={pending.item} onClose={close} />
) : null}
{pending?.kind === "pay" ? <PaymentForm item={pending.item} onClose={close} /> : null}
<AlertDialog open={pending?.kind === "delete"} onOpenChange={(o) => !o && close()}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.deleteTitle}</AlertDialogTitle>
<AlertDialogDescription>{t.deleteDescription}</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
if (pending?.kind !== "delete") return;
const r = await deleteInKindAction(pending.item.id);
close();
if (r.ok) toast.success(t.toast.deleted);
else toast.error(r.error);
}}
>
{t.delete}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</section>
);
}
function InKindCard({
item,
canWrite,
onAction,
}: {
item: InKindView;
canWrite: boolean;
onAction: (p: Pending) => void;
}) {
const p = item.progress;
const debt = item.direction === "debt";
const open = !item.closedAt;
return (
<Card size="sm" className={cn(!open && "opacity-70")}>
<CardHeader>
<div className="flex items-start justify-between gap-2">
<div className="min-w-0">
<CardTitle className="flex flex-wrap items-center gap-2 text-base">
{item.label}
<Badge variant={debt ? "destructive" : "secondary"}>
{t.directions[item.direction]}
</Badge>
{item.closedAt ? (
<Badge variant="outline">{t.stats.closed(d(item.closedAt))}</Badge>
) : null}
</CardTitle>
<CardDescription>
{t.stats.dateValue(d(item.date))}:{" "}
{item.valueMinor !== null ? formatMoney(item.valueMinor) : "—"}
{item.unitPriceMinor !== null
? ` · ${t.stats.priceAt(formatMoney(item.unitPriceMinor), d(item.date))}`
: ""}
</CardDescription>
</div>
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={tr.recurring.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={() => onAction({ kind: "form", item })}>
<Pencil />
{tr.common.edit}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
onSelect={() => onAction({ kind: "delete", item })}
>
<Trash2 />
{t.delete}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null}
</div>
</CardHeader>
<CardContent className="flex flex-col gap-3">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat
label={t.stats.remaining}
value={formatAssetQuantity(item.assetKey, p.remainingQuantity)}
/>
<Stat
label={t.stats.currentValue}
value={
p.currentValueMinor !== null ? formatMoney(p.currentValueMinor) : t.stats.noPrice
}
tone={debt ? "text-expense" : "text-income"}
/>
{item.savingsAccount ? (
<>
<Stat
label={`${t.stats.accumulated} · ${item.savingsAccount.name}`}
value={formatMoney(p.accumulatedMinor)}
tone="text-income"
/>
<Stat
label={t.stats.remainingNeed}
value={p.remainingNeedMinor !== null ? formatMoney(p.remainingNeedMinor) : "—"}
/>
</>
) : null}
</div>
{p.estimatedCloseMonth && open ? (
<p className="text-sm">
{t.stats.estimatedClose}:{" "}
<span className="font-medium capitalize">
{monthFmt.format(new Date(`${p.estimatedCloseMonth}-15T12:00:00+03:00`))}
</span>
{item.monthlyPlanMinor ? (
<span className="text-muted-foreground">
{" "}
· {formatMoney(item.monthlyPlanMinor)}/ay
</span>
) : null}
</p>
) : null}
{item.currentPrice ? (
<p className="text-xs text-muted-foreground">
{t.stats.currentPrice(
debt,
formatMoney(debt ? item.currentPrice.sellMinor : item.currentPrice.buyMinor),
d(item.currentPrice.date),
)}
</p>
) : null}
{item.note ? <p className="text-sm text-muted-foreground">{item.note}</p> : null}
{item.payments.length ? (
<div>
<p className="mb-1 text-xs font-medium text-muted-foreground">{t.payments}</p>
<ul className="divide-y rounded-lg border text-sm">
{item.payments.map((x) => (
<li key={x.id} className="flex items-center justify-between gap-2 p-2">
<span className="min-w-0 truncate">
{d(x.date)} ·{" "}
{t.paymentLine(
t.methods[x.method],
formatAssetQuantity(item.assetKey, x.quantity),
x.amountMinor ? formatMoney(x.amountMinor) : null,
)}
</span>
{x.account ? (
<span className="shrink-0 text-xs text-muted-foreground">{x.account}</span>
) : null}
</li>
))}
</ul>
</div>
) : null}
{canWrite && open ? (
<div className="flex flex-wrap justify-end gap-2">
{debt && item.savingsAccount ? (
<Button
size="sm"
variant="outline"
onClick={() => onAction({ kind: "contribute", item })}
>
<PiggyBank />
{t.contribute}
</Button>
) : null}
<Button size="sm" onClick={() => onAction({ kind: "pay", item })}>
<HandCoins />
{t.pay}
</Button>
</div>
) : null}
</CardContent>
</Card>
);
}
function Footer({ busy, formId, onClose }: { busy: boolean; formId: string; onClose: () => void }) {
return (
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form={formId} disabled={busy}>
{tr.common.save}
</Button>
</>
);
}
function InKindForm({
contactId,
item,
onClose,
}: {
contactId: string;
item: InKindView | null;
onClose: () => void;
}) {
const accounts = useAccounts();
const [v, setV] = useState({
direction: item?.direction ?? "debt",
assetKey: (item?.assetKey ?? "gram_gold") as AssetKey,
quantity: item ? qtyInput(item.quantity) : "",
date: item?.date ?? todayIstanbul(),
unitPrice: item?.unitPriceMinor ? formatMoneyInput(item.unitPriceMinor) : "",
note: item?.note ?? "",
savingsAccountId: item?.savingsAccount?.id ?? "",
monthlyPlan: item?.monthlyPlanMinor ? formatMoneyInput(item.monthlyPlanMinor) : "",
});
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 NONE = "__none__";
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveInKindAction(contactId, item?.id ?? null, {
...v,
savingsAccountId: v.direction === "debt" ? v.savingsAccountId : "",
monthlyPlan: v.direction === "debt" && v.savingsAccountId ? v.monthlyPlan : "",
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.saved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
const f = t.fields;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={item ? t.editTitle : t.createTitle}
footer={<Footer busy={busy} formId="in-kind-form" onClose={onClose} />}
>
<form id="in-kind-form" onSubmit={submit} noValidate>
<FieldGroup>
<Tabs
value={v.direction}
onValueChange={(x) => set("direction", x as "debt" | "receivable")}
>
<TabsList className="w-full">
{(["debt", "receivable"] as const).map((x) => (
<TabsTrigger
key={x}
value={x}
className="flex-1"
disabled={Boolean(item?.payments.length)}
>
{t.directions[x]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<div className="grid grid-cols-[1fr_8rem] gap-3">
<Field>
<FieldLabel htmlFor="ik-asset">{f.asset}</FieldLabel>
<Select
value={v.assetKey}
onValueChange={(x) => set("assetKey", x as AssetKey)}
disabled={Boolean(item?.payments.length)}
>
<SelectTrigger id="ik-asset" className="w-full">
<SelectValue>{ASSETS[v.assetKey].label}</SelectValue>
</SelectTrigger>
<SelectContent>
{ASSET_KEYS.map((k) => (
<SelectItem key={k} value={k}>
{ASSETS[k].label}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
<Field data-invalid={Boolean(errors.quantity)}>
<FieldLabel htmlFor="ik-qty">
{f.quantity} ({ASSETS[v.assetKey].unit})
</FieldLabel>
<Input
id="ik-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>
</div>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="ik-date">{f.date}</FieldLabel>
<Input
id="ik-date"
type="date"
value={v.date}
onChange={(e) => set("date", e.target.value)}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.unitPrice)}>
<FieldLabel htmlFor="ik-price">{f.unitPrice}</FieldLabel>
<MoneyInput id="ik-price" value={v.unitPrice} onChange={(x) => set("unitPrice", x)} />
{errors.unitPrice ? <FieldError>{errors.unitPrice}</FieldError> : null}
</Field>
</div>
<FieldDescription className="-mt-2">{f.unitPriceHint}</FieldDescription>
{v.direction === "debt" ? (
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.savingsAccountId)}>
<FieldLabel htmlFor="ik-savings">{f.savingsAccount}</FieldLabel>
<Select
value={v.savingsAccountId || NONE}
onValueChange={(x) => set("savingsAccountId", x === NONE ? "" : x)}
>
<SelectTrigger id="ik-savings" className="w-full">
<SelectValue>
{accounts?.find((a) => a.id === v.savingsAccountId)?.name ??
(v.savingsAccountId ? item?.savingsAccount?.name : f.savingsNone)}
</SelectValue>
</SelectTrigger>
<SelectContent>
<SelectItem value={NONE}>{f.savingsNone}</SelectItem>
{(accounts ?? [])
.filter((a) => a.type !== "credit_card")
.map((a) => (
<SelectItem key={a.id} value={a.id}>
{a.name}
</SelectItem>
))}
</SelectContent>
</Select>
{errors.savingsAccountId ? (
<FieldError>{errors.savingsAccountId}</FieldError>
) : null}
</Field>
<Field>
<FieldLabel htmlFor="ik-plan">{f.monthlyPlan}</FieldLabel>
<MoneyInput
id="ik-plan"
value={v.monthlyPlan}
onChange={(x) => set("monthlyPlan", x)}
disabled={!v.savingsAccountId}
/>
</Field>
</div>
) : null}
{v.direction === "debt" ? (
<FieldDescription className="-mt-2">{f.planHint}</FieldDescription>
) : null}
<Field>
<FieldLabel htmlFor="ik-note">{f.note}</FieldLabel>
<Input id="ik-note" value={v.note} onChange={(e) => set("note", e.target.value)} />
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
function ContributionForm({ item, onClose }: { item: InKindView; onClose: () => void }) {
const accounts = useAccounts();
const [v, setV] = useState({
fromAccountId: "",
amount: item.monthlyPlanMinor ? formatMoneyInput(item.monthlyPlanMinor) : "",
date: todayIstanbul(),
});
const [errors, setErrors] = useState<Errors>({});
const [busy, setBusy] = useState(false);
const sources = (accounts ?? []).filter((a) => a.id !== item.savingsAccount?.id);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await addContributionAction(item.id, {
...v,
fromAccountId: v.fromAccountId || sources[0]?.id || "",
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.contributed);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={`${t.contributionTitle} · ${item.label}`}
description={`→ ${item.savingsAccount?.name ?? ""}`}
footer={<Footer busy={busy} formId="contribution-form" onClose={onClose} />}
>
<form id="contribution-form" onSubmit={submit} noValidate>
<FieldGroup>
<Field data-invalid={Boolean(errors.fromAccountId)}>
<FieldLabel htmlFor="ct-from">{t.fromAccount}</FieldLabel>
<AccountSelect
id="ct-from"
value={v.fromAccountId || sources[0]?.id || ""}
onChange={(x) => setV((s) => ({ ...s, fromAccountId: x }))}
accounts={sources}
/>
{errors.fromAccountId ? <FieldError>{errors.fromAccountId}</FieldError> : null}
</Field>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.amount)}>
<FieldLabel htmlFor="ct-amount">{tr.transactions.fields.amount}</FieldLabel>
<MoneyInput
id="ct-amount"
value={v.amount}
onChange={(x) => setV((s) => ({ ...s, amount: x }))}
/>
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="ct-date">{tr.transactions.fields.date}</FieldLabel>
<Input
id="ct-date"
type="date"
value={v.date}
onChange={(e) => setV((s) => ({ ...s, date: e.target.value }))}
/>
</Field>
</div>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
function PaymentForm({ item, onClose }: { item: InKindView; onClose: () => void }) {
const accounts = useAccounts();
const debt = item.direction === "debt";
const [method, setMethod] = useState<"asset" | "cash">("cash");
const [v, setV] = useState({
date: todayIstanbul(),
quantity: qtyInput(item.progress.remainingQuantity),
amount: "",
accountId: item.savingsAccount?.id ?? "",
note: "",
});
const [errors, setErrors] = useState<Errors>({});
const [busy, setBusy] = useState(false);
const assets = useAssetOptions(item.assetKey);
const [link, setLink] = useState(false);
const [assetId, setAssetId] = useState("");
const linked = method === "asset" && link;
const linkAssetId = assetId || assets?.[0]?.id || "";
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const amount = linked ? "" : v.amount;
const r = await recordPaymentAction(item.id, {
method,
date: v.date,
quantity: method === "cash" ? "" : v.quantity,
amount,
accountId: amount ? v.accountId || accounts?.[0]?.id || "" : "",
assetId: linked ? linkAssetId : "",
note: v.note,
});
setBusy(false);
if (r.ok) {
toast.success((r.data as { closed: boolean }).closed ? t.toast.closed : t.toast.paid);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
const f = t.payFields;
const hints = debt ? t.methodHints : t.receiveHints;
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={`${t.payTitle} · ${item.label}`}
description={`${t.stats.remaining}: ${formatAssetQuantity(item.assetKey, item.progress.remainingQuantity)}`}
footer={<Footer busy={busy} formId="payment-form" onClose={onClose} />}
>
<form id="payment-form" onSubmit={submit} noValidate>
<FieldGroup>
<Tabs value={method} onValueChange={(x) => setMethod(x as "asset" | "cash")}>
<TabsList className="w-full">
{(["cash", "asset"] as const).map((m) => (
<TabsTrigger key={m} value={m} className="flex-1">
{t.methods[m]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<p className="-mt-2 text-xs text-muted-foreground">{hints[method]}</p>
<div className="grid grid-cols-2 gap-3">
{method === "asset" ? (
<Field data-invalid={Boolean(errors.quantity)}>
<FieldLabel htmlFor="pay-qty">
{f.quantity} ({ASSETS[item.assetKey].unit})
</FieldLabel>
<Input
id="pay-qty"
inputMode="decimal"
value={v.quantity}
onChange={(e) => setV((s) => ({ ...s, quantity: e.target.value }))}
className="text-right tabular-nums"
/>
{errors.quantity ? <FieldError>{errors.quantity}</FieldError> : null}
</Field>
) : null}
{linked || (method === "asset" && !debt) ? null : (
<Field data-invalid={Boolean(errors.amount)}>
<FieldLabel htmlFor="pay-amount">
{method === "cash" ? f.amount : f.assetAmount}
</FieldLabel>
<MoneyInput
id="pay-amount"
value={v.amount}
onChange={(x) => setV((s) => ({ ...s, amount: x }))}
/>
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
)}
<Field>
<FieldLabel htmlFor="pay-date">{tr.transactions.fields.date}</FieldLabel>
<Input
id="pay-date"
type="date"
value={v.date}
max={todayIstanbul()}
onChange={(e) => setV((s) => ({ ...s, date: e.target.value }))}
/>
</Field>
</div>
{method === "cash" ? (
<FieldDescription className="-mt-2">{f.quantityHint}</FieldDescription>
) : null}
{method === "asset" ? (
<div className="flex flex-col gap-2 rounded-lg border p-3">
<label className="flex items-start gap-2 text-sm">
<Checkbox
checked={link}
onCheckedChange={(x) => setLink(x === true)}
disabled={!assets?.length}
className="mt-0.5"
/>
<span>
{debt ? t.link.debt : t.link.receivable}
<span className="block text-xs text-muted-foreground">
{assets && !assets.length
? t.link.none
: debt
? t.link.debtHint
: t.link.receivableHint}
</span>
</span>
</label>
{link && assets?.length ? (
<Field data-invalid={Boolean(errors.assetId)}>
<FieldLabel htmlFor="pay-asset" className="sr-only">
{t.link.asset}
</FieldLabel>
<Select value={linkAssetId} onValueChange={setAssetId}>
<SelectTrigger id="pay-asset" className="w-full">
<SelectValue>{assets.find((a) => a.id === linkAssetId)?.name}</SelectValue>
</SelectTrigger>
<SelectContent>
{assets.map((a) => (
<SelectItem key={a.id} value={a.id}>
{a.name} · {formatAssetQuantity(item.assetKey, a.quantity)}
</SelectItem>
))}
</SelectContent>
</Select>
{errors.assetId ? <FieldError>{errors.assetId}</FieldError> : null}
</Field>
) : null}
</div>
) : null}
{(method === "cash" || v.amount) && !linked ? (
<Field data-invalid={Boolean(errors.accountId)}>
<FieldLabel htmlFor="pay-account">{f.account}</FieldLabel>
<AccountSelect
id="pay-account"
value={v.accountId || accounts?.[0]?.id || ""}
onChange={(x) => setV((s) => ({ ...s, accountId: x }))}
accounts={accounts ?? []}
invalid={Boolean(errors.accountId)}
/>
{errors.accountId ? <FieldError>{errors.accountId}</FieldError> : null}
</Field>
) : null}
<Field>
<FieldLabel htmlFor="pay-note">{t.fields.note}</FieldLabel>
<Input
id="pay-note"
value={v.note}
onChange={(e) => setV((s) => ({ ...s, note: e.target.value }))}
/>
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,235 @@
"use client";
import { ChevronDown, Plus } from "lucide-react";
import { Fragment, useState } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
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,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { ASSET_KEYS, ASSETS, type AssetKey } from "@/shared/assets";
import { todayIstanbul } from "@/shared/dates";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import { savePriceAction } from "../actions";
import type { PriceRow } from "../service";
const t = tr.prices;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
export function PricesView({ rows, canWrite }: { rows: PriceRow[]; canWrite: boolean }) {
const [editing, setEditing] = useState<AssetKey | null>(null);
const [openRow, setOpenRow] = useState<AssetKey | null>(null);
return (
<div className="flex flex-col gap-4">
{canWrite ? (
<div className="flex justify-end">
<Button onClick={() => setEditing("gram_gold")}>
<Plus />
{t.add}
</Button>
</div>
) : null}
<div className="overflow-x-auto rounded-xl border bg-card">
<table className="w-full text-sm">
<thead className="text-xs text-muted-foreground">
<tr className="border-b">
<th className="p-3 text-left font-normal">{t.asset}</th>
<th className="p-3 text-right font-normal">{t.buy}</th>
<th className="p-3 text-right font-normal">{t.sell}</th>
<th className="p-3 text-right font-normal">{t.date}</th>
<th className="w-10" />
</tr>
</thead>
<tbody className="divide-y tabular-nums">
{rows.map((r) => (
<Fragment key={r.assetKey}>
<tr>
<td className="p-3">
<button
type="button"
className="flex items-center gap-1 text-left font-medium disabled:cursor-default"
onClick={() => setOpenRow(openRow === r.assetKey ? null : r.assetKey)}
disabled={r.history.length < 2}
aria-expanded={openRow === r.assetKey}
>
{r.history.length > 1 ? (
<ChevronDown
className={cn(
"size-4 transition-transform",
openRow === r.assetKey && "rotate-180",
)}
/>
) : null}
{ASSETS[r.assetKey].label}
<span className="text-xs font-normal text-muted-foreground">
{t.perUnit(ASSETS[r.assetKey].unit)}
</span>
</button>
</td>
<td className="p-3 text-right">
{r.latest ? formatMoney(r.latest.buyMinor) : "—"}
</td>
<td className="p-3 text-right">
{r.latest ? formatMoney(r.latest.sellMinor) : "—"}
</td>
<td className="p-3 text-right text-muted-foreground">
{r.latest ? d(r.latest.date) : t.noPrice}
</td>
<td className="p-1 text-right">
{canWrite ? (
<Button
size="icon-sm"
variant="ghost"
onClick={() => setEditing(r.assetKey)}
aria-label={`${t.add}: ${ASSETS[r.assetKey].label}`}
>
<Plus />
</Button>
) : null}
</td>
</tr>
{openRow === r.assetKey
? r.history.slice(1).map((h) => (
<tr key={h.date} className="bg-muted/30 text-muted-foreground">
<td className="p-2 pl-9 text-xs">{t.history}</td>
<td className="p-2 text-right">{formatMoney(h.buyMinor)}</td>
<td className="p-2 text-right">{formatMoney(h.sellMinor)}</td>
<td className="p-2 text-right">{d(h.date)}</td>
<td />
</tr>
))
: null}
</Fragment>
))}
</tbody>
</table>
</div>
{editing ? (
<PriceForm
key={editing}
assetKey={editing}
latest={rows.find((r) => r.assetKey === editing)?.latest ?? null}
onClose={() => setEditing(null)}
/>
) : null}
</div>
);
}
function PriceForm({
assetKey: initial,
latest,
onClose,
}: {
assetKey: AssetKey;
latest: PriceRow["latest"];
onClose: () => void;
}) {
const [v, setV] = useState({
assetKey: initial,
date: todayIstanbul(),
buy: latest ? formatMoneyInput(latest.buyMinor) : "",
sell: latest ? formatMoneyInput(latest.sellMinor) : "",
});
const [errors, setErrors] = useState<Record<string, string | undefined>>({});
const [busy, setBusy] = useState(false);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await savePriceAction(v);
setBusy(false);
if (r.ok) {
toast.success(t.saved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={t.add}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="price-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="price-form" onSubmit={submit} noValidate>
<FieldGroup>
<div className="grid grid-cols-[1fr_auto] gap-3">
<Field>
<FieldLabel htmlFor="pr-asset">{t.asset}</FieldLabel>
<Select
value={v.assetKey}
onValueChange={(x) => setV((s) => ({ ...s, assetKey: x as AssetKey }))}
>
<SelectTrigger id="pr-asset" className="w-full">
<SelectValue>{ASSETS[v.assetKey].label}</SelectValue>
</SelectTrigger>
<SelectContent>
{ASSET_KEYS.map((k) => (
<SelectItem key={k} value={k}>
{ASSETS[k].label}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="pr-date">{t.date}</FieldLabel>
<Input
id="pr-date"
type="date"
value={v.date}
max={todayIstanbul()}
onChange={(e) => setV((s) => ({ ...s, date: e.target.value }))}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
</div>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.buy)}>
<FieldLabel htmlFor="pr-buy">{t.buy}</FieldLabel>
<MoneyInput
id="pr-buy"
value={v.buy}
onChange={(x) => setV((s) => ({ ...s, buy: x }))}
autoFocus
/>
{errors.buy ? <FieldError>{errors.buy}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="pr-sell">{t.sell}</FieldLabel>
<MoneyInput
id="pr-sell"
value={v.sell}
onChange={(x) => setV((s) => ({ ...s, sell: x }))}
/>
</Field>
</div>
<FieldDescription className="-mt-2">{t.sellHint}</FieldDescription>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
+60
View File
@@ -0,0 +1,60 @@
import "server-only";
import type { Types } from "mongoose";
import { AssetPriceModel } from "@/models/asset-price";
import type { AssetKey } from "@/shared/assets";
/** Fiyat tablosu okuma yardımcıları (aynî kayıtlar ve varlık takibi ortak kullanır). */
export type PriceQuote = { buyMinor: number; sellMinor: number; date: string };
/** Varlığın verilen tarihteki (veya öncesindeki en yakın) fiyatı. */
export async function priceOn(
householdId: Types.ObjectId,
assetKey: AssetKey,
date: string,
): Promise<PriceQuote | null> {
const p = await AssetPriceModel.findOne({ householdId, assetKey, date: { $lte: date } })
.sort({ date: -1 })
.lean();
return p ? { buyMinor: p.buyMinor, sellMinor: p.sellMinor, date: p.date } : null;
}
/**
* Varlıkların `to` tarihine kadarki tüm fiyatları; dönen fonksiyon bir tarihteki (veya
* öncesindeki en yakın) alış fiyatını verir (yoksa null).
*/
export async function buyPriceLookup(
householdId: Types.ObjectId,
assetKeys: AssetKey[],
to: string,
): Promise<(assetKey: AssetKey, date: string) => number | null> {
const rows = await AssetPriceModel.find({
householdId,
assetKey: { $in: assetKeys },
date: { $lte: to },
})
.sort({ date: 1 })
.lean();
const by = new Map<string, { date: string; buyMinor: number }[]>();
for (const r of rows) {
const list = by.get(r.assetKey) ?? [];
list.push({ date: r.date, buyMinor: r.buyMinor });
by.set(r.assetKey, list);
}
return (assetKey, date) => {
const list = by.get(assetKey);
if (!list) return null;
// İkili arama: date'ten küçük-eşit son kayıt.
let lo = 0;
let hi = list.length - 1;
let found = -1;
while (lo <= hi) {
const mid = (lo + hi) >> 1;
if (list[mid]!.date <= date) {
found = mid;
lo = mid + 1;
} else hi = mid - 1;
}
return found === -1 ? null : list[found]!.buyMinor;
};
}
+270
View File
@@ -0,0 +1,270 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { listAccounts } from "@/features/accounts/service";
import { createContact, listContacts } from "@/features/contacts/service";
import { listTransactions, setTransactionDeleted } from "@/features/transactions/service";
import { AccountModel } from "@/models/account";
import { AssetPriceModel } from "@/models/asset-price";
import { AuditLogModel } from "@/models/audit-log";
import { InKindDebtModel } from "@/models/in-kind-debt";
import { todayIstanbul } from "@/shared/dates";
import { addDays, addMonths } from "@/shared/recurrence";
import { contactFormSchema } from "@/shared/schemas/contact";
import {
assetPriceFormSchema,
contributionSchema,
inKindFormSchema,
paymentFormSchema,
} from "@/shared/schemas/in-kind";
import { transactionFilterSchema } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
addContribution,
createInKind,
listInKind,
listPrices,
recordPayment,
savePrice,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
const today = todayIstanbul();
const monthAgo = addDays(today, -30);
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
// Seed örnek fiyatları bu testin fiyat senaryolarını etkilemesin.
await AssetPriceModel.deleteMany({});
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => String(a!._id));
async function balance(accountId: string) {
return (await listAccounts(ayse, cakir))!.accounts.find((a) => a.id === accountId)!.balanceMinor!;
}
const price = (assetKey: string, date: string, buy: string, sell = "") =>
assetPriceFormSchema.parse({ assetKey, date, buy, sell });
async function contact(name: string, isPrivate = false) {
const r = await createContact(
ayse,
cakir,
contactFormSchema.parse({ name, openingDate: monthAgo, isPrivate }),
);
return r.ok ? r.data.id : "";
}
async function view(id: string) {
return (await listInKind(ayse, cakir))!.find((v) => v.id === id)!;
}
describe("fiyat tablosu", () => {
it("elle fiyat; tek fiyat ikisine yazılır; gelecek tarih reddedilir; izleyici yazamaz", async () => {
expect((await savePrice(ayse, cakir, price("gram_gold", today, "3.200", "3.300"))).ok).toBe(
true,
);
expect((await savePrice(ayse, cakir, price("usd", today, "41,50"))).ok).toBe(true);
expect((await savePrice(ayse, cakir, price("usd", addDays(today, 1), "1"))).ok).toBe(false);
expect((await savePrice(zeynep, cakir, price("usd", today, "1"))).ok).toBe(false);
const rows = (await listPrices(ayse, cakir))!.rows;
expect(rows.find((r) => r.assetKey === "usd")!.latest).toMatchObject({
buyMinor: 41_50,
sellMinor: 41_50,
});
// Aynı gün yeniden giriş günceller.
await savePrice(ayse, cakir, price("usd", today, "42"));
expect(
(await listPrices(ayse, cakir))!.rows.find((r) => r.assetKey === "usd")!.history,
).toHaveLength(1);
});
});
describe("aynî borç", () => {
let gold = "";
let ahmet = "";
it("borç tarihindeki fiyat tablodan; yoksa birim fiyat istenir; değer satış fiyatıyla", async () => {
ahmet = await contact("Altın Ahmet");
const input = inKindFormSchema.parse({
direction: "debt",
assetKey: "gram_gold",
quantity: "5",
date: monthAgo,
savingsAccountId: await acc("Birikim (Vadeli)"),
monthlyPlan: "2.000",
});
expect((await createInKind(ayse, cakir, ahmet, input)).ok).toBe(false);
await savePrice(ayse, cakir, price("gram_gold", monthAgo, "2.900", "3.000"));
const r = await createInKind(ayse, cakir, ahmet, input);
expect(r.ok).toBe(true);
gold = r.ok ? r.data.id : "";
const v = await view(gold);
expect(v).toMatchObject({
unitPriceMinor: 3_000_00,
valueMinor: 15_000_00,
label: "5 gr Gram altın (24 ayar)",
});
// Güncel: 5 × 3.300 (satış) = 16.500; birikim 0; ayda 2.000 → 9 ay.
expect(v.progress).toMatchObject({
currentValueMinor: 16_500_00,
accumulatedMinor: 0,
remainingNeedMinor: 16_500_00,
estimatedCloseMonth: addMonths(`${today.slice(0, 7)}-01`, 9).slice(0, 7),
});
});
it("birikim katkısı: hesaptan birikim hesabına transfer; borç kapanmaz; cari TL bakiyesi ve gelir/gider değişmez", async () => {
const ziraat = await acc("Ziraat Maaş");
const birikim = await acc("Birikim (Vadeli)");
const [z0, b0] = [await balance(ziraat), await balance(birikim)];
const sums0 = (await listTransactions(ayse, cakir, transactionFilterSchema.parse({})))!.sums;
const r = await addContribution(
ayse,
cakir,
gold,
contributionSchema.parse({ fromAccountId: ziraat, amount: "6.000", date: today }),
);
expect(r.ok).toBe(true);
expect(await balance(ziraat)).toBe(z0 - 6_000_00);
expect(await balance(birikim)).toBe(b0 + 6_000_00);
const v = await view(gold);
expect(v.progress.accumulatedMinor).toBe(6_000_00);
expect(v.progress.remainingNeedMinor).toBe(10_500_00);
expect(v.closedAt).toBeNull();
expect(
(await listContacts(ayse, cakir))!.contacts.find((c) => c.id === ahmet)!.balanceMinor,
).toBe(0);
expect((await listTransactions(ayse, cakir, transactionFilterSchema.parse({})))!.sums).toEqual(
sums0,
);
});
it("TL karşılığıyla kısmi ödeme: miktar güncel fiyattan; birikim hesabından çıkış", async () => {
const birikim = await acc("Birikim (Vadeli)");
const b0 = await balance(birikim);
const r = await recordPayment(
ayse,
cakir,
gold,
paymentFormSchema.parse({ method: "cash", date: today, amount: "6.600", accountId: birikim }),
);
expect(r).toMatchObject({ ok: true, data: { closed: false } });
const v = await view(gold);
expect(v.paidQuantity).toBe(2_000);
expect(v.progress.remainingQuantity).toBe(3_000);
expect(v.progress.accumulatedMinor).toBe(0);
expect(await balance(birikim)).toBe(b0 - 6_600_00);
// Ödeme işlemi tek başına silinemez.
const doc = (await InKindDebtModel.findById(gold).lean())!;
expect(
(await setTransactionDeleted(ayse, cakir, String(doc.payments[0]!.transactionId), true)).ok,
).toBe(false);
});
it("aynı varlıkla ödeme kalanı aşarsa kalana sınırlanır ve kayıt kapanır", async () => {
const r = await recordPayment(
ayse,
cakir,
gold,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "5" }),
);
expect(r).toMatchObject({ ok: true, data: { closed: true } });
const v = await view(gold);
expect(v.paidQuantity).toBe(5_000);
expect(v.closedAt).toBe(today);
expect(await AuditLogModel.exists({ action: "inkind.close", targetId: gold })).toBeTruthy();
expect(
(
await recordPayment(
ayse,
cakir,
gold,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "1" }),
)
).ok,
).toBe(false);
});
it("aynî alacak: alış fiyatıyla değerlenir, tahsilat hesaba girer; birikim planı alınmaz", async () => {
const elif = await contact("Döviz Elif");
const cuzdan = await acc("Cüzdan");
expect(
(
await createInKind(
ayse,
cakir,
elif,
inKindFormSchema.parse({
direction: "receivable",
assetKey: "usd",
quantity: "100",
date: today,
savingsAccountId: await acc("Birikim (Vadeli)"),
}),
)
).ok,
).toBe(false);
const r = await createInKind(
ayse,
cakir,
elif,
inKindFormSchema.parse({
direction: "receivable",
assetKey: "usd",
quantity: "100",
date: today,
}),
);
const id = r.ok ? r.data.id : "";
expect((await view(id)).progress.currentValueMinor).toBe(4_200_00);
const c0 = await balance(cuzdan);
await recordPayment(
ayse,
cakir,
id,
paymentFormSchema.parse({ method: "cash", date: today, amount: "2.100", accountId: cuzdan }),
);
expect(await balance(cuzdan)).toBe(c0 + 2_100_00);
expect((await view(id)).paidQuantity).toBe(50_000);
});
it("gizli cari: aynî kayıt başkasına görünmez ve eklenemez", async () => {
const secret = await contact("Gizli Altın", true);
await createInKind(
ayse,
cakir,
secret,
inKindFormSchema.parse({
direction: "debt",
assetKey: "gram_gold",
quantity: "1",
date: today,
}),
);
expect((await listInKind(emre, cakir))!.some((v) => v.contactId === secret)).toBe(false);
expect(await listInKind(emre, cakir, secret)).toBeNull();
expect(
(
await createInKind(
emre,
cakir,
secret,
inKindFormSchema.parse({
direction: "debt",
assetKey: "gram_gold",
quantity: "1",
date: today,
}),
)
).ok,
).toBe(false);
});
});
+617
View File
@@ -0,0 +1,617 @@
import "server-only";
import mongoose, { Types } from "mongoose";
import { hasHouseholdRole } from "@/features/households/roles";
import { loadContext, type Ctx } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { AssetPriceModel } from "@/models/asset-price";
import { InKindDebtModel } from "@/models/in-kind-debt";
import { TransactionModel } from "@/models/transaction";
import { addMovement } from "@/features/assets/service";
import { AssetMovementModel } from "@/models/asset-movement";
import { priceOn, type PriceQuote } from "./prices";
import {
ASSET_KEYS,
formatAssetQuantity,
inKindProgress,
quantityForAmount,
valuationPrice,
valueOf,
type AssetKey,
type InKindDirection,
type InKindProgress,
} from "@/shared/assets";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import type {
AssetPriceForm,
ContributionForm,
InKindForm,
PaymentForm,
} from "@/shared/schemas/in-kind";
import { foldTr } from "@/shared/search";
/**
* Aynî borç/alacak ve fiyat tablosu (Bölüm 6.5–6.6). Okuma: viewer; yazma: member.
* Görünürlük cariye bağlıdır ("yalnızca ben" cari → kayıt da gizli).
*/
const t = tr.inKind;
// --- Fiyat tablosu ---
export { priceOn, type PriceQuote } from "./prices";
export type PriceRow = { assetKey: AssetKey; latest: PriceQuote | null; history: PriceQuote[] };
export async function listPrices(
userId: string,
householdId: string,
): Promise<{ rows: PriceRow[]; canWrite: boolean } | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const all = await AssetPriceModel.find({ householdId: ctx.m.householdId })
.sort({ date: -1 })
.limit(1000)
.lean();
const rows = ASSET_KEYS.map((assetKey): PriceRow => {
const history = all
.filter((p) => p.assetKey === assetKey)
.slice(0, 10)
.map((p) => ({ buyMinor: p.buyMinor, sellMinor: p.sellMinor, date: p.date }));
return { assetKey, latest: history[0] ?? null, history };
});
return { rows, canWrite: hasHouseholdRole(ctx.m.role, "member") };
}
export async function savePrice(
actorId: string,
householdId: string,
input: AssetPriceForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
if (input.date > todayIstanbul()) return fail(tr.validation.date, { date: tr.validation.date });
await AssetPriceModel.updateOne(
{ householdId: ctx.m.householdId, assetKey: input.assetKey, date: input.date },
{
$set: { buyMinor: input.buyMinor, sellMinor: input.sellMinor, source: "manual" },
$setOnInsert: { createdBy: new Types.ObjectId(actorId) },
},
{ upsert: true },
);
return ok(undefined);
}
// --- Aynî kayıtlar ---
type PaymentDoc = {
_id: Types.ObjectId;
date: string;
method: "asset" | "cash";
quantity: number;
amountMinor: number;
accountId?: Types.ObjectId | null;
transactionId?: Types.ObjectId | null;
note: string;
};
type DebtDoc = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
contactId: Types.ObjectId;
direction: InKindDirection;
assetKey: AssetKey;
quantity: number;
date: string;
unitPriceMinor?: number | null;
valueMinor?: number | null;
note: string;
savingsAccountId?: Types.ObjectId | null;
monthlyPlanMinor?: number | null;
payments: PaymentDoc[];
closedAt?: string | null;
};
export type InKindView = {
id: string;
contactId: string;
contactName: string;
direction: InKindDirection;
assetKey: AssetKey;
label: string;
quantity: number;
paidQuantity: number;
date: string;
unitPriceMinor: number | null;
valueMinor: number | null;
note: string;
savingsAccount: { id: string; name: string } | null;
monthlyPlanMinor: number | null;
closedAt: string | null;
currentPrice: PriceQuote | null;
progress: InKindProgress;
payments: {
id: string;
date: string;
method: "asset" | "cash";
quantity: number;
amountMinor: number;
account: string | null;
note: string;
}[];
};
function contactVisible(ctx: Ctx, contactId: Types.ObjectId | string) {
const c = ctx.contactMap.get(String(contactId));
return c && !c.hidden ? c : null;
}
/** Birikim: borca bağlı katkılar (birikim hesabına giren) − birikim hesabından yapılan ödemeler. */
async function savingsFlows(debtIds: Types.ObjectId[]) {
const rows = await TransactionModel.aggregate<{
_id: { debt: Types.ObjectId; role: string };
sum: number;
}>([
{
$match: {
inKindDebtId: { $in: debtIds },
status: "posted",
deletedAt: null,
},
},
{
$group: {
_id: { debt: "$inKindDebtId", role: "$inKindRole" },
sum: { $sum: "$amountMinor" },
},
},
]);
const map = new Map<string, { contributed: number }>();
for (const r of rows) {
if (r._id.role !== "contribution") continue;
map.set(String(r._id.debt), { contributed: r.sum });
}
return map;
}
async function toViews(ctx: Ctx, docs: DebtDoc[]): Promise<InKindView[]> {
const today = todayIstanbul();
const flows = await savingsFlows(docs.map((d) => d._id));
const priceCache = new Map<string, PriceQuote | null>();
const views: InKindView[] = [];
for (const d of docs) {
if (!priceCache.has(d.assetKey))
priceCache.set(d.assetKey, await priceOn(ctx.m.householdId, d.assetKey, today));
const price = priceCache.get(d.assetKey)!;
const paidQuantity = d.payments.reduce((a, p) => a + p.quantity, 0);
const savingsId = d.savingsAccountId ? String(d.savingsAccountId) : null;
// Birikim hesabından yapılan ödemeler birikimden düşer.
const spentMinor = d.payments
.filter((p) => savingsId && String(p.accountId) === savingsId)
.reduce((a, p) => a + p.amountMinor, 0);
const savings = savingsId ? ctx.accountMap.get(savingsId) : undefined;
views.push({
id: String(d._id),
contactId: String(d.contactId),
contactName: ctx.contactMap.get(String(d.contactId))?.name ?? "—",
direction: d.direction,
assetKey: d.assetKey,
label: formatAssetQuantity(d.assetKey, d.quantity),
quantity: d.quantity,
paidQuantity,
date: d.date,
unitPriceMinor: d.unitPriceMinor ?? null,
valueMinor: d.valueMinor ?? null,
note: d.note,
savingsAccount: savings && !savings.hidden ? { id: savingsId!, name: savings.name } : null,
monthlyPlanMinor: d.monthlyPlanMinor ?? null,
closedAt: d.closedAt ?? null,
currentPrice: price,
progress: inKindProgress({
quantity: d.quantity,
paidQuantity,
unitPriceMinor: valuationPrice(d.direction, price),
contributedMinor: flows.get(String(d._id))?.contributed ?? 0,
spentMinor,
monthlyPlanMinor: d.direction === "debt" ? (d.monthlyPlanMinor ?? null) : null,
today,
}),
payments: d.payments.map((p) => {
const a = p.accountId ? ctx.accountMap.get(String(p.accountId)) : undefined;
return {
id: String(p._id),
date: p.date,
method: p.method,
quantity: p.quantity,
amountMinor: p.amountMinor,
account: a ? (a.hidden ? tr.transactions.list.hiddenAccount : a.name) : null,
note: p.note,
};
}),
});
}
return views;
}
/** Bir carinin (veya tüm görünür carilerin) aynî kayıtları; açıklar önce. */
export async function listInKind(
userId: string,
householdId: string,
contactId?: string,
): Promise<InKindView[] | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const filter: Record<string, unknown> = { householdId: ctx.m.householdId, deletedAt: null };
if (contactId) {
const id = toObjectId(contactId);
if (!id || !contactVisible(ctx, id)) return null;
filter.contactId = id;
} else {
filter.contactId = { $nin: ctx.hiddenContactIds };
}
const docs = await InKindDebtModel.find(filter).sort({ closedAt: 1, date: -1 }).lean<DebtDoc[]>();
return toViews(
ctx,
docs.filter((d) => contactVisible(ctx, d.contactId)),
);
}
async function loadDebt(ctx: Ctx, debtId: string) {
const id = toObjectId(debtId);
if (!id) return null;
const d = await InKindDebtModel.findOne({
_id: id,
householdId: ctx.m.householdId,
deletedAt: null,
}).lean<DebtDoc>();
return d && contactVisible(ctx, d.contactId) ? d : null;
}
function checkAccount(ctx: Ctx, id: string | null) {
if (!id) return null;
const a = ctx.accountMap.get(id);
return a && !a.hidden && !a.archived ? a : null;
}
async function debtFields(ctx: Ctx, input: InKindForm) {
let unitPriceMinor = input.unitPrice;
if (unitPriceMinor === null) {
const p = await priceOn(ctx.m.householdId, input.assetKey, input.date);
unitPriceMinor = valuationPrice(input.direction, p);
}
if (unitPriceMinor === null) return fail(t.errors.noPrice, { unitPrice: t.errors.noPrice });
if (input.savingsAccountId && input.direction !== "debt")
return fail(t.errors.receivablePlan, { savingsAccountId: t.errors.receivablePlan });
const savings = input.savingsAccountId ? checkAccount(ctx, input.savingsAccountId) : null;
if (input.savingsAccountId && !savings)
return fail(tr.transactions.validation.accountInvalid, {
savingsAccountId: tr.transactions.validation.accountInvalid,
});
return ok({
direction: input.direction,
assetKey: input.assetKey,
quantity: input.quantity,
date: input.date,
unitPriceMinor,
valueMinor: valueOf(input.quantity, unitPriceMinor),
note: input.note,
savingsAccountId: savings?.id ?? null,
monthlyPlanMinor: savings ? input.monthlyPlan : null,
});
}
export async function createInKind(
actorId: string,
householdId: string,
contactId: string,
input: InKindForm,
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const cid = toObjectId(contactId);
const contact = cid ? contactVisible(ctx, cid) : null;
if (!contact) return fail(tr.common.notFound);
if (contact.archived) return fail(tr.contacts.errors.archived);
const fields = await debtFields(ctx, input);
if (!fields.ok) return fields;
const actor = new Types.ObjectId(actorId);
const doc = await InKindDebtModel.create({
...fields.data,
householdId: ctx.m.householdId,
contactId: contact.id,
createdBy: actor,
updatedBy: actor,
});
return ok({ id: String(doc._id) });
}
export async function updateInKind(
actorId: string,
householdId: string,
debtId: string,
input: InKindForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const d = await loadDebt(ctx, debtId);
if (!d) return fail(tr.common.notFound);
const paid = d.payments.reduce((a, p) => a + p.quantity, 0);
if (input.quantity < paid)
return fail(t.errors.quantityBelowPaid, { quantity: t.errors.quantityBelowPaid });
// Ödeme varsa yön ve varlık değişemez (ödemeler o varlık cinsindendir).
if (d.payments.length && (input.direction !== d.direction || input.assetKey !== d.assetKey))
return fail(t.errors.closed);
const fields = await debtFields(ctx, input);
if (!fields.ok) return fields;
await InKindDebtModel.updateOne(
{ _id: d._id, householdId: ctx.m.householdId },
{
$set: {
...fields.data,
closedAt: paid >= input.quantity ? (d.closedAt ?? todayIstanbul()) : null,
updatedBy: new Types.ObjectId(actorId),
},
},
);
return ok(undefined);
}
export async function deleteInKind(
actorId: string,
householdId: string,
debtId: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const d = await loadDebt(ctx, debtId);
if (!d) return fail(tr.common.notFound);
const actor = new Types.ObjectId(actorId);
await InKindDebtModel.updateOne(
{ _id: d._id },
{ $set: { deletedAt: new Date(), updatedBy: actor } },
);
// Bağlı varlık hareketleri serbest kalır (Birikim sayfasından yönetilebilir).
await AssetMovementModel.updateMany(
{ householdId: ctx.m.householdId, inKindDebtId: d._id },
{ $set: { inKindDebtId: null } },
);
await writeAudit({
action: "inkind.delete",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "inKindDebt",
targetId: String(d._id),
diff: { assetKey: d.assetKey, quantity: d.quantity, direction: d.direction },
});
return ok(undefined);
}
// --- Birikim ve ödeme ---
/** Birikim katkısı: kaynak hesaptan borcun birikim hesabına transfer (borç kapanmaz). */
export async function addContribution(
actorId: string,
householdId: string,
debtId: string,
input: ContributionForm,
): Promise<ActionResult<{ transactionId: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const d = await loadDebt(ctx, debtId);
if (!d) return fail(tr.common.notFound);
if (d.closedAt) return fail(t.errors.closed);
if (d.direction !== "debt" || !d.savingsAccountId) return fail(t.errors.noSavings);
const from = checkAccount(ctx, input.fromAccountId);
const to = checkAccount(ctx, String(d.savingsAccountId));
if (!from || !to)
return fail(tr.transactions.validation.accountInvalid, {
fromAccountId: tr.transactions.validation.accountInvalid,
});
if (from.id.equals(to.id))
return fail(t.errors.sameAccount, { fromAccountId: t.errors.sameAccount });
const date = istanbulDayStart(input.date);
if (!date) return fail(tr.validation.date, { date: tr.validation.date });
const actor = new Types.ObjectId(actorId);
const contactName = ctx.contactMap.get(String(d.contactId))?.name ?? "";
const description = t.contributionDescription(
formatAssetQuantity(d.assetKey, d.quantity),
contactName,
);
const tx = await TransactionModel.create({
householdId: ctx.m.householdId,
type: "transfer",
status: "posted",
date,
accountId: from.id,
toAccountId: to.id,
amountMinor: input.amount,
description,
searchText: foldTr(description),
contactId: d.contactId,
inKindDebtId: d._id,
inKindRole: "contribution",
createdBy: actor,
updatedBy: actor,
});
return ok({ transactionId: String(tx._id) });
}
/**
* "Ödeme gerçekleşti": kısmi ödeme miktarı düşürür, tam ödemede kayıt kapanır. TL tutar varsa
* hesaptan çıkış (borç) veya hesaba giriş (alacak) işlemi aynı transaction içinde oluşturulur.
*/
export async function recordPayment(
actorId: string,
householdId: string,
debtId: string,
input: PaymentForm,
): Promise<ActionResult<{ closed: boolean }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const d = await loadDebt(ctx, debtId);
if (!d) return fail(tr.common.notFound);
if (d.closedAt) return fail(t.errors.closed);
if (input.date > todayIstanbul()) return fail(tr.validation.date, { date: tr.validation.date });
const date = istanbulDayStart(input.date);
if (!date) return fail(tr.validation.date, { date: tr.validation.date });
const account = input.accountId ? checkAccount(ctx, input.accountId) : null;
if (input.accountId && !account)
return fail(tr.transactions.validation.accountInvalid, {
accountId: tr.transactions.validation.accountInvalid,
});
let quantity = input.quantity;
if (quantity === null) {
const price = valuationPrice(
d.direction,
await priceOn(ctx.m.householdId, d.assetKey, input.date),
);
if (!price) return fail(t.errors.noCurrentPrice, { quantity: t.errors.noCurrentPrice });
quantity = quantityForAmount(input.amount ?? 0, price);
}
const paid = d.payments.reduce((a, p) => a + p.quantity, 0);
const remaining = d.quantity - paid;
quantity = Math.min(quantity, remaining);
if (quantity <= 0) return fail(t.validation.quantity, { quantity: t.validation.quantity });
const closed = paid + quantity >= d.quantity;
const actor = new Types.ObjectId(actorId);
const amountMinor = input.amount ?? 0;
const contactName = ctx.contactMap.get(String(d.contactId))?.name ?? "";
const description = t.paymentDescription(
d.direction === "debt",
formatAssetQuantity(d.assetKey, quantity),
contactName,
);
if (input.assetId) {
const asset = ctx.assetMap.get(input.assetId);
if (!asset || asset.hidden || asset.deleted)
return fail(tr.common.notFound, { assetId: tr.common.notFound });
if (asset.assetKey !== d.assetKey)
return fail(t.link.assetMismatch, { assetId: t.link.assetMismatch });
}
const writePayment = async (session: mongoose.ClientSession) => {
let transactionId: Types.ObjectId | null = null;
if (amountMinor > 0 && account) {
const out = d.direction === "debt";
const [tx] = await TransactionModel.create(
[
{
householdId: ctx.m.householdId,
type: "transfer",
status: "posted",
date,
// Borç ödemesi hesaptan çıkar; alacak tahsilatı hesaba girer.
accountId: out ? account.id : null,
toAccountId: out ? null : account.id,
amountMinor,
description,
searchText: foldTr(description),
contactId: d.contactId,
inKindDebtId: d._id,
inKindRole: "payment",
createdBy: actor,
updatedBy: actor,
},
],
{ session },
);
transactionId = tx!._id;
}
await InKindDebtModel.updateOne(
{ _id: d._id, householdId: ctx.m.householdId, closedAt: null },
{
$push: {
payments: {
date: input.date,
method: input.method,
quantity,
amountMinor,
accountId: account?.id ?? null,
transactionId,
note: input.note,
createdBy: actor,
},
},
$set: { closedAt: closed ? input.date : null, updatedBy: actor },
},
{ session },
);
await writeAudit(
{
action: closed ? "inkind.close" : "inkind.payment",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "inKindDebt",
targetId: String(d._id),
diff: { method: input.method, quantity, amountMinor, remaining: remaining - quantity },
},
session,
);
};
try {
await mongoose.connection.transaction(async (session) => {
// Varlık bağlantısı: borç ödemesi varlıktan çıkış, alacak tahsilatı varlığa giriş.
if (input.assetId) {
const r = await addMovement(
actorId,
householdId,
input.assetId,
{
kind: d.direction === "debt" ? "gift_out" : "gift_in",
date: input.date,
quantity,
unitPrice: d.direction === "debt" ? null : (d.unitPriceMinor ?? null),
amount: null,
accountId: null,
storage: "",
note: t.link.movementNote(contactName),
},
{ inKindDebtId: d._id, session },
);
if (!r.ok) throw new LinkError(r.error, r.fieldErrors?.quantity);
}
await writePayment(session);
});
} catch (error) {
if (error instanceof LinkError)
return fail(error.message, error.quantity ? { quantity: error.quantity } : undefined);
throw error;
}
return ok({ closed });
}
/** Varlık hareketi eklenemedi: transaction geri alınır, hata kullanıcıya döner. */
class LinkError extends Error {
constructor(
message: string,
readonly quantity?: string,
) {
super(message);
}
}
/** Cari listesi için açık aynî kayıt özetleri (cari kimliği → etiketler). */
export async function openInKindByContact(
userId: string,
householdId: string,
): Promise<Map<string, { direction: InKindDirection; label: string }[]>> {
const views = (await listInKind(userId, householdId)) ?? [];
const map = new Map<string, { direction: InKindDirection; label: string }[]>();
for (const v of views) {
if (v.closedAt) continue;
const list = map.get(v.contactId) ?? [];
list.push({
direction: v.direction,
label: formatAssetQuantity(v.assetKey, v.quantity - v.paidQuantity),
});
map.set(v.contactId, list);
}
return map;
}
@@ -0,0 +1,62 @@
import { Card, CardContent } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
import type { NetWorth } from "../service";
const t = tr.assets.netWorth;
/** Net varlık dökümü: artılar ve eksiler, altta toplam. */
export function NetWorthCard({ data }: { data: NetWorth }) {
const rows: { label: string; minor: number; sign: 1 | -1 }[] = [
{ label: t.accounts, minor: data.accountsMinor, sign: 1 },
{ label: t.assets, minor: data.assetsMinor, sign: 1 },
{ label: t.contactReceivable, minor: data.contactReceivableMinor, sign: 1 },
{ label: t.inKindReceivable, minor: data.inKindReceivableMinor, sign: 1 },
{ label: t.cardDebt, minor: data.cardDebtMinor, sign: -1 },
{ label: t.contactPayable, minor: data.contactPayableMinor, sign: -1 },
{ label: t.inKindPayable, minor: data.inKindPayableMinor, sign: -1 },
];
const plus = rows.filter((r) => r.sign === 1);
const minus = rows.filter((r) => r.sign === -1);
const list = (items: typeof rows) => (
<dl className="flex flex-col text-sm">
{items.map((r) => (
<div key={r.label} className="flex items-center justify-between gap-2 py-1">
<dt className="text-muted-foreground">{r.label}</dt>
<dd className="tabular-nums">
{r.sign < 0 && r.minor ? "−" : ""}
{formatMoney(r.minor)}
</dd>
</div>
))}
</dl>
);
return (
<Card size="sm">
<CardContent className="flex flex-col gap-3">
<div>
<p
className={cn(
"text-3xl font-semibold tracking-tight tabular-nums",
data.totalMinor < 0 && "text-expense",
)}
>
{formatMoney(data.totalMinor)}
</p>
<p className="text-sm text-muted-foreground">{t.description}</p>
</div>
<div className="grid gap-x-8 gap-y-1 border-t pt-2 sm:grid-cols-2">
{list(plus)}
{list(minus)}
</div>
{data.missingPrice ? (
<p className="text-xs text-muted-foreground">{t.missingPrice(data.missingPrice)}</p>
) : null}
{data.includesHidden ? (
<p className="text-xs text-muted-foreground">{t.includesHidden}</p>
) : null}
</CardContent>
</Card>
);
}
+310
View File
@@ -0,0 +1,310 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { addMovement, createAsset, getAsset, getPeriodReport } from "@/features/assets/service";
import { createContactEntry, createContact } from "@/features/contacts/service";
import {
createInKind,
deleteInKind,
listInKind,
recordPayment,
savePrice,
} from "@/features/in-kind/service";
import { AccountModel } from "@/models/account";
import { AssetModel } from "@/models/asset";
import { AssetMovementModel } from "@/models/asset-movement";
import { AssetPriceModel } from "@/models/asset-price";
import { InKindDebtModel } from "@/models/in-kind-debt";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { addDays, addMonths } from "@/shared/recurrence";
import { assetFormSchema, movementFormSchema } from "@/shared/schemas/asset";
import { contactEntrySchema, contactFormSchema } from "@/shared/schemas/contact";
import {
assetPriceFormSchema,
inKindFormSchema,
paymentFormSchema,
} from "@/shared/schemas/in-kind";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { getNetWorth } from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
const today = todayIstanbul();
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
// Seed varlık/fiyat/aynî örnekleri senaryoları etkilemesin.
await Promise.all([
AssetPriceModel.deleteMany({}),
AssetModel.deleteMany({}),
AssetMovementModel.deleteMany({}),
InKindDebtModel.deleteMany({}),
TransactionModel.deleteMany({
$or: [{ assetId: { $ne: null } }, { inKindDebtId: { $ne: null } }],
}),
]);
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => String(a!._id));
const price = (assetKey: string, date: string, buy: string, sell = "") =>
savePrice(ayse, cakir, assetPriceFormSchema.parse({ assetKey, date, buy, sell }));
const mv = (input: Record<string, unknown>) => movementFormSchema.parse({ date: today, ...input });
async function asset(name: string, assetKey = "gram_gold", isPrivate = false, by = ayse) {
const r = await createAsset(by, cakir, assetFormSchema.parse({ assetKey, name, isPrivate }));
return r.ok ? r.data.id : "";
}
async function contact(name: string) {
const r = await createContact(
ayse,
cakir,
contactFormSchema.parse({ name, openingDate: addDays(today, -200) }),
);
return r.ok ? r.data.id : "";
}
const netWorth = async (user = ayse) => (await getNetWorth(user, cakir))!;
describe("dönemsel rapor", () => {
let gold = "";
it("son 6 ay: yatırılan, dönem sonu değer ve kâr; aylık noktalar", async () => {
const m6 = addMonths(today, -6);
await price("gram_gold", addDays(m6, -10), "2.500", "2.550");
await price("gram_gold", addMonths(today, -3), "2.800", "2.850");
await price("gram_gold", today, "3.000", "3.050");
gold = await asset("Rapor altın");
// Dönem öncesi 2 gr (başlangıç değeri), dönem içinde 10 gr + 1 gr.
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "buy", date: addDays(m6, -5), quantity: "2", amount: "5.000" }),
);
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "buy", date: addDays(m6, 3), quantity: "10", amount: "25.000" }),
);
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "buy", date: addMonths(today, -2), quantity: "1", amount: "2.850" }),
);
const r = (await getPeriodReport(ayse, cakir, "6", gold))!;
expect(r.from).toBe(m6);
expect(r.startValueMinor).toBe(5_000_00);
expect(r.investedMinor).toBe(27_850_00);
expect(r.endValueMinor).toBe(39_000_00);
expect(r.profitMinor).toBe(39_000_00 - 5_000_00 - 27_850_00);
expect(r.points[0]!.date).toBe(m6);
expect(r.points.at(-1)).toMatchObject({
date: today,
valueMinor: 39_000_00,
costMinor: 32_850_00,
});
expect(r.points.length).toBeGreaterThanOrEqual(7);
// "Tümü" ilk hareketten başlar; başlangıç değeri 0, kâr = değer − maliyet.
const all = (await getPeriodReport(ayse, cakir, "tum", gold))!;
expect(all.startValueMinor).toBe(0);
expect(all.profitMinor).toBe(39_000_00 - 32_850_00);
});
it("toplam rapor gizli varlığı başkasına katmaz; fiyatsız varlık dışarıda sayılır", async () => {
const secret = await asset("Gizli altın", "gram_gold", true, emre);
await addMovement(emre, cakir, secret, mv({ kind: "buy", quantity: "5", amount: "15.000" }));
const silver = await asset("Gümüş", "silver_gram");
await addMovement(
ayse,
cakir,
silver,
mv({ kind: "gift_in", quantity: "100", amount: "4.000" }),
);
const forAyse = (await getPeriodReport(ayse, cakir, "tum"))!;
expect(forAyse.investedMinor).toBe(32_850_00);
expect(forAyse.excluded).toBe(1);
const forEmre = (await getPeriodReport(emre, cakir, "tum"))!;
expect(forEmre.investedMinor).toBe(32_850_00 + 15_000_00);
expect(await getPeriodReport(ayse, cakir, "6", secret)).toBeNull();
});
});
describe("net varlık", () => {
it("formül: hesaplar − kart borcu + varlıklar + alacaklar − borçlar", async () => {
const n = await netWorth();
expect(n.totalMinor).toBe(
n.accountsMinor -
n.cardDebtMinor +
n.assetsMinor +
n.contactReceivableMinor -
n.contactPayableMinor +
n.inKindReceivableMinor -
n.inKindPayableMinor,
);
// Gümüşün fiyatı yok → katılmaz ve sayılır.
expect(n.missingPrice).toBe(1);
// Emre kendi gizli altınını da görür: 5 × 3.000.
expect((await netWorth(emre)).assetsMinor - n.assetsMinor).toBe(15_000_00);
});
it("satış fiyatından alım net varlığı yalnızca makas kadar düşürür; cariden borç almak değiştirmez", async () => {
const gold = await asset("Makas altın");
const n0 = (await netWorth()).totalMinor;
await addMovement(
ayse,
cakir,
gold,
mv({ kind: "buy", quantity: "1", accountId: await acc("Ziraat Maaş") }),
);
expect((await netWorth()).totalMinor).toBe(n0 - 50_00);
const ali = await contact("Net Ali");
const n1 = (await netWorth()).totalMinor;
await createContactEntry(
ayse,
cakir,
ali,
contactEntrySchema.parse({
kind: "borrow",
accountId: await acc("Cüzdan"),
amount: "1.000",
date: today,
}),
);
const n2 = await netWorth();
expect(n2.totalMinor).toBe(n1);
expect(n2.contactPayableMinor).toBeGreaterThanOrEqual(1_000_00);
});
it("aynî borç satış, aynî alacak alış fiyatıyla düşülür/eklenir", async () => {
const hasan = await contact("Net Hasan");
const n0 = (await netWorth()).totalMinor;
await createInKind(
ayse,
cakir,
hasan,
inKindFormSchema.parse({
direction: "debt",
assetKey: "gram_gold",
quantity: "2",
date: today,
}),
);
expect((await netWorth()).totalMinor).toBe(n0 - 6_100_00);
await createInKind(
ayse,
cakir,
hasan,
inKindFormSchema.parse({
direction: "receivable",
assetKey: "gram_gold",
quantity: "1",
date: today,
}),
);
expect((await netWorth()).totalMinor).toBe(n0 - 6_100_00 + 3_000_00);
});
});
describe("aynî kayıt ↔ varlık bağlantısı", () => {
it("borç aynı varlıkla ödenirken varlıktan düşer; yetersizse hiçbir şey yazılmaz", async () => {
const kasa = await asset("Kasa altın");
await addMovement(ayse, cakir, kasa, mv({ kind: "buy", quantity: "3", amount: "9.000" }));
const veli = await contact("Bağ Veli");
const debt = await createInKind(
ayse,
cakir,
veli,
inKindFormSchema.parse({
direction: "debt",
assetKey: "gram_gold",
quantity: "5",
date: today,
}),
);
const debtId = debt.ok ? debt.data.id : "";
// 4 gr ödemek istiyor ama kasada 3 gr var → reddedilir, ödeme yazılmaz.
const fail = await recordPayment(
ayse,
cakir,
debtId,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "4", assetId: kasa }),
);
expect(fail.ok).toBe(false);
expect((await InKindDebtModel.findById(debtId).lean())!.payments).toHaveLength(0);
const r = await recordPayment(
ayse,
cakir,
debtId,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "2", assetId: kasa }),
);
expect(r).toMatchObject({ ok: true, data: { closed: false } });
const a = (await getAsset(ayse, cakir, kasa))!;
expect(a.summary.quantity).toBe(1_000);
expect(a.movements[0]).toMatchObject({ kind: "gift_out", quantity: 2_000, fromInKind: true });
expect((await listInKind(ayse, cakir, veli))![0]!.paidQuantity).toBe(2_000);
// Kayıt silinince hareket serbest kalır.
await deleteInKind(ayse, cakir, debtId);
expect((await getAsset(ayse, cakir, kasa))!.movements[0]!.fromInKind).toBe(false);
});
it("alacak aynı varlıkla tahsil edilince varlığa borç tarihindeki fiyatla eklenir", async () => {
const ziynet = await asset("Ziynet kutusu", "quarter_gold");
const ayten = await contact("Bağ Ayten");
const rec = await createInKind(
ayse,
cakir,
ayten,
inKindFormSchema.parse({
direction: "receivable",
assetKey: "quarter_gold",
quantity: "2",
date: addDays(today, -30),
unitPrice: "5.000",
}),
);
const recId = rec.ok ? rec.data.id : "";
const gold = await asset("Yanlış tür");
expect(
(
await recordPayment(
ayse,
cakir,
recId,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "2", assetId: gold }),
)
).ok,
).toBe(false);
expect(
paymentFormSchema.safeParse({
method: "cash",
date: today,
amount: "1",
accountId: await acc("Cüzdan"),
assetId: ziynet,
}).success,
).toBe(false);
const r = await recordPayment(
ayse,
cakir,
recId,
paymentFormSchema.parse({ method: "asset", date: today, quantity: "2", assetId: ziynet }),
);
expect(r).toMatchObject({ ok: true, data: { closed: true } });
const a = (await getAsset(ayse, cakir, ziynet))!;
expect(a.summary).toMatchObject({ quantity: 2_000, costMinor: 10_000_00, investedMinor: 0 });
expect(a.movements[0]).toMatchObject({ kind: "gift_in", fromInKind: true });
});
});
+71
View File
@@ -0,0 +1,71 @@
import "server-only";
import { listAccounts } from "@/features/accounts/service";
import { listAssets } from "@/features/assets/service";
import { listContacts } from "@/features/contacts/service";
import { listInKind } from "@/features/in-kind/service";
/**
* Net varlık (Bölüm 6.6): hesap bakiyeleri (kart borçları eksi) + varlıkların güncel değeri
* (alış) + cari alacaklar − cari borçlar + aynî alacaklar (alış) − aynî borçlar (satış).
* Görünürlük kaynak listelerin kurallarını izler (gizli varlık/cari sayılmaz; gizli hesap
* bakiyeleri hane ayarına göre toplama girer).
*/
export type NetWorth = {
accountsMinor: number;
cardDebtMinor: number;
assetsMinor: number;
contactReceivableMinor: number;
contactPayableMinor: number;
inKindReceivableMinor: number;
inKindPayableMinor: number;
totalMinor: number;
/** Fiyatı olmadığı için katılmayan varlık + aynî kayıt sayısı. */
missingPrice: number;
/** Başkasının gizli hesabının bakiyesi toplama dahil (hane ayarı). */
includesHidden: boolean;
};
export async function getNetWorth(userId: string, householdId: string): Promise<NetWorth | null> {
const [accounts, assets, contacts, inKind] = await Promise.all([
listAccounts(userId, householdId),
listAssets(userId, householdId),
listContacts(userId, householdId),
listInKind(userId, householdId),
]);
if (!accounts || !assets || !contacts || !inKind) return null;
let inKindReceivableMinor = 0;
let inKindPayableMinor = 0;
let missingPrice = assets.totals.missingPrice;
for (const v of inKind) {
if (v.closedAt || v.progress.remainingQuantity === 0) continue;
const value = v.progress.currentValueMinor;
if (value === null) {
missingPrice++;
continue;
}
if (v.direction === "debt") inKindPayableMinor += value;
else inKindReceivableMinor += value;
}
const r = {
accountsMinor: accounts.totals.assetsMinor,
cardDebtMinor: -accounts.totals.cardDebtMinor,
assetsMinor: assets.totals.valueMinor,
contactReceivableMinor: contacts.totals.owesMeMinor,
contactPayableMinor: contacts.totals.iOweMinor,
inKindReceivableMinor,
inKindPayableMinor,
};
return {
...r,
totalMinor:
r.accountsMinor -
r.cardDebtMinor +
r.assetsMinor +
r.contactReceivableMinor -
r.contactPayableMinor +
r.inKindReceivableMinor -
r.inKindPayableMinor,
missingPrice,
includesHidden: accounts.totals.includesHidden,
};
}
+44
View File
@@ -0,0 +1,44 @@
"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 { productPriceFormSchema } from "@/shared/schemas/product-price";
import { addProductPrice, deleteProductPrice } 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;
}
export async function addProductPriceAction(input: unknown) {
return run(productPriceFormSchema, input, (u, h, d) => addProductPrice(u, h, d));
}
export async function deleteProductPriceAction(priceId: unknown) {
const id = idSchema.safeParse(priceId);
if (!id.success) return fail(tr.common.notFound);
return run(z.unknown(), null, (u, h) => deleteProductPrice(u, h, id.data));
}
@@ -0,0 +1,124 @@
import { Clock, Tag, Trophy } from "lucide-react";
import Link from "next/link";
import { Badge } from "@/components/ui/badge";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { formatUnitPrice, type RankedOffer } from "@/shared/prices";
import type { StoreOffer } from "../service";
const t = tr.productPrices;
export const ymdLabel = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
/** Mağaza renk işareti (kimlik; metin her zaman yanında). */
export function StoreDot({ slot, className }: { slot: number; className?: string }) {
return (
<span
aria-hidden
className={cn("mr-1.5 inline-block size-2.5 shrink-0 rounded-full", className)}
style={{ backgroundColor: `var(--series-${slot})` }}
/>
);
}
/** Teklif rozetleri: en uygun, kampanya, kampanya bitti, eski fiyat. */
function OfferBadges({ offer }: { offer: RankedOffer<StoreOffer> }) {
const p = offer.price;
return (
<span className="flex flex-wrap items-center gap-1">
{offer.cheapest ? (
<Badge className="gap-1 bg-income text-income-foreground">
<Trophy className="size-3" aria-hidden />
{t.cheapest}
</Badge>
) : null}
{p.isPromo && !offer.promoEnded ? (
<Badge variant="outline" className="gap-1 border-budget/50 text-budget">
<Tag className="size-3" aria-hidden />
{t.promo}
{p.promoUntil ? ` · ${t.promoUntil(ymdLabel(p.promoUntil))}` : ""}
</Badge>
) : null}
{offer.fellBack ? <Badge variant="secondary">{t.fellBack}</Badge> : null}
{offer.promoEnded ? <Badge variant="secondary">{t.promoEnded}</Badge> : null}
{offer.stale ? (
<Badge
variant="outline"
className="gap-1 border-amber-500/50 text-amber-700 dark:text-amber-400"
title={t.staleHint}
>
<Clock className="size-3" aria-hidden />
{t.stale(offer.ageDays)}
</Badge>
) : null}
</span>
);
}
/**
* Birim fiyata göre sıralı teklifler. `showProduct`: ürün tipi karşılaştırmasında marka/paket
* ve ürün sayfası bağlantısı.
*/
export function OffersList({
offers,
typeUnit,
showProduct = false,
}: {
offers: RankedOffer<StoreOffer>[];
typeUnit: string;
showProduct?: boolean;
}) {
return (
<ol className="divide-y rounded-xl border bg-card">
{offers.map((o) => (
<li
key={o.key}
className={cn(
"grid grid-cols-[1.5rem_minmax(0,1fr)_auto] items-start gap-x-3 gap-y-1 p-3",
o.cheapest && "bg-income/5",
)}
>
<span className="pt-0.5 text-sm text-muted-foreground tabular-nums">{o.rank ?? "–"}</span>
<div className="min-w-0">
{showProduct ? (
<p className="truncate font-medium">
<Link href={`/stok/urunler/${o.productId}`} className="hover:underline">
{o.productLabel}
</Link>{" "}
<span className="text-xs font-normal text-muted-foreground">{o.packageLabel}</span>
</p>
) : null}
<p
className={cn(
"flex flex-wrap items-center",
showProduct ? "text-sm text-muted-foreground" : "font-medium",
)}
>
<StoreDot slot={o.store.slot} />
{o.store.label}
<span className="ml-1.5 text-xs font-normal text-muted-foreground">
· {ymdLabel(o.price.date)}
</span>
</p>
<div className="mt-1">
<OfferBadges offer={o} />
</div>
</div>
<div className="text-right tabular-nums">
<p className="font-semibold">
{o.unitPriceMinor === null ? (
<span className="text-sm font-normal text-muted-foreground">{t.noConversion}</span>
) : (
formatUnitPrice(o.unitPriceMinor, typeUnit)
)}
</p>
<p className="text-xs text-muted-foreground">
{formatMoney(o.price.priceMinor)}
{o.diffPct ? ` · ${t.diff(o.diffPct)}` : ""}
</p>
</div>
</li>
))}
</ol>
);
}
@@ -0,0 +1,200 @@
"use client";
import { useState } from "react";
import { toast } from "sonner";
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 {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { todayIstanbul } from "@/shared/dates";
import { parseMoney } from "@/shared/money";
import { formatUnitPrice, unitPrice } from "@/shared/prices";
import { addProductPriceAction } from "../actions";
import type { PriceProductOption } from "../options";
import type { StoreRef } from "../service";
import { StoreDot } from "./offers-list";
const t = tr.productPrices;
type Errors = Record<string, string | undefined>;
/** Elle fiyat girişi: ürün (sabit olabilir), mağaza, tarih, paket fiyatı, kampanya. */
export function PriceFormDialog({
products,
stores,
productId,
onClose,
}: {
products: PriceProductOption[];
stores: StoreRef[];
/** Ürün sayfasından açılınca sabit. */
productId?: string;
onClose: () => void;
}) {
const [v, setV] = useState({
productId: productId ?? (products.length === 1 ? products[0]!.id : ""),
storeId: "",
date: todayIstanbul(),
price: "",
isPromo: false,
promoUntil: "",
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 product = products.find((p) => p.id === v.productId);
const minor = parseMoney(v.price);
const preview =
product?.inTypeUnit && minor && minor > 0
? formatUnitPrice(unitPrice(minor, product.inTypeUnit), product.typeUnit)
: null;
const f = t.fields;
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await addProductPriceAction(v);
setBusy(false);
if (r.ok) {
toast.success(t.toast.saved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={t.addTitle}
description={product ? `${product.label} · ${product.packageLabel}` : undefined}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="price-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="price-form" onSubmit={submit} noValidate>
<FieldGroup>
{productId ? null : (
<Field data-invalid={Boolean(errors.productId)}>
<FieldLabel htmlFor="pp-product">{f.product}</FieldLabel>
<Select value={v.productId} onValueChange={(x) => set("productId", x)}>
<SelectTrigger
id="pp-product"
className="w-full"
aria-invalid={Boolean(errors.productId)}
>
<SelectValue placeholder={t.validation.product} />
</SelectTrigger>
<SelectContent>
{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)}>
<FieldLabel htmlFor="pp-store">{f.store}</FieldLabel>
<Select value={v.storeId} onValueChange={(x) => set("storeId", x)}>
<SelectTrigger
id="pp-store"
className="w-full"
aria-invalid={Boolean(errors.storeId)}
>
<SelectValue placeholder={t.validation.store} />
</SelectTrigger>
<SelectContent>
{stores.map((s) => (
<SelectItem key={s.id} value={s.id}>
<StoreDot slot={s.slot} />
{s.label}
</SelectItem>
))}
</SelectContent>
</Select>
{errors.storeId ? <FieldError>{errors.storeId}</FieldError> : null}
</Field>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="pp-date">{f.date}</FieldLabel>
<Input
id="pp-date"
type="date"
value={v.date}
max={todayIstanbul()}
onChange={(e) => set("date", e.target.value)}
aria-invalid={Boolean(errors.date)}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.price)}>
<FieldLabel htmlFor="pp-price">{f.price}</FieldLabel>
<Input
id="pp-price"
inputMode="decimal"
value={v.price}
onChange={(e) => set("price", e.target.value)}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.price)}
autoFocus
/>
{errors.price ? <FieldError>{errors.price}</FieldError> : null}
</Field>
</div>
{preview ? (
<FieldDescription className="-mt-2 text-right tabular-nums">
{f.unitPreview(preview)}
</FieldDescription>
) : null}
<Field orientation="horizontal">
<Checkbox
id="pp-promo"
checked={v.isPromo}
onCheckedChange={(x) => set("isPromo", x === true)}
/>
<FieldLabel htmlFor="pp-promo">{f.isPromo}</FieldLabel>
</Field>
{v.isPromo ? (
<Field data-invalid={Boolean(errors.promoUntil)}>
<FieldLabel htmlFor="pp-until">{f.promoUntil}</FieldLabel>
<Input
id="pp-until"
type="date"
value={v.promoUntil}
min={v.date}
onChange={(e) => set("promoUntil", e.target.value)}
aria-invalid={Boolean(errors.promoUntil)}
/>
<FieldDescription>{f.promoUntilHint}</FieldDescription>
{errors.promoUntil ? <FieldError>{errors.promoUntil}</FieldError> : null}
</Field>
) : null}
<Field>
<FieldLabel htmlFor="pp-note">{f.note}</FieldLabel>
<Input id="pp-note" value={v.note} onChange={(e) => set("note", e.target.value)} />
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,271 @@
"use client";
import { ArrowLeft, Plus, Trash2 } from "lucide-react";
import Link from "next/link";
import { useState } from "react";
import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
import { toast } from "sonner";
import { PageHeader } from "@/components/page-header";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
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 { AttachmentStrip } from "@/features/attachments/components/attachment-strip";
import { tr } from "@/i18n/tr";
import { formatMoney } from "@/shared/format";
import { formatUnitPrice } from "@/shared/prices";
import { deleteProductPriceAction } from "../actions";
import { priceProductOption } from "../options";
import type { PriceRow, ProductPriceDetail } from "../service";
import { OffersList, StoreDot, ymdLabel } from "./offers-list";
import { PriceFormDialog } from "./price-dialog";
const t = tr.productPrices;
const shortDate = (ymd: string) =>
new Intl.DateTimeFormat("tr-TR", { day: "numeric", month: "short" }).format(
new Date(`${ymd}T12:00:00+03:00`),
);
const compactTl = (minor: number) =>
new Intl.NumberFormat("tr-TR", { maximumFractionDigits: 0 }).format(minor / 100) + " ₺";
/** Mağaza başına paket fiyatı; fiyat yeni kayda kadar geçerli (basamaklı çizgi). */
function PriceChart({ data }: { data: ProductPriceDetail }) {
const config = Object.fromEntries(
data.series.map((s) => [`s${s.id}`, { label: s.label, color: `var(--series-${s.slot})` }]),
) satisfies ChartConfig;
return (
<ChartContainer
config={config}
className="aspect-auto h-64 w-full"
role="img"
aria-label={t.detail.chartLabel(data.product.label)}
>
<LineChart data={data.points} margin={{ left: 4, right: 12, top: 8 }}>
<CartesianGrid vertical={false} />
<XAxis
dataKey="date"
tickLine={false}
axisLine={false}
tickMargin={8}
minTickGap={24}
tickFormatter={(v: string) => shortDate(v)}
/>
<YAxis
tickLine={false}
axisLine={false}
width={64}
domain={["auto", "auto"]}
tickFormatter={(v: number) => compactTl(v)}
/>
<ChartTooltip
content={
<ChartTooltipContent
labelFormatter={(_, payload) =>
payload?.[0] ? ymdLabel(String(payload[0].payload.date)) : ""
}
formatter={(value, name) => (
<div className="flex w-full items-center justify-between gap-3">
<span className="flex items-center">
<StoreDot slot={data.series.find((s) => `s${s.id}` === name)?.slot ?? 1} />
{config[String(name)]?.label}
</span>
<span className="font-medium tabular-nums">{formatMoney(Number(value))}</span>
</div>
)}
/>
}
/>
<ChartLegend content={<ChartLegendContent />} />
{data.series.map((s) => (
<Line
key={s.id}
dataKey={`s${s.id}`}
type="stepAfter"
stroke={`var(--color-s${s.id})`}
strokeWidth={2}
dot={{ r: 3 }}
activeDot={{ r: 5 }}
connectNulls
isAnimationActive={false}
/>
))}
</LineChart>
</ChartContainer>
);
}
/** /stok/urunler/:id — ürün bilgisi, mağazalardaki fiyatlar, fiyat geçmişi ve kayıtlar. */
export function ProductPriceView({ data }: { data: ProductPriceDetail }) {
const [adding, setAdding] = useState(false);
const [deleting, setDeleting] = useState<PriceRow | null>(null);
const p = data.product;
const canAdd = data.canWrite && !p.archived && data.stores.length > 0;
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/stok/urunler">
<ArrowLeft />
{t.detail.back}
</Link>
</Button>
<PageHeader
title={p.label}
description={
<>
<Link href={`/stok/${p.productTypeId}`} className="hover:underline">
{t.detail.typeLink(p.productTypeName)}
</Link>
{" · "}
{p.packageLabel}
{p.barcode ? ` · ${tr.products.barcode(p.barcode)}` : ""}
</>
}
actions={
canAdd ? (
<Button size="sm" onClick={() => setAdding(true)}>
<Plus />
{t.add}
</Button>
) : null
}
/>
<div className="-mt-2 flex flex-wrap items-center gap-2">
{p.archived ? <Badge variant="secondary">{tr.products.archived}</Badge> : null}
{p.conversionMissing ? (
<Badge
variant="outline"
className="border-amber-500/50 text-amber-700 dark:text-amber-400"
>
{tr.products.conversionMissing}
</Badge>
) : null}
<AttachmentStrip items={p.images} />
</div>
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.detail.currentTitle}</CardTitle>
<CardDescription>{t.detail.currentDescription}</CardDescription>
</CardHeader>
<CardContent>
{data.offers.length === 0 ? (
<p className="text-sm text-muted-foreground">{t.noPrices}</p>
) : (
<OffersList offers={data.offers} typeUnit={p.typeUnit} />
)}
</CardContent>
</Card>
{data.history.length > 1 ? (
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.detail.chartTitle}</CardTitle>
<CardDescription>{t.detail.chartDescription}</CardDescription>
</CardHeader>
<CardContent>
<PriceChart data={data} />
</CardContent>
</Card>
) : null}
{data.history.length ? (
<section className="flex flex-col gap-2" aria-labelledby="price-history-title">
<h2 id="price-history-title" className="text-base font-medium">
{t.detail.historyTitle}
</h2>
<ul className="divide-y rounded-xl border bg-card">
{data.history.map((r) => (
<li key={r.id} className="flex items-start gap-3 p-3">
<div className="min-w-0 flex-1">
<p className="flex items-center text-sm font-medium">
<StoreDot slot={r.store.slot} />
{r.store.label}
</p>
<p className="text-xs text-muted-foreground">
{ymdLabel(r.date)}
{r.isPromo
? ` · ${r.promoEnded ? t.promoEnded : t.promo}${
r.promoUntil ? ` (${t.promoUntil(ymdLabel(r.promoUntil))})` : ""
}`
: ""}
{` · ${t.sources[r.source.split(":")[0]!] ?? r.source}`}
{r.note ? ` · ${r.note}` : ""}
</p>
</div>
<div className="text-right text-sm tabular-nums">
<p className="font-medium">{formatMoney(r.priceMinor)}</p>
{r.unitPriceMinor !== null ? (
<p className="text-xs text-muted-foreground">
{formatUnitPrice(r.unitPriceMinor, p.typeUnit)}
</p>
) : null}
</div>
{data.canWrite ? (
<Button
size="icon-sm"
variant="ghost"
aria-label={t.detail.deletePrice}
onClick={() => setDeleting(r)}
>
<Trash2 />
</Button>
) : null}
</li>
))}
</ul>
</section>
) : null}
{adding ? (
<PriceFormDialog
products={[priceProductOption(p)]}
productId={p.id}
stores={data.stores}
onClose={() => setAdding(false)}
/>
) : null}
<AlertDialog open={deleting !== null} onOpenChange={(o) => !o && setDeleting(null)}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.detail.deleteTitle}</AlertDialogTitle>
<AlertDialogDescription>{t.detail.deleteDescription}</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
const r = deleting;
setDeleting(null);
if (!r) return;
const res = await deleteProductPriceAction(r.id);
if (res.ok) toast.success(t.toast.deleted);
else toast.error(res.error);
}}
>
{t.detail.deletePrice}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
@@ -0,0 +1,52 @@
"use client";
import { Plus } from "lucide-react";
import { useState } from "react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { unitPriceBase } from "@/shared/prices";
import type { TypePriceComparison as Data } from "../service";
import { OffersList } from "./offers-list";
import { PriceFormDialog } from "./price-dialog";
const t = tr.productPrices;
/** /stok/:id: markalar ve mağazalar birim fiyata göre; en uygun vurgulu. */
export function TypePriceComparison({ data }: { data: Data }) {
const [adding, setAdding] = useState(false);
return (
<Card size="sm">
<CardHeader className="flex flex-row items-start justify-between gap-3">
<div>
<CardTitle className="text-base">{t.comparisonTitle}</CardTitle>
<CardDescription>
{t.comparisonDescription(unitPriceBase(data.typeUnit).unit)}
</CardDescription>
</div>
{data.canWrite && data.products.length && data.stores.length ? (
<Button size="sm" variant="outline" onClick={() => setAdding(true)}>
<Plus />
{t.add}
</Button>
) : null}
</CardHeader>
<CardContent>
{data.products.length === 0 ? (
<p className="text-sm text-muted-foreground">{t.noProducts}</p>
) : data.offers.length === 0 ? (
<p className="text-sm text-muted-foreground">{t.noPrices}</p>
) : (
<OffersList offers={data.offers} typeUnit={data.typeUnit} showProduct />
)}
</CardContent>
{adding ? (
<PriceFormDialog
products={data.products}
stores={data.stores}
onClose={() => setAdding(false)}
/>
) : null}
</Card>
);
}
+18
View File
@@ -0,0 +1,18 @@
import type { ProductView } from "@/features/products/service";
/** Fiyat formu ürün seçeneği (birim fiyat önizlemesi için dönüşümle). İstemcide de kullanılır. */
export type PriceProductOption = {
id: string;
label: string;
packageLabel: string;
inTypeUnit: number | null;
typeUnit: string;
};
export const priceProductOption = (p: ProductView): PriceProductOption => ({
id: p.id,
label: p.label,
packageLabel: p.packageLabel,
inTypeUnit: p.inTypeUnit,
typeUnit: p.typeUnit,
});
+150
View File
@@ -0,0 +1,150 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { getStockAnalysis } from "@/features/stock/service";
import { AuditLogModel } from "@/models/audit-log";
import { ProductModel } from "@/models/product";
import { ProductTypeModel } from "@/models/product-type";
import { StoreModel } from "@/models/store";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { productPriceFormSchema } from "@/shared/schemas/product-price";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
addProductPrice,
deleteProductPrice,
getProductPrices,
getTypePriceComparison,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let zeynep = "";
let fatma = "";
const today = todayIstanbul();
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);
const ref = (
model: typeof ProductModel | typeof StoreModel | typeof ProductTypeModel,
seedRef: string,
) =>
(model as typeof ProductModel)
.findOne({ seedRef })
.lean()
.then((x) => String(x!._id));
describe("birim fiyat karşılaştırması", () => {
it("toz deterjan: birim fiyata göre sıralı, en uygun işaretli, süren kampanya", async () => {
const c = (await getTypePriceComparison(
ayse,
cakir,
await ref(ProductTypeModel, "toz-deterjan"),
))!;
expect(c.typeUnit).toBe("yıkama");
const units = c.offers.map((o) => o.unitPriceMinor!);
expect(units).toEqual([...units].sort((a, b) => a - b));
expect(c.offers[0]!.cheapest).toBe(true);
expect(c.offers.filter((o) => o.cheapest)).toHaveLength(1);
const ariel = c.offers.find(
(o) => o.productLabel.startsWith("Ariel") && o.store.label.startsWith("Migros"),
)!;
expect(ariel.price).toMatchObject({ isPromo: true, promoUntil: addDays(today, 6) });
expect(ariel.promoEnded).toBe(false);
// Birim fiyat = paket / 33 yıkama.
expect(ariel.unitPriceMinor!).toBeCloseTo((ariel.price.priceMinor * 1000) / 33_000, 6);
expect(c.products).toHaveLength(3);
expect(
await getTypePriceComparison(fatma, cakir, await ref(ProductTypeModel, "toz-deterjan")),
).toBeNull();
});
it("süresi biten kampanyada normal fiyata dönülür; eski fiyat işaretlenir", async () => {
const sut = (await getProductPrices(ayse, cakir, await ref(ProductModel, "pinar-sut")))!;
const a101 = sut.offers.find((o) => o.store.label.startsWith("A101"))!;
expect(a101).toMatchObject({ fellBack: true, promoEnded: false });
expect(a101.price.isPromo).toBe(false);
expect(a101.price.date).toBe(addDays(today, -30));
expect(sut.history.some((h) => h.isPromo && h.promoEnded)).toBe(true);
expect(sut.series.length).toBeGreaterThanOrEqual(3);
expect(sut.points.length).toBeGreaterThan(5);
const reis = (await getProductPrices(ayse, cakir, await ref(ProductModel, "reis-mercimek")))!;
expect(reis.offers.find((o) => o.store.label.startsWith("Metro"))!.stale).toBe(true);
});
});
describe("fiyat girişi", () => {
it("ekle, gelecek tarih ve arşivli mağaza reddi, izleyici yazamaz, sil + denetim", async () => {
const productId = await ref(ProductModel, "omo-6kg");
const storeId = await ref(StoreModel, "sok");
const form = (over: Record<string, unknown> = {}) =>
productPriceFormSchema.parse({
productId,
storeId,
date: today,
price: "449,90",
isPromo: false,
promoUntil: "",
note: "",
...over,
});
expect(
productPriceFormSchema.safeParse({ ...form(), price: "0", isPromo: false }).success,
).toBe(false);
expect(
productPriceFormSchema.safeParse({
productId,
storeId,
date: today,
price: "10",
isPromo: true,
promoUntil: addDays(today, -1),
}).success,
).toBe(false);
expect((await addProductPrice(ayse, cakir, form({ date: addDays(today, 1) }))).ok).toBe(false);
expect((await addProductPrice(zeynep, cakir, form())).ok).toBe(false);
const r = await addProductPrice(ayse, cakir, form());
expect(r.ok).toBe(true);
let d = (await getProductPrices(ayse, cakir, productId))!;
const sok = d.offers.find((o) => o.store.id === storeId)!;
expect(sok.price).toMatchObject({ priceMinor: 449_90, date: today, source: "manual" });
// 6 kg = 40 yıkama → 11,2475 TL/yıkama.
expect(sok.unitPriceMinor).toBeCloseTo(1124.75, 6);
const priceId = r.ok ? r.data.id : "";
expect((await deleteProductPrice(fatma, cakir, priceId)).ok).toBe(false);
expect((await deleteProductPrice(ayse, cakir, priceId)).ok).toBe(true);
expect(await AuditLogModel.exists({ action: "price.delete", targetId: priceId })).toBeTruthy();
d = (await getProductPrices(ayse, cakir, productId))!;
expect(d.history.some((h) => h.id === priceId)).toBe(false);
await StoreModel.updateOne({ _id: storeId }, { $set: { archivedAt: new Date() } });
expect(await addProductPrice(ayse, cakir, form())).toMatchObject({
ok: false,
fieldErrors: { storeId: expect.any(String) },
});
await StoreModel.updateOne({ _id: storeId }, { $set: { archivedAt: null } });
});
});
describe("tüketim analizinde maliyet", () => {
it("aylık ortalama tüketim × son birim fiyat", async () => {
const a = (await getStockAnalysis(ayse, cakir))!;
const deterjan = a.rows.find((r) => r.name === "Toz Deterjan")!;
expect(deterjan.unitPrice).not.toBeNull();
// Maliyet yuvarlanmamış ortalamadan; gösterilen ortalama yuvarlıdır (≤ %1 fark).
const expected = (deterjan.avgMonthlyUsed! * deterjan.unitPrice!.minor) / 1000;
expect(Math.abs(deterjan.avgMonthlyCostMinor! - expected) / expected).toBeLessThan(0.01);
// Ürünü (marka/paket) olmayan tipte maliyet yok.
expect(a.rows.find((r) => r.name === "Domates")!.avgMonthlyCostMinor).toBeNull();
});
});
+436
View File
@@ -0,0 +1,436 @@
import "server-only";
import { Types } from "mongoose";
import { hasHouseholdRole } from "@/features/households/roles";
import { resolveMembership, type Membership } from "@/features/households/service";
import { listProducts, type ProductView } from "@/features/products/service";
import { storeLabel } from "@/features/stores/service";
import { priceProductOption, type PriceProductOption } from "./options";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { ProductModel } from "@/models/product";
import { ProductPriceModel } from "@/models/product-price";
import { ProductTypeModel } from "@/models/product-type";
import { StoreModel } from "@/models/store";
import { todayIstanbul } from "@/shared/dates";
import {
effectivePrice,
promoEnded,
rankOffers,
seriesSlot,
unitPrice,
type PriceSource,
type RankedOffer,
} from "@/shared/prices";
import { packageInTypeUnit } from "@/shared/products";
import type { ProductPriceForm } from "@/shared/schemas/product-price";
import { compareTr } from "@/shared/search";
/**
* Ürün fiyatları (Bölüm 6.11). Hane bazlı; okuma viewer, yazma member. Birim fiyat ürünün
* dönüşümüyle okuma sırasında hesaplanır (saf motor: shared/prices).
*/
const t = tr.productPrices;
type PriceLean = {
_id: Types.ObjectId;
productId: Types.ObjectId;
storeId: Types.ObjectId;
date: string;
priceMinor: number;
isPromo: boolean;
promoUntil: string | null;
source: PriceSource;
note: string;
createdAt: Date;
};
type StoreLean = {
_id: Types.ObjectId;
name: string;
branch: string;
archivedAt: Date | null;
createdAt: Date;
};
export type StoreRef = { id: string; label: string; slot: number; archived: boolean };
export type PriceRow = {
id: string;
productId: string;
store: StoreRef;
date: string;
priceMinor: number;
isPromo: boolean;
promoUntil: string | null;
promoEnded: boolean;
source: PriceSource;
note: string;
/** Ürün tipi biriminde 1 birimin fiyatı (kesirli kuruş; dönüşüm yoksa null). */
unitPriceMinor: number | null;
};
export type StoreOffer = {
/** Teklif anahtarı: ürün + mağaza. */
key: string;
productId: string;
productLabel: string;
packageLabel: string;
store: StoreRef;
price: PriceRow;
/** Son kayıt süresi biten kampanyaydı; önceki normal fiyat gösteriliyor. */
fellBack: boolean;
promoEnded: boolean;
ageDays: number;
stale: boolean;
unitPriceMinor: number | null;
};
export type ProductPriceDetail = {
product: ProductView;
offers: RankedOffer<StoreOffer>[];
/** Tüm kayıtlar, yeniden eskiye. */
history: PriceRow[];
/** Grafik: mağaza serileri ve tarih noktaları (paket fiyatı, kuruş). */
series: StoreRef[];
points: Record<string, number | string>[];
stores: StoreRef[];
canWrite: boolean;
today: string;
};
export type TypePriceComparison = {
typeUnit: string;
offers: RankedOffer<StoreOffer>[];
/** Fiyat girişi seçenekleri. */
products: PriceProductOption[];
stores: StoreRef[];
canWrite: boolean;
};
/** Hanenin tüm mağazaları; renk yuvası ekleniş sırasına göre sabit. */
async function loadStores(householdId: Types.ObjectId) {
const rows = await StoreModel.find({ householdId })
.select({ name: 1, branch: 1, archivedAt: 1, createdAt: 1 })
.sort({ createdAt: 1, _id: 1 })
.lean<StoreLean[]>();
return new Map(
rows.map((s, i) => [
String(s._id),
{
id: String(s._id),
label: storeLabel(s),
slot: seriesSlot(i),
archived: Boolean(s.archivedAt),
} satisfies StoreRef,
]),
);
}
const sortRecords = (a: PriceLean, b: PriceLean) =>
a.date === b.date ? a.createdAt.getTime() - b.createdAt.getTime() : a.date < b.date ? -1 : 1;
async function loadPrices(householdId: Types.ObjectId, productIds: Types.ObjectId[]) {
const rows = await ProductPriceModel.find({
householdId,
productId: { $in: productIds },
deletedAt: null,
}).lean<PriceLean[]>();
return rows.sort(sortRecords);
}
function toRow(r: PriceLean, store: StoreRef, inTypeUnit: number | null, today: string): PriceRow {
return {
id: String(r._id),
productId: String(r.productId),
store,
date: r.date,
priceMinor: r.priceMinor,
isPromo: r.isPromo,
promoUntil: r.promoUntil,
promoEnded: promoEnded(r, today),
source: r.source,
note: r.note,
unitPriceMinor: inTypeUnit ? unitPrice(r.priceMinor, inTypeUnit) : null,
};
}
/** Ürün × mağaza başına geçerli fiyat teklifleri (sıralanmamış). */
function offersFor(
products: ProductView[],
prices: PriceLean[],
stores: Map<string, StoreRef>,
today: string,
): StoreOffer[] {
const groups = new Map<string, PriceLean[]>();
for (const r of prices) {
const key = `${r.productId}:${r.storeId}`;
groups.set(key, [...(groups.get(key) ?? []), r]);
}
const byId = new Map(products.map((p) => [p.id, p]));
const out: StoreOffer[] = [];
for (const [key, records] of groups) {
const p = byId.get(String(records[0]!.productId));
const store = stores.get(String(records[0]!.storeId));
if (!p || !store) continue;
const eff = effectivePrice(records, today)!;
const row = toRow(eff.record, store, p.inTypeUnit, today);
out.push({
key,
productId: p.id,
productLabel: p.label,
packageLabel: p.packageLabel,
store,
price: row,
fellBack: eff.fellBack,
promoEnded: eff.promoEnded,
ageDays: eff.ageDays,
stale: eff.stale,
unitPriceMinor: row.unitPriceMinor,
});
}
return out;
}
const activeStores = (stores: Map<string, StoreRef>) =>
[...stores.values()].filter((s) => !s.archived).sort((a, b) => compareTr(a.label, b.label));
/** /stok/urunler/:id — ürünün mağaza bazında fiyatları, geçmişi ve grafiği. */
export async function getProductPrices(
userId: string,
householdId: string,
productId: string,
): Promise<ProductPriceDetail | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const id = toObjectId(productId);
if (!id) return null;
const doc = await ProductModel.findOne({ _id: id, householdId: m.householdId })
.select({ productTypeId: 1 })
.lean<{ productTypeId: Types.ObjectId }>();
if (!doc) return null;
const list = await listProducts(userId, householdId, {
productTypeId: String(doc.productTypeId),
includeArchived: true,
});
const product = list?.products.find((p) => p.id === productId);
if (!product) return null;
const today = todayIstanbul();
const [stores, prices] = await Promise.all([
loadStores(m.householdId),
loadPrices(m.householdId, [id]),
]);
const history = prices
.map((r) => toRow(r, stores.get(String(r.storeId))!, product.inTypeUnit, today))
.filter((r) => r.store)
.reverse();
const seriesIds = [...new Set(prices.map((r) => String(r.storeId)))];
const series = seriesIds
.map((sid) => stores.get(sid)!)
.filter(Boolean)
.sort((a, b) => a.slot - b.slot);
// Aynı gün aynı mağazada birden çok kayıt: son giriş geçerli.
const byDate = new Map<string, Record<string, number | string>>();
for (const r of prices) {
const point = byDate.get(r.date) ?? { date: r.date };
point[`s${String(r.storeId)}`] = r.priceMinor;
byDate.set(r.date, point);
}
// Son nokta bugün: her mağazanın geçerli fiyatı (çizgi bugüne uzar; biten kampanyada normal fiyat).
const offers = offersFor([product], prices, stores, today);
if (offers.length) {
const point = byDate.get(today) ?? { date: today };
for (const o of offers) point[`s${o.store.id}`] ??= o.price.priceMinor;
byDate.set(today, point);
}
return {
product,
offers: rankOffers(offers),
history,
series,
points: [...byDate.values()].sort((a, b) => (String(a.date) < String(b.date) ? -1 : 1)),
stores: activeStores(stores),
canWrite: hasHouseholdRole(m.role, "member"),
today,
};
}
/** Ürün tipi detayı: tüm marka/paket ve mağazalar birim fiyata göre. */
export async function getTypePriceComparison(
userId: string,
householdId: string,
productTypeId: string,
): Promise<TypePriceComparison | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const list = await listProducts(userId, householdId, { productTypeId });
if (!list) return null;
const type = await ProductTypeModel.findOne({
_id: new Types.ObjectId(productTypeId),
householdId: m.householdId,
})
.select({ unit: 1 })
.lean<{ unit: string }>();
if (!type) return null;
const today = todayIstanbul();
const [stores, prices] = await Promise.all([
loadStores(m.householdId),
loadPrices(
m.householdId,
list.products.map((p) => new Types.ObjectId(p.id)),
),
]);
return {
typeUnit: type.unit,
offers: rankOffers(
offersFor(list.products, prices, stores, today).filter((o) => !o.store.archived),
),
products: list.products.map(priceProductOption),
stores: activeStores(stores),
canWrite: list.canWrite,
};
}
/**
* Ü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 [products, types] = await Promise.all([
ProductModel.find({ householdId, productTypeId: { $in: productTypeIds } })
.select({ productTypeId: 1, packageQuantity: 1, packageUnit: 1, typeQuantity: 1 })
.lean<
{
_id: Types.ObjectId;
productTypeId: Types.ObjectId;
packageQuantity: number;
packageUnit: string;
typeQuantity: number | null;
}[]
>(),
ProductTypeModel.find({ householdId, _id: { $in: productTypeIds } })
.select({ unit: 1 })
.lean<{ _id: Types.ObjectId; unit: string }[]>(),
]);
const unitOf = new Map(types.map((x) => [String(x._id), x.unit]));
const prices = await loadPrices(
householdId,
products.map((p) => p._id),
);
const groups = new Map<string, PriceLean[]>();
for (const r of prices) {
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 }>();
for (const records of groups.values()) {
const p = productById.get(String(records[0]!.productId))!;
const typeId = String(p.productTypeId);
const inType = packageInTypeUnit({
packageQuantity: p.packageQuantity,
packageUnit: p.packageUnit,
typeUnit: unitOf.get(typeId) ?? "",
typeQuantity: p.typeQuantity,
});
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,
});
}
return out;
}
// --- Yazma ---
async function activeRefs(m: Membership, input: Pick<ProductPriceForm, "productId" | "storeId">) {
const [product, store] = await Promise.all([
ProductModel.exists({
_id: new Types.ObjectId(input.productId),
householdId: m.householdId,
archivedAt: null,
}),
StoreModel.exists({
_id: new Types.ObjectId(input.storeId),
householdId: m.householdId,
archivedAt: null,
}),
]);
if (!product) return fail(t.validation.product, { productId: t.validation.product });
if (!store) return fail(t.validation.store, { storeId: t.validation.store });
return null;
}
/** Fiyat kaydı ekler. Gelecek tarihli fiyat girilemez. */
export async function addProductPrice(
actorId: string,
householdId: string,
input: ProductPriceForm,
source: PriceSource = "manual",
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
if (input.date > todayIstanbul())
return fail(t.validation.futureDate, { date: t.validation.futureDate });
const bad = await activeRefs(m, input);
if (bad) return bad;
const doc = await ProductPriceModel.create({
householdId: m.householdId,
productId: new Types.ObjectId(input.productId),
storeId: new Types.ObjectId(input.storeId),
date: input.date,
priceMinor: input.priceMinor,
isPromo: input.isPromo,
promoUntil: input.promoUntil,
source,
note: input.note,
createdBy: new Types.ObjectId(actorId),
});
return ok({ id: String(doc._id) });
}
export async function deleteProductPrice(
actorId: string,
householdId: string,
priceId: string,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const id = toObjectId(priceId);
const row = id
? await ProductPriceModel.findOne({
_id: id,
householdId: m.householdId,
deletedAt: null,
}).lean<PriceLean>()
: null;
if (!row) return fail(tr.common.notFound);
const actor = new Types.ObjectId(actorId);
await ProductPriceModel.updateOne({ _id: row._id }, { $set: { deletedAt: new Date() } });
await writeAudit({
action: "price.delete",
actorId: actor,
householdId: m.householdId,
targetType: "productPrice",
targetId: priceId,
diff: {
productId: String(row.productId),
storeId: String(row.storeId),
date: row.date,
priceMinor: row.priceMinor,
},
});
return ok(undefined);
}
export type { PriceProductOption };
+50
View File
@@ -0,0 +1,50 @@
"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 { productFormSchema } from "@/shared/schemas/product";
import { createProduct, setProductArchived, updateProduct } 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;
}
/** Yeni (id boş) veya mevcut ürün. */
export async function saveProductAction(productId: unknown, input: unknown) {
if (productId) {
const id = idSchema.safeParse(productId);
if (!id.success) return fail(tr.common.notFound);
return run(productFormSchema, input, (u, h, d) => updateProduct(u, h, id.data, d));
}
return run(productFormSchema, input, createProduct);
}
export async function setProductArchivedAction(productId: unknown, archived: unknown) {
const id = idSchema.safeParse(productId);
if (!id.success) return fail(tr.common.notFound);
return run(z.boolean(), archived, (u, h, a) => setProductArchived(u, h, id.data, a));
}
@@ -0,0 +1,261 @@
"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,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { AttachmentPicker } from "@/features/attachments/components/attachment-picker";
import type { AttachmentInfo } from "@/features/attachments/service";
import { tr } from "@/i18n/tr";
import { autoConvertible, packageInTypeUnit } from "@/shared/products";
import { formatQuantity, parseQuantity } from "@/shared/quantity";
import { quantityInput, STOCK_UNITS } from "@/shared/stock";
import { saveProductAction } from "../actions";
import type { ProductTypeOption, ProductView } from "../service";
const t = tr.products;
const CUSTOM = "__custom__";
type Errors = Record<string, string | undefined>;
/** Yeni ürün / düzenle: marka, tanım, barkod, paket, gerekirse dönüşüm, görseller. */
export function ProductFormDialog({
product,
types,
defaultTypeId,
onClose,
}: {
product: ProductView | null;
types: ProductTypeOption[];
defaultTypeId?: string;
onClose: () => void;
}) {
const initialType = product?.productTypeId ?? defaultTypeId ?? "";
const typeUnitOf = (id: string) => types.find((x) => x.id === id)?.unit ?? "";
const unitChoices = (typeUnit: string) => [
...new Set([typeUnit, ...STOCK_UNITS].filter(Boolean)),
];
const initialUnit = product?.packageUnit ?? typeUnitOf(initialType) ?? "adet";
const known = unitChoices(typeUnitOf(initialType)).includes(initialUnit);
const [v, setV] = useState({
productTypeId: initialType,
brand: product?.brand ?? "",
name: product?.name ?? "",
barcode: product?.barcode ?? "",
packageQuantity: product ? quantityInput(product.packageQuantity) : "1",
unitChoice: known ? initialUnit || "adet" : CUSTOM,
customUnit: known ? "" : initialUnit,
typeQuantity: product?.typeQuantity ? quantityInput(product.typeQuantity) : "",
note: product?.note ?? "",
});
const [images, setImages] = useState<AttachmentInfo[]>(product?.images ?? []);
const [uploading, setUploading] = useState(false);
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 = typeUnitOf(v.productTypeId);
const packageUnit = v.unitChoice === CUSTOM ? v.customUnit.trim() : v.unitChoice;
const needsConversion =
Boolean(typeUnit && packageUnit) && !autoConvertible(packageUnit, typeUnit);
const pkgQty = parseQuantity(v.packageQuantity);
const pkgText = pkgQty ? formatQuantity(pkgQty, packageUnit) : `1 ${packageUnit}`;
const autoValue =
pkgQty && typeUnit && !needsConversion
? packageInTypeUnit({ packageQuantity: pkgQty, packageUnit, typeUnit, typeQuantity: null })
: null;
const f = t.fields;
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveProductAction(product?.id ?? null, {
productTypeId: v.productTypeId,
brand: v.brand,
name: v.name,
barcode: v.barcode,
packageQuantity: v.packageQuantity,
packageUnit,
typeQuantity: needsConversion ? v.typeQuantity : "",
note: v.note,
imageIds: images.map((i) => i.id),
});
setBusy(false);
if (r.ok) {
toast.success(t.toast.saved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={product ? t.editTitle : t.createTitle}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="product-variant-form" disabled={busy || uploading}>
{tr.common.save}
</Button>
</>
}
>
<form id="product-variant-form" onSubmit={submit} noValidate>
<FieldGroup>
<Field data-invalid={Boolean(errors.productTypeId)}>
<FieldLabel htmlFor="pr-type">{f.productType}</FieldLabel>
<Select
value={v.productTypeId}
onValueChange={(x) => {
set("productTypeId", x);
if (!product && v.unitChoice !== CUSTOM) set("unitChoice", typeUnitOf(x) || "adet");
}}
>
<SelectTrigger
id="pr-type"
className="w-full"
aria-invalid={Boolean(errors.productTypeId)}
>
<SelectValue placeholder={t.validation.productType} />
</SelectTrigger>
<SelectContent className="max-h-72">
{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>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.brand)}>
<FieldLabel htmlFor="pr-brand">{f.brand}</FieldLabel>
<Input
id="pr-brand"
value={v.brand}
placeholder={f.brandPlaceholder}
onChange={(e) => set("brand", e.target.value)}
aria-invalid={Boolean(errors.brand)}
autoFocus={!product}
/>
{errors.brand ? <FieldError>{errors.brand}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="pr-name">{f.name}</FieldLabel>
<Input
id="pr-name"
value={v.name}
placeholder={f.namePlaceholder}
onChange={(e) => set("name", e.target.value)}
/>
</Field>
</div>
<div className="grid grid-cols-2 gap-3">
<Field data-invalid={Boolean(errors.packageQuantity)}>
<FieldLabel htmlFor="pr-qty">{f.packageQuantity}</FieldLabel>
<Input
id="pr-qty"
inputMode="decimal"
value={v.packageQuantity}
onChange={(e) => set("packageQuantity", e.target.value)}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.packageQuantity)}
/>
{errors.packageQuantity ? <FieldError>{errors.packageQuantity}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.packageUnit)}>
<FieldLabel htmlFor="pr-unit">{f.packageUnit}</FieldLabel>
<Select value={v.unitChoice} onValueChange={(x) => set("unitChoice", x)}>
<SelectTrigger id="pr-unit" className="w-full">
<SelectValue>
{v.unitChoice === CUSTOM ? tr.stock.fields.customUnit : v.unitChoice}
</SelectValue>
</SelectTrigger>
<SelectContent>
{unitChoices(typeUnit).map((u) => (
<SelectItem key={u} value={u}>
{u}
</SelectItem>
))}
<SelectItem value={CUSTOM}>{tr.stock.fields.customUnitOption}</SelectItem>
</SelectContent>
</Select>
{v.unitChoice === CUSTOM ? (
<Input
value={v.customUnit}
placeholder={tr.stock.fields.customUnitPlaceholder}
aria-label={tr.stock.fields.customUnit}
onChange={(e) => set("customUnit", e.target.value)}
aria-invalid={Boolean(errors.packageUnit)}
/>
) : null}
{errors.packageUnit ? <FieldError>{errors.packageUnit}</FieldError> : null}
</Field>
</div>
{needsConversion ? (
<Field data-invalid={Boolean(errors.typeQuantity)}>
<FieldLabel htmlFor="pr-conv">{f.typeQuantity(typeUnit)}</FieldLabel>
<Input
id="pr-conv"
inputMode="decimal"
value={v.typeQuantity}
onChange={(e) => set("typeQuantity", e.target.value)}
className="text-right tabular-nums"
aria-invalid={Boolean(errors.typeQuantity)}
/>
<FieldDescription>{f.typeQuantityHint(pkgText, typeUnit)}</FieldDescription>
{errors.typeQuantity ? <FieldError>{errors.typeQuantity}</FieldError> : null}
</Field>
) : autoValue !== null && packageUnit !== typeUnit ? (
<FieldDescription className="-mt-2">
{f.autoConversion(formatQuantity(autoValue, typeUnit))}
</FieldDescription>
) : null}
<Field data-invalid={Boolean(errors.barcode)}>
<FieldLabel htmlFor="pr-barcode">{f.barcode}</FieldLabel>
<Input
id="pr-barcode"
inputMode="numeric"
value={v.barcode}
onChange={(e) => set("barcode", e.target.value)}
className="tabular-nums"
aria-invalid={Boolean(errors.barcode)}
/>
<FieldDescription>{f.barcodeHint}</FieldDescription>
{errors.barcode ? <FieldError>{errors.barcode}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.imageIds)}>
<FieldLabel>{f.images}</FieldLabel>
<AttachmentPicker
value={images}
onChange={setImages}
allowedKinds={["image"]}
onBusyChange={setUploading}
addLabel={f.addImage}
hint={f.imagesHint}
/>
{errors.imageIds ? <FieldError>{errors.imageIds}</FieldError> : null}
</Field>
<Field>
<FieldLabel htmlFor="pr-note">{f.note}</FieldLabel>
<Input id="pr-note" value={v.note} onChange={(e) => set("note", e.target.value)} />
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,188 @@
"use client";
import {
Archive,
ArchiveRestore,
AlertTriangle,
EllipsisVertical,
ImageIcon,
Pencil,
} from "lucide-react";
import Link from "next/link";
import { useState } from "react";
import { toast } from "sonner";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-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 { AttachmentThumb } from "@/features/attachments/components/attachment-strip";
import { AttachmentViewer } from "@/features/attachments/components/attachment-viewer";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { setProductArchivedAction } from "../actions";
import type { ProductTypeOption, ProductView } from "../service";
import { ProductFormDialog } from "./product-dialog";
const t = tr.products;
/** Ürün satırları: görsel, marka/tanım, paket, barkod; düzenle/arşivle. */
export function ProductList({
products,
types,
canWrite,
showType = false,
}: {
products: ProductView[];
types: ProductTypeOption[];
canWrite: boolean;
/** Katalogda ürün tipi bağlantısı. */
showType?: boolean;
}) {
const [editing, setEditing] = useState<ProductView | null>(null);
const [archiving, setArchiving] = useState<ProductView | null>(null);
const [viewer, setViewer] = useState<ProductView | null>(null);
async function setArchived(p: ProductView, archived: boolean) {
const r = await setProductArchivedAction(p.id, archived);
if (r.ok) toast.success(archived ? t.toast.archived : t.toast.unarchived);
else toast.error(r.error);
}
return (
<>
<ul className="divide-y rounded-xl border bg-card">
{products.map((p) => {
const cover = p.images[0];
return (
<li
key={p.id}
className={cn("flex items-center gap-3 p-3", p.archived && "opacity-60")}
>
{cover ? (
<AttachmentThumb item={cover} onClick={() => setViewer(p)} className="size-14" />
) : (
<span
aria-hidden
className="flex size-14 shrink-0 items-center justify-center rounded-md border border-dashed bg-muted/40"
>
<ImageIcon className="size-5 text-muted-foreground/60" />
</span>
)}
<div className="min-w-0 flex-1">
<p className="truncate font-medium">
<Link href={`/stok/urunler/${p.id}`} className="hover:underline">
{p.label}
</Link>
</p>
<p className="truncate text-sm text-muted-foreground tabular-nums">
{p.packageLabel}
{showType ? (
<>
{" · "}
<Link href={`/stok/${p.productTypeId}`} className="hover:underline">
{p.productTypeName}
</Link>
</>
) : null}
</p>
<div className="mt-1 flex flex-wrap items-center gap-1.5 text-xs text-muted-foreground">
{p.barcode ? <span className="tabular-nums">{t.barcode(p.barcode)}</span> : null}
{p.images.length > 1 ? <span>{t.images(p.images.length)}</span> : null}
{p.archived ? <Badge variant="secondary">{t.archived}</Badge> : null}
{p.conversionMissing ? (
<Badge
variant="outline"
className="gap-1 border-amber-500/50 text-amber-700 dark:text-amber-400"
title={t.conversionMissingHint}
>
<AlertTriangle className="size-3" aria-hidden />
{t.conversionMissing}
</Badge>
) : null}
</div>
</div>
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
size="icon-sm"
variant="ghost"
aria-label={`${p.label}: ${t.actions.more}`}
>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem disabled={p.archived} onSelect={() => setEditing(p)}>
<Pencil />
{t.actions.edit}
</DropdownMenuItem>
<DropdownMenuSeparator />
{p.archived ? (
<DropdownMenuItem onSelect={() => setArchived(p, false)}>
<ArchiveRestore />
{t.actions.unarchive}
</DropdownMenuItem>
) : (
<DropdownMenuItem variant="destructive" onSelect={() => setArchiving(p)}>
<Archive />
{t.actions.archive}
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
);
})}
</ul>
{editing ? (
<ProductFormDialog product={editing} types={types} onClose={() => setEditing(null)} />
) : null}
<AttachmentViewer
items={viewer?.images ?? []}
startIndex={0}
open={viewer !== null}
onOpenChange={(o) => !o && setViewer(null)}
/>
<AlertDialog open={archiving !== null} onOpenChange={(o) => !o && setArchiving(null)}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.archiveTitle}</AlertDialogTitle>
<AlertDialogDescription>
{archiving ? t.archiveDescription(archiving.label) : null}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
const p = archiving;
setArchiving(null);
if (p) await setArchived(p, true);
}}
>
{t.actions.archive}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</>
);
}
@@ -0,0 +1,110 @@
"use client";
import { ArrowLeft, Plus, Search } from "lucide-react";
import Link from "next/link";
import { useMemo, useState } from "react";
import { PageHeader } from "@/components/page-header";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Input } from "@/components/ui/input";
import { tr } from "@/i18n/tr";
import { foldTr } from "@/shared/search";
import type { ProductTypeOption, ProductView } from "../service";
import { ProductFormDialog } from "./product-dialog";
import { ProductList } from "./product-list";
const t = tr.products;
/** /stok/urunler: tüm ürünler ürün tipine göre gruplu; marka, tanım veya barkodla arama. */
export function ProductsCatalog({
products,
types,
canWrite,
}: {
products: ProductView[];
types: ProductTypeOption[];
canWrite: boolean;
}) {
const [query, setQuery] = useState("");
const [showArchived, setShowArchived] = useState(false);
const [creating, setCreating] = useState(false);
const groups = useMemo(() => {
const q = foldTr(query.trim());
const digits = query.replace(/\s/g, "");
const match = (p: ProductView) =>
(showArchived || !p.archived) &&
(!q ||
foldTr(`${p.label} ${p.productTypeName}`).includes(q) ||
(/^\d+$/.test(digits) && (p.barcode ?? "").includes(digits)));
const by = new Map<string, { name: string; items: ProductView[] }>();
for (const p of products.filter(match)) {
const g = by.get(p.productTypeId) ?? { name: p.productTypeName, items: [] };
g.items.push(p);
by.set(p.productTypeId, g);
}
return [...by.entries()];
}, [products, query, showArchived]);
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/stok">
<ArrowLeft />
{t.back}
</Link>
</Button>
<PageHeader
title={t.title}
description={t.description}
actions={
canWrite && types.length ? (
<Button size="sm" onClick={() => setCreating(true)}>
<Plus />
{t.new}
</Button>
) : null
}
/>
<div className="flex flex-wrap items-center gap-3">
<div className="relative min-w-48 flex-1">
<Search className="pointer-events-none absolute top-1/2 left-2.5 size-4 -translate-y-1/2 text-muted-foreground" />
<Input
value={query}
onChange={(e) => setQuery(e.target.value)}
placeholder={t.search}
aria-label={t.search}
className="pl-8"
/>
</div>
{products.some((p) => p.archived) ? (
<label className="flex items-center gap-2 text-sm">
<Checkbox checked={showArchived} onCheckedChange={(x) => setShowArchived(x === true)} />
{t.showArchived}
</label>
) : null}
</div>
{products.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
) : groups.length === 0 ? (
<p className="text-sm text-muted-foreground">{t.noMatch}</p>
) : (
groups.map(([typeId, g]) => (
<section key={typeId} className="flex flex-col gap-2">
<h2 className="text-sm font-medium text-muted-foreground">
<Link href={`/stok/${typeId}`} className="hover:underline">
{g.name}
</Link>
</h2>
<ProductList products={g.items} types={types} canWrite={canWrite} />
</section>
))
)}
{creating ? (
<ProductFormDialog product={null} types={types} onClose={() => setCreating(false)} />
) : null}
</div>
);
}
@@ -0,0 +1,59 @@
"use client";
import { Plus } from "lucide-react";
import { useState } from "react";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import type { ProductTypeOption, ProductView } from "../service";
import { ProductFormDialog } from "./product-dialog";
import { ProductList } from "./product-list";
const t = tr.products;
/** /stok/:id içinde: bu ürün tipinin markaları ve paketleri. */
export function ProductsSection({
productTypeId,
products,
types,
canWrite,
}: {
productTypeId: string;
products: ProductView[];
types: ProductTypeOption[];
canWrite: boolean;
}) {
const [creating, setCreating] = useState(false);
return (
<section className="flex flex-col gap-2" aria-labelledby="products-title">
<div className="flex items-end justify-between gap-3">
<div>
<h2 id="products-title" className="text-base font-medium">
{t.sectionTitle}
</h2>
<p className="text-xs text-muted-foreground">{t.sectionDescription}</p>
</div>
{canWrite && types.some((x) => x.id === productTypeId) ? (
<Button size="sm" variant="outline" onClick={() => setCreating(true)}>
<Plus />
{t.new}
</Button>
) : null}
</div>
{products.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.emptyType}
</p>
) : (
<ProductList products={products} types={types} canWrite={canWrite} />
)}
{creating ? (
<ProductFormDialog
product={null}
types={types}
defaultTypeId={productTypeId}
onClose={() => setCreating(false)}
/>
) : null}
</section>
);
}
+179
View File
@@ -0,0 +1,179 @@
import { rm } from "node:fs/promises";
import sharp from "sharp";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { readAttachmentForUser, uploadAttachment } from "@/features/attachments/service";
import { env } from "@/lib/env";
import { AttachmentModel } from "@/models/attachment";
import { ProductTypeModel } from "@/models/product-type";
import { productFormSchema, type ProductFormInput } from "@/shared/schemas/product";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
createProduct,
listProducts,
listProductTypeOptions,
setProductArchived,
updateProduct,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
beforeAll(async () => {
await rm(env().UPLOAD_DIR, { recursive: true, force: true });
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(async () => {
await teardownDb();
await rm(env().UPLOAD_DIR, { recursive: true, force: true });
});
const typeId = (ref: string) =>
ProductTypeModel.findOne({ seedRef: ref })
.lean()
.then((x) => String(x!._id));
const png = () =>
sharp({ create: { width: 40, height: 30, channels: 3, background: "#cc6633" } })
.png()
.toBuffer();
async function form(over: Partial<ProductFormInput> = {}) {
return productFormSchema.parse({
productTypeId: await typeId("toz-deterjan"),
brand: "Persil",
name: "Matik",
barcode: "",
packageQuantity: "4,5",
packageUnit: "kg",
typeQuantity: "30",
note: "",
imageIds: [],
...over,
});
}
describe("ürünler (marka/paket)", () => {
it("seed: dönüşümler ve paket açıklaması; izolasyon", async () => {
const all = (await listProducts(ayse, cakir))!;
expect(all.products).toHaveLength(22);
const ariel = all.products.find((p) => p.brand === "Ariel")!;
expect(ariel).toMatchObject({
productTypeName: "Toz Deterjan",
typeUnit: "yıkama",
inTypeUnit: 33_000,
packageLabel: "5 kg · 33 yıkama",
conversionMissing: false,
});
const icim = all.products.find((p) => p.brand === "İçim")!;
expect(icim).toMatchObject({ typeQuantity: null, inTypeUnit: 500 });
const peynir = (await listProducts(ayse, cakir, {
productTypeId: await typeId("beyaz-peynir"),
}))!;
expect(peynir.products.map((p) => p.packageLabel)).toEqual(["500 g · 0,5 kg"]);
expect(await listProducts(fatma, cakir)).toBeNull();
expect((await listProductTypeOptions(ayse, cakir))!.length).toBe(19);
});
it("dönüşüm zorunlu; kendiliğinden çevrilebilende yok sayılır; barkod tek", async () => {
const missing = await createProduct(ayse, cakir, await form({ typeQuantity: "" }));
expect(missing).toMatchObject({ ok: false, fieldErrors: { typeQuantity: expect.any(String) } });
const ok = await createProduct(ayse, cakir, await form({ barcode: "8690 0000 0099 9" }));
expect(ok.ok).toBe(true);
const sut = await createProduct(
ayse,
cakir,
await form({
productTypeId: await typeId("sut"),
brand: "Torku",
packageQuantity: "1000",
packageUnit: "ml",
typeQuantity: "7",
}),
);
expect(sut.ok).toBe(true);
const list = (await listProducts(ayse, cakir))!.products;
expect(list.find((p) => p.brand === "Persil")).toMatchObject({
barcode: "8690000000999",
inTypeUnit: 30_000,
});
expect(list.find((p) => p.brand === "Torku")).toMatchObject({
typeQuantity: null,
inTypeUnit: 1_000,
});
const dup = await createProduct(
ayse,
cakir,
await form({ brand: "Başka", barcode: "8690000000999" }),
);
expect(dup).toMatchObject({ ok: false, fieldErrors: { barcode: expect.any(String) } });
expect(productFormSchema.safeParse({ ...(await form()), barcode: "12a" }).success).toBe(false);
expect((await createProduct(zeynep, cakir, await form({ brand: "İzleyici" }))).ok).toBe(false);
});
it("görseller: bağlanır, sıralanır, çıkarılır; okuma hane üyeleriyle sınırlı", async () => {
const a1 = await uploadAttachment(ayse, cakir, { name: "on.png", bytes: await png() });
const a2 = await uploadAttachment(ayse, cakir, { name: "arka.png", bytes: await png() });
const id1 = a1.ok ? a1.data.id : "";
const id2 = a2.ok ? a2.data.id : "";
const r = await createProduct(
ayse,
cakir,
await form({ brand: "Peros", imageIds: [id2, id1] }),
);
expect(r.ok).toBe(true);
const pid = r.ok ? r.data.id : "";
let p = (await listProducts(ayse, cakir))!.products.find((x) => x.id === pid)!;
expect(p.images.map((i) => i.id)).toEqual([id2, id1]);
// Aynı hanenin başka üyesi görür; başka hane görmez.
expect(await readAttachmentForUser(emre, id1, "thumb")).not.toBeNull();
expect(await readAttachmentForUser(fatma, id1, "full")).toBeNull();
// Başkasının yüklediği bekleyen görsel bağlanamaz.
const foreign = await uploadAttachment(emre, cakir, { name: "x.png", bytes: await png() });
const bad = await updateProduct(
ayse,
cakir,
pid,
await form({ brand: "Peros", imageIds: [id1, foreign.ok ? foreign.data.id : ""] }),
);
expect(bad.ok).toBe(false);
p = (await listProducts(ayse, cakir))!.products.find((x) => x.id === pid)!;
expect(p.images).toHaveLength(2);
expect(
(await updateProduct(ayse, cakir, pid, await form({ brand: "Peros", imageIds: [id1] }))).ok,
).toBe(true);
expect(await AttachmentModel.exists({ _id: id2, deletedAt: { $ne: null } })).toBeTruthy();
p = (await listProducts(ayse, cakir))!.products.find((x) => x.id === pid)!;
expect(p.images.map((i) => i.id)).toEqual([id1]);
});
it("arşiv: listeden çıkar, düzenlenemez, barkod çakışırsa geri alınamaz", async () => {
const r = await createProduct(ayse, cakir, await form({ brand: "Arşiv", barcode: "12345678" }));
const id = r.ok ? r.data.id : "";
expect((await setProductArchived(ayse, cakir, id, true)).ok).toBe(true);
expect((await listProducts(ayse, cakir))!.products.some((p) => p.id === id)).toBe(false);
expect(
(await listProducts(ayse, cakir, { includeArchived: true }))!.products.find(
(p) => p.id === id,
)!.archived,
).toBe(true);
expect((await updateProduct(ayse, cakir, id, await form({ brand: "Arşiv" }))).ok).toBe(false);
expect(
(await createProduct(ayse, cakir, await form({ brand: "Yeni", barcode: "12345678" }))).ok,
).toBe(true);
expect((await setProductArchived(ayse, cakir, id, false)).ok).toBe(false);
});
});
+358
View File
@@ -0,0 +1,358 @@
import "server-only";
import { Types } from "mongoose";
import {
syncOwnerAttachments,
toAttachmentInfo,
type AttachmentInfo,
} from "@/features/attachments/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 { AttachmentModel } from "@/models/attachment";
import { ProductModel } from "@/models/product";
import { ProductTypeModel } from "@/models/product-type";
import { autoConvertible, describePackage, packageInTypeUnit } from "@/shared/products";
import type { ProductForm } from "@/shared/schemas/product";
import { compareTr, foldTr } from "@/shared/search";
/**
* Ürünler (marka/varyant, Bölüm 6.11). Hane bazlı, hane içinde ortak. Okuma: viewer; yazma:
* member. Paket birimi ürün tipinin birimine kendiliğinden çevrilemiyorsa dönüşüm zorunludur.
* Görseller ek dosya altyapısıyla (ownerType "product", yalnızca görsel).
*/
const t = tr.products;
type ProductLean = {
_id: Types.ObjectId;
productTypeId: Types.ObjectId;
brand: string;
name: string;
barcode: string | null;
packageQuantity: number;
packageUnit: string;
typeQuantity: number | null;
note: string;
imageCount: number;
archivedAt: Date | null;
};
type TypeLean = { _id: Types.ObjectId; name: string; unit: string; archivedAt: Date | null };
export type ProductView = {
id: string;
productTypeId: string;
productTypeName: string;
typeUnit: string;
brand: string;
name: string;
/** "Ariel Matik Dağ Esintisi". */
label: string;
barcode: string | null;
packageQuantity: number;
packageUnit: string;
/** Elle girilen dönüşüm (kendiliğinden çevrilebiliyorsa null). */
typeQuantity: number | null;
/** Bir paketin ürün tipi birimindeki karşılığı (çevrilemiyorsa null). */
inTypeUnit: number | null;
/** Ürün tipinin birimi sonradan değişti ve dönüşüm yok: fiyat karşılaştırmasına katılamaz. */
conversionMissing: boolean;
/** "5 kg · 50 yıkama". */
packageLabel: string;
note: string;
archived: boolean;
images: AttachmentInfo[];
};
export type ProductTypeOption = { id: string; name: string; unit: string };
export const productLabel = (p: { brand: string; name: string }) =>
p.name ? `${p.brand} ${p.name}` : p.brand;
function toView(p: ProductLean, type: TypeLean | undefined, images: AttachmentInfo[]): ProductView {
const typeUnit = type?.unit ?? "";
const conv = {
packageQuantity: p.packageQuantity,
packageUnit: p.packageUnit,
typeUnit,
typeQuantity: p.typeQuantity,
};
const inTypeUnit = packageInTypeUnit(conv);
return {
id: String(p._id),
productTypeId: String(p.productTypeId),
productTypeName: type?.name ?? "",
typeUnit,
brand: p.brand,
name: p.name,
label: productLabel(p),
barcode: p.barcode,
packageQuantity: p.packageQuantity,
packageUnit: p.packageUnit,
typeQuantity: p.typeQuantity,
inTypeUnit,
conversionMissing: inTypeUnit === null,
packageLabel: describePackage(conv),
note: p.note,
archived: Boolean(p.archivedAt),
images,
};
}
async function loadImages(householdId: Types.ObjectId, productIds: Types.ObjectId[]) {
const rows = await AttachmentModel.find({
householdId,
ownerType: "product",
ownerId: { $in: productIds },
deletedAt: null,
})
.sort({ order: 1, createdAt: 1 })
.lean();
const by = new Map<string, AttachmentInfo[]>();
for (const a of rows) {
const key = String(a.ownerId);
by.set(key, [
...(by.get(key) ?? []),
toAttachmentInfo(a as Parameters<typeof toAttachmentInfo>[0]),
]);
}
return by;
}
/**
* Ürün listesi: ürün tipine göre (verilirse) veya tüm katalog. Sıra: ürün tipi adı, marka,
* tanım. Arşivliler `includeArchived` ile.
*/
export async function listProducts(
userId: string,
householdId: string,
opts: { productTypeId?: string; includeArchived?: boolean } = {},
): Promise<{ products: ProductView[]; canWrite: boolean } | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const typeId = opts.productTypeId ? toObjectId(opts.productTypeId) : null;
if (opts.productTypeId && !typeId) return null;
const rows = await ProductModel.find({
householdId: m.householdId,
...(typeId ? { productTypeId: typeId } : {}),
...(opts.includeArchived ? {} : { archivedAt: null }),
}).lean<ProductLean[]>();
const types = await ProductTypeModel.find({
householdId: m.householdId,
_id: {
$in: [...new Set(rows.map((r) => String(r.productTypeId)))].map(
(id) => new Types.ObjectId(id),
),
},
})
.select({ name: 1, unit: 1, archivedAt: 1 })
.lean<TypeLean[]>();
const typeById = new Map(types.map((x) => [String(x._id), x]));
const images = await loadImages(
m.householdId,
rows.filter((r) => r.imageCount > 0).map((r) => r._id),
);
const products = rows
.map((r) => toView(r, typeById.get(String(r.productTypeId)), images.get(String(r._id)) ?? []))
.sort(
(a, b) =>
compareTr(a.productTypeName, b.productTypeName) ||
compareTr(a.brand, b.brand) ||
compareTr(a.name, b.name),
);
return { products, canWrite: hasHouseholdRole(m.role, "member") };
}
/** Ürün formu için aktif ürün tipleri (ada göre). */
export async function listProductTypeOptions(
userId: string,
householdId: string,
): Promise<ProductTypeOption[] | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const rows = await ProductTypeModel.find({ householdId: m.householdId, archivedAt: null })
.select({ name: 1, unit: 1 })
.lean<TypeLean[]>();
return rows
.map((r) => ({ id: String(r._id), name: r.name, unit: r.unit }))
.sort((a, b) => compareTr(a.name, b.name));
}
/** Ürün tipi, dönüşüm ve barkod denetimi; geçerliyse kaydedilecek dönüşümü döner. */
async function checkInput(
m: Membership,
input: ProductForm,
exceptId?: Types.ObjectId,
): Promise<{ error: ActionResult<never> } | { error: null; typeQuantity: number | null }> {
const type = await ProductTypeModel.findOne({
_id: new Types.ObjectId(input.productTypeId),
householdId: m.householdId,
}).lean<TypeLean>();
if (!type || type.archivedAt)
return { error: fail(t.validation.productType, { productTypeId: t.validation.productType }) };
const auto = autoConvertible(input.packageUnit, type.unit);
if (!auto && !input.typeQuantity) {
const msg = t.validation.conversionRequired(input.packageUnit, type.unit);
return { error: fail(msg, { typeQuantity: msg }) };
}
if (input.barcode) {
const dup = await ProductModel.exists({
householdId: m.householdId,
barcode: input.barcode,
archivedAt: null,
...(exceptId ? { _id: { $ne: exceptId } } : {}),
});
if (dup)
return { error: fail(t.validation.barcodeTaken, { barcode: t.validation.barcodeTaken }) };
}
return { error: null, typeQuantity: auto ? null : input.typeQuantity };
}
/** Ek senkronizasyonu başarısızsa transaction'ı geri almak için fırlatılır. */
class ImageError extends Error {
constructor(readonly result: ActionResult<never>) {
super(result.ok ? "" : result.error);
}
}
async function save(
m: Membership,
actorId: string,
input: ProductForm,
typeQuantity: number | null,
existing: Types.ObjectId | null,
): Promise<ActionResult<{ id: string }>> {
const actor = new Types.ObjectId(actorId);
const fields = {
productTypeId: new Types.ObjectId(input.productTypeId),
brand: input.brand,
name: input.name,
searchKey: foldTr(`${input.brand} ${input.name}`),
barcode: input.barcode,
packageQuantity: input.packageQuantity,
packageUnit: input.packageUnit,
typeQuantity,
note: input.note,
updatedBy: actor,
};
const mongoose = await connectMongoose();
let id = existing;
try {
await mongoose.connection.transaction(async (session) => {
if (existing) {
await ProductModel.updateOne(
{ _id: existing, householdId: m.householdId },
{ $set: fields },
{ session },
);
} else {
const [doc] = await ProductModel.create(
[{ householdId: m.householdId, ...fields, createdBy: actor }],
{ session },
);
id = doc!._id;
}
const synced = await syncOwnerAttachments({
householdId: m.householdId,
actorId,
ownerType: "product",
ownerId: id!,
ids: input.imageIds,
allowedKinds: ["image"],
session,
});
if (!synced.ok) throw new ImageError(synced);
await ProductModel.updateOne(
{ _id: id!, householdId: m.householdId },
{ $set: { imageCount: synced.data } },
{ session },
);
});
} catch (error) {
if (error instanceof ImageError) return error.result;
throw error;
}
return ok({ id: String(id) });
}
export async function createProduct(
actorId: string,
householdId: string,
input: ProductForm,
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const c = await checkInput(m, input);
if (c.error) return c.error;
return save(m, actorId, input, c.typeQuantity, null);
}
export async function updateProduct(
actorId: string,
householdId: string,
productId: string,
input: ProductForm,
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const id = toObjectId(productId);
const current = id
? await ProductModel.findOne({ _id: id, householdId: m.householdId }).lean<ProductLean>()
: null;
if (!current) return fail(tr.common.notFound);
if (current.archivedAt) return fail(t.validation.archived);
const c = await checkInput(m, input, current._id);
if (c.error) return c.error;
return save(m, actorId, input, c.typeQuantity, current._id);
}
export async function setProductArchived(
actorId: string,
householdId: string,
productId: string,
archived: boolean,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const id = toObjectId(productId);
const current = id
? await ProductModel.findOne({ _id: id, householdId: m.householdId }).lean<ProductLean>()
: null;
if (!current) return fail(tr.common.notFound);
if (!archived) {
const type = await ProductTypeModel.exists({
_id: current.productTypeId,
householdId: m.householdId,
archivedAt: null,
});
if (!type) return fail(t.validation.productType);
if (
current.barcode &&
(await ProductModel.exists({
householdId: m.householdId,
barcode: current.barcode,
archivedAt: null,
_id: { $ne: current._id },
}))
)
return fail(t.validation.barcodeTaken);
}
const actor = new Types.ObjectId(actorId);
await ProductModel.updateOne(
{ _id: current._id, householdId: m.householdId },
{ $set: { archivedAt: archived ? new Date() : null, updatedBy: actor } },
);
await writeAudit({
action: archived ? "product.archive" : "product.unarchive",
actorId: actor,
householdId: m.householdId,
targetType: "product",
targetId: productId,
diff: { label: productLabel(current) },
});
return ok(undefined);
}
+1 -1
View File
@@ -196,7 +196,7 @@ describe("kural ve planlı kayıtlar", () => {
type: "expense",
amount: 777_00,
date: d.date,
accountId: d.account.id,
accountId: d.account!.id,
toAccountId: null,
categoryId: d.categoryId,
splits: [],
+2 -1
View File
@@ -376,7 +376,8 @@ export async function confirmOccurrence(
ctx.m.householdId,
tx.payeeName ?? "",
tx.type,
tx.accountId,
// Planlı kayıtlar cari hareketi değildir; kaynak hesap her zaman dolu.
tx.accountId!,
tx.categoryId ?? null,
);
await TransactionModel.updateOne(
+130
View File
@@ -0,0 +1,130 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import {
productTypeFormSchema,
stockCategoryFormSchema,
stockCountFormSchema,
stockCountSheetSchema,
stockMovementFormSchema,
} from "@/shared/schemas/stock";
import {
addStockMovement,
countStock,
createProductType,
createStockCategory,
deleteStockMovement,
getStockOptions,
quickConsume,
setProductTypeArchived,
setStockCategoryArchived,
submitCount,
updateProductType,
updateStockCategory,
type StockOption,
} 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;
}
function withId<R>(
raw: unknown,
fn: (id: string) => Promise<ActionResult<R>>,
): Promise<ActionResult<R>> {
const id = idSchema.safeParse(raw);
if (!id.success) return Promise.resolve(fail(tr.common.notFound));
return fn(id.data);
}
/** Yeni (id boş) veya mevcut stok kategorisi. */
export async function saveStockCategoryAction(categoryId: unknown, input: unknown) {
if (categoryId)
return withId(categoryId, (id) =>
run(stockCategoryFormSchema, input, (u, h, d) => updateStockCategory(u, h, id, d)),
);
return run(stockCategoryFormSchema, input, createStockCategory);
}
export async function setStockCategoryArchivedAction(categoryId: unknown, archived: unknown) {
return withId(categoryId, (id) =>
run(z.boolean(), archived, (u, h, a) => setStockCategoryArchived(u, h, id, a)),
);
}
/** Yeni (id boş) veya mevcut ürün tipi. */
export async function saveProductTypeAction(productTypeId: unknown, input: unknown) {
if (productTypeId)
return withId(productTypeId, (id) =>
run(productTypeFormSchema, input, (u, h, d) => updateProductType(u, h, id, d)),
);
return run(productTypeFormSchema, input, createProductType);
}
export async function setProductTypeArchivedAction(productTypeId: unknown, archived: unknown) {
return withId(productTypeId, (id) =>
run(z.boolean(), archived, (u, h, a) => setProductTypeArchived(u, h, id, a)),
);
}
export async function addStockMovementAction(productTypeId: unknown, input: unknown) {
return withId(productTypeId, (id) =>
run(stockMovementFormSchema, input, (u, h, d) => addStockMovement(u, h, id, d)),
);
}
export async function quickConsumeAction(productTypeId: unknown) {
return withId(productTypeId, (id) => run(z.unknown(), null, (u, h) => quickConsume(u, h, id)));
}
export async function countStockAction(productTypeId: unknown, input: unknown) {
return withId(productTypeId, (id) =>
run(stockCountFormSchema, input, (u, h, d) => countStock(u, h, id, d)),
);
}
/** Toplu sayım (/stok/sayim). */
export async function submitCountAction(input: unknown) {
return run(stockCountSheetSchema, input, submitCount);
}
export async function deleteStockMovementAction(movementId: unknown) {
return withId(movementId, (id) =>
run(z.unknown(), null, (u, h) => deleteStockMovement(u, h, id)),
);
}
/** Ürün tipi ve stok kategorisi formları için seçenekler. */
export async function getStockOptionsAction(): Promise<
ActionResult<{ categories: StockOption[]; expenseCategories: StockOption[] }>
> {
const ctx = await getHouseholdActionContext("viewer");
if (!ctx) return fail(tr.common.unauthorized);
const data = await getStockOptions(ctx.user.id, ctx.household.id);
return data ? ok(data) : fail(tr.common.unauthorized);
}
@@ -0,0 +1,351 @@
"use client";
import { ArrowLeft, ClipboardCheck, Eraser, ListChecks } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useMemo, useState, useTransition } from "react";
import { toast } from "sonner";
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 { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { parseQuantity } from "@/shared/quantity";
import { formatStock, quantityInput, WASTE_REASONS, type WasteReason } from "@/shared/stock";
import { submitCountAction } from "../actions";
import type { CountSheet as Data, CountSheetRow } from "../service";
import { ymdLabel } from "./stock-view";
const t = tr.stock;
const ALL = "__all__";
type Entry = { actual: string; waste: string; reason: WasteReason | "" };
const EMPTY: Entry = { actual: "", waste: "", reason: "" };
function signed(q: number, unit: string) {
if (q === 0) return t.count.same;
return `${q > 0 ? "+" : "−"}${formatStock(Math.abs(q), unit)}`;
}
/** /stok/sayim — liste hâlinde beklenen → sayılan; fark sayım düzeltmesi, bir kısmı fire. */
export function CountSheet({ data }: { data: Data }) {
const router = useRouter();
const [entries, setEntries] = useState<Record<string, Entry>>({});
const [errors, setErrors] = useState<Record<string, string>>({});
const [onlyDue, setOnlyDue] = useState(data.rows.some((r) => r.count?.due));
const [note, setNote] = useState("");
const [pending, start] = useTransition();
const rows = useMemo(
() => (onlyDue ? data.rows.filter((r) => r.count?.due) : data.rows),
[data.rows, onlyDue],
);
const groups = useMemo(() => {
const by = new Map<string, { path: string; rows: CountSheetRow[] }>();
for (const r of rows) {
const g = by.get(r.categoryId) ?? { path: r.categoryPath, rows: [] };
g.rows.push(r);
by.set(r.categoryId, g);
}
return [...by.values()];
}, [rows]);
const dueTotal = data.rows.filter((r) => r.count?.due).length;
const filled = data.rows.filter((r) => entries[r.id]?.actual.trim()).length;
const set = (id: string, patch: Partial<Entry>) =>
setEntries((e) => ({ ...e, [id]: { ...(e[id] ?? EMPTY), ...patch } }));
const fillExpected = () =>
setEntries((e) => {
const next = { ...e };
for (const r of rows)
if (!next[r.id]?.actual.trim())
next[r.id] = { ...(next[r.id] ?? EMPTY), actual: quantityInput(Math.max(0, r.expected)) };
return next;
});
const submit = () =>
start(async () => {
const sent = data.rows.filter((r) => entries[r.id]?.actual.trim());
const r = await submitCountAction({
date: data.today,
categoryId: data.category?.id ?? "",
note,
rows: sent.map((row) => {
const e = entries[row.id]!;
// Fire alanı yalnızca sayımda eksik çıkınca geçerlidir.
const actual = parseQuantity(e.actual);
const short = actual !== null && actual < row.expected;
return {
productTypeId: row.id,
actualQuantity: e.actual,
wasteQuantity: short ? e.waste : "",
wasteReason: short ? e.reason : "",
};
}),
});
if (r.ok) {
const d = r.data as { counted: number; adjusted: number };
toast.success(t.count.done(d.counted, d.adjusted));
setEntries({});
setErrors({});
setNote("");
router.refresh();
return;
}
const next: Record<string, string> = {};
for (const [key, msg] of Object.entries(r.fieldErrors ?? {})) {
const m = /^rows\.(\d+)\.(\w+)$/.exec(key);
const row = m ? sent[Number(m[1])] : undefined;
if (row && msg) next[`${row.id}.${m![2]}`] = msg;
}
setErrors(next);
toast.error(r.fieldErrors?.rows ?? r.error);
});
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/stok">
<ArrowLeft />
{t.count.back}
</Link>
</Button>
<PageHeader
title={data.category ? `${t.count.title}: ${data.category.path}` : t.count.title}
description={t.count.description}
/>
<div className="flex flex-wrap items-center gap-3">
<Select
value={data.category?.id ?? ALL}
onValueChange={(v) =>
router.push(v === ALL ? "/stok/sayim" : `/stok/sayim?kategori=${v}`)
}
>
<SelectTrigger className="w-full sm:w-72" aria-label={t.count.category}>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value={ALL}>{t.count.allCategories}</SelectItem>
{data.categories.map((c) => (
<SelectItem key={c.id} value={c.id}>
<span style={{ paddingLeft: c.depth * 12 }}>{c.path.split(" › ").at(-1)}</span>
{c.due ? (
<span className="text-xs text-amber-700 dark:text-amber-400">
{" "}
· {t.count.dueCount(c.due)}
</span>
) : null}
</SelectItem>
))}
</SelectContent>
</Select>
{dueTotal > 0 ? (
<label className="flex items-center gap-2 text-sm">
<Checkbox checked={onlyDue} onCheckedChange={(x) => setOnlyDue(x === true)} />
{t.count.onlyDue} ({dueTotal})
</label>
) : null}
{data.canWrite && rows.length ? (
<div className="flex gap-2 sm:ml-auto">
<Button
size="sm"
variant="outline"
onClick={fillExpected}
title={t.count.fillExpectedHint}
>
<ListChecks />
{t.count.fillExpected}
</Button>
{filled ? (
<Button size="sm" variant="ghost" onClick={() => setEntries({})}>
<Eraser />
{t.count.clear}
</Button>
) : null}
</div>
) : null}
</div>
{rows.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.count.empty}
</p>
) : null}
{groups.map((g) => (
<section key={g.path} className="flex flex-col gap-2">
<h2 className="text-sm font-medium text-muted-foreground">{g.path}</h2>
<ul className="divide-y rounded-xl border bg-card">
{g.rows.map((r) => (
<CountRow
key={r.id}
row={r}
entry={entries[r.id] ?? EMPTY}
errors={errors}
disabled={!data.canWrite || pending}
onChange={(patch) => set(r.id, patch)}
/>
))}
</ul>
</section>
))}
{data.canWrite && data.rows.length ? (
<div className="sticky bottom-[calc(4rem+env(safe-area-inset-bottom))] z-10 -mx-4 flex flex-wrap items-center gap-3 border-t bg-background/95 px-4 py-3 backdrop-blur md:bottom-0 md:mx-0 md:rounded-xl md:border">
<Input
value={note}
onChange={(e) => setNote(e.target.value)}
placeholder={t.count.note}
aria-label={t.count.note}
maxLength={300}
className="min-w-40 flex-1"
/>
<span className="text-sm text-muted-foreground tabular-nums">
{t.count.counted(filled)}
</span>
<Button onClick={submit} disabled={pending || filled === 0}>
<ClipboardCheck />
{t.count.submit}
</Button>
</div>
) : null}
</div>
);
}
function CountRow({
row,
entry,
errors,
disabled,
onChange,
}: {
row: CountSheetRow;
entry: Entry;
errors: Record<string, string>;
disabled: boolean;
onChange: (patch: Partial<Entry>) => void;
}) {
const actual = entry.actual.trim() ? parseQuantity(entry.actual) : null;
const diff = actual === null ? null : actual - row.expected;
const shortage = diff !== null && diff < 0 ? -diff : 0;
const actualError = errors[`${row.id}.actualQuantity`];
const wasteError = errors[`${row.id}.wasteQuantity`] ?? errors[`${row.id}.wasteReason`];
const inputId = `count-${row.id}`;
return (
<li className="flex flex-col gap-2 p-3">
<div className="flex flex-wrap items-center gap-x-3 gap-y-2">
<div className="min-w-0 flex-1 basis-40">
<label htmlFor={inputId} className="flex flex-wrap items-center gap-1.5 font-medium">
<span className="truncate">{row.name}</span>
{row.count?.due ? (
<Badge
variant="outline"
className="border-amber-500/50 text-amber-700 dark:text-amber-400"
>
{t.count.dueBadge(row.count.overdueDays)}
</Badge>
) : null}
</label>
<p className="truncate text-xs text-muted-foreground">
{[
row.location,
row.count
? row.count.lastDate
? t.count.lastCount(ymdLabel(row.count.lastDate))
: t.count.neverCounted
: null,
]
.filter(Boolean)
.join(" · ")}
</p>
</div>
<div className="flex items-center gap-3">
<div className="w-20 text-right text-sm tabular-nums">
<p className="text-xs text-muted-foreground">{t.count.expected}</p>
{formatStock(Math.max(0, row.expected), row.unit)}
</div>
<div className="w-28">
<span className="text-xs text-muted-foreground">
{t.count.actual} ({row.unit})
</span>
<Input
id={inputId}
inputMode="decimal"
value={entry.actual}
onChange={(e) => onChange({ actual: e.target.value })}
disabled={disabled}
aria-invalid={Boolean(actualError) || (entry.actual.trim() !== "" && actual === null)}
className="h-8 tabular-nums"
/>
</div>
<div className="w-20 text-right text-sm tabular-nums">
<p className="text-xs text-muted-foreground">{t.count.diff}</p>
<span
className={cn(
diff === null
? "text-muted-foreground"
: diff > 0
? "text-income"
: diff < 0
? "text-expense"
: "text-muted-foreground",
)}
>
{diff === null ? "—" : signed(diff, row.unit)}
</span>
</div>
</div>
</div>
{actualError ? <p className="text-xs text-destructive">{actualError}</p> : null}
{shortage > 0 ? (
<div className="flex flex-wrap items-center gap-2 rounded-lg bg-muted/50 p-2 text-sm">
<span className="text-xs text-muted-foreground">{t.count.markWaste}:</span>
<Input
inputMode="decimal"
value={entry.waste}
onChange={(e) => onChange({ waste: e.target.value })}
disabled={disabled}
placeholder={t.count.wasteMax(formatStock(shortage, row.unit))}
aria-label={`${row.name}: ${t.count.wasteQuantity}`}
aria-invalid={Boolean(errors[`${row.id}.wasteQuantity`])}
className="h-8 w-36 tabular-nums"
/>
<Select
value={entry.reason}
onValueChange={(v) => onChange({ reason: v as WasteReason })}
disabled={disabled || !entry.waste.trim()}
>
<SelectTrigger
size="sm"
className="w-48"
aria-label={`${row.name}: ${t.fields.wasteReason}`}
aria-invalid={Boolean(errors[`${row.id}.wasteReason`])}
>
<SelectValue placeholder={t.fields.wasteReason} />
</SelectTrigger>
<SelectContent>
{WASTE_REASONS.map((w) => (
<SelectItem key={w} value={w}>
{t.wasteReasons[w]}
</SelectItem>
))}
</SelectContent>
</Select>
{wasteError ? <p className="w-full text-xs text-destructive">{wasteError}</p> : null}
</div>
) : null}
</li>
);
}
@@ -0,0 +1,106 @@
import { ClipboardCheck, Clock } from "lucide-react";
import Link from "next/link";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { formatStock } from "@/shared/stock";
import { getStock } from "../service";
const t = tr.stock;
const LIMIT = 5;
/** Dashboard: eşiğin altındaki ürünler, SKT'si yaklaşan partiler, sayımı gelen kategoriler. */
export async function LowStockCard({
userId,
householdId,
}: {
userId: string;
householdId: string;
}) {
const data = await getStock(userId, householdId);
if (!data || (!data.suggestions.length && !data.expiring.length && !data.countDue.length))
return null;
const low = data.suggestions.slice(0, LIMIT);
const expiring = data.expiring.slice(0, Math.max(0, LIMIT - low.length) || 2);
return (
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.dashboard.title}</CardTitle>
<CardDescription>
{t.dashboard.description(
data.suggestions.length,
data.expiring.length,
data.countDue.length,
)}
</CardDescription>
</CardHeader>
<CardContent className="flex flex-col gap-3">
<ul className="divide-y text-sm">
{low.map((i) => (
<li key={i.id} className="flex items-center justify-between gap-3 py-1.5">
<Link href={`/stok/${i.id}`} className="min-w-0 truncate hover:underline">
{i.name}
</Link>
<span className="shrink-0 text-xs tabular-nums">
<span className="text-expense">{formatStock(Math.max(0, i.current), i.unit)}</span>
<span className="text-muted-foreground">
{" · "}
{t.suggestions.suggested(formatStock(i.suggestedQuantity, i.unit))}
</span>
</span>
</li>
))}
{expiring.map(({ item, lot }) => (
<li
key={`${item.id}-${lot.index}`}
className="flex items-center justify-between gap-3 py-1.5"
>
<Link href={`/stok/${item.id}`} className="min-w-0 truncate hover:underline">
{item.name}
</Link>
<span
className={
lot.status === "expired"
? "flex shrink-0 items-center gap-1 text-xs text-expense"
: "flex shrink-0 items-center gap-1 text-xs text-amber-700 dark:text-amber-400"
}
>
<Clock className="size-3" />
{t.expiring.on(
new Intl.DateTimeFormat("tr-TR", { day: "numeric", month: "short" }).format(
new Date(`${lot.expiryDate}T12:00:00+03:00`),
),
)}
</span>
</li>
))}
{data.countDue.slice(0, 3).map((g) => (
<li
key={`count-${g.categoryId}`}
className="flex items-center justify-between gap-3 py-1.5"
>
<Link
href={`/stok/sayim?kategori=${g.categoryId}`}
className="min-w-0 truncate hover:underline"
>
{g.path}
</Link>
<span className="flex shrink-0 items-center gap-1 text-xs text-amber-700 dark:text-amber-400">
<ClipboardCheck className="size-3" />
{t.count.dueBadge(g.overdueDays)}
</span>
</li>
))}
</ul>
{data.suggestions.length > low.length ? (
<p className="text-xs text-muted-foreground">
{t.dashboard.more(data.suggestions.length - low.length)}
</p>
) : null}
<Button size="sm" variant="outline" className="w-fit" asChild>
<Link href="/stok">{t.dashboard.open}</Link>
</Button>
</CardContent>
</Card>
);
}
@@ -0,0 +1,385 @@
"use client";
import {
Archive,
ArchiveRestore,
ArrowLeft,
ClipboardCheck,
EllipsisVertical,
Minus,
Pencil,
ShoppingBag,
Trash,
Trash2,
} from "lucide-react";
import Link from "next/link";
import { useState } from "react";
import { toast } from "sonner";
import { PageHeader } from "@/components/page-header";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatStock, roundForDisplay } from "@/shared/stock";
import { deleteStockMovementAction, setProductTypeArchivedAction } from "../actions";
import type { ProductTypeDetail, StockMovementRow, StockOption } from "../service";
import {
ProductTypeFormDialog,
StockCountDialog,
StockMovementDialog,
type MovementKindInput,
} from "./stock-dialogs";
import {
ExpiryBadge,
LevelBadge,
QuickConsumeButton,
StockBar,
suggestionReasons,
ymdLabel,
} from "./stock-view";
const t = tr.stock;
type Pending =
| { kind: "edit" }
| { kind: "movement"; movement: MovementKindInput }
| { kind: "count" }
| { kind: "archive" }
| { kind: "deleteMovement"; row: StockMovementRow }
| null;
function Stat({ label, children }: { label: string; children: React.ReactNode }) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<div className="font-semibold tabular-nums">{children}</div>
</div>
);
}
/** /stok/:id — mevcut durum, partiler (SKT) ve hareketler. */
export function ProductDetailView({
data,
categories,
products,
}: {
data: ProductTypeDetail;
categories: StockOption[];
/** Marka/paket bölümü (Faz 12). */
products?: React.ReactNode;
}) {
const [pending, setPending] = useState<Pending>(null);
const close = () => setPending(null);
const q = (x: number) => formatStock(x, data.unit);
const active = data.canWrite && !data.archived;
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/stok">
<ArrowLeft />
{t.detail.back}
</Link>
</Button>
<PageHeader
title={data.name}
description={data.categoryPath}
actions={
data.canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon" variant="outline" aria-label={tr.recurring.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem
disabled={data.archived}
onSelect={() => setPending({ kind: "edit" })}
>
<Pencil />
{tr.common.edit}
</DropdownMenuItem>
<DropdownMenuSeparator />
{data.archived ? (
<DropdownMenuItem
onSelect={async () => {
const r = await setProductTypeArchivedAction(data.id, false);
if (r.ok) toast.success(t.toast.unarchived);
else toast.error(r.error);
}}
>
<ArchiveRestore />
{t.detail.unarchive}
</DropdownMenuItem>
) : (
<DropdownMenuItem
variant="destructive"
onSelect={() => setPending({ kind: "archive" })}
>
<Archive />
{t.detail.archive}
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
) : null
}
/>
<div className="-mt-2 flex flex-wrap gap-1.5">
{data.archived ? <Badge variant="secondary">{t.detail.archived}</Badge> : null}
<LevelBadge item={data} />
</div>
<Card size="sm">
<CardContent className="flex flex-col gap-3">
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={t.detail.current}>
<span className={cn(data.level.low && "text-expense")}>
{q(Math.max(0, data.current))}
</span>
</Stat>
<Stat label={t.detail.target}>{q(data.targetQuantity)}</Stat>
<Stat label={t.detail.threshold}>
{q(data.level.thresholdQuantity)}{" "}
<span className="text-xs font-normal text-muted-foreground">
(%{data.thresholdPct})
</span>
</Stat>
<Stat label={t.detail.suggested}>{q(data.suggestedQuantity)}</Stat>
</div>
<StockBar item={data} />
{suggestionReasons(data).length ? (
<p
className={cn(
"text-xs",
data.suggestion.waste
? "text-amber-700 dark:text-amber-400"
: "text-muted-foreground",
)}
>
{suggestionReasons(data).join(" ")}
</p>
) : null}
<div className="grid grid-cols-1 gap-3 border-t pt-3 sm:grid-cols-2">
<Stat label={t.detail.usage}>
{data.suggestion.usage ? (
t.detail.perWeek(q(roundForDisplay(data.suggestion.usage.perDay * 7)))
) : (
<span className="font-normal text-muted-foreground">{t.detail.noUsage}</span>
)}
</Stat>
<Stat label={t.detail.countSchedule}>
{data.count ? (
<span className="flex flex-wrap items-center gap-x-2">
<span>{t.detail.countEvery(data.count.everyDays)}</span>
<span
className={cn(
"text-xs font-normal",
data.count.due
? "text-amber-700 dark:text-amber-400"
: "text-muted-foreground",
)}
>
{data.count.due
? tr.stock.count.dueBadge(data.count.overdueDays)
: t.detail.nextCount(ymdLabel(data.count.nextDate))}
{data.count.lastDate
? ` · ${tr.stock.count.lastCount(ymdLabel(data.count.lastDate))}`
: ""}
</span>
</span>
) : (
<span className="font-normal text-muted-foreground">
{t.detail.noCountSchedule}
</span>
)}
</Stat>
</div>
{data.location ? (
<p className="text-sm">
<span className="text-muted-foreground">{t.detail.location}:</span> {data.location}
</p>
) : null}
{data.note ? <p className="text-sm text-muted-foreground">{data.note}</p> : null}
{active ? (
<div className="flex flex-wrap justify-end gap-2">
<QuickConsumeButton item={data} />
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "movement", movement: "consume" })}
>
<Minus />
{t.actions.consume}
</Button>
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "movement", movement: "waste" })}
>
<Trash />
{t.actions.waste}
</Button>
<Button size="sm" variant="outline" onClick={() => setPending({ kind: "count" })}>
<ClipboardCheck />
{t.actions.count}
</Button>
<Button
size="sm"
onClick={() => setPending({ kind: "movement", movement: "purchase" })}
>
<ShoppingBag />
{t.actions.purchase}
</Button>
</div>
) : null}
</CardContent>
</Card>
<Card size="sm">
<CardHeader>
<CardTitle className="text-base">{t.detail.lots}</CardTitle>
<p className="text-xs text-muted-foreground">{t.detail.lotsHint}</p>
</CardHeader>
<CardContent>
{data.lots.length === 0 ? (
<p className="text-sm text-muted-foreground">{t.detail.noLots}</p>
) : (
<ul className="divide-y text-sm">
{data.lots.map((lot, i) => (
<li key={i} className="flex items-center justify-between gap-3 py-2">
<span className="min-w-0">
<span className="font-medium tabular-nums">{q(lot.remaining)}</span>
<span className="text-xs text-muted-foreground"> · {ymdLabel(lot.date)}</span>
</span>
{lot.expiryDate && lot.status && lot.status !== "ok" ? (
<ExpiryBadge lot={{ expiryDate: lot.expiryDate, status: lot.status }} />
) : (
<span className="text-xs text-muted-foreground">
{lot.expiryDate ? t.expiring.on(ymdLabel(lot.expiryDate)) : t.detail.noExpiry}
</span>
)}
</li>
))}
</ul>
)}
</CardContent>
</Card>
{products}
<section className="flex flex-col gap-2" aria-labelledby="stock-movements-title">
<h2 id="stock-movements-title" className="text-base font-medium">
{t.detail.movements}
</h2>
{data.movements.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.detail.noMovements}
</p>
) : (
<ul className="divide-y rounded-xl border bg-card">
{data.movements.map((row) => (
<li key={row.id} className="flex items-start gap-3 p-3">
<div className="min-w-0 flex-1">
<p className="flex flex-wrap items-center gap-x-2 text-sm font-medium">
<span>{row.initial ? t.initial : t.kinds[row.kind]}</span>
<span
className={cn("tabular-nums", row.delta > 0 ? "text-income" : "text-expense")}
>
{row.delta > 0 ? "+" : "−"}
{q(Math.abs(row.delta))}
</span>
</p>
<p className="text-xs text-muted-foreground">
{ymdLabel(row.date)}
{row.wasteReason ? ` · ${t.wasteReasons[row.wasteReason]}` : ""}
{row.expiryDate ? ` · ${t.expiring.on(ymdLabel(row.expiryDate))}` : ""}
{row.note ? ` · ${row.note}` : ""}
</p>
</div>
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
{t.detail.after(q(row.quantityAfter))}
</span>
{data.canWrite ? (
<Button
size="icon-sm"
variant="ghost"
aria-label={t.detail.deleteMovement}
onClick={() => setPending({ kind: "deleteMovement", row })}
className="shrink-0"
>
<Trash2 />
</Button>
) : null}
</li>
))}
</ul>
)}
</section>
{pending?.kind === "edit" ? (
<ProductTypeFormDialog item={data} categories={categories} onClose={close} />
) : null}
{pending?.kind === "movement" ? (
<StockMovementDialog item={data} initialKind={pending.movement} onClose={close} />
) : null}
{pending?.kind === "count" ? <StockCountDialog item={data} onClose={close} /> : null}
<AlertDialog
open={pending?.kind === "archive" || pending?.kind === "deleteMovement"}
onOpenChange={(o) => !o && close()}
>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{pending?.kind === "archive" ? t.detail.archiveTitle : t.detail.deleteMovementTitle}
</AlertDialogTitle>
<AlertDialogDescription>
{pending?.kind === "archive"
? t.detail.archiveDescription(data.name)
: t.detail.deleteMovementDescription}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
const r =
pending?.kind === "archive"
? await setProductTypeArchivedAction(data.id, true)
: pending?.kind === "deleteMovement"
? await deleteStockMovementAction(pending.row.id)
: null;
const wasArchive = pending?.kind === "archive";
close();
if (!r) return;
if (r.ok) toast.success(wasArchive ? t.toast.archived : t.toast.deleted);
else toast.error(r.error);
}}
>
{pending?.kind === "archive" ? t.detail.archive : t.detail.deleteMovement}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
@@ -0,0 +1,209 @@
import { ArrowLeft } 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 { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { formatUnitPrice } from "@/shared/prices";
import { formatStock } from "@/shared/stock";
import type { StockAnalysis, StockAnalysisRow } from "../service";
const t = tr.stock.analysis;
/** Bu oranın (%) üstündeki fire vurgulanır. */
const HIGH_WASTE_PCT = 15;
const monthShort = (month: string) =>
new Intl.DateTimeFormat("tr-TR", { month: "short" }).format(new Date(`${month}-15T12:00:00Z`));
const monthLong = (month: string) =>
new Intl.DateTimeFormat("tr-TR", { month: "long", year: "numeric" }).format(
new Date(`${month}-15T12:00:00Z`),
);
/** Ürünün kendi ölçeğinde son aylar: tüketim (alt) + fire (üst), taban çizgisine oturur. */
function Trend({ row }: { row: StockAnalysisRow }) {
const max = Math.max(1, ...row.months.map((m) => m.used + m.wasted));
return (
<div
role="img"
aria-label={t.chartLabel(row.name)}
className="flex h-8 w-full items-end gap-1 border-b border-border"
>
{row.months.map((m) => {
const total = m.used + m.wasted;
const label = t.monthValue(
monthLong(m.month),
formatStock(m.used, row.unit),
formatStock(m.wasted, row.unit),
);
return (
<div
key={m.month}
title={label}
className="flex h-full min-w-0 flex-1 flex-col justify-end gap-0.5 hover:opacity-80"
>
{m.wasted > 0 ? (
<div
className="w-full rounded-t-[3px] bg-expense"
style={{ height: `${(m.wasted / max) * 100}%`, minHeight: 2 }}
/>
) : null}
{m.used > 0 ? (
<div
className={cn("w-full bg-budget", m.wasted > 0 ? "" : "rounded-t-[3px]")}
style={{ height: `${(m.used / max) * 100}%`, minHeight: 2 }}
/>
) : null}
{total === 0 ? <span className="sr-only">{label}</span> : null}
</div>
);
})}
</div>
);
}
function Num({ value, unit, tone }: { value: number | null; unit: string; tone?: string }) {
return (
<span className={cn("tabular-nums", value === null && "text-muted-foreground", tone)}>
{value === null ? t.noData : formatStock(value, unit)}
</span>
);
}
/** /stok/analiz: ürün tipi başına aylık ortalama tüketim, fire ve son ayların eğilimi. */
export function StockAnalysisView({ data }: { data: StockAnalysis }) {
const groups = new Map<string, StockAnalysisRow[]>();
for (const r of data.rows) groups.set(r.categoryPath, [...(groups.get(r.categoryPath) ?? []), r]);
const totalCost = data.rows.reduce((sum, r) => sum + (r.avgMonthlyCostMinor ?? 0), 0);
const first = data.months[0]!;
const last = data.months.at(-1)!;
return (
<div className="flex flex-col gap-4">
<Button variant="ghost" size="sm" asChild className="-ml-2 w-fit">
<Link href="/stok">
<ArrowLeft />
{t.back}
</Link>
</Button>
<PageHeader title={t.title} description={t.description} />
{data.rows.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
) : (
<>
{totalCost > 0 ? <p className="text-sm">{t.totalCost(formatMoney(totalCost))}</p> : null}
<div className="flex flex-wrap items-center gap-x-4 gap-y-1 text-xs text-muted-foreground">
<span>
{t.trend(data.months.length)}: {monthShort(first)} – {monthShort(last)}
</span>
<span className="flex items-center gap-1.5">
<span aria-hidden className="size-2.5 rounded-sm bg-budget" />
{tr.stock.kinds.consume}
</span>
<span className="flex items-center gap-1.5">
<span aria-hidden className="size-2.5 rounded-sm bg-expense" />
{tr.stock.kinds.waste}
</span>
</div>
<div className="overflow-hidden rounded-xl border bg-card">
<div className="hidden grid-cols-[minmax(0,1.4fr)_minmax(0,1fr)_repeat(5,minmax(0,0.7fr))] gap-3 border-b px-3 py-2 text-xs text-muted-foreground md:grid">
<span>{t.product}</span>
<span>{t.trend(data.months.length)}</span>
<span className="text-right">{t.avgUsed}</span>
<span className="text-right">{t.avgCost}</span>
<span className="text-right">{t.avgWasted}</span>
<span className="text-right">{t.wastePct}</span>
<span className="text-right">{t.thisMonth}</span>
</div>
{[...groups.entries()].map(([path, rows]) => (
<section key={path}>
<h2 className="border-b bg-muted/40 px-3 py-1.5 text-xs font-medium text-muted-foreground">
{path}
</h2>
<ul className="divide-y">
{rows.map((r) => {
const high = r.wastePct !== null && r.wastePct >= HIGH_WASTE_PCT;
return (
<li
key={r.id}
className="grid grid-cols-2 items-center gap-x-3 gap-y-2 px-3 py-2.5 text-sm md:grid-cols-[minmax(0,1.4fr)_minmax(0,1fr)_repeat(5,minmax(0,0.7fr))]"
>
<Link
href={`/stok/${r.id}`}
className="min-w-0 truncate font-medium hover:underline"
>
{r.name}
</Link>
<Trend row={r} />
<p className="flex justify-between gap-2 md:block md:text-right">
<span className="text-xs text-muted-foreground md:hidden">
{t.avgUsed}
</span>
<Num value={r.avgMonthlyUsed} unit={r.unit} />
</p>
<p className="flex justify-between gap-2 md:block md:text-right">
<span className="text-xs text-muted-foreground md:hidden">
{t.avgCost}
</span>
<span
className={cn(
"tabular-nums",
r.avgMonthlyCostMinor === null && "text-muted-foreground",
)}
title={
r.unitPrice
? t.costHint(
formatUnitPrice(r.unitPrice.minor, r.unit),
formatDate(`${r.unitPrice.date}T12:00:00+03:00`),
)
: t.noPrice
}
>
{r.avgMonthlyCostMinor === null
? t.noData
: formatMoney(r.avgMonthlyCostMinor)}
</span>
</p>
<p className="flex justify-between gap-2 md:block md:text-right">
<span className="text-xs text-muted-foreground md:hidden">
{t.avgWasted}
</span>
<Num value={r.avgMonthlyWasted} unit={r.unit} />
</p>
<p className="flex justify-between gap-2 md:block md:text-right">
<span className="text-xs text-muted-foreground md:hidden">
{t.wastePct}
</span>
<span
className={cn(
"tabular-nums",
high ? "font-medium text-expense" : "",
r.wastePct === null && "text-muted-foreground",
)}
title={high ? t.highWaste : undefined}
>
{r.wastePct === null ? t.noData : `%${r.wastePct}`}
</span>
</p>
<p className="flex justify-between gap-2 md:block md:text-right">
<span className="text-xs text-muted-foreground md:hidden">
{t.thisMonth}
</span>
<Num value={r.thisMonth.used} unit={r.unit} />
</p>
</li>
);
})}
</ul>
</section>
))}
</div>
</>
)}
</div>
);
}
@@ -0,0 +1,353 @@
"use client";
import {
Archive,
ArchiveRestore,
ArrowLeft,
EllipsisVertical,
FolderPlus,
Pencil,
Plus,
} from "lucide-react";
import Link from "next/link";
import { useMemo, useState } from "react";
import { toast } from "sonner";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { saveStockCategoryAction, setStockCategoryArchivedAction } from "../actions";
import type { StockCategoryView, StockOption } from "../service";
const t = tr.stock.categories;
const NONE = "__none__";
type Errors = Record<string, string | undefined>;
type Pending =
| { kind: "create"; parentId: string | null }
| { kind: "edit"; category: StockCategoryView }
| { kind: "archive"; category: StockCategoryView }
| null;
/** /stok/kategoriler: ağaç, gider eşlemesi, sayım sıklığı, arşiv. */
export function StockCategoriesManager({
categories,
expenseCategories,
canWrite,
}: {
categories: StockCategoryView[];
expenseCategories: StockOption[];
canWrite: boolean;
}) {
const [pending, setPending] = useState<Pending>(null);
const [showArchived, setShowArchived] = useState(false);
const close = () => setPending(null);
const visible = categories.filter((c) => showArchived || !c.archived);
async function unarchive(c: StockCategoryView) {
const r = await setStockCategoryArchivedAction(c.id, false);
if (r.ok) toast.success(tr.stock.toast.unarchived);
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="/stok">
<ArrowLeft />
{t.back}
</Link>
</Button>
<div className="flex flex-wrap items-center justify-between gap-2">
<label className="flex items-center gap-2 text-sm">
<Checkbox checked={showArchived} onCheckedChange={(x) => setShowArchived(x === true)} />
{t.showArchived}
</label>
{canWrite ? (
<Button size="sm" onClick={() => setPending({ kind: "create", parentId: null })}>
<Plus />
{t.new}
</Button>
) : null}
</div>
{visible.length === 0 ? (
<p className="rounded-lg border border-dashed p-6 text-center text-sm text-muted-foreground">
{t.empty}
</p>
) : (
<ul className="divide-y rounded-xl border bg-card">
{visible.map((c) => (
<li
key={c.id}
className={cn("flex items-center gap-2 p-3", c.archived && "opacity-60")}
style={{ paddingLeft: `${12 + c.depth * 20}px` }}
>
<div className="min-w-0 flex-1">
<p className="flex flex-wrap items-center gap-1.5 text-sm font-medium">
<span className="truncate">{c.name}</span>
{c.isDefault ? <Badge variant="secondary">{t.defaultBadge}</Badge> : null}
{c.archived ? <Badge variant="outline">{t.archived}</Badge> : null}
</p>
<p className="truncate text-xs text-muted-foreground">
{[
c.expense
? c.expense.inherited
? t.inherited(c.expense.path)
: c.expense.path
: t.noExpense,
c.effectiveCountDays ? t.everyDays(c.effectiveCountDays) : null,
c.productCount ? t.productCount(c.productCount) : null,
]
.filter(Boolean)
.join(" · ")}
</p>
</div>
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={tr.common.actions}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{c.archived ? (
<DropdownMenuItem onSelect={() => unarchive(c)}>
<ArchiveRestore />
{t.unarchive}
</DropdownMenuItem>
) : (
<>
<DropdownMenuItem
onSelect={() => setPending({ kind: "create", parentId: c.id })}
>
<FolderPlus />
{t.addChild}
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() => setPending({ kind: "edit", category: c })}
>
<Pencil />
{t.edit}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
onSelect={() => setPending({ kind: "archive", category: c })}
>
<Archive />
{t.archive}
</DropdownMenuItem>
</>
)}
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
))}
</ul>
)}
{pending?.kind === "create" || pending?.kind === "edit" ? (
<StockCategoryDialog
category={pending.kind === "edit" ? pending.category : null}
parentId={
pending.kind === "create" ? pending.parentId : (pending.category.parentId ?? null)
}
categories={categories}
expenseCategories={expenseCategories}
onClose={close}
/>
) : null}
<AlertDialog open={pending?.kind === "archive"} onOpenChange={(o) => !o && close()}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.archiveTitle}</AlertDialogTitle>
<AlertDialogDescription>
{pending?.kind === "archive" ? t.archiveDescription(pending.category.name) : null}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={async () => {
if (pending?.kind !== "archive") return;
const r = await setStockCategoryArchivedAction(pending.category.id, true);
close();
if (r.ok) toast.success(tr.stock.toast.archived);
else toast.error(r.error);
}}
>
{t.archive}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
function StockCategoryDialog({
category,
parentId,
categories,
expenseCategories,
onClose,
}: {
category: StockCategoryView | null;
parentId: string | null;
categories: StockCategoryView[];
expenseCategories: StockOption[];
onClose: () => void;
}) {
const [v, setV] = useState({
name: category?.name ?? "",
parentId: parentId ?? "",
expenseCategoryId: category?.expenseCategoryId ?? "",
countEveryDays: category?.countEveryDays ? String(category.countEveryDays) : "",
});
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 }));
// Kendisi ve alt ağacı üst olarak seçilemez.
const parents = useMemo(() => {
if (!category) return categories.filter((c) => !c.archived);
const blocked = new Set([category.id]);
for (const c of categories) if (c.parentId && blocked.has(c.parentId)) blocked.add(c.id);
return categories.filter((c) => !c.archived && !blocked.has(c.id));
}, [categories, category]);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await saveStockCategoryAction(category?.id ?? null, v);
setBusy(false);
if (r.ok) {
toast.success(tr.stock.toast.saved);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={category ? t.editTitle : t.createTitle}
footer={
<>
<Button variant="outline" type="button" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button type="submit" form="stock-category-form" disabled={busy}>
{tr.common.save}
</Button>
</>
}
>
<form id="stock-category-form" onSubmit={submit} noValidate>
<FieldGroup>
<Field data-invalid={Boolean(errors.name)}>
<FieldLabel htmlFor="sc-name">{t.name}</FieldLabel>
<Input
id="sc-name"
value={v.name}
onChange={(e) => set("name", e.target.value)}
aria-invalid={Boolean(errors.name)}
autoFocus
/>
{errors.name ? <FieldError>{errors.name}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.parentId)}>
<FieldLabel htmlFor="sc-parent">{t.parent}</FieldLabel>
<Select
value={v.parentId || NONE}
onValueChange={(x) => set("parentId", x === NONE ? "" : x)}
>
<SelectTrigger id="sc-parent" className="w-full">
<SelectValue>
{categories.find((c) => c.id === v.parentId)?.path ?? t.noParent}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
<SelectItem value={NONE}>{t.noParent}</SelectItem>
{parents.map((c) => (
<SelectItem key={c.id} value={c.id}>
<span style={{ paddingLeft: `${c.depth * 12}px` }}>{c.name}</span>
</SelectItem>
))}
</SelectContent>
</Select>
{errors.parentId ? <FieldError>{errors.parentId}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.expenseCategoryId)}>
<FieldLabel htmlFor="sc-expense">{t.expenseCategory}</FieldLabel>
<Select
value={v.expenseCategoryId || NONE}
onValueChange={(x) => set("expenseCategoryId", x === NONE ? "" : x)}
>
<SelectTrigger id="sc-expense" className="w-full">
<SelectValue>
{expenseCategories.find((c) => c.id === v.expenseCategoryId)?.path ??
t.expenseInherit}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
<SelectItem value={NONE}>{t.expenseInherit}</SelectItem>
{expenseCategories.map((c) => (
<SelectItem key={c.id} value={c.id}>
<span style={{ paddingLeft: `${c.depth * 12}px` }}>{c.label}</span>
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription>{t.expenseHint}</FieldDescription>
{errors.expenseCategoryId ? <FieldError>{errors.expenseCategoryId}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.countEveryDays)}>
<FieldLabel htmlFor="sc-count">{t.countEveryDays}</FieldLabel>
<Input
id="sc-count"
inputMode="numeric"
value={v.countEveryDays}
onChange={(e) => set("countEveryDays", e.target.value)}
className="w-32 text-right tabular-nums"
aria-invalid={Boolean(errors.countEveryDays)}
/>
<FieldDescription>{t.countEveryDaysHint}</FieldDescription>
{errors.countEveryDays ? <FieldError>{errors.countEveryDays}</FieldError> : null}
</Field>
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}

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