45 Commits

Author SHA1 Message Date
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
suphicakir b18f918baf feat: Faz 7b - kart ve KMH dönemleri, taksitler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir c711eb8d28 chore(release): 0.7.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 6ae98a1cb4 fix(seed): çakışan transfer seedRef'leri; örnek taksitli alışverişler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 0ad52757ad feat(ui): kart özeti, KMH paneli, taksit seçimi ve kalan taksit iptali
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir cc624af69f feat(cards): kart/KMH dönem hesabı, taksitli harcama, kart ve KMH özeti servisleri, 006 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 57067b0fd0 feat: Faz 7a - planlı ve düzenli işlemler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 8c4771908c chore: CHANGELOG (Faz 7a)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 5bd2c372bf feat(seed): örnek düzenli işlemler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir cfc2b2c974 feat(ui): planlı işlemler sayfası, kural formu ve vadesi geçmiş uyarısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 04a17d2775 feat(recurring): düzenli işlem kuralları, planlı kayıt üretimi, onay/atla/ertele ve seri düzenleme
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir eaafe5dd9b docs: Faz 7 kararlarını kaydet
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 2d3a9e3a68 feat: Faz 6c - ek dosyalar, carousel ve mutabakat
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 07:55:11 +03:00
suphicakir 43053898b4 chore(release): 0.6.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 07:55:04 +03:00
suphicakir 8a9f5ddc7d feat(ui): ek ekleme alanı, carousel görüntüleyici, ekstre sayfası ve mutabakat penceresi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 07:55:04 +03:00
suphicakir 2e2e33233f feat(transactions): ek bağlama, hesap ekstresi ve mutabakat servisi, 004 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 07:55:04 +03:00
suphicakir 2e1f4d7929 feat(attachments): depolama soyutlaması, içerikten tür tespiti, sharp/HEIC dönüşümü ve yetkili dosya servisi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 07:55:04 +03:00
suphicakir 99fc9dfea6 feat: Faz 6b - işlemler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir 00f8809823 chore: typecheck route tipleri, CHANGELOG (Faz 6b)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir 3acd71fd59 feat(seed): son 6 ayın örnek işlemleri ve 003 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir dcfa2f8c8d feat(transactions): işlem formu, bölme, liste, filtreler, ayrıntı ve CSV
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir 1208e2d1eb feat(transactions): işlem servisi, bakiye hesaplama, satıcı kuralları ve izolasyon
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir d18c8a0d76 feat(shared): işlem şeması, bakiye etkisi, etiket ve CSV yardımcıları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:23:30 +03:00
suphicakir a00c953dc0 feat: Faz 6a - para, hesaplar ve kategoriler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir 904a969b18 docs: CHANGELOG (Faz 6a)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir 0558d92203 feat(seed): varsayılan kategoriler, örnek hesaplar ve 002 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir d2aa9d8ae2 feat(ui): renk paleti, ikonlar, MoneyInput ve navigasyon
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir 8dd5fd42e3 feat(accounts): hesaplar (KMH, kredi kartı, yemek kartı, yalnızca ben)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir 380ddaf303 feat(categories): kategori ağacı, varsayılan Türkçe set ve yönetim ekranı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir eaf80c6bb4 feat(shared): para, miktar ve İstanbul günü yardımcıları
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:57:58 +03:00
suphicakir 7fda139199 feat: Faz 5 - haneler, roller ve veri izolasyonu
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:35:01 +03:00
suphicakir be9f2a5c3a docs: CHANGELOG, README ve PROMPT (0.5.0)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:35:01 +03:00
suphicakir b79951601c feat(db): migration mekanizması ve ilk index migration'ı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:35:01 +03:00
suphicakir 3644e081b1 feat(households): hane seçici, ayarlar, admin hane yönetimi ve hane-yok sayfası
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:35:01 +03:00
suphicakir de91f2505a feat(households): hane rolleri, servis, DAL hane kapsamı ve denetim kaydı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:35:01 +03:00
177 changed files with 23748 additions and 139 deletions
+160 -1
View File
@@ -6,6 +6,164 @@ Biçim [Keep a Changelog](https://keepachangelog.com/tr-TR/1.1.0/) esas alınır
## [Yayınlanmamış]
## [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ı).
### Eklendi — Faz 7b: kart ve KMH dönemleri, taksitler
- Dönem hesabı (`shared/card-periods.ts`): kesim günü dahil "Hesap Kesim Dönemi", sonrası "Güncel Dönem"; kesim günü ayda yoksa ayın son günü; kesim günü bitmeden dönem kapanmış sayılmaz. Son ödeme: kesimden N gün sonra veya ayın sabit günü.
- Kart özeti (`/hesaplar/:id`, kredi kartı): toplam borç, kullanılabilir limit (gelecek taksitler dahil düşülür) ve kullanım çubuğu; hesap kesim dönemi borcu, asgari ödeme, ödenen, kalan, son ödeme tarihi ve kalan gün; güncel dönem harcaması; dönem dönem yaklaşan taksitler; planlı harcamalar; son 6 ekstre.
- Asgari ödeme: limit 50.000 TL altı %20, üstü %40; kart bazında oran girilebilir (hesap formu).
- "Borcu öde": ödeme hesabından karta transfer formu kalan dönem borcuyla dolu açılır; ödemeler dönem borcundan düşer (kısmi ödeme desteklenir).
- Taksitli harcama: kredi kartı giderinde taksit sayısı (2–36). Her taksit ayrı işlem ("Hepsiburada 4/9"); toplam kuruş kaybı olmadan bölünür; vadesi gelen taksit kendi döneminde otomatik gerçekleşir, gelecek taksitler planlıdır ve bakiyeyi etkilemez. Ayrıntıdan "Kalan taksitleri iptal et".
- KMH özeti (KMH'li banka hesabı): limit, kullanılan, kullanılabilir; geçen ve bu dönem için gün sonu eksi bakiyelerden tahmini faiz; "Faiz kaydı ekle" kesim tarihli, "Banka › Faiz" kategorili gider formunu doldurur (vergiler hariç not).
- `statements` koleksiyonu: kart/KMH dönem kayıtları (borç, asgari, ödenen, harcama, tahmini faiz); kart özeti okunurken işlemlerden yeniden hesaplanır.
- İşlem formuna ön doldurma desteği (kart ödemesi, faiz kaydı).
- Seed: iki taksitli kart alışverişi.
- `006` migration'ı: `statements` index'leri, taksit planı index'i.
- Testler: dönem/son ödeme/asgari/taksit planı/KMH faizi (birim); kart özeti tutarlılığı (bağımsız bakiye hesabıyla), ödeme etkisi, taksit üretimi ve otomatik gerçekleşme, taksit iptali, taksit kuralları, KMH faiz tahmini ve yetki (entegrasyon).
### Düzeltildi — Faz 7b
- Seed: aynı aydaki satıcısız/kategorisiz transferler aynı `seedRef`'i aldığı için kart borcu ödemesi ve aylık birikim transferleri hiç oluşmuyordu; artık oluşuyor (mevcut kayıtlar kopyalanmaz). Kart ödemesi son ödeme gününden önceye alındı.
### Eklendi — Faz 7a: planlı ve düzenli işlemler
- Düzenli işlem kuralları (`recurringRules`): gelir, gider, transfer; sabit veya tahmini tutar; günlük/haftalık/aylık/yıllık, "her N birimde bir", ayın N. günü (ayda yoksa son gün) veya ayın son günü; bitiş yok, tekrar sayısı (ör. 12) veya bitiş tarihi. Formda Türkçe tekrar açıklaması ve ilk tarihlerin önizlemesi.
- Her tekrar için `planned` durumunda planlı kayıt; bitiş tarihsiz kurallarda 12 ay ileriye kadar. Ufuk sayfa okunurken ilerletilir (zamanlanmış görev gerekmez); üretim idempotent (`recurringRuleId + occurrenceIndex` benzersiz). Planlı kayıtlar bakiyeyi etkilemez.
- `/planli`: vadesi geçmiş, yaklaşan (60 gün) ve kurallar sekmeleri; "Onayla" (tutar ve tarih düzeltilebilir), "Ertele", "Atla"; seri pozisyonu ("3/12") ve "Tahmini" rozetleri.
- Seri düzenleme: "Yalnızca bu" (kayıt seriden ayrılır), "Bu ve sonrakiler" (seri bölünür), "Tümü" (onaylanmamış planlı kayıtlar yeniden üretilir; gerçekleşen, atlanan ve ayrılmış kayıtlar korunur). Silmede "bu ve sonrakiler" / "tüm seri"; gerçekleşmiş kayıtlar silinmez.
- Dashboard'da vadesi geçmiş planlı işlem uyarısı.
- Seed: 11 örnek düzenli işlem (maaş, kira, aidat, tahmini faturalar, abonelikler, emekli maaşı; vadesi geçmiş örnek olarak 12 taksitli spor salonu).
- `005` migration'ı: `recurringRules` index'leri, işlemlerde tekrar alanları. Denetim kaydı: `recurring.delete`.
- Testler: tekrar tarihi hesabı (ay sonu, artık yıl, aralık, sayı/bitiş/ufuk) ve form şeması (birim); üretim, onay/atla/ertele, seri düzenleme ve silme, bakiye etkisizliği, yetki ve gizli hesap izolasyonu (entegrasyon).
### Değişti — Faz 7a
- İşlem listesi varsayılan olarak planlı kayıtları göstermez (durum filtresiyle görülebilir); özet toplamları seçili duruma göre hesaplanır.
## [0.6.0] - 2026-11-05
Faz 6: hesaplar, kategoriler, işlemler, ek dosyalar ve mutabakat (6a, 6b, 6c alt fazları).
### Eklendi — Faz 6c: ek dosyalar, carousel, ekstre ve mutabakat
- Depolama soyutlaması `lib/storage/` (`put`, `get`, `delete`); yerel disk sürücüsü (`UPLOAD_DIR`), atomik yazma, rastgele anahtarlar, yol geçişine karşı anahtar doğrulaması.
- Ek dosya yükleme `POST /api/files`: tür dosya içeriğinden (imza) tespit edilir — JPEG, PNG, WebP, HEIC, PDF; uzantıya güvenilmez. Dosya başına `MAX_UPLOAD_MB` (10 MB), kayıt başına 10 dosya. Origin kontrolü.
- Görseller sharp ile EXIF yönüne göre döndürülür, en fazla 2000 px'e küçültülür, WebP'ye çevrilir; EXIF/GPS dahil tüm meta veri silinir; 320 px küçük resim üretilir. iPhone HEIC dosyaları libheif (WASM, `heic-decode`) ile çözülür. PDF'ler yapı kontrolünden sonra olduğu gibi saklanır.
- Yetkili servis `GET /api/files/:id` (`?v=thumb`, `&indir=1`): oturum + hane üyeliği; bekleyen ek yalnızca yükleyene; silinmiş işlemin veya başkasının gizli hesabındaki işlemin eki görünmez (404). Dosyalara özel sıkı CSP, `nosniff`, `private` önbellek.
- `attachments` koleksiyonu (`ownerType`, `ownerId`, tür, boyut, yükleyen, sıra). Ekler işlemle aynı MongoDB transaction'ında bağlanır; hata olursa işlem de oluşmaz. Gider: yalnızca görsel; gelir ve transfer: görsel veya PDF.
- İşlem formunda küçük "Ek ekle" alanı (çoklu seçim, yükleme göstergesi, küçük önizleme, kaldırma, sayaç); yüklemeler bitmeden kaydedilemez. Kopyada ekler taşınmaz.
- Görüntüleyici: shadcn Carousel (Embla) — oklar, kaydırma, klavye okları, tam ekran, "2 / 5" göstergesi, indirme; PDF'ler ikon + "Aç" düğmesiyle. Ayrıntıda en fazla 4 küçük resim + "+N".
- Temizlik `npm run cleanup`: 24 saatten eski bağlanmamış ekler, 30 günden önce kayıttan çıkarılmış ekler ve 30 günden önce silinmiş işlemlerin ekleri (dosyalarıyla) silinir.
- Hesap ekstresi `/hesaplar/:id?ay=YYYY-MM`: ay başı/ay sonu bakiyesi, giriş/çıkış, yürüyen bakiye, mutabakat işaretleri; işlem ayrıntısı ekstreden açılır. Başkasının gizli hesabına transfer ekstrede görünür ama karşı hesap adı gizlenir.
- Mutabakat: ekstre tarihi ve bakiyesi girilir, uygulama bakiyesiyle karşılaştırılır (kredi kartında borç pozitif girilir). Fark varsa onayla "Mutabakat düzeltmesi" işlemi oluşturulur; o tarihe kadarki işlemler hesap bazında işaretlenir; `reconciliations` kaydı ve denetim kaydı (`account.reconcile`) tek transaction'da.
- `004` migration'ı: `attachments` ve `reconciliations` index'leri; işlemlerde `reconciledAccountIds` ve `isAdjustment`.
- Testler: dosya türü tespiti, depolama, ekstre yardımcıları (birim); yükleme/dönüştürme (EXIF silme, yön, boyut, HEIC), bağlama kuralları, erişim izolasyonu, temizlik, ekstre tutarlılığı, mutabakat (entegrasyon).
### Değişti — Faz 6c
- Hesap adı artık hesap ekstresini açar (gizli hesaplarda bağlantı yok).
- Bakiyeyi etkileyen alanı (tutar, tarih, tür, hesap) değiştirilen işlemin mutabakat işareti kalkar. Mutabakat düzeltmesi düzenlenemez, yalnızca silinebilir.
- İşlemlerdeki kullanılmayan `reconciledAt` alanı, hesap bazında `reconciledAccountIds` ile değiştirildi.
### Düzeltildi
- `seed:reset` işlemleri ve satıcıları silmiyordu; artık işlemler, satıcılar, ekler (diskteki dosyalarıyla) ve mutabakatlar da temizlenir.
### Eklendi — Faz 6b: işlemler
- İşlemler (`/islemler`): gelir, gider ve transfer (hesap ↔ hesap). Tutar her zaman pozitif; işaret türden gelir. Hesap bakiyeleri artık açılış bakiyesi + gerçekleşmiş işlemlerden hesaplanır (tek doğruluk kaynağı: işlemler).
- Bölünmüş işlem: en az 2 kalem, kalemler toplamı = tutar (istemci ve sunucuda aynı zod şeması); kalan tutar göstergesi, "kalanı son kaleme ekle"; listede tek satır, ayrıntıda kalemler.
- Akıllı giriş: satıcı önerileri (Türkçe normalize arama, kullanım sıklığı) ve satıcının son kullanılan kategori/hesabı; işlemi kopyalama.
- Liste: güne göre gruplama ve günlük net, gelir/gider/net özetleri, sayfalama; filtreler (tarih aralığı İstanbul gününe göre, tür, durum, hesap — transfer hedefi dahil, kategori — alt kategoriler ve bölünmüş kalemler dahil, ekleyen kişi, tutar aralığı, etiket, metin arama); filtreler URL'de.
- İşlem ayrıntısı, düzenleme ve yumuşak silme; silme bildiriminde "Geri al".
- CSV dışa aktarma (`/islemler/disa-aktar`): listedeki filtrelerle, bölünmüş işlem kalem başına satır; Türkçe Excel uyumlu (noktalı virgül, ondalık virgül, UTF-8 BOM), formül enjeksiyonu koruması.
- Hızlı ekle her ekrandan doğrudan işlem formunu açar (gider/gelir/transfer sekmeleri).
- Gizlilik: başkasının "yalnızca ben" hesabına dokunan işlemler listede, ayrıntıda ve CSV'de görünmez; o hesaba yalnızca sahibi işlem girer.
- Seed: son 6 ayın 221 gerçekçi işlemi (faker.seed(42); maaş, kira, faturalar — kışın doğalgaz yüksek, market — bir kısmı bölünmüş, yakıt, kafe, kart ödemesi, birikim, nakit çekme), satıcı kuralları; idempotent (`seedRef`).
- `003` migration'ı: `transactions` ve `payees` index'leri. Denetim kaydı: işlem silme/geri alma.
- Testler: bakiye tutarlılığı (bağımsız doğrulama dahil), izolasyon, gizli hesap, arşivli kategori, filtreler, satıcı kuralları, CSV.
### Değişti
- `npm run typecheck` önce route tiplerini üretir (`next typegen`).
### Eklendi — Faz 6a: para, hesaplar ve kategoriler
- `shared/money.ts`: Türkçe tutar ayrıştırma (`"1.250,50"` → 125050 kuruş; binlik/ondalık kuralları belgeli), `formatMoneyInput`, `sumMoney`, kuruş kaybı olmadan oransal bölme (`allocate`, `splitEvenly`).
- `shared/quantity.ts`: miktarlar birimin binde biri tamsayı (`1,5 kg` → 1500); ayrıştırma, biçimlendirme, kg↔g / lt↔ml dönüşümü.
- `shared/dates.ts`: İstanbul günü yardımcıları (gün başlangıcı, UTC → yerel gün).
- Hesaplar (`/hesaplar`): nakit, vadesiz banka (KMH limiti, aylık faiz, kesim günü), birikim, kredi kartı (limit, kesim günü, son ödeme kuralı, ödeme hesabı), yemek kartı (sağlayıcı); hesap sahibi kişi ve "yalnızca ben" (bakiyeyi yalnızca hesap sahibi görür, toplamlar hane ayarına uyar); renk/ikon, sıralama, arşiv. Varlık / kart borcu / net özet.
- Kategoriler (`/kategoriler`): gelir ve gider ağaçları (5 seviyeye kadar), ekleme, düzenleme, taşıma (alt ağaçla, transaction), sıralama, arşivleme (alt ağaçla); kardeşler arasında ad tekrarı engeli (Türkçe normalize).
- Varsayılan Türkçe kategori seti (44 kategori): yeni hanede aynı transaction'da, mevcut hanelere `002` migration'ıyla, idempotent (`defaultKey`).
- Kategori ağacı saf fonksiyonları (`buildTree`, `toOptions`, `checkMove`, `rollupTotals` …) ve birim testleri.
- Renk paleti (13 renk, açık/koyu tema değişkenleri) ve ikon kayıt tablosu; ikon/renk seçiciler, `MoneyInput`.
- Seed: varsayılan kategoriler ve 7 örnek hesap (KMH'li banka, kredi kartı, birikim, "yalnızca ben" yemek kartı).
- Denetim kaydı: hesap oluşturma/düzenleme/arşiv, kategori taşıma/arşiv.
- Entegrasyon testleri: kategori ve hesap izolasyonu, roller, gizli bakiye, kart kuralları, ağaç kuralları.
## [0.5.0] - 2026-11-05
Faz 5: Haneler, hane içi roller ve veri izolasyonu.
### Eklendi
- Hane içi roller (`viewer < member < owner`) ve kuralları: son sahip düşürülemez veya çıkarılamaz.
- DAL: `getHouseholdContext` (istek başına tek okuma), `requireActiveHousehold(minRole)`, `getHouseholdActionContext(minRole)`, `requireHouseholdMember(householdId, minRole)`. Sistem admini için hane verisinde ayrıcalık yok.
- Hane servisi (`features/households/service.ts`, framework'ten bağımsız): her hane kapsamlı fonksiyon üyeliği kendisi de doğrular; hane oluşturma + ilk sahip + denetim kaydı tek MongoDB transaction'ında.
- Aktif hane seçici (üst bar): seçim sunucuda doğrulanır, `butcem.hh` cookie'sine yazılır; geçersiz/uydurma cookie yok sayılır. Tercih yoksa en yüksek rolün olduğu hane açılır.
- `/ayarlar`: hane adı, bütçe ayı başlangıç günü, taksit modu, günlük plan dağıtımı, "yalnızca ben" hesaplarının toplamlara dahil edilmesi, ek mağaza tasarruf eşiği; üye rolleri ve üye çıkarma (yalnızca sahip; diğer roller salt okunur).
- `/admin/haneler`: hane oluşturma (ilk sahip seçerek), kullanıcıyı haneye ekleme, hane içi rol değiştirme, üye çıkarma.
- `/hane-yok`: hiçbir haneye üye olmayan kullanıcılar için yönlendirme sayfası.
- Denetim kaydı (`auditLogs`): hane ayarları, üye ekleme/rol/çıkarma, hane oluşturma ve tüm admin kullanıcı işlemleri (oluşturma, düzenleme, rol, şifre sıfırlama, askı, silme).
- Migration mekanizması: `npm run migrate`, `scripts/migrations/NNN-*.ts`, uygulananlar `migrations` koleksiyonunda; `001-initial-indexes`. Seed önce migration'ları çalıştırır.
- Veri izolasyonu entegrasyon testleri (başka hanenin üyeliği/ayrıntısı/ayarları, rol yetersizliği, uydurma ve enjeksiyon denemesi kimlikler, hanesi olmayan admin, çapraz hane üyelik değişikliği, son sahip, transaction).
### Değişti
- İzleyici (viewer) rolünde Hızlı ekle gizlenir/pasifleşir.
- Kullanıcı silindiğinde tüm hane üyelikleri de temizlenir.
### Kaldırıldı
- Hane mock verisi.
## [0.4.0] - 2026-11-05
Faz 4: Örnek test verisi.
@@ -94,7 +252,8 @@ 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.4.0...HEAD
[Yayınlanmamış]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.5.0...HEAD
[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
[0.2.0]: https://gitea.ta1sph.info/suphicakir/butcem/compare/v0.1.0...v0.2.0
+19 -10
View File
@@ -52,16 +52,25 @@ Giriş kullanıcı adı **veya** e-posta ile yapılır. Kayıt kapalıdır; kull
## Scriptler
| Komut | Açıklama |
| ----------------------------- | -------------------------------- |
| `npm run dev` | Geliştirme sunucusu |
| `npm run build` / `start` | Üretim build'i / sunucusu |
| `npm run lint` | ESLint |
| `npm run typecheck` | `tsc --noEmit` |
| `npm run test` | Vitest birim testleri |
| `npm run format` | Prettier |
| `npm run db:up` / `db:down` | Lokal MongoDB'yi başlat / durdur |
| `npm run seed` / `seed:reset` | Örnek veri (Faz 4) |
| Komut | Açıklama |
| ----------------------------- | --------------------------------- |
| `npm run dev` | Geliştirme sunucusu |
| `npm run build` / `start` | Üretim build'i / sunucusu |
| `npm run lint` | ESLint |
| `npm run typecheck` | `tsc --noEmit` |
| `npm run test` | Vitest birim testleri |
| `npm run format` | Prettier |
| `npm run db:up` / `db:down` | Lokal MongoDB'yi başlat / durdur |
| `npm run seed` / `seed:reset` | Örnek veri (Faz 4) |
| `npm run test:integration` | Entegrasyon testleri (MongoDB) |
| `npm run migrate` | Bekleyen migration'lar |
| `npm run cleanup` | Eski/bağlanmamış ek dosyaları sil |
## Haneler ve yetki
- Tüm alan verisi bir **haneye** (`householdId`) aittir; kullanıcı yalnızca üyesi olduğu hanelerin verisini görür. Sistem admini de bu kurala tabidir.
- Hane içi roller: **sahip** (ayarlar, üyeler), **üye** (veri girer), **izleyici** (yalnızca görüntüler).
- Her sayfa, Server Action ve API, hane yetkisini `src/lib/dal.ts` üzerinden sunucuda doğrular; servisler de üyeliği ayrıca kontrol eder.
## Marka dosyaları
+3
View File
@@ -317,6 +317,9 @@ Aşağıdakileri varsayılan olarak kabul ettim. Faz 0'da yalnızca bunlardan em
- **Değerleme:** varlıklar ve aynî alacaklar **alış** fiyatıyla, aynî borçlar **satış** fiyatıyla değerlenir. Tek fiyat girilirse ikisine de yazılır.
- **URL'ler:** ekran yolları Türkçe ASCII (`/islemler`, `/butce`); kod, koleksiyon adları ve `/api/v1` İngilizce.
- **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.
- **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir.
---
+24 -1
View File
@@ -42,10 +42,24 @@ const securityHeaders = [
[{ key: "Strict-Transport-Security", value: "max-age=31536000" }]),
];
/**
* /api/files: kullanıcı dosyaları (WebP görsel, PDF). Sayfa CSP'si yerine daha sıkı bir politika:
* betik yok; PDF'in tarayıcı görüntüleyicisinde açılabilmesi için object-src 'self'.
*/
const fileCsp = [
"default-src 'none'",
"img-src 'self'",
"style-src 'unsafe-inline'",
"object-src 'self'",
"frame-ancestors 'self'",
].join("; ");
const nextConfig: NextConfig = {
// Docker imajı için yalnızca gerekli dosyaları .next/standalone altına kopyala.
output: "standalone",
poweredByHeader: false,
// HEIC çözücü (libheif WASM) bundle'a girmesin; Node require ile yüklensin.
serverExternalPackages: ["heic-decode", "libheif-js"],
experimental: {
agentFeedback: true,
},
@@ -60,7 +74,16 @@ const nextConfig: NextConfig = {
},
},
async headers() {
return [{ source: "/:path*", headers: securityHeaders }];
return [
{ source: "/:path((?!api/files/).*)", headers: securityHeaders },
{
source: "/api/files/:path*",
headers: [
...securityHeaders.filter((h) => h.key !== "Content-Security-Policy"),
{ key: "Content-Security-Policy", value: fileCsp },
],
},
];
},
};
+53 -2
View File
@@ -1,18 +1,20 @@
{
"name": "butcem",
"version": "0.1.0",
"version": "0.8.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "butcem",
"version": "0.1.0",
"version": "0.8.0",
"dependencies": {
"@hookform/resolvers": "^7.0.2",
"@tanstack/react-table": "^9.3.1",
"better-auth": "^1.7.17",
"class-variance-authority": "^0.7.1",
"cn": "^0.5.2",
"embla-carousel-react": "^8.6.0",
"heic-decode": "^2.1.0",
"lucide-react": "^1.68.0",
"mongodb": "~7.7",
"mongoose": "^9.11.4",
@@ -6861,6 +6863,34 @@
"integrity": "sha512-LnPnRZ0esKB9NjsSIaC+mffW+5dAtBui6kbK5f9Qykblj4Q33cn6yIhuCcTVjwpvL3YJPqqQ4IlsNyriGNpyFQ==",
"license": "ISC"
},
"node_modules/embla-carousel": {
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
"integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
"license": "MIT"
},
"node_modules/embla-carousel-react": {
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/embla-carousel-react/-/embla-carousel-react-8.6.0.tgz",
"integrity": "sha512-0/PjqU7geVmo6F734pmPqpyHqiM99olvyecY7zdweCw+6tKEXnrE90pBiBbMMU8s5tICemzpQ3hi5EpxzGW+JA==",
"license": "MIT",
"dependencies": {
"embla-carousel": "8.6.0",
"embla-carousel-reactive-utils": "8.6.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.1 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
}
},
"node_modules/embla-carousel-reactive-utils": {
"version": "8.6.0",
"resolved": "https://registry.npmjs.org/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.6.0.tgz",
"integrity": "sha512-fMVUDUEx0/uIEDM0Mz3dHznDhfX+znCCDCeIophYb1QGVM7YThSWX+wz11zlYwWFOr74b4QLGg0hrGPJeG2s4A==",
"license": "MIT",
"peerDependencies": {
"embla-carousel": "8.6.0"
}
},
"node_modules/emoji-regex": {
"version": "9.2.2",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -8205,6 +8235,18 @@
"node": ">= 0.4"
}
},
"node_modules/heic-decode": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/heic-decode/-/heic-decode-2.1.0.tgz",
"integrity": "sha512-0fB3O3WMk38+PScbHLVp66jcNhsZ/ErtQ6u2lMYu/YxXgbBtl+oKOhGQHa4RpvE68k8IzbWkABzHnyAIjR758A==",
"license": "ISC",
"dependencies": {
"libheif-js": "^1.19.8"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/hermes-estree": {
"version": "0.25.1",
"resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
@@ -9076,6 +9118,15 @@
"node": ">= 0.8.0"
}
},
"node_modules/libheif-js": {
"version": "1.23.5",
"resolved": "https://registry.npmjs.org/libheif-js/-/libheif-js-1.23.5.tgz",
"integrity": "sha512-umXZPthnWZtF3iG/5mQG+AZ2V6i0UeYpo3z2CkggTEgL8dKmIIwJT6TDuAMuabXa1yTW8uJ1ZAgR+CxNTklYYw==",
"license": "LGPL-3.0",
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/lightningcss": {
"version": "1.33.0",
"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
+7 -3
View File
@@ -1,6 +1,6 @@
{
"name": "butcem",
"version": "0.4.0",
"version": "0.8.0",
"private": true,
"description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması",
"engines": {
@@ -11,7 +11,7 @@
"build": "next build",
"start": "next start",
"lint": "eslint",
"typecheck": "tsc --noEmit",
"typecheck": "next typegen && tsc --noEmit",
"test": "vitest run",
"test:watch": "vitest",
"format": "prettier --write .",
@@ -21,7 +21,9 @@
"seed": "tsx --conditions=react-server --env-file=.env.local scripts/seed.ts",
"seed:reset": "tsx --conditions=react-server --env-file=.env.local scripts/seed.ts --reset",
"icons": "tsx scripts/generate-icons.ts",
"test:integration": "vitest run --config vitest.integration.config.mts"
"test:integration": "vitest run --config vitest.integration.config.mts",
"migrate": "tsx --conditions=react-server --env-file=.env.local scripts/migrate.ts",
"cleanup": "tsx --conditions=react-server --env-file=.env.local scripts/cleanup.ts"
},
"dependencies": {
"@hookform/resolvers": "^7.0.2",
@@ -29,6 +31,8 @@
"better-auth": "^1.7.17",
"class-variance-authority": "^0.7.1",
"cn": "^0.5.2",
"embla-carousel-react": "^8.6.0",
"heic-decode": "^2.1.0",
"lucide-react": "^1.68.0",
"mongodb": "~7.7",
"mongoose": "^9.11.4",
+18
View File
@@ -0,0 +1,18 @@
/**
* Ek dosya temizliği: npm run cleanup (canlıda günlük zamanlanmış görev; bkz. Faz 15).
* 24 saatten eski bağlanmamış ekler ve 30 günden önce silinmiş kayıtların ekleri fiziksel olarak silinir.
*/
import mongoose from "mongoose";
import { purgeAttachments } from "@/features/attachments/service";
import { getMongoClient } from "@/lib/db/mongo";
purgeAttachments()
.then(({ removed }) => console.log(`✓ Temizlenen ek dosya: ${removed}`))
.catch((err: unknown) => {
console.error(err instanceof Error ? err.message : err);
process.exitCode = 1;
})
.finally(async () => {
await mongoose.disconnect();
await getMongoClient().close();
});
+17
View File
@@ -0,0 +1,17 @@
/**
* Migration'ları uygular: npm run migrate (canlıda deploy sonrası; bkz. docs/DEPLOY.md, Faz 15).
* `server-only` modülleri Next dışında yükleyebilmek için --conditions=react-server ile çalışır.
*/
import mongoose from "mongoose";
import { getMongoClient } from "@/lib/db/mongo";
import { runMigrations } from "./migrations";
runMigrations()
.catch((err: unknown) => {
console.error(err instanceof Error ? err.message : err);
process.exitCode = 1;
})
.finally(async () => {
await mongoose.disconnect();
await getMongoClient().close();
});
View File
+15
View File
@@ -0,0 +1,15 @@
import { AuditLogModel } from "@/models/audit-log";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import type { Migration } from "./types";
/** Hane, üyelik ve denetim kaydı index'leri (Mongoose şemalarındaki tanımlarla). */
export const migration: Migration = {
name: "001-initial-indexes",
description: "households, householdMembers ve auditLogs index'leri",
async up() {
await HouseholdModel.createIndexes();
await HouseholdMemberModel.createIndexes();
await AuditLogModel.createIndexes();
},
};
@@ -0,0 +1,19 @@
import { Types } from "mongoose";
import { installDefaultCategories } from "@/features/categories/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { HouseholdModel } from "@/models/household";
import type { Migration } from "./types";
/** Hesap ve kategori index'leri + mevcut hanelere varsayılan kategori seti (idempotent). */
export const migration: Migration = {
name: "002-accounts-categories",
description: "accounts/categories index'leri ve mevcut hanelere varsayılan kategoriler",
async up() {
await AccountModel.createIndexes();
await CategoryModel.createIndexes();
for (const h of await HouseholdModel.find().select({ _id: 1, createdBy: 1 }).lean()) {
await installDefaultCategories(h._id as Types.ObjectId, h.createdBy as Types.ObjectId);
}
},
};
+12
View File
@@ -0,0 +1,12 @@
import { PayeeModel } from "@/models/payee";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "003-transactions",
description: "transactions ve payees index'leri",
async up() {
await TransactionModel.createIndexes();
await PayeeModel.createIndexes();
},
};
@@ -0,0 +1,20 @@
import { AttachmentModel } from "@/models/attachment";
import { ReconciliationModel } from "@/models/reconciliation";
import type { Migration } from "./types";
export const migration: Migration = {
name: "004-attachments-reconciliation",
description: "attachments ve reconciliations index'leri; işlemlerde mutabakat alanları",
async up(db) {
await AttachmentModel.createIndexes();
await ReconciliationModel.createIndexes();
const tx = db.collection("transactions");
// reconciledAt (hiç kullanılmadı) → hesap bazında reconciledAccountIds.
await tx.updateMany({ reconciledAt: { $exists: true } }, { $unset: { reconciledAt: "" } });
await tx.updateMany(
{ reconciledAccountIds: { $exists: false } },
{ $set: { reconciledAccountIds: [] } },
);
await tx.updateMany({ isAdjustment: { $exists: false } }, { $set: { isAdjustment: false } });
},
};
+17
View File
@@ -0,0 +1,17 @@
import { RecurringRuleModel } from "@/models/recurring-rule";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "005-recurring",
description: "recurringRules index'leri; işlemlerde tekrar alanları ve benzersiz tekrar index'i",
async up(db) {
const tx = db.collection("transactions");
await tx.updateMany(
{ occurrenceIndex: { $exists: false } },
{ $set: { occurrenceIndex: null, detached: false, isEstimate: false } },
);
await RecurringRuleModel.createIndexes();
await TransactionModel.createIndexes();
},
};
+12
View File
@@ -0,0 +1,12 @@
import { CardStatementModel } from "@/models/card-statement";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "006-card-statements",
description: "statements (kart/KMH dönemleri) index'leri; taksit planı index'i",
async up() {
await CardStatementModel.createIndexes();
await TransactionModel.createIndexes();
},
};
+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();
},
};
+42
View File
@@ -0,0 +1,42 @@
import { getDb } from "@/lib/db/mongo";
import { connectMongoose } from "@/lib/db/mongoose";
import { migration as m001 } from "./001-initial-indexes";
import { migration as m002 } from "./002-accounts-categories";
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 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, m007, m008];
const COLLECTION = "migrations";
/**
* Uygulanmamış migration'ları sırayla çalıştırır; her biri bir kez (`migrations` koleksiyonu).
* Aynı anda iki çalıştırma olursa benzersiz `name` index'i ikinci kaydı reddeder.
*/
export async function runMigrations(log: (line: string) => void = console.log): Promise<string[]> {
const db = getDb();
await connectMongoose();
const col = db.collection<{ name: string; appliedAt: Date; durationMs: number }>(COLLECTION);
await col.createIndex({ name: 1 }, { unique: true });
const applied = new Set(
(await col.find({}, { projection: { name: 1 } }).toArray()).map((d) => d.name),
);
const ran: string[] = [];
for (const m of MIGRATIONS) {
if (applied.has(m.name)) continue;
const started = Date.now();
await m.up(db);
await col.insertOne({ name: m.name, appliedAt: new Date(), durationMs: Date.now() - started });
ran.push(m.name);
log(`✓ Migration: ${m.name} — ${m.description}`);
}
if (!ran.length) log("• Bekleyen migration yok.");
return ran;
}
+8
View File
@@ -0,0 +1,8 @@
import type { Db } from "mongodb";
/** Bir migration: adı dosya adıyla aynı olmalı (ör. "001-initial-indexes"). Geri alma yok; ileri yönlü. */
export type Migration = {
name: string;
description: string;
up: (db: Db) => Promise<void>;
};
+4 -2
View File
@@ -11,8 +11,10 @@ import { closeSeedConnections, runSeed } from "./seed/run";
async function main() {
const summary = await runSeed({ reset: process.argv.includes("--reset") });
const { users, households, memberships } = summary.created;
console.log(`\nOluşturulan: ${users} kullanıcı, ${households} hane, ${memberships} üyelik.`);
const { users, households, memberships, categories, accounts, transactions } = summary.created;
console.log(
`\nOluşturulan: ${users} kullanıcı, ${households} hane, ${memberships} üyelik, ${categories} kategori, ${accounts} hesap, ${transactions} işlem.`,
);
// Hesap tablosu yalnızca geliştirme ortamında gösterilir.
if (env().NODE_ENV !== "production" && summary.accounts.length) {
+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;
}
+96
View File
@@ -1,4 +1,6 @@
import type { HouseholdRole } from "@/features/households/types";
import type { AccountType, MealCardProvider } from "@/shared/accounts";
import type { IconKey, Swatch } from "@/shared/appearance";
import type { SystemRole } from "@/shared/schemas/common";
/** Örnek (geliştirme) kullanıcıları. E-postası olmayanlar kullanıcı adıyla giriş yapar. */
@@ -56,3 +58,97 @@ export const SEED_HOUSEHOLDS: SeedHousehold[] = [
],
},
];
/** Örnek hesaplar (tutarlar kuruş; kart borcu negatif). Açılış: 6 ay önce. */
export type SeedAccount = {
household: string;
name: string;
type: AccountType;
institution?: string;
openingBalanceMinor: number;
color: Swatch;
icon: IconKey;
owner?: string;
isPrivate?: boolean;
mealCardProvider?: MealCardProvider;
overdraft?: { limitMinor: number; monthlyRateBp: number; statementDay: number };
creditCard?: {
limitMinor: number;
statementDay: number;
dueDays: number;
paymentAccount: string;
};
};
export const SEED_ACCOUNTS: SeedAccount[] = [
{
household: "Çakır Ailesi",
name: "Cüzdan",
type: "cash",
openingBalanceMinor: 2_350_00,
color: "green",
icon: "wallet",
},
{
household: "Çakır Ailesi",
name: "Ziraat Maaş",
type: "bank",
institution: "Ziraat Bankası",
openingBalanceMinor: 18_420_50,
color: "red",
icon: "landmark",
overdraft: { limitMinor: 10_000_00, monthlyRateBp: 425, statementDay: 1 },
},
{
household: "Çakır Ailesi",
name: "Garanti Bonus",
type: "credit_card",
institution: "Garanti BBVA",
openingBalanceMinor: -6_480_75,
color: "teal",
icon: "credit-card",
creditCard: {
limitMinor: 60_000_00,
statementDay: 29,
dueDays: 10,
paymentAccount: "Ziraat Maaş",
},
},
{
household: "Çakır Ailesi",
name: "Birikim (Vadeli)",
type: "savings",
institution: "Ziraat Bankası",
openingBalanceMinor: 45_000_00,
color: "indigo",
icon: "piggy-bank",
},
{
household: "Çakır Ailesi",
name: "Ayşe — Pluxee",
type: "meal_card",
mealCardProvider: "pluxee",
openingBalanceMinor: 3_120_00,
color: "lime",
icon: "utensils",
owner: "ayse",
isPrivate: true,
},
{
household: "Annemler",
name: "Nakit",
type: "cash",
openingBalanceMinor: 1_500_00,
color: "green",
icon: "wallet",
},
{
household: "Annemler",
name: "Vakıfbank Emekli",
type: "bank",
institution: "VakıfBank",
openingBalanceMinor: 27_800_00,
color: "amber",
icon: "landmark",
},
];
+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;
}
+68
View File
@@ -0,0 +1,68 @@
import type { Types } from "mongoose";
import { createTransaction } from "@/features/transactions/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
/**
* Örnek taksitli kart harcamaları (Faz 7b): bir kısmı gerçekleşmiş, kalanı planlı taksitler.
* İdempotent: aynı satıcıyla taksit planı varsa atlanır.
*/
const PURCHASES = [
{
payee: "Hepsiburada",
description: "Çamaşır makinesi",
amountMinor: 18_000_00,
count: 9,
daysAgo: 75,
category: "ev",
by: "admin",
},
{
payee: "Teknosa",
description: "Telefon",
amountMinor: 12_000_00,
count: 6,
daysAgo: 20,
category: "diger-gider",
by: "emre",
},
];
export async function seedInstallments(
householdId: Types.ObjectId,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
const card = await AccountModel.findOne({ householdId, name: "Garanti Bonus" }).lean();
if (!card) return 0;
let created = 0;
for (const p of PURCHASES) {
const exists = await TransactionModel.exists({
householdId,
payeeName: p.payee,
"installment.planId": { $type: "objectId" },
});
if (exists) continue;
const category = await CategoryModel.findOne({ householdId, defaultKey: p.category }).lean();
const r = await createTransaction(userIds.get(p.by)!, String(householdId), {
type: "expense",
amount: p.amountMinor,
date: addDays(today, -p.daysAgo),
accountId: String(card._id),
toAccountId: null,
categoryId: String(category!._id),
splits: [],
payee: p.payee,
description: p.description,
tags: [],
installments: p.count,
attachmentIds: [],
});
if (!r.ok) throw new Error(`Seed taksiti oluşturulamadı (${p.payee}): ${r.error}`);
created++;
}
return created;
}
+201
View File
@@ -0,0 +1,201 @@
import type { Types } from "mongoose";
import { createRule } from "@/features/recurring/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { RecurringRuleModel } from "@/models/recurring-rule";
import { todayIstanbul } from "@/shared/dates";
import { addDays, addMonths } from "@/shared/recurrence";
import { recurringRuleFormSchema, type RecurringRuleFormInput } from "@/shared/schemas/recurring";
import { formatMoneyInput } from "@/shared/money";
/**
* Örnek düzenli işlemler (Faz 7a). Seed işlemleri bugüne kadarki günleri doldurur; kurallar bir
* sonraki gerçekleşme gününden başlar (çakışma yok). "Spor salonu" kasıtlı olarak 3 gün önce
* başlar: vadesi geçmiş planlı kayıt örneği. İdempotent (`seedRef`).
*/
type SeedRule = {
ref: string;
by: string;
type: "income" | "expense" | "transfer";
amountMinor: number;
account: string;
category?: string;
payee: string;
/** Ayın günü (bir sonraki gerçekleşme) veya bugüne göre gün farkı. */
day?: number;
offsetDays?: number;
isEstimate?: boolean;
count?: number;
};
const RULES: Record<string, SeedRule[]> = {
"Çakır Ailesi": [
{
ref: "maas",
by: "admin",
type: "income",
amountMinor: 52_000_00,
account: "Ziraat Maaş",
category: "maas",
payee: "Anadolu Yazılım A.Ş.",
day: 15,
},
{
ref: "kira",
by: "admin",
type: "expense",
amountMinor: 17_500_00,
account: "Ziraat Maaş",
category: "kira",
payee: "Ev sahibi",
day: 3,
},
{
ref: "aidat",
by: "admin",
type: "expense",
amountMinor: 1_250_00,
account: "Ziraat Maaş",
category: "aidat",
payee: "Site yönetimi",
day: 5,
},
{
ref: "elektrik",
by: "ayse",
type: "expense",
amountMinor: 1_200_00,
account: "Ziraat Maaş",
category: "faturalar.elektrik",
payee: "Enerjisa",
day: 10,
isEstimate: true,
},
{
ref: "su",
by: "ayse",
type: "expense",
amountMinor: 450_00,
account: "Ziraat Maaş",
category: "faturalar.su",
payee: "İSKİ",
day: 12,
isEstimate: true,
},
{
ref: "dogalgaz",
by: "ayse",
type: "expense",
amountMinor: 2_500_00,
account: "Ziraat Maaş",
category: "faturalar.dogalgaz",
payee: "İGDAŞ",
day: 14,
isEstimate: true,
},
{
ref: "internet",
by: "admin",
type: "expense",
amountMinor: 499_90,
account: "Garanti Bonus",
category: "faturalar.internet",
payee: "Türk Telekom",
day: 20,
},
{
ref: "netflix",
by: "admin",
type: "expense",
amountMinor: 229_99,
account: "Garanti Bonus",
category: "abonelikler",
payee: "Netflix",
day: 8,
},
{
ref: "spor",
by: "emre",
type: "expense",
amountMinor: 1_250_00,
account: "Garanti Bonus",
category: "eglence",
payee: "Spor salonu",
offsetDays: -3,
count: 12,
},
],
Annemler: [
{
ref: "emekli",
by: "fatma",
type: "income",
amountMinor: 24_350_00,
account: "Vakıfbank Emekli",
category: "maas",
payee: "SGK",
day: 17,
},
{
ref: "elektrik",
by: "fatma",
type: "expense",
amountMinor: 700_00,
account: "Vakıfbank Emekli",
category: "faturalar.elektrik",
payee: "Enerjisa",
day: 11,
isEstimate: true,
},
],
};
/** Bugünden sonraki ilk "ayın N. günü". */
function nextMonthDay(today: string, day: number): string {
const thisMonth = addMonths(today, 0, day);
return thisMonth > today ? thisMonth : addMonths(today, 1, day);
}
export async function seedRecurring(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
let created = 0;
for (const [household, rules] of Object.entries(RULES)) {
const householdId = householdIds.get(household)!;
const [accounts, categories] = await Promise.all([
AccountModel.find({ householdId }).select({ name: 1 }).lean(),
CategoryModel.find({ householdId, defaultKey: { $ne: null } })
.select({ defaultKey: 1 })
.lean(),
]);
for (const r of rules) {
const seedRef = `rule:${r.ref}`;
if (await RecurringRuleModel.exists({ householdId, seedRef })) continue;
const input: RecurringRuleFormInput = {
type: r.type,
amount: formatMoneyInput(r.amountMinor),
isEstimate: r.isEstimate ?? false,
accountId: String(accounts.find((a) => a.name === r.account)!._id),
categoryId: r.category
? String(categories.find((c) => c.defaultKey === r.category)!._id)
: null,
payee: r.payee,
startDate: r.day ? nextMonthDay(today, r.day) : addDays(today, r.offsetDays ?? 0),
frequency: "monthly",
endKind: r.count ? "count" : "never",
count: r.count ?? null,
};
const result = await createRule(
userIds.get(r.by)!,
String(householdId),
recurringRuleFormSchema.parse(input),
);
if (!result.ok) throw new Error(`Seed kuralı oluşturulamadı (${seedRef}): ${result.error}`);
await RecurringRuleModel.updateOne({ _id: result.data.id }, { $set: { seedRef } });
created++;
}
}
return created;
}
+31 -2
View File
@@ -24,22 +24,51 @@ describe("seed", () => {
it("ilk çalıştırmada admin, örnek kullanıcılar, haneler ve üyelikleri oluşturur", async () => {
const summary = await runSeed({ log: silent });
const memberCount = SEED_HOUSEHOLDS.reduce((n, h) => n + h.members.length, 0);
expect(summary.created).toEqual({
expect(summary.created).toMatchObject({
users: SEED_USERS.length + 1,
households: SEED_HOUSEHOLDS.length,
memberships: memberCount,
});
expect(summary.created.categories).toBeGreaterThan(40);
expect(summary.created.accounts).toBe(7);
expect(summary.created.transactions).toBeGreaterThan(150);
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdMemberModel.countDocuments()).toBe(memberCount);
});
it("idempotenttir: ikinci çalıştırma kopya oluşturmaz", async () => {
const summary = await runSeed({ log: silent });
expect(summary.created).toEqual({ users: 0, households: 0, memberships: 0 });
expect(summary.created).toEqual({
users: 0,
households: 0,
memberships: 0,
categories: 0,
accounts: 0,
transactions: 0,
recurringRules: 0,
installmentPlans: 0,
contacts: 0,
inKind: 0,
});
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length);
});
it("aynı aydaki transferlerin hepsi oluşur (seedRef çakışması yok)", async () => {
const tx = getDb().collection("transactions");
const months = new Set(
(await tx.find({ description: "ATM" }).toArray()).map((t) => t.seedRef.split(":")[1]),
);
expect(months.size).toBeGreaterThanOrEqual(5);
// Her ay ATM'nin yanında kart ödemesi ve birikim de var (ayın 7'si geçmişse).
expect(await tx.countDocuments({ description: "Kart borcu ödemesi" })).toBeGreaterThanOrEqual(
months.size - 1,
);
expect(await tx.countDocuments({ description: "Aylık birikim" })).toBeGreaterThanOrEqual(
months.size - 1,
);
});
it("roller ve askı durumu doğru", async () => {
const users = await getDb()
.collection("user")
+131 -8
View File
@@ -3,10 +3,25 @@ import { getAuth } from "@/lib/auth";
import { getDb } from "@/lib/db/mongo";
import { connectMongoose } from "@/lib/db/mongoose";
import { env } from "@/lib/env";
import { getStorage } from "@/lib/storage";
import { installDefaultCategories } from "@/features/categories/service";
import { AccountModel } from "@/models/account";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import { storedEmail } from "@/shared/account-email";
import { ADMIN_USERNAME, SEED_HOUSEHOLDS, SEED_USERS, type SeedUser } from "./fixtures";
import { runMigrations } from "../migrations";
import { seedContacts } from "./contacts";
import { seedInKind } from "./in-kind";
import { seedInstallments } from "./installments";
import { seedRecurring } from "./recurring";
import { seedTransactions } from "./transactions";
import {
ADMIN_USERNAME,
SEED_ACCOUNTS,
SEED_HOUSEHOLDS,
SEED_USERS,
type SeedUser,
} from "./fixtures";
/**
* İdempotent seed. Kullanıcılar Better Auth API'siyle oluşturulur (şifreler doğru hashlenir);
@@ -25,12 +40,38 @@ export type SeedAccountRow = {
};
export type SeedSummary = {
created: { users: number; households: number; memberships: number };
created: {
users: number;
households: number;
memberships: number;
categories: number;
accounts: number;
transactions: number;
recurringRules: number;
installmentPlans: number;
contacts: number;
inKind: number;
};
accounts: SeedAccountRow[];
};
const AUTH_COLLECTIONS = ["user", "account", "session", "verification", "rateLimit"];
const DOMAIN_COLLECTIONS = ["households", "householdMembers"];
const DOMAIN_COLLECTIONS = [
"households",
"householdMembers",
"auditLogs",
"categories",
"accounts",
"transactions",
"payees",
"attachments",
"reconciliations",
"recurringRules",
"statements",
"contacts",
"assetPrices",
"inKindDebts",
];
type AuthApi = ReturnType<typeof getAuth>["api"];
@@ -72,20 +113,38 @@ export async function runSeed({
const db = getDb();
await connectMongoose();
const summary: SeedSummary = {
created: { users: 0, households: 0, memberships: 0 },
created: {
users: 0,
households: 0,
memberships: 0,
categories: 0,
accounts: 0,
transactions: 0,
recurringRules: 0,
installmentPlans: 0,
contacts: 0,
inKind: 0,
},
accounts: [],
};
if (reset) {
// Ek dosyaların diskteki kopyaları da silinsin (yetim dosya kalmasın).
const storage = getStorage();
for await (const a of db
.collection("attachments")
.find({}, { projection: { storageKey: 1, thumbKey: 1 } })) {
await storage.delete(String(a.storageKey));
if (a.thumbKey) await storage.delete(String(a.thumbKey));
}
for (const name of [...AUTH_COLLECTIONS, ...DOMAIN_COLLECTIONS]) {
await db.collection(name).deleteMany({});
}
log("• Kimlik doğrulama ve hane koleksiyonları temizlendi.");
}
// Index'ler (production'da Mongoose autoIndex kapalı olduğu için açıkça oluşturulur).
await HouseholdModel.createIndexes();
await HouseholdMemberModel.createIndexes();
// Index'ler ve şema değişiklikleri (production'da Mongoose autoIndex kapalı).
await runMigrations(log);
// 1) Admin
const adminEmail = e.SEED_ADMIN_EMAIL.toLowerCase();
@@ -180,7 +239,71 @@ export async function runSeed({
}
}
// 5) Geliştirme hesapları tablosu
// 5) Varsayılan kategoriler ve örnek hesaplar
const householdIds = new Map<string, Types.ObjectId>();
for (const h of SEED_HOUSEHOLDS) {
const doc = await HouseholdModel.findOne({ name: h.name }).select({ _id: 1 }).lean();
householdIds.set(h.name, doc!._id);
summary.created.categories += await installDefaultCategories(doc!._id, actor);
}
const openingDate = new Date(Date.now() - 183 * 24 * 60 * 60 * 1000);
for (const [order, a] of SEED_ACCOUNTS.entries()) {
const householdId = householdIds.get(a.household)!;
if (await AccountModel.exists({ householdId, name: a.name })) continue;
const payer = a.creditCard
? await AccountModel.findOne({ householdId, name: a.creditCard.paymentAccount })
.select({ _id: 1 })
.lean()
: null;
await AccountModel.create({
householdId,
name: a.name,
type: a.type,
institution: a.institution ?? "",
mealCardProvider: a.mealCardProvider ?? null,
openingBalanceMinor: a.openingBalanceMinor,
openingDate,
color: a.color,
icon: a.icon,
order,
ownerUserId: a.owner ? new Types.ObjectId(ids.get(a.owner)!) : null,
isPrivate: a.isPrivate ?? false,
overdraft: a.overdraft ? { enabled: true, ...a.overdraft } : null,
creditCard: a.creditCard
? {
limitMinor: a.creditCard.limitMinor,
statementDay: a.creditCard.statementDay,
dueRule: { kind: "daysAfter", value: a.creditCard.dueDays },
paymentAccountId: payer?._id ?? null,
}
: null,
createdBy: actor,
updatedBy: actor,
});
summary.created.accounts++;
}
if (summary.created.categories) log(`✓ Varsayılan kategoriler: ${summary.created.categories}`);
if (summary.created.accounts) log(`✓ Örnek hesaplar: ${summary.created.accounts}`);
// 6) Son 6 ayın örnek işlemleri (faker.seed(42), idempotent)
const userIdMap = new Map([...ids.entries()]);
summary.created.transactions = await seedTransactions(householdIds, userIdMap);
if (summary.created.transactions) log(`✓ Örnek işlemler: ${summary.created.transactions}`);
summary.created.recurringRules = await seedRecurring(householdIds, userIdMap);
if (summary.created.recurringRules)
log(`✓ Örnek düzenli işlemler: ${summary.created.recurringRules}`);
summary.created.installmentPlans = await seedInstallments(
householdIds.get("Çakır Ailesi")!,
userIdMap,
);
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}`);
// 7) Geliştirme hesapları tablosu
const all = [
{ username: ADMIN_USERNAME, name: "Yönetici", email: adminEmail, role: "admin" as const },
...SEED_USERS,
+504
View File
@@ -0,0 +1,504 @@
import { faker } from "@faker-js/faker";
import { Types } from "mongoose";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { PayeeModel } from "@/models/payee";
import { TransactionModel } from "@/models/transaction";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import { allocate } from "@/shared/money";
import { foldTr } from "@/shared/search";
import type { TransactionType } from "@/shared/transactions";
/**
* Son 6 ayın gerçekçi işlemleri (faker.seed(42) ile tekrarlanabilir).
* Her işlemin sabit `seedRef`'i vardır: tekrar çalıştırmada kopya oluşmaz.
*/
type Ctx = {
householdId: Types.ObjectId;
account: (name: string) => Types.ObjectId;
category: (key: string) => Types.ObjectId;
user: (username: string) => Types.ObjectId;
};
type SeedTx = {
ref: string;
type: TransactionType;
ymd: string;
amountMinor: number;
account: string;
toAccount?: string;
category?: string;
splits?: { category: string; weight: number; note?: string }[];
payee?: string;
description?: string;
tags?: string[];
by: string;
};
const tl = (min: number, max: number) => faker.number.int({ min: min * 100, max: max * 100 });
const pick = <T>(xs: readonly T[]) => faker.helpers.arrayElement(xs);
/** Ayın gün sayısına göre güvenli gün (31 → ayın son günü). */
function ymdOf(year: number, month: number, day: number) {
const last = new Date(Date.UTC(year, month, 0)).getUTCDate();
return `${year}-${String(month).padStart(2, "0")}-${String(Math.min(day, last)).padStart(2, "0")}`;
}
function months(count: number): { y: number; m: number; key: string }[] {
const [ty, tm] = todayIstanbul().split("-").map(Number) as [number, number];
return Array.from({ length: count }, (_, i) => {
const d = new Date(Date.UTC(ty, tm - 1 - (count - 1 - i), 1));
const y = d.getUTCFullYear();
const m = d.getUTCMonth() + 1;
return { y, m, key: `${y}-${String(m).padStart(2, "0")}` };
});
}
function cakirAiles(): SeedTx[] {
const out: SeedTx[] = [];
const marketPayees = ["Migros", "BİM", "A101", "Şok", "CarrefourSA"] as const;
for (const { y, m, key } of months(6)) {
const winter = [11, 12, 1, 2, 3].includes(m);
const d = (day: number) => ymdOf(y, m, day);
const add = (x: Omit<SeedTx, "ref">, n = 0) =>
out.push({ ...x, ref: `cakir:${key}:${x.payee ?? x.category ?? x.type}:${n}` });
add({
type: "income",
ymd: d(15),
amountMinor: 52_000_00,
account: "Ziraat Maaş",
category: "maas",
payee: "Anadolu Yazılım A.Ş.",
by: "admin",
});
add({
type: "income",
ymd: d(1),
amountMinor: 4_500_00,
account: "Ayşe — Pluxee",
category: "yemek-karti",
payee: "Pluxee",
by: "ayse",
});
add({
type: "expense",
ymd: d(3),
amountMinor: 17_500_00,
account: "Ziraat Maaş",
category: "kira",
payee: "Ev sahibi",
description: "Kira",
by: "admin",
});
add({
type: "expense",
ymd: d(5),
amountMinor: 1_250_00,
account: "Ziraat Maaş",
category: "aidat",
payee: "Site yönetimi",
by: "admin",
});
add({
type: "expense",
ymd: d(10),
amountMinor: tl(750, 1_600),
account: "Ziraat Maaş",
category: "faturalar.elektrik",
payee: "Enerjisa",
by: "ayse",
});
add({
type: "expense",
ymd: d(12),
amountMinor: tl(300, 620),
account: "Ziraat Maaş",
category: "faturalar.su",
payee: "İSKİ",
by: "ayse",
});
add({
type: "expense",
ymd: d(14),
amountMinor: winter ? tl(1_800, 3_400) : tl(350, 700),
account: "Ziraat Maaş",
category: "faturalar.dogalgaz",
payee: "İGDAŞ",
by: "ayse",
});
add({
type: "expense",
ymd: d(20),
amountMinor: 499_90,
account: "Garanti Bonus",
category: "faturalar.internet",
payee: "Türk Telekom",
by: "admin",
});
add({
type: "expense",
ymd: d(22),
amountMinor: 714_00,
account: "Garanti Bonus",
category: "faturalar.telefon",
payee: "Turkcell",
description: "2 hat",
by: "admin",
});
add({
type: "expense",
ymd: d(8),
amountMinor: 229_99,
account: "Garanti Bonus",
category: "abonelikler",
payee: "Netflix",
by: "admin",
});
add({
type: "expense",
ymd: d(9),
amountMinor: 99_99,
account: "Garanti Bonus",
category: "abonelikler",
payee: "Spotify",
by: "emre",
});
// Transferler: nakit çekme, kart ödemesi, birikim. Satıcı/kategori olmadığından seedRef
// türden üretilir; çakışmasın diye sıra numarası verilir (ATM 0 — mevcut veriyle uyumlu).
add({
type: "transfer",
ymd: d(2),
amountMinor: 2_000_00,
account: "Ziraat Maaş",
toAccount: "Cüzdan",
description: "ATM",
by: "admin",
});
add(
{
type: "transfer",
// Kesim 29, son ödeme ~8: ödeme son ödeme gününden önce.
ymd: d(7),
amountMinor: tl(11_000, 15_000),
account: "Ziraat Maaş",
toAccount: "Garanti Bonus",
description: "Kart borcu ödemesi",
by: "admin",
},
1,
);
add(
{
type: "transfer",
ymd: d(16),
amountMinor: 5_000_00,
account: "Ziraat Maaş",
toAccount: "Birikim (Vadeli)",
description: "Aylık birikim",
by: "ayse",
},
2,
);
// Market: haftada 1–2; bir kısmı bölünmüş.
const marketCount = faker.number.int({ min: 6, max: 8 });
for (let i = 0; i < marketCount; i++) {
const payee = pick(marketPayees);
const amountMinor = tl(280, 2_600);
const split = amountMinor > 1_200_00 && faker.datatype.boolean({ probability: 0.5 });
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor,
account: pick(["Garanti Bonus", "Garanti Bonus", "Cüzdan"]),
...(split
? {
splits: [
{ category: "market.gida", weight: faker.number.int({ min: 55, max: 75 }) },
{
category: "market.temizlik",
weight: faker.number.int({ min: 10, max: 25 }),
note: "Deterjan",
},
{
category: "market.kisisel-bakim",
weight: faker.number.int({ min: 5, max: 15 }),
},
],
}
: { category: "market.gida" }),
payee,
tags: faker.datatype.boolean({ probability: 0.15 }) ? ["indirim"] : [],
by: pick(["ayse", "ayse", "admin", "emre"]),
},
i,
);
}
for (let i = 0; i < faker.number.int({ min: 2, max: 3 }); i++) {
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(1_200, 2_300),
account: "Garanti Bonus",
category: "ulasim.yakit",
payee: pick(["Shell", "Opet", "BP"]),
by: "admin",
},
i,
);
}
for (let i = 0; i < faker.number.int({ min: 4, max: 6 }); i++) {
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(110, 340),
account: "Ayşe — Pluxee",
category: "eglence.kafe",
payee: pick(["Starbucks", "Kahve Dünyası", "Simit Sarayı"]),
by: "ayse",
},
i,
);
}
for (let i = 0; i < faker.number.int({ min: 2, max: 4 }); i++) {
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(450, 1_600),
account: pick(["Garanti Bonus", "Ayşe — Pluxee"]),
category: "eglence.disarida-yemek",
payee: pick(["Köfteci Yusuf", "Nusr-Et", "Big Chefs", "Yemeksepeti"]),
by: pick(["ayse", "admin"]),
},
i,
);
}
for (let i = 0; i < 4; i++) {
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(60, 220),
account: "Cüzdan",
category: "ulasim.toplu-tasima",
payee: "İstanbulkart",
by: "emre",
},
i,
);
}
if (faker.datatype.boolean({ probability: 0.6 })) {
add({
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(140, 650),
account: "Cüzdan",
category: "saglik.ilac",
payee: "Eczane",
by: "ayse",
});
}
if (faker.datatype.boolean({ probability: 0.5 })) {
add({
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(600, 3_200),
account: "Garanti Bonus",
category: "giyim",
payee: pick(["LC Waikiki", "Trendyol", "Koton"]),
by: "ayse",
});
}
}
return out;
}
function annemler(): SeedTx[] {
const out: SeedTx[] = [];
for (const { y, m, key } of months(6)) {
const winter = [11, 12, 1, 2, 3].includes(m);
const d = (day: number) => ymdOf(y, m, day);
const add = (x: Omit<SeedTx, "ref">, n = 0) =>
out.push({ ...x, ref: `annemler:${key}:${x.payee ?? x.category ?? x.type}:${n}` });
add({
type: "income",
ymd: d(17),
amountMinor: 24_350_00,
account: "Vakıfbank Emekli",
category: "maas",
payee: "SGK",
description: "Emekli maaşı",
by: "fatma",
});
add({
type: "expense",
ymd: d(11),
amountMinor: tl(450, 900),
account: "Vakıfbank Emekli",
category: "faturalar.elektrik",
payee: "Enerjisa",
by: "mehmet",
});
add({
type: "expense",
ymd: d(13),
amountMinor: winter ? tl(1_400, 2_600) : tl(250, 500),
account: "Vakıfbank Emekli",
category: "faturalar.dogalgaz",
payee: "İGDAŞ",
by: "mehmet",
});
add({
type: "transfer",
ymd: d(18),
amountMinor: 4_000_00,
account: "Vakıfbank Emekli",
toAccount: "Nakit",
description: "ATM",
by: "fatma",
});
for (let i = 0; i < 5; i++) {
add(
{
type: "expense",
ymd: d(faker.number.int({ min: 1, max: 28 })),
amountMinor: tl(200, 1_100),
account: pick(["Nakit", "Vakıfbank Emekli"]),
category: "market.gida",
payee: pick(["BİM", "Şok", "Pazar"]),
by: pick(["fatma", "mehmet"]),
},
i,
);
}
}
return out;
}
export async function seedTransactions(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
faker.seed(42);
let inserted = 0;
const plan: [string, SeedTx[]][] = [
["Çakır Ailesi", cakirAiles()],
["Annemler", annemler()],
];
const today = todayIstanbul();
for (const [householdName, txs] of plan) {
const householdId = householdIds.get(householdName)!;
const [accounts, categories] = await Promise.all([
AccountModel.find({ householdId }).select({ name: 1 }).lean(),
CategoryModel.find({ householdId, defaultKey: { $ne: null } })
.select({ defaultKey: 1 })
.lean(),
]);
const ctx: Ctx = {
householdId,
account: (name) => accounts.find((a) => a.name === name)!._id,
category: (key) => categories.find((c) => c.defaultKey === key)!._id,
user: (username) => new Types.ObjectId(userIds.get(username)!),
};
const payeeStats = new Map<
string,
{
name: string;
type: TransactionType;
account: Types.ObjectId;
category: Types.ObjectId | null;
count: number;
last: Date;
}
>();
for (const x of txs) {
if (x.ymd > today) continue; // Gelecek tarihli seed işlemi yok.
const date = istanbulDayStart(x.ymd)!;
const splits = x.splits
? allocate(
x.amountMinor,
x.splits.map((s) => s.weight),
).map((amountMinor, i) => ({
categoryId: ctx.category(x.splits![i]!.category),
amountMinor,
note: x.splits![i]!.note ?? "",
}))
: [];
const categoryId = x.category ? ctx.category(x.category) : null;
const accountId = ctx.account(x.account);
const by = ctx.user(x.by);
const doc = {
householdId,
type: x.type,
status: "posted",
date,
accountId,
toAccountId: x.toAccount ? ctx.account(x.toAccount) : null,
amountMinor: x.amountMinor,
categoryId: splits.length ? null : categoryId,
splits,
effectiveCategoryIds: splits.length
? [...new Set(splits.map((s) => String(s.categoryId)))].map(
(id) => new Types.ObjectId(id),
)
: categoryId
? [categoryId]
: [],
payeeName: x.payee ?? "",
description: x.description ?? "",
searchText: foldTr(
[x.payee ?? "", x.description ?? "", ...splits.map((s) => s.note)].join(" "),
),
tags: x.tags ?? [],
seedRef: x.ref,
createdBy: by,
updatedBy: by,
};
const res = await TransactionModel.updateOne(
{ householdId, seedRef: x.ref },
{ $setOnInsert: doc },
{ upsert: true },
);
if (res.upsertedCount) inserted++;
if (x.payee) {
const key = foldTr(x.payee);
const prev = payeeStats.get(key);
const latest = !prev || date >= prev.last;
payeeStats.set(key, {
name: x.payee,
type: latest ? x.type : prev!.type,
account: latest ? accountId : prev!.account,
category: latest ? (splits.length ? null : categoryId) : prev!.category,
count: (prev?.count ?? 0) + 1,
last: latest ? date : prev!.last,
});
}
}
for (const [nameKey, p] of payeeStats) {
await PayeeModel.updateOne(
{ householdId, nameKey },
{
$setOnInsert: { householdId, nameKey, name: p.name },
$set: {
lastType: p.type,
lastAccountId: p.account,
lastCategoryId: p.category,
useCount: p.count,
lastUsedAt: p.last,
},
},
{ upsert: true },
);
}
}
return inserted;
}
+18
View File
@@ -0,0 +1,18 @@
import type { Metadata } from "next";
import { PageHeader } from "@/components/page-header";
import { HouseholdsAdmin } from "@/features/admin-households/components/households-admin";
import { getAdminHouseholdsData } from "@/features/admin-households/queries";
import { tr } from "@/i18n/tr";
import { requireRole } from "@/lib/dal";
export const metadata: Metadata = { title: tr.adminHouseholds.title };
export default async function AdminHouseholdsPage() {
const [admin, data] = await Promise.all([requireRole("admin"), getAdminHouseholdsData()]);
return (
<>
<PageHeader title={tr.adminHouseholds.title} description={tr.adminHouseholds.description} />
<HouseholdsAdmin households={data.households} users={data.users} currentUserId={admin.id} />
</>
);
}
+50
View File
@@ -0,0 +1,50 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { HouseholdSettingsForm } from "@/features/households/components/household-settings-form";
import { SettingsMembers } from "@/features/households/components/settings-members";
import { getHouseholdDetail } from "@/features/households/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.settings.title };
export default async function SettingsPage() {
const { user, household } = await requireActiveHousehold("viewer");
const detail = await getHouseholdDetail(user.id, household.id);
if (!detail) notFound();
const isOwner = household.role === "owner";
const t = tr.settings;
return (
<>
<PageHeader title={t.title} description={t.description} />
<div className="grid gap-4 lg:grid-cols-2 lg:items-start">
<Card>
<CardHeader>
<CardTitle>{t.household}</CardTitle>
<CardDescription>{isOwner ? t.householdDescription : t.ownerOnly}</CardDescription>
</CardHeader>
<CardContent>
<HouseholdSettingsForm settings={detail.settings} canEdit={isOwner} />
</CardContent>
</Card>
<Card>
<CardHeader>
<CardTitle>{t.members}</CardTitle>
<CardDescription>{t.membersDescription}</CardDescription>
</CardHeader>
<CardContent>
<SettingsMembers
members={detail.members}
householdName={detail.name}
currentUserId={user.id}
canManage={isOwner}
/>
</CardContent>
</Card>
</div>
</>
);
}
+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")}
/>
</>
);
}
+11 -3
View File
@@ -3,8 +3,10 @@ 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 { ContactsDueBanner } from "@/features/contacts/components/due-banner";
import { OverdueBanner } from "@/features/recurring/components/overdue-banner";
import { tr } from "@/i18n/tr";
import { requireSession } from "@/lib/dal";
import { requireActiveHousehold } from "@/lib/dal";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
@@ -52,13 +54,19 @@ async function SummaryCards() {
}
export default async function DashboardPage() {
const user = await requireSession();
const { user, household } = await requireActiveHousehold("viewer");
return (
<>
<PageHeader
title={tr.dashboard.welcome(user.name.split(" ")[0] ?? user.name)}
description={tr.dashboard.welcomeDescription}
description={`${household.name} · ${tr.dashboard.welcomeDescription}`}
/>
<Suspense fallback={null}>
<OverdueBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={null}>
<ContactsDueBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={<SummaryCardsSkeleton />}>
<SummaryCards />
</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} />
</>
);
}
+39
View File
@@ -0,0 +1,39 @@
import { House } from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
import { redirect } from "next/navigation";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { getHouseholdContext } from "@/lib/dal";
export const metadata: Metadata = { title: tr.households.noHousehold.title };
/** Hiçbir haneye üye olmayan kullanıcılar (ör. hanesi olmayan admin) buraya yönlenir. */
export default async function NoHouseholdPage() {
const ctx = await getHouseholdContext();
if (!ctx) redirect("/login");
if (ctx.household) redirect("/dashboard");
const t = tr.households.noHousehold;
return (
<div className="flex flex-1 items-center justify-center">
<Card className="max-w-md">
<CardHeader>
<span className="mb-2 flex size-12 items-center justify-center rounded-full bg-primary/10 text-primary">
<House className="size-6" />
</span>
<CardTitle className="text-xl">{t.title}</CardTitle>
<CardDescription>{t.description}</CardDescription>
</CardHeader>
{ctx.user.role === "admin" ? (
<CardContent className="flex flex-col items-start gap-3">
<p className="text-sm text-muted-foreground">{t.adminHint}</p>
<Button asChild>
<Link href="/admin/haneler">{t.adminLink}</Link>
</Button>
</CardContent>
) : null}
</Card>
</div>
);
}
+42
View File
@@ -0,0 +1,42 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { hasHouseholdRole } from "@/features/households/roles";
import { StatementView } from "@/features/transactions/components/statement-view";
import { getCardSummary, getOverdraftSummary } from "@/features/transactions/card";
import { currentMonth, getAccountStatement } from "@/features/transactions/statement";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { MONTH_PATTERN } from "@/shared/statement";
export const metadata: Metadata = { title: tr.statement.title };
/** /hesaplar/:id?ay=2026-11 — aylık hesap ekstresi (yürüyen bakiye) ve mutabakat. */
export default async function AccountStatementPage({
params,
searchParams,
}: PageProps<"/hesaplar/[id]">) {
const { user, household } = await requireActiveHousehold("viewer");
const [{ id }, sp] = await Promise.all([params, searchParams]);
const now = currentMonth();
const requested = typeof sp.ay === "string" && MONTH_PATTERN.test(sp.ay) ? sp.ay : now;
const month = requested > now ? now : requested;
const statement = await getAccountStatement(user.id, household.id, id, month);
if (!statement) notFound();
const [card, overdraft] = await Promise.all([
statement.account.type === "credit_card"
? getCardSummary(user.id, household.id, id)
: Promise.resolve(null),
statement.account.type === "bank"
? getOverdraftSummary(user.id, household.id, id)
: Promise.resolve(null),
]);
return (
<StatementView
key={`${id}-${month}`}
statement={statement}
card={card}
overdraft={overdraft}
canWrite={hasHouseholdRole(household.role, "member")}
/>
);
}
+29
View File
@@ -0,0 +1,29 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { AccountsView } from "@/features/accounts/components/accounts-view";
import { listAccounts, listMemberOptions } from "@/features/accounts/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.accounts.title };
export default async function AccountsPage() {
const { user, household } = await requireActiveHousehold("viewer");
const [data, members] = await Promise.all([
listAccounts(user.id, household.id, { includeArchived: true }),
listMemberOptions(user.id, household.id),
]);
if (!data || !members) notFound();
return (
<>
<PageHeader title={tr.accounts.title} description={tr.accounts.description} />
<AccountsView
accounts={data.accounts}
totals={data.totals}
members={members}
canEdit={household.role === "owner"}
/>
</>
);
}
@@ -0,0 +1,44 @@
import { exportTransactions } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { getHouseholdContext } from "@/lib/dal";
import { csvMoney, toCsv } from "@/shared/csv";
import { todayIstanbul } from "@/shared/dates";
import { formatDate } from "@/shared/format";
import { transactionFilterSchema } from "@/shared/schemas/transaction";
/** GET /islemler/disa-aktar?…filtreler → CSV (listedeki filtrelerle, sayfalama yok). */
export async function GET(request: Request) {
const ctx = await getHouseholdContext();
if (!ctx?.household) return new Response(tr.common.unauthorized, { status: 401 });
const params = Object.fromEntries(new URL(request.url).searchParams);
const filters = transactionFilterSchema.parse(params);
const rows = await exportTransactions(ctx.user.id, ctx.household.id, filters);
if (!rows) return new Response(tr.common.unauthorized, { status: 403 });
const t = tr.transactions;
const csv = toCsv(
t.csv.header,
rows.map((r) => [
r.no,
formatDate(`${r.date}T12:00:00+03:00`),
t.types[r.type],
t.statuses[r.status],
r.account,
r.toAccount,
r.category,
r.payee,
r.description,
r.note,
r.tags,
csvMoney(r.amountMinor),
r.createdBy,
]),
);
return new Response(csv, {
headers: {
"Content-Type": "text/csv; charset=utf-8",
"Content-Disposition": `attachment; filename="${t.csv.filename(todayIstanbul())}"`,
"Cache-Control": "no-store",
},
});
}
+44
View File
@@ -0,0 +1,44 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { listMemberOptions } from "@/features/accounts/service";
import { hasHouseholdRole } from "@/features/households/roles";
import { TransactionsView } from "@/features/transactions/components/transactions-view";
import { getTransactionFormOptions, listTransactions } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { transactionFilterSchema } from "@/shared/schemas/transaction";
export const metadata: Metadata = { title: tr.transactions.title };
export default async function TransactionsPage({ searchParams }: PageProps<"/islemler">) {
const { user, household } = await requireActiveHousehold("viewer");
const params = await searchParams;
// Yalnızca tekil string değerler (dizi parametreleri yok sayılır).
const raw = Object.fromEntries(
Object.entries(params).filter(
(e): e is [string, string] => typeof e[1] === "string" && e[1] !== "",
),
);
const filters = transactionFilterSchema.parse(raw);
const [data, options, members] = await Promise.all([
listTransactions(user.id, household.id, filters),
getTransactionFormOptions(user.id, household.id),
listMemberOptions(user.id, household.id),
]);
if (!data || !options || !members) notFound();
return (
<>
<PageHeader title={tr.transactions.title} description={tr.transactions.description} />
<TransactionsView
// Filtre değişince istemci durumu (açık diyaloglar) sıfırlansın.
key={JSON.stringify(raw)}
data={data}
filters={filters}
raw={raw}
options={{ ...options, members }}
canWrite={hasHouseholdRole(household.role, "member")}
/>
</>
);
}
+25
View File
@@ -0,0 +1,25 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { CategoriesManager } from "@/features/categories/components/categories-manager";
import { listCategories } from "@/features/categories/service";
import { hasHouseholdRole } from "@/features/households/roles";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.categories.title };
export default async function CategoriesPage() {
const { user, household } = await requireActiveHousehold("viewer");
const categories = await listCategories(user.id, household.id, { includeArchived: true });
if (!categories) notFound();
return (
<>
<PageHeader title={tr.categories.title} description={tr.categories.description} />
<CategoriesManager
categories={categories}
canEdit={hasHouseholdRole(household.role, "member")}
/>
</>
);
}
+15 -6
View File
@@ -1,3 +1,4 @@
import { redirect } from "next/navigation";
import { Suspense } from "react";
import { AppHeader } from "@/components/layout/app-header";
import { AppShellFallback } from "@/components/layout/app-shell-fallback";
@@ -5,8 +6,8 @@ import { AppSidebar } from "@/components/layout/app-sidebar";
import { BottomNav } from "@/components/layout/bottom-nav";
import { QuickAddProvider } from "@/components/layout/quick-add";
import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
import { MOCK_HOUSEHOLDS } from "@/features/households/mock";
import { requireSession } from "@/lib/dal";
import { hasHouseholdRole } from "@/features/households/roles";
import { getHouseholdContext } from "@/lib/dal";
import { APP_VERSION } from "@/lib/version";
/**
@@ -23,18 +24,26 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
}
async function AuthenticatedShell({ children }: { children: React.ReactNode }) {
const user = await requireSession();
const ctx = await getHouseholdContext();
if (!ctx) redirect("/login");
const { user, household, memberships } = ctx;
const canWrite = household ? hasHouseholdRole(household.role, "member") : false;
return (
<SidebarProvider>
<QuickAddProvider>
<AppSidebar isAdmin={user.role === "admin"} version={APP_VERSION} />
<SidebarInset>
{/* FAZ 5: kullanıcının üye olduğu haneler */}
<AppHeader user={user} households={MOCK_HOUSEHOLDS} version={APP_VERSION} />
<AppHeader
user={user}
households={memberships}
activeHouseholdId={household?.id}
canWrite={canWrite}
version={APP_VERSION}
/>
{/* Mobilde alt menü yüksekliği kadar boşluk */}
<div className="flex flex-1 flex-col gap-4 p-4 pb-24 md:p-6 md:pb-6">{children}</div>
</SidebarInset>
<BottomNav />
<BottomNav canWrite={canWrite} />
</QuickAddProvider>
</SidebarProvider>
);
+22
View File
@@ -0,0 +1,22 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { hasHouseholdRole } from "@/features/households/roles";
import { PlannedView } from "@/features/recurring/components/planned-view";
import { getPlannedOverview } from "@/features/recurring/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.recurring.title };
export default async function PlannedPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await getPlannedOverview(user.id, household.id);
if (!data) notFound();
return (
<>
<PageHeader title={tr.recurring.title} description={tr.recurring.description} />
<PlannedView data={data} canWrite={hasHouseholdRole(household.role, "member")} />
</>
);
}
+49
View File
@@ -0,0 +1,49 @@
import type { NextRequest } from "next/server";
import { readAttachmentForUser } from "@/features/attachments/service";
import { getCurrentUser } from "@/lib/dal";
/**
* GET /api/files/:id[?v=thumb][&indir=1] — oturum ve hane yetkisi kontrol edilerek ek dosyayı
* servis eder. Erişim yoksa (başka hane, gizli hesap, silinmiş kayıt) 404: varlık sızdırılmaz.
*/
export async function GET(request: NextRequest, ctx: RouteContext<"/api/files/[id]">) {
const user = await getCurrentUser();
if (!user) return new Response(null, { status: 401 });
const { id } = await ctx.params;
const params = request.nextUrl.searchParams;
const file = await readAttachmentForUser(
user.id,
id,
params.get("v") === "thumb" ? "thumb" : "full",
);
if (!file) return new Response(null, { status: 404 });
const disposition = params.get("indir") === "1" ? "attachment" : "inline";
const fallbackName = file.mimeType === "application/pdf" ? "belge.pdf" : "gorsel.webp";
const name = toServedName(file.name || fallbackName, file.mimeType);
return new Response(new Uint8Array(file.bytes), {
headers: {
"Content-Type": file.mimeType,
"Content-Length": String(file.bytes.length),
"Content-Disposition": `${disposition}; filename="${asciiName(name)}"; filename*=UTF-8''${encodeURIComponent(name)}`,
// Yalnızca kullanıcının tarayıcısında; paylaşılan önbelleklere girmez.
"Cache-Control": "private, max-age=3600",
"X-Content-Type-Options": "nosniff",
},
});
}
/** Görseller WebP'ye çevrildiği için indirilen adın uzantısı içerikle uyumlu olsun. */
function toServedName(name: string, mimeType: string): string {
const ext = mimeType === "application/pdf" ? ".pdf" : ".webp";
return name.replace(/\.[a-z0-9]{1,5}$/i, "") + ext;
}
function asciiName(name: string): string {
return (
name
.normalize("NFKD")
.replace(/[^\x20-\x7e]/g, "")
.replace(/["\\]/g, "") || "dosya"
);
}
+53
View File
@@ -0,0 +1,53 @@
import { uploadAttachment } from "@/features/attachments/service";
import { tr } from "@/i18n/tr";
import { fail } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import { env } from "@/lib/env";
/** Multipart başlıkları için tolerans. */
const MULTIPART_OVERHEAD = 64 * 1024;
/**
* POST /api/files — tek dosya yükler (`file` alanı), aktif haneye bekleyen ek olarak kaydeder.
* Kayıt (ör. işlem) kaydedilirken ek kimlikleri gönderilir ve ek kayda bağlanır.
*/
export async function POST(request: Request) {
if (!isSameOrigin(request)) return Response.json(fail(tr.common.unauthorized), { status: 403 });
const ctx = await getHouseholdActionContext("member");
if (!ctx) return Response.json(fail(tr.common.unauthorized), { status: 401 });
const maxMb = env().MAX_UPLOAD_MB;
const length = Number(request.headers.get("content-length") ?? 0);
if (length > maxMb * 1024 * 1024 + MULTIPART_OVERHEAD) {
return Response.json(fail(tr.attachments.errors.tooLarge(maxMb)), { status: 413 });
}
let file: FormDataEntryValue | null;
try {
file = (await request.formData()).get("file");
} catch {
return Response.json(fail(tr.attachments.errors.invalid), { status: 400 });
}
if (!(file instanceof File)) {
return Response.json(fail(tr.attachments.errors.empty), { status: 400 });
}
const bytes = Buffer.from(await file.arrayBuffer());
const result = await uploadAttachment(ctx.user.id, ctx.household.id, { name: file.name, bytes });
return Response.json(result, { status: result.ok ? 201 : 400 });
}
/**
* CSRF savunması: tarayıcı isteğinde Origin varsa uygulamanın kendi host'u olmalı.
* (Oturum cookie'si SameSite=Lax; bu ek bir katman.)
*/
function isSameOrigin(request: Request): boolean {
const origin = request.headers.get("origin");
if (!origin) return true;
const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
try {
return new URL(origin).host === host;
} catch {
return false;
}
}
+29
View File
@@ -96,6 +96,21 @@
--chart-4: var(--warning);
--chart-5: oklch(0.65 0.08 230);
--radius: 0.625rem;
/* Kullanıcı verisi renkleri (kategori/hesap): anahtar → değişken (shared/appearance.ts) */
--swatch-blue: oklch(0.6 0.15 258);
--swatch-sky: oklch(0.6 0.15 230);
--swatch-teal: oklch(0.6 0.15 185);
--swatch-green: oklch(0.6 0.15 150);
--swatch-lime: oklch(0.6 0.15 125);
--swatch-amber: oklch(0.6 0.15 80);
--swatch-orange: oklch(0.6 0.15 55);
--swatch-red: oklch(0.6 0.15 25);
--swatch-rose: oklch(0.6 0.15 10);
--swatch-pink: oklch(0.6 0.15 350);
--swatch-purple: oklch(0.6 0.15 305);
--swatch-indigo: oklch(0.6 0.15 275);
--swatch-slate: oklch(0.55 0.03 255);
--sidebar: oklch(0.975 0.008 250);
--sidebar-foreground: oklch(0.22 0.04 262);
--sidebar-primary: oklch(0.49 0.17 258);
@@ -140,6 +155,20 @@
--chart-3: var(--expense);
--chart-4: var(--warning);
--chart-5: oklch(0.7 0.07 230);
--swatch-blue: oklch(0.74 0.13 258);
--swatch-sky: oklch(0.74 0.13 230);
--swatch-teal: oklch(0.74 0.13 185);
--swatch-green: oklch(0.74 0.13 150);
--swatch-lime: oklch(0.74 0.13 125);
--swatch-amber: oklch(0.74 0.13 80);
--swatch-orange: oklch(0.74 0.13 55);
--swatch-red: oklch(0.74 0.13 25);
--swatch-rose: oklch(0.74 0.13 10);
--swatch-pink: oklch(0.74 0.13 350);
--swatch-purple: oklch(0.74 0.13 305);
--swatch-indigo: oklch(0.74 0.13 275);
--swatch-slate: oklch(0.72 0.03 255);
--sidebar: oklch(0.2 0.045 264);
--sidebar-foreground: oklch(0.96 0.01 250);
--sidebar-primary: oklch(0.76 0.12 245);
+108
View File
@@ -0,0 +1,108 @@
import {
Baby,
Banknote,
Book,
Briefcase,
Building,
Bus,
Car,
CircleEllipsis,
Coffee,
Coins,
CreditCard,
Droplet,
Dumbbell,
Film,
Flame,
Fuel,
Gamepad2,
Gift,
GraduationCap,
HeartPulse,
House,
Landmark,
Music,
PawPrint,
Percent,
PiggyBank,
Pill,
Plane,
Receipt,
Repeat,
Scissors,
Shirt,
ShoppingBasket,
ShoppingCart,
Smartphone,
Sofa,
Sparkles,
SprayCan,
Tag,
Train,
TrendingUp,
Undo2,
Utensils,
Wallet,
Wifi,
Wrench,
Zap,
type LucideIcon,
type LucideProps,
} from "lucide-react";
import type { IconKey } from "@/shared/appearance";
/** Saklanan ikon anahtarı → lucide bileşeni (shared/appearance.ts ICON_KEYS ile birebir). */
export const ICONS: Record<IconKey, LucideIcon> = {
wallet: Wallet,
banknote: Banknote,
landmark: Landmark,
"piggy-bank": PiggyBank,
"credit-card": CreditCard,
utensils: Utensils,
"shopping-cart": ShoppingCart,
"shopping-basket": ShoppingBasket,
receipt: Receipt,
zap: Zap,
droplet: Droplet,
flame: Flame,
wifi: Wifi,
smartphone: Smartphone,
house: House,
building: Building,
car: Car,
fuel: Fuel,
bus: Bus,
train: Train,
"heart-pulse": HeartPulse,
pill: Pill,
"graduation-cap": GraduationCap,
book: Book,
shirt: Shirt,
gamepad: Gamepad2,
film: Film,
music: Music,
coffee: Coffee,
plane: Plane,
gift: Gift,
baby: Baby,
"paw-print": PawPrint,
wrench: Wrench,
sofa: Sofa,
repeat: Repeat,
briefcase: Briefcase,
"trending-up": TrendingUp,
coins: Coins,
percent: Percent,
undo: Undo2,
sparkles: Sparkles,
"spray-can": SprayCan,
scissors: Scissors,
dumbbell: Dumbbell,
tag: Tag,
"circle-ellipsis": CircleEllipsis,
};
export function AppIcon({ name, ...props }: { name: IconKey } & LucideProps) {
const Icon = ICONS[name] ?? Tag;
return <Icon aria-hidden {...props} />;
}
+78
View File
@@ -0,0 +1,78 @@
"use client";
import { Check } from "lucide-react";
import { cn } from "@/lib/utils";
import { ICON_KEYS, SWATCHES, type IconKey, type Swatch } from "@/shared/appearance";
import { AppIcon } from "./app-icon";
import { swatchStyle } from "./swatch";
import { tr } from "@/i18n/tr";
/** Renk seçici (radio grubu, klavye ile gezilebilir). */
export function SwatchPicker({
value,
onChange,
labelledBy,
}: {
value: Swatch;
onChange: (v: Swatch) => void;
labelledBy: string;
}) {
return (
<div role="radiogroup" aria-labelledby={labelledBy} className="flex flex-wrap gap-2">
{SWATCHES.map((s) => (
<button
key={s}
type="button"
role="radio"
aria-checked={value === s}
aria-label={tr.swatches[s]}
title={tr.swatches[s]}
onClick={() => onChange(s)}
style={swatchStyle(s)}
className="flex size-8 items-center justify-center rounded-full bg-(--swatch) text-background ring-offset-2 ring-offset-background outline-none focus-visible:ring-3 focus-visible:ring-ring/50 aria-checked:ring-2 aria-checked:ring-(--swatch)"
>
{value === s ? <Check className="size-4" /> : null}
</button>
))}
</div>
);
}
/** İkon seçici; seçili renkle önizler. */
export function IconPicker({
value,
color,
onChange,
labelledBy,
}: {
value: IconKey;
color: Swatch;
onChange: (v: IconKey) => void;
labelledBy: string;
}) {
return (
<div
role="radiogroup"
aria-labelledby={labelledBy}
style={swatchStyle(color)}
className="grid max-h-44 grid-cols-8 gap-1 overflow-y-auto rounded-lg border p-1.5 sm:grid-cols-10"
>
{ICON_KEYS.map((key) => (
<button
key={key}
type="button"
role="radio"
aria-checked={value === key}
aria-label={key}
onClick={() => onChange(key)}
className={cn(
"flex aspect-square items-center justify-center rounded-md outline-none hover:bg-muted focus-visible:ring-3 focus-visible:ring-ring/50",
"aria-checked:bg-(--swatch)/15 aria-checked:text-(--swatch) aria-checked:ring-1 aria-checked:ring-(--swatch)",
)}
>
<AppIcon name={key} className="size-4.5" />
</button>
))}
</div>
);
}
+33
View File
@@ -0,0 +1,33 @@
import { cn } from "@/lib/utils";
import type { IconKey, Swatch } from "@/shared/appearance";
import { AppIcon } from "./app-icon";
/** Renk anahtarını CSS değişkenine bağlar: --swatch-blue → --swatch (sınıflar bunu kullanır). */
export const swatchStyle = (color: Swatch) =>
({ "--swatch": `var(--swatch-${color})` }) as React.CSSProperties;
/** Renkli yuvarlak ikon rozeti (kategori/hesap). */
export function IconBadge({
icon,
color,
className,
size = "md",
}: {
icon: IconKey;
color: Swatch;
className?: string;
size?: "sm" | "md";
}) {
return (
<span
style={swatchStyle(color)}
className={cn(
"inline-flex shrink-0 items-center justify-center rounded-full bg-(--swatch)/15 text-(--swatch)",
size === "sm" ? "size-7 [&_svg]:size-3.5" : "size-9 [&_svg]:size-4.5",
className,
)}
>
<AppIcon name={icon} />
</span>
);
}
+7 -2
View File
@@ -11,18 +11,23 @@ import { UserMenu } from "./user-menu";
export function AppHeader({
user,
households,
activeHouseholdId,
canWrite,
version,
}: {
user: SessionUser;
households: HouseholdSummary[];
activeHouseholdId: string | undefined;
/** Aktif hanede en az "member" mi? (İzleyici veri giremez.) */
canWrite: boolean;
version: string;
}) {
return (
<header className="sticky top-0 z-30 flex h-14 items-center gap-2 border-b bg-background/95 px-3 backdrop-blur supports-backdrop-filter:bg-background/80 md:px-4">
<SidebarTrigger className="hidden md:inline-flex" aria-label={tr.nav.toggleSidebar} />
<HouseholdSwitcher households={households} />
<HouseholdSwitcher households={households} activeId={activeHouseholdId} />
<div className="ml-auto flex items-center gap-1">
<QuickAddButton className="hidden md:inline-flex" />
{canWrite ? <QuickAddButton className="hidden md:inline-flex" /> : null}
<ThemeToggle />
<UserMenu user={user} version={version} />
</div>
+5 -3
View File
@@ -40,7 +40,7 @@ function BottomNavLink({ item, pathname }: { item: NavItem; pathname: string })
}
/** Mobil alt gezinme çubuğu (md altı). */
export function BottomNav() {
export function BottomNav({ canWrite }: { canWrite: boolean }) {
const pathname = usePathname();
const { openQuickAdd } = useQuickAdd();
const { setOpenMobile } = useSidebar();
@@ -56,9 +56,11 @@ export function BottomNav() {
<div className="flex flex-1 items-center justify-center">
<button
type="button"
onClick={openQuickAdd}
onClick={() => openQuickAdd()}
disabled={!canWrite}
title={canWrite ? undefined : tr.households.viewerReadOnly}
aria-label={tr.quickAdd.button}
className="-mt-5 flex size-14 items-center justify-center rounded-full bg-primary text-primary-foreground shadow-lg outline-none focus-visible:ring-4 focus-visible:ring-ring/50"
className="-mt-5 flex size-14 items-center justify-center rounded-full bg-primary text-primary-foreground shadow-lg outline-none focus-visible:ring-4 focus-visible:ring-ring/50 disabled:opacity-40"
>
<Plus className="size-6" />
</button>
+29 -7
View File
@@ -1,7 +1,8 @@
"use client";
import { House } from "lucide-react";
import { useState } from "react";
import { useTransition } from "react";
import { toast } from "sonner";
import {
Select,
SelectContent,
@@ -9,17 +10,38 @@ import {
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { switchHouseholdAction } from "@/features/households/actions";
import type { HouseholdSummary } from "@/features/households/types";
import { tr } from "@/i18n/tr";
/** Üst bar aktif hane seçici. FAZ 5: seçim sunucuda (cookie) saklanacak. */
export function HouseholdSwitcher({ households }: { households: HouseholdSummary[] }) {
const [value, setValue] = useState(households[0]?.id);
const current = households.find((h) => h.id === value);
/** Üst bar aktif hane seçici. Seçim sunucuda doğrulanır ve cookie'ye yazılır. */
export function HouseholdSwitcher({
households,
activeId,
}: {
households: HouseholdSummary[];
activeId: string | undefined;
}) {
const [pending, startTransition] = useTransition();
const current = households.find((h) => h.id === activeId);
if (households.length === 0) return null;
function onChange(id: string) {
if (id === activeId) return;
startTransition(async () => {
const result = await switchHouseholdAction(id);
if (result.ok) toast.success(tr.household.switched(result.data.name));
else toast.error(result.error);
});
}
return (
<Select value={value} onValueChange={setValue}>
<SelectTrigger aria-label={tr.household.label} className="w-[min(46vw,13rem)]">
<Select value={activeId} onValueChange={onChange} disabled={pending || households.length < 2}>
<SelectTrigger
aria-label={tr.household.label}
className="w-[min(46vw,13rem)]"
aria-busy={pending}
>
<House className="text-muted-foreground" />
{/* Etiket children ile verilir: Radix aksi halde hydration'a kadar boş gösterir. */}
<SelectValue placeholder={tr.household.select}>{current?.name}</SelectValue>
+12 -7
View File
@@ -8,6 +8,7 @@ import {
Package,
Settings,
ShoppingCart,
Tags,
Target,
UserCog,
Users,
@@ -25,16 +26,18 @@ export type NavItem = {
};
/** Şu an tamamlanmış en yüksek faz — sayfalar eklendikçe artar. */
export const CURRENT_PHASE = 2;
/** Alt fazlar ondalıkla: 6.1 = Faz 6a. */
export const CURRENT_PHASE = 8.2;
export const isAvailable = (item: NavItem) => item.phase <= CURRENT_PHASE;
export const MAIN_NAV: NavItem[] = [
{ href: "/dashboard", label: tr.nav.dashboard, icon: LayoutDashboard, phase: 2 },
{ href: "/islemler", label: tr.nav.transactions, icon: ArrowLeftRight, phase: 6 },
{ href: "/hesaplar", label: tr.nav.accounts, icon: Wallet, phase: 6 },
{ href: "/planli", label: tr.nav.planned, icon: CalendarClock, phase: 7 },
{ href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8 },
{ href: "/islemler", label: tr.nav.transactions, icon: ArrowLeftRight, phase: 6.2 },
{ 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.1 },
{ 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 },
@@ -49,9 +52,11 @@ export const ADMIN_NAV: NavItem[] = [
];
/** Mobil alt menü: ortada Hızlı ekle, sağda "Daha fazla" (yan menüyü açar). */
const navByHref = (href: string) => MAIN_NAV.find((i) => i.href === href)!;
export const BOTTOM_NAV = {
left: [MAIN_NAV[0]!, MAIN_NAV[1]!],
right: [MAIN_NAV[6]!],
left: [navByHref("/dashboard"), navByHref("/islemler")],
right: [navByHref("/butce")],
};
export function isActivePath(pathname: string, href: string) {
+21 -72
View File
@@ -1,16 +1,22 @@
"use client";
import { ArrowDownLeft, ArrowLeftRight, ArrowUpRight, Plus } from "lucide-react";
import { Plus } from "lucide-react";
import { createContext, use, useState } from "react";
import { toast } from "sonner";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Button } from "@/components/ui/button";
import {
TransactionFormDialog,
type TransactionFormMode,
} from "@/features/transactions/components/transaction-form";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
type QuickAddKind = "expense" | "income" | "transfer";
type QuickAddApi = {
/** Hızlı ekle: yeni işlem formu (varsayılan gider; sekmelerle gelir/transfer). */
openQuickAdd: (type?: "expense" | "income" | "transfer") => void;
/** Düzenle / kopyala (işlem listesi ve ayrıntısı). */
openTransactionForm: (mode: TransactionFormMode) => void;
};
const QuickAddContext = createContext<{ openQuickAdd: () => void } | null>(null);
const QuickAddContext = createContext<QuickAddApi | null>(null);
export function useQuickAdd() {
const ctx = use(QuickAddContext);
@@ -18,74 +24,17 @@ export function useQuickAdd() {
return ctx;
}
const CHOICES: {
kind: QuickAddKind;
label: string;
hint: string;
icon: typeof Plus;
tone: string;
}[] = [
{
kind: "expense",
label: tr.quickAdd.expense,
hint: tr.quickAdd.expenseHint,
icon: ArrowUpRight,
tone: "text-expense bg-expense/10",
},
{
kind: "income",
label: tr.quickAdd.income,
hint: tr.quickAdd.incomeHint,
icon: ArrowDownLeft,
tone: "text-income bg-income/10",
},
{
kind: "transfer",
label: tr.quickAdd.transfer,
hint: tr.quickAdd.transferHint,
icon: ArrowLeftRight,
tone: "text-budget bg-budget/10",
},
];
/** Hızlı ekle (gider / gelir / transfer) — her ekrandan açılabilir. */
/** Uygulama genelinde tek işlem formu; her ekrandan açılabilir (Bölüm 4). */
export function QuickAddProvider({ children }: { children: React.ReactNode }) {
const [open, setOpen] = useState(false);
function choose(kind: QuickAddKind) {
setOpen(false);
// FAZ 6: ilgili işlem formu açılacak.
toast.info(`${CHOICES.find((c) => c.kind === kind)?.label}: ${tr.quickAdd.notYet}`);
}
const [mode, setMode] = useState<TransactionFormMode | null>(null);
const api: QuickAddApi = {
openQuickAdd: (type = "expense") => setMode({ kind: "create", type }),
openTransactionForm: setMode,
};
return (
<QuickAddContext value={{ openQuickAdd: () => setOpen(true) }}>
<QuickAddContext value={api}>
{children}
<ResponsiveDialog
open={open}
onOpenChange={setOpen}
title={tr.quickAdd.title}
description={tr.quickAdd.description}
>
<div className="grid gap-2 pb-2 sm:grid-cols-3">
{CHOICES.map(({ kind, label, hint, icon: Icon, tone }) => (
<button
key={kind}
type="button"
onClick={() => choose(kind)}
className="flex items-center gap-3 rounded-xl border p-4 text-left transition-colors outline-none hover:bg-muted focus-visible:ring-3 focus-visible:ring-ring/50 sm:flex-col sm:text-center"
>
<span className={cn("flex size-10 items-center justify-center rounded-full", tone)}>
<Icon className="size-5" />
</span>
<span className="flex flex-col">
<span className="font-medium">{label}</span>
<span className="text-xs text-muted-foreground">{hint}</span>
</span>
</button>
))}
</div>
</ResponsiveDialog>
<TransactionFormDialog mode={mode} onOpenChange={(open) => !open && setMode(null)} />
</QuickAddContext>
);
}
@@ -94,7 +43,7 @@ export function QuickAddProvider({ children }: { children: React.ReactNode }) {
export function QuickAddButton({ className }: { className?: string }) {
const { openQuickAdd } = useQuickAdd();
return (
<Button onClick={openQuickAdd} className={className}>
<Button onClick={() => openQuickAdd()} className={className}>
<Plus />
{tr.quickAdd.button}
</Button>
+49
View File
@@ -0,0 +1,49 @@
"use client";
import {
InputGroup,
InputGroupAddon,
InputGroupInput,
InputGroupText,
} from "@/components/ui/input-group";
import { formatMoneyInput, parseMoney } from "@/shared/money";
/**
* Türkçe tutar girişi ("1.250,50"). Değer string olarak tutulur (zod sunucuda/istemcide ayrıştırır);
* alandan çıkınca geçerliyse Türkçe biçime getirilir.
*/
export function MoneyInput({
value,
onChange,
onBlur,
allowNegative = false,
...props
}: Omit<React.ComponentProps<typeof InputGroupInput>, "value" | "onChange" | "type"> & {
value: string;
onChange: (value: string) => void;
allowNegative?: boolean;
}) {
return (
<InputGroup>
<InputGroupInput
{...props}
type="text"
inputMode="decimal"
autoComplete="off"
className="text-right tabular-nums"
value={value}
onChange={(e) =>
onChange(e.target.value.replace(allowNegative ? /[^\d.,\s-−]/g : /[^\d.,\s]/g, ""))
}
onBlur={(e) => {
const minor = parseMoney(value);
if (minor !== null && value.trim() !== "") onChange(formatMoneyInput(minor));
onBlur?.(e);
}}
/>
<InputGroupAddon align="inline-end">
<InputGroupText>₺</InputGroupText>
</InputGroupAddon>
</InputGroup>
);
}
+242
View File
@@ -0,0 +1,242 @@
"use client";
import * as React from "react";
import { cn } from "cn";
import useEmblaCarousel, { type UseEmblaCarouselType } from "embla-carousel-react";
import { Button } from "@/components/ui/button";
import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
type CarouselApi = UseEmblaCarouselType[1];
type UseCarouselParameters = Parameters<typeof useEmblaCarousel>;
type CarouselOptions = UseCarouselParameters[0];
type CarouselPlugin = UseCarouselParameters[1];
type CarouselProps = {
opts?: CarouselOptions;
plugins?: CarouselPlugin;
orientation?: "horizontal" | "vertical";
setApi?: (api: CarouselApi) => void;
};
type CarouselContextProps = {
carouselRef: ReturnType<typeof useEmblaCarousel>[0];
api: ReturnType<typeof useEmblaCarousel>[1];
scrollPrev: () => void;
scrollNext: () => void;
canScrollPrev: boolean;
canScrollNext: boolean;
} & CarouselProps;
const CarouselContext = React.createContext<CarouselContextProps | null>(null);
function useCarousel() {
const context = React.useContext(CarouselContext);
if (!context) {
throw new Error("useCarousel must be used within a <Carousel />");
}
return context;
}
function Carousel({
orientation = "horizontal",
opts,
setApi,
plugins,
className,
children,
...props
}: React.ComponentProps<"div"> & CarouselProps) {
const [carouselRef, api] = useEmblaCarousel(
{
...opts,
axis: orientation === "horizontal" ? "x" : "y",
},
plugins,
);
const [canScrollPrev, setCanScrollPrev] = React.useState(false);
const [canScrollNext, setCanScrollNext] = React.useState(false);
const onSelect = React.useCallback((api: CarouselApi) => {
if (!api) return;
setCanScrollPrev(api.canScrollPrev());
setCanScrollNext(api.canScrollNext());
}, []);
const scrollPrev = React.useCallback(() => {
api?.scrollPrev();
}, [api]);
const scrollNext = React.useCallback(() => {
api?.scrollNext();
}, [api]);
const handleKeyDown = React.useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === "ArrowLeft") {
event.preventDefault();
scrollPrev();
} else if (event.key === "ArrowRight") {
event.preventDefault();
scrollNext();
}
},
[scrollPrev, scrollNext],
);
React.useEffect(() => {
if (!api || !setApi) return;
setApi(api);
}, [api, setApi]);
React.useEffect(() => {
if (!api) return;
// İlk durum bir sonraki karede okunur (effect içinde senkron setState yapılmaz).
const frame = requestAnimationFrame(() => onSelect(api));
api.on("reInit", onSelect);
api.on("select", onSelect);
return () => {
cancelAnimationFrame(frame);
api.off("select", onSelect);
api.off("reInit", onSelect);
};
}, [api, onSelect]);
return (
<CarouselContext.Provider
value={{
carouselRef,
api: api,
opts,
orientation: orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext,
}}
>
<div
onKeyDownCapture={handleKeyDown}
className={cn("relative", className)}
role="region"
aria-roledescription="carousel"
data-slot="carousel"
{...props}
>
{children}
</div>
</CarouselContext.Provider>
);
}
function CarouselContent({
className,
containerClassName,
...props
}: React.ComponentProps<"div"> & { containerClassName?: string }) {
const { carouselRef, orientation } = useCarousel();
return (
<div
ref={carouselRef}
className={cn("overflow-hidden", containerClassName)}
data-slot="carousel-content"
>
<div
className={cn("flex", orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col", className)}
{...props}
/>
</div>
);
}
function CarouselItem({ className, ...props }: React.ComponentProps<"div">) {
const { orientation } = useCarousel();
return (
<div
role="group"
aria-roledescription="slide"
data-slot="carousel-item"
className={cn(
"min-w-0 shrink-0 grow-0 basis-full",
orientation === "horizontal" ? "pl-4" : "pt-4",
className,
)}
{...props}
/>
);
}
function CarouselPrevious({
className,
variant = "outline",
size = "icon-sm",
...props
}: React.ComponentProps<typeof Button>) {
const { orientation, scrollPrev, canScrollPrev } = useCarousel();
return (
<Button
data-slot="carousel-previous"
variant={variant}
size={size}
className={cn(
"absolute touch-manipulation rounded-full",
orientation === "horizontal"
? "inset-y-0 -left-12 my-auto"
: "-top-12 left-1/2 -translate-x-1/2 rotate-90",
className,
)}
disabled={!canScrollPrev}
onClick={scrollPrev}
{...props}
>
<ChevronLeftIcon />
<span className="sr-only">Previous slide</span>
</Button>
);
}
function CarouselNext({
className,
variant = "outline",
size = "icon-sm",
...props
}: React.ComponentProps<typeof Button>) {
const { orientation, scrollNext, canScrollNext } = useCarousel();
return (
<Button
data-slot="carousel-next"
variant={variant}
size={size}
className={cn(
"absolute touch-manipulation rounded-full",
orientation === "horizontal"
? "inset-y-0 -right-12 my-auto"
: "-bottom-12 left-1/2 -translate-x-1/2 rotate-90",
className,
)}
disabled={!canScrollNext}
onClick={scrollNext}
{...props}
>
<ChevronRightIcon />
<span className="sr-only">Next slide</span>
</Button>
);
}
export {
type CarouselApi,
Carousel,
CarouselContent,
CarouselItem,
CarouselPrevious,
CarouselNext,
useCarousel,
};
+75
View File
@@ -0,0 +1,75 @@
"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 { accountFormSchema } from "@/shared/schemas/account";
import { createAccount, reorderAccount, setAccountArchived, updateAccount } from "./service";
const PATH = "/hesaplar";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
/** zod hatalarını alan bazlı mesajlara çevirir (formda gösterilir). */
function fieldErrors(error: z.ZodError) {
const out: Record<string, string> = {};
for (const issue of error.issues) {
const key = String(issue.path[0] ?? "");
if (key && !out[key]) out[key] = issue.message;
}
return out;
}
export async function createAccountAction(input: unknown): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = accountFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await createAccount(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
export async function updateAccountAction(
accountId: unknown,
input: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(accountId);
const parsed = accountFormSchema.safeParse(input);
if (!id.success) return fail(tr.common.notFound);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await updateAccount(ctx.user.id, ctx.household.id, id.data, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
export async function setAccountArchivedAction(
accountId: unknown,
archived: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(accountId);
const a = z.boolean().safeParse(archived);
if (!id.success || !a.success) return fail(tr.common.genericError);
const result = await setAccountArchived(ctx.user.id, ctx.household.id, id.data, a.data);
if (result.ok) revalidatePath(PATH);
return result;
}
export async function reorderAccountAction(
accountId: unknown,
direction: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(accountId);
const dir = z.enum(["up", "down"]).safeParse(direction);
if (!id.success || !dir.success) return fail(tr.common.genericError);
const result = await reorderAccount(ctx.user.id, ctx.household.id, id.data, dir.data);
if (result.ok) revalidatePath(PATH);
return result;
}
@@ -0,0 +1,706 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { ChevronDown, Loader2 } from "lucide-react";
import { useEffect, useState } from "react";
import { Controller, useForm, useWatch, type Control, type Resolver } from "react-hook-form";
import { toast } from "sonner";
import { IconPicker, SwatchPicker } from "@/components/appearance/pickers";
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 { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import {
Field,
FieldDescription,
FieldError,
FieldGroup,
FieldLabel,
FieldLegend,
FieldSet,
} 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 {
ACCOUNT_TYPES,
DUE_RULE_KINDS,
MEAL_CARD_PROVIDERS,
type AccountType,
} from "@/shared/accounts";
import type { IconKey } from "@/shared/appearance";
import { todayIstanbul } from "@/shared/dates";
import { formatMoneyInput } from "@/shared/money";
import {
accountFormSchema,
type AccountForm,
type AccountFormInput,
} from "@/shared/schemas/account";
import { createAccountAction, updateAccountAction } from "../actions";
import type { AccountView } from "../service";
const t = tr.accounts;
const f = t.fields;
const NONE = "__none__";
const DAYS = Array.from({ length: 31 }, (_, i) => i + 1);
const DEFAULT_ICON: Record<AccountType, IconKey> = {
cash: "wallet",
bank: "landmark",
savings: "piggy-bank",
credit_card: "credit-card",
meal_card: "utensils",
};
type FormValues = {
name: string;
type: AccountType;
institution: string;
mealCardProvider: AccountFormInput["mealCardProvider"];
openingBalance: string;
openingDate: string;
color: AccountFormInput["color"];
icon: AccountFormInput["icon"];
ownerUserId: string;
isPrivate: boolean;
overdraftEnabled: boolean;
overdraftLimit: string;
overdraftMonthlyRate: string;
overdraftStatementDay: string;
cardLimit: string;
cardStatementDay: string;
cardDueKind: AccountFormInput["cardDueKind"];
cardDueValue: string;
cardPaymentAccountId: string;
cardMinimumRate: string;
};
const money = (minor: number | null | undefined) => (minor ? formatMoneyInput(minor) : "");
function toValues(a?: AccountView): FormValues {
if (!a) {
return {
name: "",
type: "bank",
institution: "",
mealCardProvider: null,
openingBalance: "",
openingDate: todayIstanbul(),
color: "blue",
icon: "landmark",
ownerUserId: "",
isPrivate: false,
overdraftEnabled: false,
overdraftLimit: "",
overdraftMonthlyRate: "",
overdraftStatementDay: "",
cardLimit: "",
cardStatementDay: "1",
cardDueKind: "daysAfter",
cardDueValue: "10",
cardPaymentAccountId: "",
cardMinimumRate: "",
};
}
const isCard = a.type === "credit_card";
return {
name: a.name,
type: a.type,
institution: a.institution,
mealCardProvider: a.mealCardProvider,
openingBalance:
a.openingBalanceMinor === null
? ""
: money(isCard ? Math.abs(a.openingBalanceMinor) : a.openingBalanceMinor),
openingDate: a.openingDate,
color: a.color,
icon: a.icon,
ownerUserId: a.ownerUserId ?? "",
isPrivate: a.isPrivate,
overdraftEnabled: Boolean(a.overdraft),
overdraftLimit: money(a.overdraft?.limitMinor),
overdraftMonthlyRate: a.overdraft?.monthlyRateBp
? formatMoneyInput(a.overdraft.monthlyRateBp)
: "",
overdraftStatementDay: a.overdraft?.statementDay ? String(a.overdraft.statementDay) : "",
cardLimit: money(a.creditCard?.limitMinor),
cardStatementDay: String(a.creditCard?.statementDay ?? 1),
cardDueKind: a.creditCard?.dueRule.kind ?? "daysAfter",
cardDueValue: String(a.creditCard?.dueRule.value ?? 10),
cardPaymentAccountId: a.creditCard?.paymentAccountId ?? "",
cardMinimumRate:
a.creditCard?.minimumPaymentRateBp != null
? formatMoneyInput(a.creditCard.minimumPaymentRateBp)
: "",
};
}
function DaySelect({
id,
value,
onChange,
max = 31,
allowEmpty,
}: {
id: string;
value: string;
onChange: (v: string) => void;
max?: number;
allowEmpty?: boolean;
}) {
return (
<Select value={value || NONE} onValueChange={(v) => onChange(v === NONE ? "" : v)}>
<SelectTrigger id={id} className="w-28">
<SelectValue>{value || "—"}</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-64">
{allowEmpty ? <SelectItem value={NONE}>—</SelectItem> : null}
{DAYS.slice(0, max).map((d) => (
<SelectItem key={d} value={String(d)}>
{d}
</SelectItem>
))}
</SelectContent>
</Select>
);
}
function MoneyField({
control,
name,
label,
hint,
allowNegative,
disabled,
}: {
control: Control<FormValues, unknown, AccountForm>;
name: "openingBalance" | "overdraftLimit" | "cardLimit";
label: string;
hint?: string;
allowNegative?: boolean;
disabled?: boolean;
}) {
return (
<Controller
name={name}
control={control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor={`acc-${name}`}>{label}</FieldLabel>
<MoneyInput
id={`acc-${name}`}
name={field.name}
value={field.value}
onChange={field.onChange}
onBlur={field.onBlur}
allowNegative={allowNegative}
disabled={disabled}
placeholder={disabled ? t.hidden : "0,00"}
aria-invalid={fieldState.invalid}
aria-describedby={hint ? `acc-${name}-hint` : undefined}
/>
{hint ? <FieldDescription id={`acc-${name}-hint`}>{hint}</FieldDescription> : null}
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
);
}
export function AccountFormDialog({
open,
account,
members,
paymentAccounts,
onOpenChange,
}: {
open: boolean;
account?: AccountView;
members: { id: string; name: string }[];
paymentAccounts: { id: string; name: string }[];
onOpenChange: (open: boolean) => void;
}) {
const isEdit = Boolean(account);
const balanceHidden = isEdit && account!.openingBalanceMinor === null;
const form = useForm<FormValues, unknown, AccountForm>({
// FormValues, şemanın giriş şekliyle birebir (sayısal alanlar string olarak girilir, zod çevirir).
resolver: zodResolver(accountFormSchema) as unknown as Resolver<
FormValues,
unknown,
AccountForm
>,
defaultValues: toValues(),
});
const [advancedOpen, setAdvancedOpen] = useState(false);
useEffect(() => {
if (open) form.reset(toValues(account));
}, [open, account, form]);
function handleOpenChange(next: boolean) {
if (!next) setAdvancedOpen(false);
onOpenChange(next);
}
const type = useWatch({ control: form.control, name: "type" });
const color = useWatch({ control: form.control, name: "color" });
const overdraftEnabled = useWatch({ control: form.control, name: "overdraftEnabled" });
const dueKind = useWatch({ control: form.control, name: "cardDueKind" });
const isCard = type === "credit_card";
/** Ham form değerleri gönderilir; sunucu aynı şemayla ayrıştırır. */
async function onSubmit() {
const values = form.getValues();
// Gizli bakiyede sunucu mevcut değeri korur; doğrulamadan geçmesi için 0 gönderilir.
const payload = balanceHidden ? { ...values, openingBalance: "0" } : values;
const result = account
? await updateAccountAction(account.id, payload)
: await createAccountAction(payload);
if (result.ok) {
toast.success(account ? t.updated(values.name) : t.created(values.name));
handleOpenChange(false);
return;
}
let advancedError = false;
for (const [name, message] of Object.entries(result.fieldErrors ?? {})) {
if (!message) continue;
form.setError(name as keyof FormValues, { message });
if (/^(overdraft|ownerUserId|isPrivate)/.test(name)) advancedError = true;
}
if (advancedError) setAdvancedOpen(true);
if (!result.fieldErrors) form.setError("root", { message: result.error });
}
return (
<ResponsiveDialog
open={open}
onOpenChange={handleOpenChange}
title={isEdit ? t.editTitle : t.createTitle}
description={t.formDescription}
footer={
<>
<Button variant="outline" type="button" onClick={() => handleOpenChange(false)}>
{tr.common.cancel}
</Button>
<Button type="submit" form="account-form" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
{isEdit ? tr.common.save : tr.common.create}
</Button>
</>
}
>
<form id="account-form" onSubmit={form.handleSubmit(onSubmit)} noValidate>
<FieldGroup>
<Controller
name="type"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="acc-type">{f.type}</FieldLabel>
<Select
value={field.value}
disabled={isEdit}
onValueChange={(v) => {
field.onChange(v);
if (!isEdit) form.setValue("icon", DEFAULT_ICON[v as AccountType]);
}}
>
<SelectTrigger id="acc-type" className="w-full">
<SelectValue>{t.types[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{ACCOUNT_TYPES.map((x) => (
<SelectItem key={x} value={x}>
{t.types[x]}
</SelectItem>
))}
</SelectContent>
</Select>
{isEdit ? <FieldDescription>{f.typeLockedHint}</FieldDescription> : null}
</Field>
)}
/>
<Controller
name="name"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-name">{f.name}</FieldLabel>
<Input {...field} id="acc-name" aria-invalid={fieldState.invalid} />
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
{type === "meal_card" ? (
<Controller
name="mealCardProvider"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-provider">{f.provider}</FieldLabel>
<Select value={field.value ?? undefined} onValueChange={field.onChange}>
<SelectTrigger
id="acc-provider"
className="w-full"
aria-invalid={fieldState.invalid}
>
<SelectValue placeholder={f.provider}>
{field.value ? t.providers[field.value] : null}
</SelectValue>
</SelectTrigger>
<SelectContent>
{MEAL_CARD_PROVIDERS.map((p) => (
<SelectItem key={p} value={p}>
{t.providers[p]}
</SelectItem>
))}
</SelectContent>
</Select>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
) : type !== "cash" ? (
<Controller
name="institution"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="acc-institution">{f.institution}</FieldLabel>
<Input {...field} id="acc-institution" placeholder={f.institutionPlaceholder} />
</Field>
)}
/>
) : null}
<div className="grid gap-4 sm:grid-cols-2">
<MoneyField
control={form.control}
name="openingBalance"
label={isCard ? f.openingDebt : f.openingBalance}
hint={
balanceHidden
? t.hiddenHint
: isCard
? f.openingDebtHint
: type === "bank"
? f.openingBalanceHint
: undefined
}
allowNegative={type === "bank"}
disabled={balanceHidden}
/>
<Controller
name="openingDate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-date">{f.openingDate}</FieldLabel>
<Input {...field} id="acc-date" type="date" aria-invalid={fieldState.invalid} />
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
</div>
{isCard ? (
<FieldSet>
<FieldLegend>{f.card}</FieldLegend>
<FieldGroup>
<MoneyField control={form.control} name="cardLimit" label={f.cardLimit} />
<Controller
name="cardStatementDay"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="acc-card-statement">{f.cardStatementDay}</FieldLabel>
<DaySelect
id="acc-card-statement"
value={field.value}
onChange={field.onChange}
/>
<FieldDescription>{f.cardStatementDayHint}</FieldDescription>
</Field>
)}
/>
<div className="grid gap-4 sm:grid-cols-2">
<Controller
name="cardDueKind"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="acc-card-due-kind">{f.cardDueKind}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger id="acc-card-due-kind" className="w-full">
<SelectValue>{f.dueKinds[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{DUE_RULE_KINDS.map((k) => (
<SelectItem key={k} value={k}>
{f.dueKinds[k]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
<Controller
name="cardDueValue"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-card-due-value">
{dueKind === "daysAfter" ? f.cardDueValueDays : f.cardDueValueDay}
</FieldLabel>
<DaySelect
id="acc-card-due-value"
value={field.value}
onChange={field.onChange}
max={dueKind === "daysAfter" ? 30 : 31}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
</div>
<Controller
name="cardPaymentAccountId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-card-payer">{f.cardPaymentAccount}</FieldLabel>
<Select
value={field.value || NONE}
onValueChange={(v) => field.onChange(v === NONE ? "" : v)}
>
<SelectTrigger
id="acc-card-payer"
className="w-full"
aria-invalid={fieldState.invalid}
>
<SelectValue>
{paymentAccounts.find((p) => p.id === field.value)?.name ??
f.cardPaymentAccountNone}
</SelectValue>
</SelectTrigger>
<SelectContent>
<SelectItem value={NONE}>{f.cardPaymentAccountNone}</SelectItem>
{paymentAccounts
.filter((p) => p.id !== account?.id)
.map((p) => (
<SelectItem key={p.id} value={p.id}>
{p.name}
</SelectItem>
))}
</SelectContent>
</Select>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="cardMinimumRate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-card-min">{f.cardMinimumRate}</FieldLabel>
<Input
{...field}
id="acc-card-min"
inputMode="decimal"
placeholder="20"
className="w-28 tabular-nums"
aria-describedby="acc-card-min-hint"
aria-invalid={fieldState.invalid}
/>
<FieldDescription id="acc-card-min-hint">
{f.cardMinimumRateHint}
</FieldDescription>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
</FieldGroup>
</FieldSet>
) : null}
<Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen}>
<CollapsibleTrigger asChild>
<Button type="button" variant="ghost" className="-ml-2 w-fit">
<ChevronDown
className={
advancedOpen ? "rotate-180 transition-transform" : "transition-transform"
}
/>
{f.advanced}
</Button>
</CollapsibleTrigger>
<CollapsibleContent className="pt-3">
<FieldGroup>
{type === "bank" ? (
<FieldSet>
<FieldLegend>{f.overdraft}</FieldLegend>
<FieldGroup>
<Controller
name="overdraftEnabled"
control={form.control}
render={({ field }) => (
<Field orientation="horizontal">
<Checkbox
id="acc-od"
checked={field.value}
onCheckedChange={(v) => field.onChange(v === true)}
/>
<FieldLabel htmlFor="acc-od" className="font-normal">
{f.overdraftEnabled}
</FieldLabel>
</Field>
)}
/>
{overdraftEnabled ? (
<>
<MoneyField
control={form.control}
name="overdraftLimit"
label={f.overdraftLimit}
/>
<div className="grid gap-4 sm:grid-cols-2">
<Controller
name="overdraftMonthlyRate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-od-rate">{f.overdraftRate}</FieldLabel>
<Input
{...field}
id="acc-od-rate"
inputMode="decimal"
placeholder="4,25"
className="w-28 tabular-nums"
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? (
<FieldError errors={[fieldState.error]} />
) : null}
</Field>
)}
/>
<Controller
name="overdraftStatementDay"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="acc-od-day">
{f.overdraftStatementDay}
</FieldLabel>
<DaySelect
id="acc-od-day"
value={field.value}
onChange={field.onChange}
allowEmpty
/>
</Field>
)}
/>
</div>
</>
) : null}
</FieldGroup>
</FieldSet>
) : null}
<Controller
name="ownerUserId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-owner">{f.owner}</FieldLabel>
<Select
value={field.value || NONE}
onValueChange={(v) => field.onChange(v === NONE ? "" : v)}
>
<SelectTrigger
id="acc-owner"
className="w-full"
aria-invalid={fieldState.invalid}
>
<SelectValue>
{members.find((m) => m.id === field.value)?.name ?? f.ownerNone}
</SelectValue>
</SelectTrigger>
<SelectContent>
<SelectItem value={NONE}>{f.ownerNone}</SelectItem>
{members.map((m) => (
<SelectItem key={m.id} value={m.id}>
{m.name}
</SelectItem>
))}
</SelectContent>
</Select>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="isPrivate"
control={form.control}
render={({ field }) => (
<Field orientation="horizontal">
<Checkbox
id="acc-private"
checked={field.value}
onCheckedChange={(v) => field.onChange(v === true)}
/>
<FieldLabel htmlFor="acc-private" className="font-normal">
{f.isPrivate}
</FieldLabel>
</Field>
)}
/>
<Controller
name="color"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel id="acc-color-label">{tr.categories.color}</FieldLabel>
<SwatchPicker
value={field.value}
onChange={field.onChange}
labelledBy="acc-color-label"
/>
</Field>
)}
/>
<Controller
name="icon"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel id="acc-icon-label">{tr.categories.icon}</FieldLabel>
<IconPicker
value={field.value}
color={color}
onChange={field.onChange}
labelledBy="acc-icon-label"
/>
</Field>
)}
/>
</FieldGroup>
</CollapsibleContent>
</Collapsible>
{form.formState.errors.root ? (
<FieldError>{form.formState.errors.root.message}</FieldError>
) : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
@@ -0,0 +1,323 @@
"use client";
import {
Archive,
ArchiveRestore,
ArrowDown,
ArrowUp,
ChevronDown,
EyeOff,
MoreHorizontal,
Pencil,
Plus,
} from "lucide-react";
import Link from "next/link";
import { useState, useTransition } from "react";
import { toast } from "sonner";
import { IconBadge } from "@/components/appearance/swatch";
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, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { ACCOUNT_TYPES, isLiabilityType } from "@/shared/accounts";
import { formatMoney } from "@/shared/format";
import { reorderAccountAction, setAccountArchivedAction } from "../actions";
import type { AccountTotals, AccountView } from "../service";
import { AccountFormDialog } from "./account-form-dialog";
const t = tr.accounts;
function BalanceText({ account }: { account: AccountView }) {
if (account.balanceMinor === null) {
return (
<span
className="inline-flex items-center gap-1 text-sm text-muted-foreground"
title={t.hiddenHint}
>
<EyeOff className="size-3.5" />
{t.hidden}
</span>
);
}
const liability = isLiabilityType(account.type);
const value = account.balanceMinor;
return (
<span className="flex flex-col items-end">
{liability ? <span className="text-xs text-muted-foreground">{t.debt}</span> : null}
<span
className={cn(
"font-semibold tabular-nums",
(liability ? value < 0 : value < 0) && "text-expense",
)}
>
{formatMoney(liability ? Math.abs(value) : value)}
</span>
</span>
);
}
export function AccountsView({
accounts,
totals,
members,
canEdit,
}: {
accounts: AccountView[];
totals: AccountTotals;
members: { id: string; name: string }[];
canEdit: boolean;
}) {
const [dialog, setDialog] = useState<{ account?: AccountView } | null>(null);
const [archiving, setArchiving] = useState<AccountView | null>(null);
const [pending, startTransition] = useTransition();
const active = accounts.filter((a) => !a.archived);
const archived = accounts.filter((a) => a.archived);
const memberName = (id: string | null) => members.find((m) => m.id === id)?.name;
const paymentAccounts = active
.filter((a) => ["bank", "cash", "savings"].includes(a.type))
.map((a) => ({ id: a.id, name: a.name }));
function run(promise: Promise<{ ok: boolean; error?: string }>, success?: string) {
startTransition(async () => {
const r = await promise;
if (r.ok) {
if (success) toast.success(success);
} else toast.error(r.error ?? tr.common.genericError);
});
}
function Row({ a, index }: { a: AccountView; index: number }) {
const owner = memberName(a.ownerUserId);
return (
<li className={cn("flex items-center gap-3 p-3", a.archived && "opacity-60")}>
<IconBadge icon={a.icon} color={a.color} />
<div className="min-w-0 flex-1">
{/* Gizli hesabın ekstresi yalnızca sahibine açılır. */}
{a.balanceMinor === null ? (
<span className="block truncate font-medium">{a.name}</span>
) : (
<Link href={`/hesaplar/${a.id}`} className="block truncate font-medium hover:underline">
{a.name}
</Link>
)}
<div className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">
{a.type === "meal_card" && a.mealCardProvider ? (
<span>{t.providers[a.mealCardProvider]}</span>
) : null}
{a.institution ? <span>{a.institution}</span> : null}
{owner ? <span>· {owner}</span> : null}
{a.isPrivate ? <Badge variant="outline">{t.privateBadge}</Badge> : null}
{a.overdraft ? (
<Badge variant="secondary">
{t.overdraftBadge(formatMoney(a.overdraft.limitMinor))}
</Badge>
) : null}
{a.creditCard ? (
<>
<Badge variant="secondary">
{t.limitLabel(formatMoney(a.creditCard.limitMinor))}
</Badge>
<span>{t.statementLabel(a.creditCard.statementDay)}</span>
</>
) : null}
</div>
</div>
<BalanceText account={a} />
{canEdit ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
aria-label={`${a.name} — ${tr.common.actions}`}
disabled={pending}
>
<MoreHorizontal />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-48">
{a.archived ? (
<DropdownMenuItem
onSelect={() =>
run(setAccountArchivedAction(a.id, false), t.unarchivedToast(a.name))
}
>
<ArchiveRestore />
{t.unarchive}
</DropdownMenuItem>
) : (
<>
<DropdownMenuItem onSelect={() => setDialog({ account: a })}>
<Pencil />
{tr.common.edit}
</DropdownMenuItem>
<DropdownMenuItem
disabled={index === 0}
onSelect={() => run(reorderAccountAction(a.id, "up"))}
>
<ArrowUp />
{tr.categories.moveUp}
</DropdownMenuItem>
<DropdownMenuItem
disabled={index === active.length - 1}
onSelect={() => run(reorderAccountAction(a.id, "down"))}
>
<ArrowDown />
{tr.categories.moveDown}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem variant="destructive" onSelect={() => setArchiving(a)}>
<Archive />
{t.archive}
</DropdownMenuItem>
</>
)}
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
);
}
const summary = [
{ label: t.summary.assets, value: totals.assetsMinor, tone: "text-income" },
{
label: t.summary.cardDebt,
value: Math.abs(totals.cardDebtMinor),
tone: totals.cardDebtMinor ? "text-expense" : "",
},
{
label: t.summary.net,
value: totals.netMinor,
tone: totals.netMinor < 0 ? "text-expense" : "",
},
];
return (
<div className="flex flex-col gap-4">
<div className="grid grid-cols-3 gap-3">
{summary.map((s) => (
<Card key={s.label} size="sm">
<CardHeader>
<CardDescription>{s.label}</CardDescription>
<CardTitle className={cn("text-base tabular-nums sm:text-lg", s.tone)}>
{formatMoney(s.value)}
</CardTitle>
</CardHeader>
</Card>
))}
</div>
{totals.includesHidden || totals.excludesHidden ? (
<p className="-mt-2 text-xs text-muted-foreground">
{totals.excludesHidden ? t.summary.excludesHidden : t.summary.includesHidden}
</p>
) : null}
<div className="flex items-center gap-3">
{!canEdit ? <p className="text-sm text-muted-foreground">{t.ownerOnly}</p> : null}
{canEdit ? (
<Button className="ml-auto" onClick={() => setDialog({})}>
<Plus />
{t.newAccount}
</Button>
) : null}
</div>
{active.length === 0 ? (
<div className="rounded-xl border border-dashed p-8 text-center text-muted-foreground">
<p>{t.empty}</p>
{canEdit ? <p className="mt-1 text-sm">{t.emptyOwnerHint}</p> : null}
</div>
) : (
ACCOUNT_TYPES.map((type) => {
const group = active.filter((a) => a.type === type);
if (!group.length) return null;
return (
<section
key={type}
aria-labelledby={`acc-group-${type}`}
className="flex flex-col gap-2"
>
<h2 id={`acc-group-${type}`} className="text-sm font-medium text-muted-foreground">
{t.typeGroups[type]}
</h2>
<ul className="divide-y rounded-xl border bg-card" aria-busy={pending}>
{group.map((a) => (
<Row key={a.id} a={a} index={active.indexOf(a)} />
))}
</ul>
</section>
);
})
)}
{archived.length ? (
<Collapsible>
<CollapsibleTrigger asChild>
<Button variant="ghost" className="-ml-2 w-fit">
<ChevronDown />
{t.archivedSection(archived.length)}
</Button>
</CollapsibleTrigger>
<CollapsibleContent>
<ul className="mt-2 divide-y rounded-xl border bg-card">
{archived.map((a) => (
<Row key={a.id} a={a} index={-1} />
))}
</ul>
</CollapsibleContent>
</Collapsible>
) : null}
<AccountFormDialog
open={Boolean(dialog)}
account={dialog?.account}
members={members}
paymentAccounts={paymentAccounts}
onOpenChange={(o) => !o && setDialog(null)}
/>
<AlertDialog open={Boolean(archiving)} onOpenChange={(o) => !o && setArchiving(null)}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.archiveTitle}</AlertDialogTitle>
<AlertDialogDescription>
{archiving ? t.archiveDescription(archiving.name) : null}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={() => {
const a = archiving!;
setArchiving(null);
run(setAccountArchivedAction(a.id, true), t.archivedToast(a.name));
}}
>
{t.archive}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
+162
View File
@@ -0,0 +1,162 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { AccountModel } from "@/models/account";
import { HouseholdModel } from "@/models/household";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { createAccount, listAccounts, setAccountArchived, updateAccount } from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let annemler = "";
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
annemler = ids.household("Annemler");
});
afterAll(teardownDb);
const base = {
name: "Test Hesap",
type: "bank" as const,
institution: "",
mealCardProvider: null,
openingBalance: 100_00,
openingDate: "2026-05-01",
color: "blue" as const,
icon: "landmark" as const,
ownerUserId: null,
isPrivate: false,
overdraftEnabled: false,
overdraftLimit: 0,
overdraftMonthlyRate: null,
overdraftStatementDay: null,
cardLimit: 0,
cardStatementDay: 1,
cardDueKind: "daysAfter" as const,
cardDueValue: 10,
cardPaymentAccountId: null,
cardMinimumRate: null,
};
const accountId = (name: string, householdId = cakir) =>
AccountModel.findOne({ householdId, name })
.lean()
.then((a) => String(a!._id));
describe("roller ve izolasyon", () => {
it("yalnızca sahip hesap oluşturur", async () => {
expect((await createAccount(ids.user("emre"), cakir, base)).ok).toBe(false);
expect((await createAccount(ids.user("zeynep"), cakir, base)).ok).toBe(false);
expect((await createAccount(ids.user("fatma"), cakir, base)).ok).toBe(false);
expect((await createAccount(ids.user("ayse"), cakir, base)).ok).toBe(true);
});
it("başka hanenin hesaplarını göremez ve değiştiremez", async () => {
expect(await listAccounts(ids.user("fatma"), cakir)).toBeNull();
const cuzdan = await accountId("Cüzdan");
expect(
(
await updateAccount(ids.user("fatma"), annemler, cuzdan, {
...base,
type: "cash",
name: "X",
})
).ok,
).toBe(false);
expect((await setAccountArchived(ids.user("fatma"), annemler, cuzdan, true)).ok).toBe(false);
const own = (await listAccounts(ids.user("fatma"), annemler))!.accounts.map((a) => a.name);
expect(own.sort()).toEqual(["Nakit", "Vakıfbank Emekli"]);
});
it("başka hanenin hesabı kart ödeme hesabı veya hesap sahibi başka hanenin üyesi olamaz", async () => {
const vakif = await accountId("Vakıfbank Emekli", annemler);
const card = {
...base,
type: "credit_card" as const,
name: "Sızma Kart",
cardPaymentAccountId: vakif,
};
expect((await createAccount(ids.user("ayse"), cakir, card)).ok).toBe(false);
expect(
(await createAccount(ids.user("ayse"), cakir, { ...base, ownerUserId: ids.user("fatma") }))
.ok,
).toBe(false);
});
});
describe("“yalnızca ben” hesabı", () => {
it("bakiyeyi yalnızca hesap sahibi görür (hane sahibi dahil diğerleri göremez)", async () => {
const find = async (user: string) =>
(await listAccounts(ids.user(user), cakir))!.accounts.find(
(a) => a.name === "Ayşe — Pluxee",
)!;
// Hesap sahibi açılış ve güncel bakiyeyi görür (güncel = açılış + işlemler).
expect((await find("ayse")).openingBalanceMinor).toBe(3_120_00);
expect((await find("ayse")).balanceMinor).not.toBeNull();
expect((await find("admin")).balanceMinor).toBeNull();
expect((await find("emre")).balanceMinor).toBeNull();
expect((await find("emre")).openingBalanceMinor).toBeNull();
});
it("toplamlar hane ayarına uyar", async () => {
const withHidden = (await listAccounts(ids.user("emre"), cakir))!.totals;
expect(withHidden.includesHidden).toBe(true);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": false } },
);
const without = (await listAccounts(ids.user("emre"), cakir))!.totals;
expect(without.excludesHidden).toBe(true);
const pluxee = (await listAccounts(ids.user("ayse"), cakir))!.accounts.find(
(a) => a.name === "Ayşe — Pluxee",
)!;
expect(withHidden.assetsMinor - without.assetsMinor).toBe(pluxee.balanceMinor);
// Hesap sahibi kendi hesabını her zaman toplamda görür.
const ayse = (await listAccounts(ids.user("ayse"), cakir))!.totals;
expect(ayse.assetsMinor).toBe(withHidden.assetsMinor);
await HouseholdModel.updateOne(
{ _id: cakir },
{ $set: { "settings.includePrivateAccountsInTotals": true } },
);
});
it("bakiyeyi göremeyen sahip düzenlediğinde gizli bakiye korunur", async () => {
const id = await accountId("Ayşe — Pluxee");
const r = await updateAccount(ids.user("admin"), cakir, id, {
...base,
type: "meal_card",
mealCardProvider: "pluxee",
name: "Ayşe — Pluxee",
openingBalance: 0,
ownerUserId: ids.user("ayse"),
isPrivate: true,
});
expect(r.ok).toBe(true);
expect((await AccountModel.findById(id).lean())?.openingBalanceMinor).toBe(3_120_00);
});
});
describe("kart ve tür kuralları", () => {
it("kart açılış borcu negatif saklanır; tür değiştirilemez", async () => {
const payer = await accountId("Ziraat Maaş");
const r = await createAccount(ids.user("ayse"), cakir, {
...base,
type: "credit_card",
name: "Yeni Kart",
openingBalance: 1_500_00,
cardLimit: 20_000_00,
cardStatementDay: 31,
cardPaymentAccountId: payer,
});
expect(r.ok).toBe(true);
const card = await AccountModel.findById(r.ok ? r.data.id : "").lean();
expect(card?.openingBalanceMinor).toBe(-1_500_00);
expect(card?.creditCard?.statementDay).toBe(31);
expect(card?.creditCard?.paymentAccountId?.toString()).toBe(payer);
const change = await updateAccount(ids.user("ayse"), cakir, String(card!._id), {
...base,
name: "Yeni Kart",
});
expect(change.ok).toBe(false);
});
});
+382
View File
@@ -0,0 +1,382 @@
import "server-only";
import { Types } from "mongoose";
import { getHouseholdDetail, resolveMembership } from "@/features/households/service";
import { computeAccountDeltas } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { diffFields, writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { AccountModel } from "@/models/account";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import {
isLiabilityType,
type AccountType,
type DueRuleKind,
type MealCardProvider,
} from "@/shared/accounts";
import type { IconKey, Swatch } from "@/shared/appearance";
import { istanbulDayStart, toIstanbulYmd } from "@/shared/dates";
import type { AccountForm } from "@/shared/schemas/account";
import { compareTr } from "@/shared/search";
/**
* Hesap servisi. Okuma: viewer; oluşturma/düzenleme/arşiv/sıralama: owner (Bölüm 5).
* "Yalnızca ben" hesaplarında bakiye yalnızca hesap sahibi kişiye görünür.
* Bakiye işareti: varlık pozitif, kredi kartı borcu negatif.
*/
const t = tr.accounts;
export type AccountView = {
id: string;
name: string;
type: AccountType;
institution: string;
mealCardProvider: MealCardProvider | null;
color: Swatch;
icon: IconKey;
order: number;
archived: boolean;
isPrivate: boolean;
ownerUserId: string | null;
/** Bu kullanıcıya gizliyse null. */
balanceMinor: number | null;
openingBalanceMinor: number | null;
openingDate: string;
overdraft: {
enabled: boolean;
limitMinor: number;
monthlyRateBp: number | null;
statementDay: number | null;
} | null;
creditCard: {
limitMinor: number;
statementDay: number;
dueRule: { kind: DueRuleKind; value: number };
paymentAccountId: string | null;
minimumPaymentRateBp: number | null;
} | null;
};
export type AccountTotals = {
/** Nakit + banka + birikim + yemek kartı (pozitif bakiyeler). */
assetsMinor: number;
/** Kredi kartı borçları (negatif). */
cardDebtMinor: number;
netMinor: number;
/** Toplamlarda bu kullanıcının bakiyesini göremediği hesap var mı? */
includesHidden: boolean;
/** Gizli hesaplar hane ayarı gereği toplamlardan çıkarıldı mı? */
excludesHidden: boolean;
};
type Lean = {
_id: Types.ObjectId;
name: string;
type: AccountType;
institution: string;
mealCardProvider: MealCardProvider | null;
color: Swatch;
icon: IconKey;
order: number;
archivedAt: Date | null;
isPrivate: boolean;
ownerUserId: Types.ObjectId | null;
openingBalanceMinor: number;
openingDate: Date;
overdraft: AccountView["overdraft"];
creditCard:
| (Omit<NonNullable<AccountView["creditCard"]>, "paymentAccountId"> & {
paymentAccountId: Types.ObjectId | null;
})
| null;
};
const canSeeBalance = (a: Lean, viewerId: string) =>
!a.isPrivate || String(a.ownerUserId) === viewerId;
/** Güncel bakiye = açılış bakiyesi + gerçekleşmiş işlemlerin etkisi (tek doğruluk kaynağı: işlemler). */
function computeBalance(a: Lean, deltas: ReadonlyMap<string, number>): number {
return a.openingBalanceMinor + (deltas.get(String(a._id)) ?? 0);
}
function toView(a: Lean, viewerId: string, deltas: ReadonlyMap<string, number>): AccountView {
const visible = canSeeBalance(a, viewerId);
return {
id: String(a._id),
name: a.name,
type: a.type,
institution: a.institution ?? "",
mealCardProvider: a.mealCardProvider ?? null,
color: a.color,
icon: a.icon,
order: a.order,
archived: Boolean(a.archivedAt),
isPrivate: a.isPrivate,
ownerUserId: a.ownerUserId ? String(a.ownerUserId) : null,
balanceMinor: visible ? computeBalance(a, deltas) : null,
openingBalanceMinor: visible ? a.openingBalanceMinor : null,
openingDate: toIstanbulYmd(a.openingDate),
overdraft: a.overdraft?.enabled ? a.overdraft : null,
creditCard: a.creditCard
? {
...a.creditCard,
paymentAccountId: a.creditCard.paymentAccountId
? String(a.creditCard.paymentAccountId)
: null,
}
: null,
};
}
export async function listAccounts(
userId: string,
householdId: string,
opts: { includeArchived?: boolean } = {},
): Promise<{ accounts: AccountView[]; totals: AccountTotals } | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const filter: Record<string, unknown> = { householdId: m.householdId };
if (!opts.includeArchived) filter.archivedAt = null;
const rows = (await AccountModel.find(filter).lean<Lean[]>()).sort(
(a, b) => a.order - b.order || compareTr(a.name, b.name),
);
const [household, deltas] = await Promise.all([
HouseholdModel.findById(m.householdId).select({ settings: 1 }).lean(),
computeAccountDeltas(m.householdId),
]);
const includePrivate = household?.settings?.includePrivateAccountsInTotals ?? true;
const totals: AccountTotals = {
assetsMinor: 0,
cardDebtMinor: 0,
netMinor: 0,
includesHidden: false,
excludesHidden: false,
};
for (const a of rows) {
if (a.archivedAt) continue;
const visible = canSeeBalance(a, userId);
if (!visible && !includePrivate) {
totals.excludesHidden = true;
continue;
}
if (!visible) totals.includesHidden = true;
const balance = computeBalance(a, deltas);
if (isLiabilityType(a.type)) totals.cardDebtMinor += balance;
else totals.assetsMinor += balance;
}
totals.netMinor = totals.assetsMinor + totals.cardDebtMinor;
return { accounts: rows.map((a) => toView(a, userId, deltas)), totals };
}
/** Form → belge alanları. Kart için açılış borcu negatif saklanır. */
async function toDocFields(
householdId: Types.ObjectId,
input: AccountForm,
selfId?: Types.ObjectId,
): Promise<ActionResult<Record<string, unknown>>> {
const openingDate = istanbulDayStart(input.openingDate);
if (!openingDate) return fail(tr.validation.date, { openingDate: tr.validation.date });
let ownerUserId: Types.ObjectId | null = null;
if (input.ownerUserId) {
ownerUserId = toObjectId(input.ownerUserId);
const isMember =
ownerUserId && (await HouseholdMemberModel.exists({ householdId, userId: ownerUserId }));
if (!isMember) return fail(t.ownerNotMember, { ownerUserId: t.ownerNotMember });
}
let paymentAccountId: Types.ObjectId | null = null;
if (input.type === "credit_card" && input.cardPaymentAccountId) {
paymentAccountId = toObjectId(input.cardPaymentAccountId);
const payer =
paymentAccountId &&
!paymentAccountId.equals(selfId ?? new Types.ObjectId()) &&
(await AccountModel.exists({
_id: paymentAccountId,
householdId,
archivedAt: null,
type: { $in: ["bank", "cash", "savings"] },
}));
if (!payer)
return fail(t.invalidPaymentAccount, { cardPaymentAccountId: t.invalidPaymentAccount });
}
const isCard = input.type === "credit_card";
return ok({
name: input.name,
institution: input.institution,
mealCardProvider: input.type === "meal_card" ? input.mealCardProvider : null,
openingBalanceMinor: isCard ? -Math.abs(input.openingBalance) : input.openingBalance,
openingDate,
color: input.color,
icon: input.icon,
ownerUserId,
isPrivate: input.isPrivate,
overdraft:
input.type === "bank" && input.overdraftEnabled
? {
enabled: true,
limitMinor: input.overdraftLimit,
monthlyRateBp: input.overdraftMonthlyRate,
statementDay: input.overdraftStatementDay,
}
: null,
creditCard: isCard
? {
limitMinor: input.cardLimit,
statementDay: input.cardStatementDay,
dueRule: { kind: input.cardDueKind, value: input.cardDueValue },
paymentAccountId,
minimumPaymentRateBp: input.cardMinimumRate,
}
: null,
});
}
export async function createAccount(
actorId: string,
householdId: string,
input: AccountForm,
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "owner");
if (!m) return fail(tr.common.unauthorized);
const fields = await toDocFields(m.householdId, input);
if (!fields.ok) return fields;
const last = await AccountModel.findOne({ householdId: m.householdId })
.sort({ order: -1 })
.select({ order: 1 })
.lean();
const actor = new Types.ObjectId(actorId);
const doc = await AccountModel.create({
...fields.data,
householdId: m.householdId,
type: input.type,
order: (last?.order ?? -1) + 1,
createdBy: actor,
updatedBy: actor,
});
await writeAudit({
action: "account.create",
actorId: actor,
householdId: m.householdId,
targetType: "account",
targetId: String(doc._id),
diff: { name: input.name, type: input.type },
});
return ok({ id: String(doc._id) });
}
export async function updateAccount(
actorId: string,
householdId: string,
accountId: string,
input: AccountForm,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "owner");
if (!m) return fail(tr.common.unauthorized);
const id = toObjectId(accountId);
const current = id
? await AccountModel.findOne({ _id: id, householdId: m.householdId }).lean<Lean>()
: null;
if (!current) return fail(tr.common.notFound);
// Tür değişikliği desteklenmez (işlemler ve kart dönemleri türe bağlıdır).
if (current.type !== input.type) return fail(t.typeLocked, { type: t.typeLocked });
const fields = await toDocFields(m.householdId, input, current._id);
if (!fields.ok) return fields;
// Bakiyesini göremediği gizli hesapta açılış bakiyesi korunur (ne görünür ne değişir).
if (!canSeeBalance(current, actorId)) delete fields.data.openingBalanceMinor;
const actor = new Types.ObjectId(actorId);
await AccountModel.updateOne(
{ _id: current._id, householdId: m.householdId },
{ $set: { ...fields.data, updatedBy: actor } },
);
await writeAudit({
action: "account.update",
actorId: actor,
householdId: m.householdId,
targetType: "account",
targetId: accountId,
// Gizli hesabın bakiyesi denetim kaydına yazılmaz.
diff: diffFields(
{
name: current.name,
institution: current.institution,
isPrivate: current.isPrivate,
ownerUserId: String(current.ownerUserId ?? ""),
},
{
name: input.name,
institution: input.institution,
isPrivate: input.isPrivate,
ownerUserId: input.ownerUserId ?? "",
},
),
});
return ok(undefined);
}
export async function setAccountArchived(
actorId: string,
householdId: string,
accountId: string,
archived: boolean,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "owner");
if (!m) return fail(tr.common.unauthorized);
const id = toObjectId(accountId);
const current = id
? await AccountModel.findOne({ _id: id, householdId: m.householdId }).lean<Lean>()
: null;
if (!current) return fail(tr.common.notFound);
const actor = new Types.ObjectId(actorId);
await AccountModel.updateOne(
{ _id: current._id, householdId: m.householdId },
{ $set: { archivedAt: archived ? new Date() : null, updatedBy: actor } },
);
await writeAudit({
action: archived ? "account.archive" : "account.unarchive",
actorId: actor,
householdId: m.householdId,
targetType: "account",
targetId: accountId,
diff: { name: current.name },
});
return ok(undefined);
}
export async function reorderAccount(
actorId: string,
householdId: string,
accountId: string,
direction: "up" | "down",
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "owner");
if (!m) return fail(tr.common.unauthorized);
const list = (
await AccountModel.find({ householdId: m.householdId, archivedAt: null }).lean<Lean[]>()
).sort((a, b) => a.order - b.order || compareTr(a.name, b.name));
const i = list.findIndex((a) => String(a._id) === accountId);
const j = direction === "up" ? i - 1 : i + 1;
if (i < 0 || j < 0 || j >= list.length) return ok(undefined);
[list[i], list[j]] = [list[j]!, list[i]!];
await AccountModel.bulkWrite(
list.map((a, order) => ({
updateOne: {
filter: { _id: a._id, householdId: m.householdId },
update: { $set: { order } },
},
})),
);
return ok(undefined);
}
/** Hane üyeleri (hesap sahibi seçimi için). */
export async function listMemberOptions(userId: string, householdId: string) {
const detail = await getHouseholdDetail(userId, householdId);
if (!detail) return null;
return detail.members.map((x) => ({ id: x.userId, name: x.name }));
}
+74
View File
@@ -0,0 +1,74 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import {
adminAddMember,
adminCreateHousehold,
adminRemoveMember,
adminSetMemberRole,
} from "@/features/households/service";
import { tr } from "@/i18n/tr";
import { fail, type ActionResult } from "@/lib/action-result";
import { getActionUser } from "@/lib/dal";
import {
addMemberSchema,
householdCreateSchema,
householdRoleSchema,
} from "@/shared/schemas/household";
/** Sistem admini: hane ve üyelik yönetimi. Hanenin finansal verisine dokunmaz. */
const PATH = "/admin/haneler";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
export async function createHouseholdAction(input: unknown): Promise<ActionResult<{ id: string }>> {
const admin = await getActionUser("admin");
if (!admin) return fail(tr.common.unauthorized);
const parsed = householdCreateSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields);
const result = await adminCreateHousehold(admin.id, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
export async function addMemberAction(householdId: unknown, input: unknown): Promise<ActionResult> {
const admin = await getActionUser("admin");
if (!admin) return fail(tr.common.unauthorized);
const hid = idSchema.safeParse(householdId);
const parsed = addMemberSchema.safeParse(input);
if (!hid.success || !parsed.success) return fail(tr.adminUsers.errors.checkFields);
const result = await adminAddMember(admin.id, hid.data, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
export async function adminSetMemberRoleAction(
householdId: unknown,
userId: unknown,
role: unknown,
): Promise<ActionResult> {
const admin = await getActionUser("admin");
if (!admin) return fail(tr.common.unauthorized);
const hid = idSchema.safeParse(householdId);
const uid = idSchema.safeParse(userId);
const r = householdRoleSchema.safeParse(role);
if (!hid.success || !uid.success || !r.success) return fail(tr.common.genericError);
const result = await adminSetMemberRole(admin.id, hid.data, uid.data, r.data);
if (result.ok) revalidatePath(PATH);
return result;
}
export async function adminRemoveMemberAction(
householdId: unknown,
userId: unknown,
): Promise<ActionResult> {
const admin = await getActionUser("admin");
if (!admin) return fail(tr.common.unauthorized);
const hid = idSchema.safeParse(householdId);
const uid = idSchema.safeParse(userId);
if (!hid.success || !uid.success) return fail(tr.common.genericError);
const result = await adminRemoveMember(admin.id, hid.data, uid.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
@@ -0,0 +1,306 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2, Plus, UserPlus } from "lucide-react";
import { useEffect, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { toast } from "sonner";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Card,
CardAction,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from "@/components/ui/card";
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 { MembersList } from "@/features/households/components/members-list";
import type { AdminHouseholdRow, UserOption } from "@/features/households/service";
import { HOUSEHOLD_ROLES } from "@/features/households/types";
import { tr } from "@/i18n/tr";
import {
addMemberSchema,
householdCreateSchema,
type AddMemberInput,
type HouseholdCreateInput,
} from "@/shared/schemas/household";
import {
addMemberAction,
adminRemoveMemberAction,
adminSetMemberRoleAction,
createHouseholdAction,
} from "../actions";
import { UserSelect } from "./user-select";
const t = tr.adminHouseholds;
function CreateHouseholdDialog({
open,
onOpenChange,
users,
}: {
open: boolean;
onOpenChange: (o: boolean) => void;
users: UserOption[];
}) {
const form = useForm<HouseholdCreateInput>({
resolver: zodResolver(householdCreateSchema),
defaultValues: { name: "", ownerUserId: "" },
});
useEffect(() => {
if (open) form.reset({ name: "", ownerUserId: "" });
}, [open, form]);
async function onSubmit(values: HouseholdCreateInput) {
const result = await createHouseholdAction(values);
if (result.ok) {
toast.success(t.created(values.name));
onOpenChange(false);
} else {
form.setError("root", { message: result.error });
}
}
return (
<ResponsiveDialog
open={open}
onOpenChange={onOpenChange}
title={t.createTitle}
description={t.createDescription}
footer={
<>
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
{tr.common.cancel}
</Button>
<Button type="submit" form="household-create" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
{tr.common.create}
</Button>
</>
}
>
<form id="household-create" onSubmit={form.handleSubmit(onSubmit)} noValidate>
<FieldGroup>
<Controller
name="name"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="hh-create-name">{t.name}</FieldLabel>
<Input {...field} id="hh-create-name" aria-invalid={fieldState.invalid} />
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="ownerUserId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="hh-create-owner">{t.owner}</FieldLabel>
<UserSelect
id="hh-create-owner"
users={users}
value={field.value}
onChange={field.onChange}
invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
{form.formState.errors.root ? (
<FieldError>{form.formState.errors.root.message}</FieldError>
) : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
function AddMemberDialog({
household,
users,
onOpenChange,
}: {
household: AdminHouseholdRow | null;
users: UserOption[];
onOpenChange: (o: boolean) => void;
}) {
const form = useForm<AddMemberInput>({
resolver: zodResolver(addMemberSchema),
defaultValues: { userId: "", role: "member" },
});
useEffect(() => {
if (household) form.reset({ userId: "", role: "member" });
}, [household, form]);
async function onSubmit(values: AddMemberInput) {
if (!household) return;
const result = await addMemberAction(household.id, values);
if (result.ok) {
toast.success(t.memberAdded(users.find((u) => u.id === values.userId)?.name ?? ""));
onOpenChange(false);
} else {
form.setError("root", { message: result.error });
}
}
return (
<ResponsiveDialog
open={Boolean(household)}
onOpenChange={onOpenChange}
title={household ? t.addMemberTitle(household.name) : t.addMember}
description={t.addMemberDescription}
footer={
<>
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
{tr.common.cancel}
</Button>
<Button type="submit" form="household-add-member" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
{t.addMember}
</Button>
</>
}
>
<form id="household-add-member" onSubmit={form.handleSubmit(onSubmit)} noValidate>
<FieldGroup>
<Controller
name="userId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="hh-member-user">{t.user}</FieldLabel>
<UserSelect
id="hh-member-user"
users={users}
value={field.value}
onChange={field.onChange}
invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="role"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="hh-member-role">{t.role}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger
id="hh-member-role"
className="w-full"
aria-describedby="hh-member-role-hint"
>
<SelectValue>{tr.household.roles[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{HOUSEHOLD_ROLES.map((r) => (
<SelectItem key={r} value={r}>
{tr.household.roles[r]}
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription id="hh-member-role-hint">
{tr.household.roleHints[field.value]}
</FieldDescription>
</Field>
)}
/>
{form.formState.errors.root ? (
<FieldError>{form.formState.errors.root.message}</FieldError>
) : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
export function HouseholdsAdmin({
households,
users,
currentUserId,
}: {
households: AdminHouseholdRow[];
users: UserOption[];
currentUserId: string;
}) {
const [creating, setCreating] = useState(false);
const [addingTo, setAddingTo] = useState<AdminHouseholdRow | null>(null);
return (
<div className="flex flex-col gap-4">
<div className="flex flex-wrap items-center gap-3">
<p className="max-w-2xl text-sm text-muted-foreground">{t.privacyNote}</p>
<Button className="ml-auto" onClick={() => setCreating(true)}>
<Plus />
{t.newHousehold}
</Button>
</div>
{households.length === 0 ? (
<p className="rounded-xl border border-dashed p-8 text-center text-muted-foreground">
{t.empty}
</p>
) : (
<div className="grid gap-4 xl:grid-cols-2">
{households.map((h) => (
<Card key={h.id}>
<CardHeader>
<CardTitle>{h.name}</CardTitle>
<CardDescription className="flex flex-wrap items-center gap-2">
<span>{t.members(h.memberCount)}</span>
{h.owners.length ? (
<span>
· {t.owners}: {h.owners.join(", ")}
</span>
) : (
<Badge variant="destructive">{t.noOwner}</Badge>
)}
</CardDescription>
<CardAction>
<Button variant="outline" size="sm" onClick={() => setAddingTo(h)}>
<UserPlus />
{t.addMember}
</Button>
</CardAction>
</CardHeader>
<CardContent>
<MembersList
members={h.members}
householdName={h.name}
currentUserId={currentUserId}
canManage
onSetRole={(userId, role) => adminSetMemberRoleAction(h.id, userId, role)}
onRemove={(userId) => adminRemoveMemberAction(h.id, userId)}
/>
</CardContent>
</Card>
))}
</div>
)}
<CreateHouseholdDialog open={creating} onOpenChange={setCreating} users={users} />
<AddMemberDialog
household={addingTo}
users={users}
onOpenChange={(o) => !o && setAddingTo(null)}
/>
</div>
);
}
@@ -0,0 +1,48 @@
"use client";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import type { UserOption } from "@/features/households/service";
import { tr } from "@/i18n/tr";
/** Kullanıcı seçici (askıdakiler işaretli). */
export function UserSelect({
id,
users,
value,
onChange,
invalid,
}: {
id: string;
users: UserOption[];
value: string;
onChange: (id: string) => void;
invalid?: boolean;
}) {
const selected = users.find((u) => u.id === value);
return (
<Select value={value || undefined} onValueChange={onChange}>
<SelectTrigger id={id} className="w-full" aria-invalid={invalid}>
<SelectValue placeholder={tr.adminHouseholds.selectUser}>
{selected ? `${selected.name} (@${selected.username})` : null}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
{users.map((u) => (
<SelectItem key={u.id} value={u.id}>
{u.name}
<span className="text-xs text-muted-foreground">
@{u.username}
{u.banned ? ` · ${tr.settings.banned}` : ""}
</span>
</SelectItem>
))}
</SelectContent>
</Select>
);
}
+10
View File
@@ -0,0 +1,10 @@
import "server-only";
import { adminListHouseholds, adminListUserOptions } from "@/features/households/service";
import { requireRole } from "@/lib/dal";
/** Admin: haneler (üyeleriyle) ve hane atamaları için kullanıcı listesi. */
export async function getAdminHouseholdsData() {
await requireRole("admin");
const [households, users] = await Promise.all([adminListHouseholds(), adminListUserOptions()]);
return { households, users };
}
+53 -1
View File
@@ -7,7 +7,9 @@ import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { getAuth } from "@/lib/auth";
import { authErrorCode } from "@/lib/auth-errors";
import { writeAudit } from "@/lib/audit";
import { getActionUser } from "@/lib/dal";
import { removeAllMembershipsOfUser } from "@/features/households/service";
import { storedEmail } from "@/shared/account-email";
import { systemRoleSchema, type SystemRole } from "@/shared/schemas/common";
import {
@@ -102,8 +104,9 @@ export async function createUserAction(input: unknown): Promise<ActionResult> {
const parsed = userCreateSchema.safeParse(input);
if (!parsed.success) return fail(t.errors.checkFields);
const v = parsed.data;
let createdId = "";
try {
await ctx.api.createUser({
const created = await ctx.api.createUser({
headers: ctx.headers,
body: {
name: v.name,
@@ -113,9 +116,17 @@ export async function createUserAction(input: unknown): Promise<ActionResult> {
data: { username: v.username },
},
});
createdId = created.user.id;
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.create",
actorId: ctx.actor.id,
targetType: "user",
targetId: createdId,
diff: { username: v.username, role: v.role },
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -148,6 +159,13 @@ export async function updateUserAction(userId: unknown, input: unknown): Promise
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.update",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
diff: { name: v.name, username: v.username, role: v.role },
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -167,6 +185,13 @@ export async function setRoleAction(userId: unknown, role: unknown): Promise<Act
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.role",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
diff: { role: { from: target.role, to: r.data } },
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -191,6 +216,12 @@ export async function setPasswordAction(userId: unknown, input: unknown): Promis
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.password.reset",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
});
return ok(undefined);
}
@@ -213,6 +244,13 @@ export async function banUserAction(userId: unknown, input: unknown): Promise<Ac
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.ban",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
diff: { reason: parsed.data.reason ?? null },
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -227,6 +265,12 @@ export async function unbanUserAction(userId: unknown): Promise<ActionResult> {
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.unban",
actorId: ctx.actor.id,
targetType: "user",
targetId: id.data,
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -245,6 +289,14 @@ export async function removeUserAction(userId: unknown): Promise<ActionResult> {
} catch (error) {
return mapAuthError(error);
}
const removedMemberships = await removeAllMembershipsOfUser(target.id);
await writeAudit({
action: "user.remove",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
diff: { name: target.name, removedMemberships },
});
revalidatePath(PATH);
return ok(undefined);
}
@@ -0,0 +1,168 @@
"use client";
import { Loader2, Paperclip, X } from "lucide-react";
import { useRef, useState } from "react";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import type { ActionResult } from "@/lib/action-result";
import { cn } from "@/lib/utils";
import {
acceptAttribute,
MAX_ATTACHMENTS_PER_RECORD,
type AttachmentKind,
} from "@/shared/attachments";
import type { AttachmentInfo } from "../service";
import { AttachmentThumb } from "./attachment-strip";
import { AttachmentViewer } from "./attachment-viewer";
const t = tr.attachments;
/** Tek dosyayı /api/files'a yükler. */
async function uploadFile(file: File): Promise<ActionResult<AttachmentInfo>> {
const body = new FormData();
body.append("file", file);
try {
const res = await fetch("/api/files", { method: "POST", body });
return (await res.json()) as ActionResult<AttachmentInfo>;
} catch {
return { ok: false, error: t.errors.upload };
}
}
/**
* Formdaki küçük "Ek ekle" alanı (Bölüm 6.3): seçilen dosyalar hemen yüklenir (bekleyen ek),
* küçük önizleme ve sayaç gösterilir; kayıt kaydedilince ekler kayda bağlanır.
*/
export function AttachmentPicker({
value,
onChange,
allowedKinds,
onBusyChange,
}: {
value: AttachmentInfo[];
onChange: (items: AttachmentInfo[]) => void;
allowedKinds: readonly AttachmentKind[];
onBusyChange?: (busy: boolean) => void;
}) {
const inputRef = useRef<HTMLInputElement>(null);
const [uploading, setUploading] = useState(0);
const [errors, setErrors] = useState<string[]>([]);
const [viewer, setViewer] = useState<number | null>(null);
const invalid = value.filter((a) => !allowedKinds.includes(a.kind));
const room = MAX_ATTACHMENTS_PER_RECORD - value.length;
async function onFiles(files: FileList | null) {
if (!files?.length) return;
const list = [...files];
const accepted = list.slice(0, Math.max(0, room));
const nextErrors: string[] = [];
if (list.length > accepted.length)
nextErrors.push(t.errors.tooMany(MAX_ATTACHMENTS_PER_RECORD));
setUploading(accepted.length);
onBusyChange?.(true);
let items = value;
for (const file of accepted) {
const result = await uploadFile(file);
if (result.ok) {
items = [...items, result.data];
onChange(items);
} else {
nextErrors.push(`${file.name}: ${result.error}`);
}
setUploading((n) => n - 1);
}
setErrors(nextErrors);
onBusyChange?.(false);
if (inputRef.current) inputRef.current.value = "";
}
function remove(id: string) {
onChange(value.filter((a) => a.id !== id));
}
return (
<div className="flex flex-col gap-2">
<div className="flex flex-wrap items-center gap-2">
<Button
type="button"
variant="outline"
size="sm"
onClick={() => inputRef.current?.click()}
disabled={room <= 0 || uploading > 0}
>
{uploading > 0 ? <Loader2 className="animate-spin" /> : <Paperclip />}
{uploading > 0 ? t.uploading : 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}
</span>
<input
ref={inputRef}
type="file"
multiple
accept={acceptAttribute(allowedKinds)}
className="sr-only"
tabIndex={-1}
aria-label={t.add}
onChange={(e) => onFiles(e.target.files)}
/>
</div>
{value.length || uploading ? (
<ul className="flex flex-wrap gap-1.5">
{value.map((item, i) => (
<li key={item.id} className="relative">
<AttachmentThumb
item={item}
className={cn(
"size-10",
!allowedKinds.includes(item.kind) && "border-destructive ring-1 ring-destructive",
)}
onClick={() => setViewer(i)}
/>
<button
type="button"
onClick={() => remove(item.id)}
className="absolute -top-1.5 -right-1.5 flex size-5 items-center justify-center rounded-full border bg-background text-muted-foreground shadow-sm hover:text-foreground"
aria-label={`${t.remove}: ${item.name}`}
>
<X className="size-3" />
</button>
</li>
))}
{Array.from({ length: uploading }, (_, i) => (
<li
key={`up-${i}`}
className="flex size-10 items-center justify-center rounded-md border border-dashed"
aria-label={t.uploading}
>
<Loader2 className="size-4 animate-spin text-muted-foreground" />
</li>
))}
</ul>
) : null}
{invalid.length ? (
<p className="text-xs text-destructive" role="alert">
{t.errors.kindNotAllowed}
</p>
) : null}
{errors.map((e) => (
<p key={e} className="text-xs text-destructive" role="alert">
{e}
</p>
))}
<AttachmentViewer
items={value}
startIndex={viewer ?? 0}
open={viewer !== null}
onOpenChange={(open) => !open && setViewer(null)}
/>
</div>
);
}
@@ -0,0 +1,75 @@
"use client";
import { FileText, Paperclip } from "lucide-react";
import { useState } from "react";
import { tr } from "@/i18n/tr";
import type { AttachmentInfo } from "../service";
import { AttachmentViewer } from "./attachment-viewer";
const t = tr.attachments;
const VISIBLE = 4;
/** Ayrıntıda küçük önizleme şeridi (en fazla 4 + "+N"); tıklayınca görüntüleyici açılır. */
export function AttachmentStrip({ items }: { items: AttachmentInfo[] }) {
const [viewer, setViewer] = useState<number | null>(null);
if (!items.length) return null;
const shown = items.slice(0, VISIBLE);
const rest = items.length - shown.length;
return (
<div className="flex items-center gap-2">
<Paperclip className="size-4 shrink-0 text-muted-foreground" aria-hidden />
<span className="sr-only">{t.count(items.length)}</span>
<ul className="flex gap-1.5">
{shown.map((item, i) => (
<li key={item.id} className="relative">
<AttachmentThumb item={item} onClick={() => setViewer(i)} />
{rest > 0 && i === shown.length - 1 ? (
<button
type="button"
onClick={() => setViewer(i + 1)}
className="absolute inset-0 flex items-center justify-center rounded-md bg-black/55 text-sm font-medium text-white"
aria-label={`${t.viewerTitle}: ${t.moreCount(rest)}`}
>
{t.moreCount(rest)}
</button>
) : null}
</li>
))}
</ul>
<AttachmentViewer
items={items}
startIndex={viewer ?? 0}
open={viewer !== null}
onOpenChange={(open) => !open && setViewer(null)}
/>
</div>
);
}
export function AttachmentThumb({
item,
onClick,
className = "size-12",
}: {
item: AttachmentInfo;
onClick?: () => void;
className?: string;
}) {
return (
<button
type="button"
onClick={onClick}
title={item.name}
aria-label={item.name}
className={`${className} flex items-center justify-center overflow-hidden rounded-md border bg-muted focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none`}
>
{item.thumbUrl ? (
// eslint-disable-next-line @next/next/no-img-element -- yetkili özel dosya
<img src={item.thumbUrl} alt="" className="size-full object-cover" loading="lazy" />
) : (
<FileText className="size-5 text-muted-foreground" aria-hidden />
)}
</button>
);
}
@@ -0,0 +1,170 @@
"use client";
import { Download, ExternalLink, FileText, Maximize, Minimize } from "lucide-react";
import { useEffect, useRef, useState } from "react";
import { Button } from "@/components/ui/button";
import {
Carousel,
CarouselContent,
CarouselItem,
CarouselNext,
CarouselPrevious,
type CarouselApi,
} from "@/components/ui/carousel";
import { Dialog, DialogContent, DialogDescription, DialogTitle } from "@/components/ui/dialog";
import { tr } from "@/i18n/tr";
import { formatFileSize } from "@/shared/attachments";
import type { AttachmentInfo } from "../service";
const t = tr.attachments;
/**
* Ek dosya görüntüleyici (Bölüm 6.3): carousel (oklar, kaydırma, klavye okları), tam ekran ve
* "2 / 5" göstergesi. PDF'ler ikon + "Aç" düğmesiyle gösterilir (tarayıcının PDF görüntüleyicisi).
*/
export function AttachmentViewer({
items,
startIndex,
open,
onOpenChange,
}: {
items: AttachmentInfo[];
startIndex: number;
open: boolean;
onOpenChange: (open: boolean) => void;
}) {
const [api, setApi] = useState<CarouselApi>();
const [index, setIndex] = useState(startIndex);
const [fullscreen, setFullscreen] = useState(false);
const containerRef = useRef<HTMLDivElement>(null);
useEffect(() => {
if (!api) return;
const update = () => setIndex(api.selectedScrollSnap());
api.on("select", update);
api.on("reInit", update);
return () => {
api.off("select", update);
api.off("reInit", update);
};
}, [api]);
useEffect(() => {
const onChange = () => setFullscreen(document.fullscreenElement === containerRef.current);
document.addEventListener("fullscreenchange", onChange);
return () => document.removeEventListener("fullscreenchange", onChange);
}, []);
function handleOpenChange(next: boolean) {
if (!next && document.fullscreenElement) void document.exitFullscreen();
if (next) setIndex(startIndex);
onOpenChange(next);
}
async function toggleFullscreen() {
if (document.fullscreenElement) await document.exitFullscreen();
else await containerRef.current?.requestFullscreen().catch(() => {});
}
/** Odak carousel dışındayken de (ör. kapat düğmesi) ok tuşları çalışsın. */
function onKeyDown(event: React.KeyboardEvent) {
if (event.defaultPrevented) return;
if (event.key === "ArrowLeft") {
event.preventDefault();
api?.scrollPrev();
} else if (event.key === "ArrowRight") {
event.preventDefault();
api?.scrollNext();
}
}
const current = items[Math.min(index, items.length - 1)];
return (
<Dialog open={open} onOpenChange={handleOpenChange}>
<DialogContent
className="flex h-[min(90dvh,900px)] w-[calc(100vw-1rem)] max-w-5xl flex-col gap-0 p-0 sm:max-w-5xl"
onKeyDown={onKeyDown}
>
<div ref={containerRef} className="flex min-h-0 flex-1 flex-col bg-background">
<div className="flex items-center gap-2 border-b px-3 py-2 pr-12">
<DialogTitle className="min-w-0 flex-1 truncate text-sm">
{current?.name ?? t.viewerTitle}
</DialogTitle>
<DialogDescription className="sr-only">{t.viewerTitle}</DialogDescription>
<span
className="shrink-0 text-xs text-muted-foreground tabular-nums"
aria-live="polite"
>
{t.position(index + 1, items.length)}
</span>
{current ? (
<Button asChild variant="ghost" size="icon-sm" aria-label={t.download}>
<a href={`${current.url}?indir=1`} download>
<Download />
</a>
</Button>
) : null}
<Button
variant="ghost"
size="icon-sm"
onClick={toggleFullscreen}
aria-label={fullscreen ? t.exitFullscreen : t.fullscreen}
>
{fullscreen ? <Minimize /> : <Maximize />}
</Button>
</div>
<Carousel
setApi={setApi}
opts={{ startIndex, loop: false }}
className="flex min-h-0 flex-1 flex-col"
aria-label={t.viewerTitle}
>
<CarouselContent className="h-full" containerClassName="h-full min-h-0 flex-1">
{items.map((item) => (
<CarouselItem
key={item.id}
className="flex h-full items-center justify-center p-4 pl-8"
>
{item.kind === "image" ? (
// eslint-disable-next-line @next/next/no-img-element -- yetkili özel dosya; optimizasyon hattına girmez
<img
src={item.url}
alt={item.name}
width={item.width ?? undefined}
height={item.height ?? undefined}
className="max-h-full max-w-full rounded-md object-contain"
draggable={false}
/>
) : (
<div className="flex flex-col items-center gap-3 text-center">
<FileText className="size-16 text-muted-foreground" aria-hidden />
<div>
<p className="font-medium break-all">{item.name}</p>
<p className="text-sm text-muted-foreground">
{t.pdf} · {formatFileSize(item.size)}
</p>
</div>
<Button asChild>
<a href={item.url} target="_blank" rel="noopener">
<ExternalLink />
{t.open}
</a>
</Button>
</div>
)}
</CarouselItem>
))}
</CarouselContent>
{items.length > 1 ? (
<>
<CarouselPrevious className="left-3" aria-label={t.previous} />
<CarouselNext className="right-3" aria-label={t.next} />
</>
) : null}
</Carousel>
</div>
</DialogContent>
</Dialog>
);
}
@@ -0,0 +1,327 @@
import { readFile, rm } from "node:fs/promises";
import sharp from "sharp";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import {
getTransaction,
createTransaction,
updateTransaction,
setTransactionDeleted,
} from "@/features/transactions/service";
import { env } from "@/lib/env";
import { getStorage } from "@/lib/storage";
import { AccountModel } from "@/models/account";
import { AttachmentModel } from "@/models/attachment";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import type { TransactionForm } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
purgeAttachments,
readAttachmentForUser,
uploadAttachment,
type AttachmentInfo,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let annemler = "";
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");
annemler = ids.household("Annemler");
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 acc = (name: string, householdId = cakir) =>
AccountModel.findOne({ householdId, name })
.lean()
.then((a) => String(a!._id));
const cat = (key: string) =>
CategoryModel.findOne({ householdId: cakir, defaultKey: key })
.lean()
.then((c) => String(c!._id));
async function form(over: Partial<TransactionForm>): Promise<TransactionForm> {
return {
type: "expense",
amount: 100_00,
date: "2026-06-15",
accountId: await acc("Cüzdan"),
toAccountId: null,
categoryId: await cat("market"),
splits: [],
payee: "",
description: "",
tags: [],
attachmentIds: [],
installments: 1,
...over,
};
}
const png = (w = 40, h = 30) =>
sharp({ create: { width: w, height: h, channels: 3, background: "#3366cc" } })
.png()
.toBuffer();
const pdf = Buffer.from("%PDF-1.4\n1 0 obj<<>>endobj\ntrailer<<>>\n%%EOF\n", "latin1");
async function upload(userId: string, bytes: Buffer, name = "fis.png", householdId = cakir) {
const r = await uploadAttachment(userId, householdId, { name, bytes });
if (!r.ok) throw new Error(r.error);
return r.data;
}
describe("yükleme ve dönüştürme", () => {
it("JPEG: EXIF/GPS silinir, yön uygulanır, 2000 px'e küçültülür, WebP + küçük resim", async () => {
const jpeg = await sharp({
create: { width: 3000, height: 1200, channels: 3, background: "#cc3333" },
})
.jpeg()
.withMetadata({ orientation: 6 })
.withExif({ IFD0: { Copyright: "gizli", Artist: "Ayşe" } })
.toBuffer();
expect((await sharp(jpeg).metadata()).exif).toBeDefined();
const info = await upload(ayse, jpeg, "../../etc/fiş.JPG");
expect(info.kind).toBe("image");
expect(info.name).toBe("fiş.JPG");
// Yön 6 (90°): 3000x1200 → 1200x3000 → en fazla 2000: 800x2000
expect([info.width, info.height]).toEqual([800, 2000]);
const doc = await AttachmentModel.findById(info.id).lean();
expect(doc!.mimeType).toBe("image/webp");
expect(doc!.ownerId).toBeNull();
const stored = await getStorage().get(doc!.storageKey);
const meta = await sharp(stored!).metadata();
expect(meta.format).toBe("webp");
expect(meta.exif).toBeUndefined();
expect(meta.orientation).toBeUndefined();
const thumb = await sharp((await getStorage().get(doc!.thumbKey!))!).metadata();
expect(Math.max(thumb.width!, thumb.height!)).toBe(320);
});
it("PNG ve PDF kabul edilir; uzantıya değil içeriğe bakılır", async () => {
expect((await upload(ayse, await png(), "resim.pdf")).kind).toBe("image");
const p = await upload(ayse, pdf, "bordro.jpg");
expect(p.kind).toBe("pdf");
expect(p.thumbUrl).toBeNull();
});
it("desteklenmeyen, bozuk ve boş dosyalar reddedilir", async () => {
const text = await uploadAttachment(ayse, cakir, {
name: "fis.jpg",
bytes: Buffer.from("<script>alert(1)</script>"),
});
expect(text.ok).toBe(false);
const broken = await uploadAttachment(ayse, cakir, {
name: "x.jpg",
bytes: Buffer.from([0xff, 0xd8, 0xff, 0xe0, 1, 2, 3, 4, 5, 6]),
});
expect(broken).toMatchObject({ ok: false });
const fakePdf = await uploadAttachment(ayse, cakir, {
name: "x.pdf",
bytes: Buffer.from("%PDF-1.4 yarım"),
});
expect(fakePdf.ok).toBe(false);
expect((await uploadAttachment(ayse, cakir, { name: "x", bytes: Buffer.alloc(0) })).ok).toBe(
false,
);
});
it("boyut sınırı uygulanır", async () => {
const big = Buffer.alloc(env().MAX_UPLOAD_MB * 1024 * 1024 + 1);
big.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
expect((await uploadAttachment(ayse, cakir, { name: "b.png", bytes: big })).ok).toBe(false);
});
it("izleyici ve hane dışı kullanıcı yükleyemez", async () => {
expect((await uploadAttachment(zeynep, cakir, { name: "a.png", bytes: await png() })).ok).toBe(
false,
);
expect((await uploadAttachment(fatma, cakir, { name: "a.png", bytes: await png() })).ok).toBe(
false,
);
});
it.skipIf(!process.env.HEIC_SAMPLE)("HEIC (iPhone) WebP'ye dönüştürülür", async () => {
const heic = await readFile(process.env.HEIC_SAMPLE!);
const info = await upload(ayse, heic, "IMG_0001.HEIC");
expect(info.kind).toBe("image");
const doc = await AttachmentModel.findById(info.id).lean();
expect(doc!.sourceType).toBe("heic");
expect((await sharp((await getStorage().get(doc!.storageKey))!).metadata()).format).toBe(
"webp",
);
});
});
describe("işleme bağlama", () => {
let a1: AttachmentInfo;
let a2: AttachmentInfo;
let a3: AttachmentInfo;
let txId = "";
it("gider işlemine görseller bağlanır, sıra korunur", async () => {
a1 = await upload(ayse, await png(10, 10));
a2 = await upload(ayse, await png(20, 10));
a3 = await upload(ayse, await png(30, 10));
const r = await createTransaction(
ayse,
cakir,
await form({ attachmentIds: [a2.id, a1.id, a3.id] }),
);
expect(r.ok).toBe(true);
txId = r.ok ? r.data.id : "";
const detail = await getTransaction(ayse, cakir, txId);
expect(detail!.attachmentCount).toBe(3);
expect(detail!.attachments.map((a) => a.id)).toEqual([a2.id, a1.id, a3.id]);
});
it("gider işlemine PDF eklenemez; gelirde eklenir; hata olursa işlem oluşmaz", async () => {
const p = await upload(ayse, pdf, "bordro.pdf");
const before = await TransactionModel.countDocuments({ householdId: cakir });
const bad = await createTransaction(ayse, cakir, await form({ attachmentIds: [p.id] }));
expect(bad).toMatchObject({ ok: false });
expect(await TransactionModel.countDocuments({ householdId: cakir })).toBe(before);
expect((await AttachmentModel.findById(p.id).lean())!.ownerId).toBeNull();
const good = await createTransaction(
ayse,
cakir,
await form({
type: "income",
categoryId: await cat("maas"),
accountId: await acc("Ziraat Maaş"),
attachmentIds: [p.id],
}),
);
expect(good.ok).toBe(true);
});
it("başkasının bekleyen eki, başka hanenin eki veya başka işlemin eki bağlanamaz", async () => {
const emres = await upload(emre, await png());
expect(
(await createTransaction(ayse, cakir, await form({ attachmentIds: [emres.id] }))).ok,
).toBe(false);
const other = await upload(fatma, await png(), "x.png", annemler);
expect(
(await createTransaction(ayse, cakir, await form({ attachmentIds: [other.id] }))).ok,
).toBe(false);
// a1 zaten txId'ye bağlı: başka işleme taşınamaz.
expect((await createTransaction(ayse, cakir, await form({ attachmentIds: [a1.id] }))).ok).toBe(
false,
);
});
it("kayıt başına en fazla 10 ek", async () => {
const many = [];
for (let i = 0; i < 11; i++) many.push((await upload(emre, await png(5 + i, 5))).id);
expect((await createTransaction(emre, cakir, await form({ attachmentIds: many }))).ok).toBe(
false,
);
expect(
(await createTransaction(emre, cakir, await form({ attachmentIds: many.slice(0, 10) }))).ok,
).toBe(true);
});
it("düzenlemede çıkarılan ek kayıttan düşer, yeni ek eklenir (başka üye de düzenleyebilir)", async () => {
const a4 = await upload(emre, await png(44, 10));
const detail = await getTransaction(emre, cakir, txId);
const r = await updateTransaction(
emre,
cakir,
txId,
await form({
accountId: detail!.account!.id,
categoryId: detail!.categoryId,
attachmentIds: [a3.id, a4.id],
}),
);
expect(r.ok).toBe(true);
const after = await getTransaction(ayse, cakir, txId);
expect(after!.attachments.map((a) => a.id)).toEqual([a3.id, a4.id]);
expect(after!.attachmentCount).toBe(2);
expect((await AttachmentModel.findById(a1.id).lean())!.deletedAt).toBeInstanceOf(Date);
expect(await readAttachmentForUser(ayse, a1.id, "full")).toBeNull();
});
it("dosya erişimi: hane üyeleri (izleyici dahil) okur; hane dışı ve silinmiş işlem okuyamaz", async () => {
const file = await readAttachmentForUser(zeynep, a3.id, "thumb");
expect(file?.mimeType).toBe("image/webp");
expect(await readAttachmentForUser(fatma, a3.id, "full")).toBeNull();
expect(await readAttachmentForUser(ayse, "not-an-id", "full")).toBeNull();
await setTransactionDeleted(ayse, cakir, txId, true);
expect(await readAttachmentForUser(ayse, a3.id, "full")).toBeNull();
await setTransactionDeleted(ayse, cakir, txId, false);
expect(await readAttachmentForUser(ayse, a3.id, "full")).not.toBeNull();
});
it("bekleyen ek yalnızca yükleyene görünür", async () => {
const pending = await upload(ayse, await png());
expect(await readAttachmentForUser(ayse, pending.id, "full")).not.toBeNull();
expect(await readAttachmentForUser(emre, pending.id, "full")).toBeNull();
});
it("gizli hesaptaki işlemin eki hesap sahibi dışındakilere kapalı", async () => {
const img = await upload(ayse, await png());
const r = await createTransaction(
ayse,
cakir,
await form({ accountId: await acc("Ayşe — Pluxee"), attachmentIds: [img.id] }),
);
expect(r.ok).toBe(true);
expect(await readAttachmentForUser(ayse, img.id, "full")).not.toBeNull();
expect(await readAttachmentForUser(emre, img.id, "full")).toBeNull();
});
});
describe("temizlik", () => {
it("eski bekleyen ekler, çıkarılmış ekler ve 30 günden önce silinmiş işlemlerin ekleri silinir", async () => {
const pending = await upload(ayse, await png());
const old = new Date(Date.now() - 25 * 60 * 60 * 1000);
await AttachmentModel.collection.updateOne(
{ _id: (await AttachmentModel.findById(pending.id))!._id },
{ $set: { createdAt: old } },
);
const kept = await upload(ayse, await png());
const r = await createTransaction(ayse, cakir, await form({ attachmentIds: [kept.id] }));
const tx = r.ok ? r.data.id : "";
await setTransactionDeleted(ayse, cakir, tx, true);
const keptDoc = (await AttachmentModel.findById(kept.id).lean())!;
// Silme 31 gün önce yapılmış gibi.
const now = new Date(Date.now() + 31 * 24 * 60 * 60 * 1000);
const pendingDoc = (await AttachmentModel.findById(pending.id).lean())!;
const { removed } = await purgeAttachments(now);
expect(removed).toBeGreaterThan(0);
expect(await AttachmentModel.findById(pending.id)).toBeNull();
expect(await getStorage().get(pendingDoc.storageKey)).toBeNull();
expect(await AttachmentModel.findById(kept.id)).toBeNull();
expect(await getStorage().get(keptDoc.storageKey)).toBeNull();
expect((await TransactionModel.findById(tx).lean())!.attachmentCount).toBe(0);
});
it("taze bekleyen ekler ve bağlı ekler korunur", async () => {
const fresh = await upload(ayse, await png());
const linked = await upload(ayse, await png());
await createTransaction(ayse, cakir, await form({ attachmentIds: [linked.id] }));
await purgeAttachments();
expect(await AttachmentModel.findById(fresh.id)).not.toBeNull();
expect(await AttachmentModel.findById(linked.id)).not.toBeNull();
});
});
+326
View File
@@ -0,0 +1,326 @@
import "server-only";
import { randomBytes } from "node:crypto";
import { Types, type ClientSession } from "mongoose";
import { resolveMembership } from "@/features/households/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { connectMongoose } from "@/lib/db/mongoose";
import { env } from "@/lib/env";
import { toObjectId } from "@/lib/object-id";
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 { TransactionModel } from "@/models/transaction";
import {
detectFileType,
MAX_ATTACHMENTS_PER_RECORD,
type AttachmentKind,
} from "@/shared/attachments";
const t = tr.attachments;
/** Bir kullanıcının bir hanede aynı anda bekletebileceği (kayda bağlanmamış) ek sayısı. */
export const MAX_PENDING_PER_USER = 30;
/** Bağlanmamış eklerin ömrü. */
export const PENDING_TTL_MS = 24 * 60 * 60 * 1000;
/** Silinen kayıt/ek dosyalarının fiziksel olarak silinmeden önce bekleme süresi (geri alma payı). */
export const SOFT_DELETE_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
export type AttachmentInfo = {
id: string;
kind: AttachmentKind;
name: string;
size: number;
width: number | null;
height: number | null;
url: string;
thumbUrl: string | null;
};
type LeanAttachment = {
_id: Types.ObjectId;
kind: AttachmentKind;
originalName?: string | null;
size: number;
width?: number | null;
height?: number | null;
thumbKey?: string | null;
};
export function toAttachmentInfo(a: LeanAttachment): AttachmentInfo {
const id = String(a._id);
return {
id,
kind: a.kind,
name: a.originalName || (a.kind === "pdf" ? "belge.pdf" : "gorsel.webp"),
size: a.size,
width: a.width ?? null,
height: a.height ?? null,
url: `/api/files/${id}`,
thumbUrl: a.thumbKey ? `/api/files/${id}?v=thumb` : null,
};
}
/** Kullanıcının verdiği dosya adını güvenli hale getirir (yol, kontrol karakteri, uzunluk). */
export function sanitizeFileName(name: string): string {
const base = name.split(/[\\/]/).pop() ?? "";
return base
.replace(/[\u0000-\u001f\u007f"<>]/g, "")
.trim()
.slice(0, 120);
}
function newKey(): string {
const id = randomBytes(16).toString("hex");
return `${id.slice(0, 2)}/${id}`;
}
// --- Yükleme ---
export async function uploadAttachment(
userId: string,
householdId: string,
file: { name: string; bytes: Buffer },
): Promise<ActionResult<AttachmentInfo>> {
const m = await resolveMembership(userId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const maxBytes = env().MAX_UPLOAD_MB * 1024 * 1024;
if (file.bytes.length === 0) return fail(t.errors.empty);
if (file.bytes.length > maxBytes) return fail(t.errors.tooLarge(env().MAX_UPLOAD_MB));
const type = detectFileType(file.bytes);
if (!type) return fail(t.errors.unsupported);
const uploader = new Types.ObjectId(userId);
const pending = await AttachmentModel.countDocuments({
householdId: m.householdId,
ownerId: null,
uploadedBy: uploader,
deletedAt: null,
});
if (pending >= MAX_PENDING_PER_USER) return fail(t.errors.tooManyPending);
const key = newKey();
const storage = getStorage();
let doc: Record<string, unknown>;
if (type === "pdf") {
if (!isPlausiblePdf(file.bytes)) return fail(t.errors.unreadable);
await storage.put(`${key}.pdf`, file.bytes);
doc = {
kind: "pdf",
mimeType: "application/pdf",
size: file.bytes.length,
storageKey: `${key}.pdf`,
thumbKey: null,
};
} else {
let processed;
try {
processed = await processImage(file.bytes, type);
} catch (error) {
if (error instanceof UnreadableImageError) return fail(t.errors.unreadable);
throw error;
}
await storage.put(`${key}.webp`, processed.main);
await storage.put(`${key}.thumb.webp`, processed.thumb);
doc = {
kind: "image",
mimeType: "image/webp",
size: processed.main.length,
width: processed.width,
height: processed.height,
storageKey: `${key}.webp`,
thumbKey: `${key}.thumb.webp`,
};
}
const created = await AttachmentModel.create({
...doc,
householdId: m.householdId,
sourceType: type,
originalName: sanitizeFileName(file.name),
originalSize: file.bytes.length,
uploadedBy: uploader,
});
return ok(toAttachmentInfo(created.toObject() as LeanAttachment));
}
// --- Kayda bağlama ---
/**
* Kaydın ek listesini `ids` ile eşitler (sıra korunur). Yeni kimlikler, bu kullanıcının bu hanede
* yüklediği bekleyen ekler olmalı; listede olmayan mevcut ekler kayıttan çıkarılır (`deletedAt`).
* Kayıttaki güncel ek sayısını döner. Transaction içinde çağrılmalı (session).
*/
export async function syncOwnerAttachments(opts: {
householdId: Types.ObjectId;
actorId: string;
ownerType: AttachmentOwnerType;
ownerId: Types.ObjectId;
ids: string[];
allowedKinds: readonly AttachmentKind[];
session?: ClientSession;
}): Promise<ActionResult<number>> {
const { householdId, ownerType, ownerId, session } = opts;
const unique = [...new Set(opts.ids)];
if (unique.length > MAX_ATTACHMENTS_PER_RECORD)
return fail(t.errors.tooMany(MAX_ATTACHMENTS_PER_RECORD));
const objectIds = unique.map(toObjectId);
if (objectIds.some((id) => !id)) return fail(t.errors.invalid);
const current = await AttachmentModel.find(
{ householdId, ownerType, ownerId, deletedAt: null },
{ _id: 1 },
{ session },
).lean();
const currentIds = new Set(current.map((a) => String(a._id)));
const newIds = objectIds.filter((id) => !currentIds.has(String(id))) as Types.ObjectId[];
const candidates = await AttachmentModel.find(
{ _id: { $in: objectIds }, householdId, deletedAt: null },
{ kind: 1, ownerId: 1, uploadedBy: 1 },
{ session },
).lean();
const byId = new Map(candidates.map((a) => [String(a._id), a]));
for (const id of newIds) {
const a = byId.get(String(id));
// Yalnızca kendi yüklediği, henüz hiçbir kayda bağlanmamış ekler bağlanabilir.
if (!a || a.ownerId || String(a.uploadedBy) !== opts.actorId) return fail(t.errors.invalid);
}
for (const id of objectIds) {
const a = byId.get(String(id));
if (a && !opts.allowedKinds.includes(a.kind)) return fail(t.errors.kindNotAllowed);
}
const removed = current.filter((a) => !objectIds.some((id) => id!.equals(a._id)));
if (removed.length) {
await AttachmentModel.updateMany(
{ _id: { $in: removed.map((a) => a._id) }, householdId },
{ $set: { deletedAt: new Date() } },
{ session },
);
}
if (objectIds.length) {
await AttachmentModel.bulkWrite(
objectIds.map((id, order) => ({
updateOne: {
filter: { _id: id!, householdId },
update: { $set: { ownerType, ownerId, order } },
},
})),
{ session },
);
}
return ok(objectIds.length);
}
export async function listOwnerAttachments(
householdId: Types.ObjectId,
ownerType: AttachmentOwnerType,
ownerId: Types.ObjectId,
): Promise<AttachmentInfo[]> {
const rows = await AttachmentModel.find({ householdId, ownerType, ownerId, deletedAt: null })
.sort({ order: 1, createdAt: 1 })
.lean();
return rows.map((a) => toAttachmentInfo(a as unknown as LeanAttachment));
}
// --- Servis etme ---
export type AttachmentFile = {
bytes: Buffer;
mimeType: string;
name: string;
};
/**
* Yetki kontrollü dosya okuma: kullanıcı ekin hanesinin üyesi olmalı; bekleyen ek yalnızca
* yükleyene; işleme bağlı ek, işlem kullanıcıya görünürse (silinmemiş ve başkasının gizli
* hesabına dokunmuyorsa). Erişim yoksa null (çağıran 404 döner; varlık sızdırılmaz).
*/
export async function readAttachmentForUser(
userId: string,
attachmentId: string,
variant: "full" | "thumb",
): Promise<AttachmentFile | null> {
const id = toObjectId(attachmentId);
if (!id) return null;
await connectMongoose();
const a = await AttachmentModel.findOne({ _id: id, deletedAt: null }).lean();
if (!a) return null;
const m = await resolveMembership(userId, String(a.householdId), "viewer");
if (!m) return null;
if (!a.ownerId) {
if (String(a.uploadedBy) !== userId) return null;
} else if (a.ownerType === "transaction") {
const tx = await TransactionModel.findOne(
{ _id: a.ownerId, householdId: a.householdId, deletedAt: null },
{ accountId: 1, toAccountId: 1 },
).lean();
if (!tx) return null;
const hidden = await AccountModel.exists({
_id: { $in: [tx.accountId, tx.toAccountId].filter(Boolean) },
householdId: a.householdId,
isPrivate: true,
ownerUserId: { $ne: new Types.ObjectId(userId) },
});
if (hidden) return null;
} else {
return null;
}
const key = variant === "thumb" && a.thumbKey ? a.thumbKey : a.storageKey;
const bytes = await getStorage().get(key);
if (!bytes) return null;
return {
bytes,
mimeType: variant === "thumb" && a.thumbKey ? "image/webp" : a.mimeType,
name: a.originalName ?? "",
};
}
// --- Temizlik ---
/**
* Fiziksel temizlik (Bölüm 7.4): 24 saatten eski bekleyen ekler, 30 günden önce çıkarılmış
* ekler ve 30 günden önce silinmiş işlemlerin ekleri. Dosyalar silinir, kayıtlar kaldırılır.
*/
export async function purgeAttachments(now = new Date()): Promise<{ removed: number }> {
await connectMongoose();
const retentionCutoff = new Date(now.getTime() - SOFT_DELETE_RETENTION_MS);
const pendingCutoff = new Date(now.getTime() - PENDING_TTL_MS);
const deletedTx = await TransactionModel.find(
{ deletedAt: { $ne: null, $lt: retentionCutoff }, attachmentCount: { $gt: 0 } },
{ _id: 1 },
).lean();
const victims = await AttachmentModel.find(
{
$or: [
{ ownerId: null, createdAt: { $lt: pendingCutoff } },
{ deletedAt: { $ne: null, $lt: retentionCutoff } },
...(deletedTx.length
? [{ ownerType: "transaction" as const, ownerId: { $in: deletedTx.map((d) => d._id) } }]
: []),
],
},
{ storageKey: 1, thumbKey: 1 },
).lean();
const storage = getStorage();
for (const v of victims) {
await storage.delete(v.storageKey);
if (v.thumbKey) await storage.delete(v.thumbKey);
await AttachmentModel.deleteOne({ _id: v._id });
}
if (deletedTx.length) {
await TransactionModel.updateMany(
{ _id: { $in: deletedTx.map((d) => d._id) } },
{ $set: { attachmentCount: 0 } },
);
}
return { removed: victims.length };
}
+65
View File
@@ -0,0 +1,65 @@
"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 { categoryFormSchema } from "@/shared/schemas/category";
import { createCategory, reorderCategory, setCategoryArchived, updateCategory } from "./service";
const PATH = "/kategoriler";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
const checkFields = tr.adminUsers.errors.checkFields;
export async function createCategoryAction(input: unknown): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = categoryFormSchema.safeParse(input);
if (!parsed.success) return fail(checkFields);
const result = await createCategory(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidatePath(PATH);
return result;
}
export async function updateCategoryAction(
categoryId: unknown,
input: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(categoryId);
const parsed = categoryFormSchema.safeParse(input);
if (!id.success || !parsed.success) return fail(checkFields);
const result = await updateCategory(ctx.user.id, ctx.household.id, id.data, parsed.data);
if (result.ok) revalidatePath(PATH);
return result;
}
export async function reorderCategoryAction(
categoryId: unknown,
direction: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(categoryId);
const dir = z.enum(["up", "down"]).safeParse(direction);
if (!id.success || !dir.success) return fail(tr.common.genericError);
const result = await reorderCategory(ctx.user.id, ctx.household.id, id.data, dir.data);
if (result.ok) revalidatePath(PATH);
return result;
}
export async function setCategoryArchivedAction(
categoryId: unknown,
archived: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(categoryId);
const a = z.boolean().safeParse(archived);
if (!id.success || !a.success) return fail(tr.common.genericError);
const result = await setCategoryArchived(ctx.user.id, ctx.household.id, id.data, a.data);
if (result.ok) revalidatePath(PATH);
return result;
}
@@ -0,0 +1,238 @@
"use client";
import {
Archive,
ArchiveRestore,
ArrowDown,
ArrowUp,
MoreHorizontal,
Pencil,
Plus,
} from "lucide-react";
import { useMemo, useState, useTransition } from "react";
import { toast } from "sonner";
import { IconBadge } from "@/components/appearance/swatch";
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 { Label } from "@/components/ui/label";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import type { CategoryKind } from "@/shared/schemas/category";
import { reorderCategoryAction, setCategoryArchivedAction } from "../actions";
import type { CategoryView } from "../service";
import { buildTree, MAX_DEPTH, type CategoryNode } from "../tree";
import { CategoryFormDialog, type CategoryDialogState } from "./category-form-dialog";
const t = tr.categories;
export function CategoriesManager({
categories,
canEdit,
}: {
categories: CategoryView[];
canEdit: boolean;
}) {
const [kind, setKind] = useState<CategoryKind>("expense");
const [showArchived, setShowArchived] = useState(false);
const [dialog, setDialog] = useState<CategoryDialogState>(null);
const [archiving, setArchiving] = useState<CategoryView | null>(null);
const [pending, startTransition] = useTransition();
const tree = useMemo(
() => buildTree(categories.filter((c) => c.kind === kind && (showArchived || !c.archived))),
[categories, kind, showArchived],
);
const archivedCount = categories.filter((c) => c.kind === kind && c.archived).length;
function run(promise: Promise<{ ok: boolean; error?: string }>, success?: string) {
startTransition(async () => {
const result = await promise;
if (result.ok) {
if (success) toast.success(success);
} else toast.error(result.error ?? tr.common.genericError);
});
}
function Row({
node,
index,
siblings,
}: {
node: CategoryNode<CategoryView>;
index: number;
siblings: number;
}) {
return (
<>
<li
className={cn("flex items-center gap-3 py-2 pr-2", node.archived && "opacity-60")}
style={{ paddingInlineStart: `${0.75 + node.depth * 1.5}rem` }}
>
<IconBadge icon={node.icon} color={node.color} size={node.depth ? "sm" : "md"} />
<span className={cn("min-w-0 flex-1 truncate", node.depth === 0 && "font-medium")}>
{node.name}
</span>
{node.archived ? <Badge variant="outline">{t.archived}</Badge> : null}
{canEdit ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
aria-label={`${node.name} — ${tr.common.actions}`}
disabled={pending}
>
<MoreHorizontal />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" className="w-52">
{!node.archived ? (
<>
{node.depth < MAX_DEPTH - 1 ? (
<DropdownMenuItem
onSelect={() => setDialog({ mode: "create", kind, parentId: node.id })}
>
<Plus />
{t.addChild}
</DropdownMenuItem>
) : null}
<DropdownMenuItem onSelect={() => setDialog({ mode: "edit", category: node })}>
<Pencil />
{t.edit}
</DropdownMenuItem>
<DropdownMenuItem
disabled={index === 0}
onSelect={() => run(reorderCategoryAction(node.id, "up"))}
>
<ArrowUp />
{t.moveUp}
</DropdownMenuItem>
<DropdownMenuItem
disabled={index === siblings - 1}
onSelect={() => run(reorderCategoryAction(node.id, "down"))}
>
<ArrowDown />
{t.moveDown}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem variant="destructive" onSelect={() => setArchiving(node)}>
<Archive />
{t.archive}
</DropdownMenuItem>
</>
) : (
<DropdownMenuItem
onSelect={() =>
run(setCategoryArchivedAction(node.id, false), t.unarchivedToast(node.name))
}
>
<ArchiveRestore />
{t.unarchive}
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
{node.children.map((child, i) => (
<Row key={child.id} node={child} index={i} siblings={node.children.length} />
))}
</>
);
}
return (
<div className="flex flex-col gap-3">
<div className="flex flex-wrap items-center gap-3">
<Tabs value={kind} onValueChange={(v) => setKind(v as CategoryKind)}>
<TabsList>
<TabsTrigger value="expense">{t.expense}</TabsTrigger>
<TabsTrigger value="income">{t.income}</TabsTrigger>
</TabsList>
</Tabs>
{archivedCount ? (
<div className="flex items-center gap-2">
<Checkbox
id="cat-show-archived"
checked={showArchived}
onCheckedChange={(v) => setShowArchived(v === true)}
/>
<Label htmlFor="cat-show-archived" className="font-normal">
{t.showArchived} ({archivedCount})
</Label>
</div>
) : null}
{canEdit ? (
<Button
className="ml-auto"
onClick={() => setDialog({ mode: "create", kind, parentId: null })}
>
<Plus />
{t.newCategory}
</Button>
) : null}
</div>
{!canEdit ? <p className="text-sm text-muted-foreground">{t.readOnly}</p> : null}
{tree.length ? (
<ul className="divide-y rounded-xl border bg-card" aria-busy={pending}>
{tree.map((node, i) => (
<Row key={node.id} node={node} index={i} siblings={tree.length} />
))}
</ul>
) : (
<p className="rounded-xl border border-dashed p-8 text-center text-muted-foreground">
{t.empty}
</p>
)}
<CategoryFormDialog
state={dialog}
categories={categories}
onOpenChange={(o) => !o && setDialog(null)}
/>
<AlertDialog open={Boolean(archiving)} onOpenChange={(o) => !o && setArchiving(null)}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.archiveTitle}</AlertDialogTitle>
<AlertDialogDescription>
{archiving ? t.archiveDescription(archiving.name) : null}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
<Button
variant="destructive"
onClick={() => {
const c = archiving!;
setArchiving(null);
run(setCategoryArchivedAction(c.id, true), t.archivedToast(c.name));
}}
>
{t.archive}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div>
);
}
@@ -0,0 +1,217 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2 } from "lucide-react";
import { useEffect, useMemo } from "react";
import { Controller, useForm, useWatch } from "react-hook-form";
import { toast } from "sonner";
import { IconPicker, SwatchPicker } from "@/components/appearance/pickers";
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 {
categoryFormSchema,
type CategoryForm,
type CategoryFormInput,
type CategoryKind,
} from "@/shared/schemas/category";
import { createCategoryAction, updateCategoryAction } from "../actions";
import type { CategoryView } from "../service";
import { buildTree, descendantIds, MAX_DEPTH, toOptions } from "../tree";
const t = tr.categories;
const ROOT = "__root__";
export type CategoryDialogState =
| { mode: "create"; kind: CategoryKind; parentId: string | null }
| { mode: "edit"; category: CategoryView }
| null;
export function CategoryFormDialog({
state,
categories,
onOpenChange,
}: {
state: CategoryDialogState;
categories: CategoryView[];
onOpenChange: (open: boolean) => void;
}) {
const form = useForm<CategoryFormInput, unknown, CategoryForm>({
resolver: zodResolver(categoryFormSchema),
});
const kind = state?.mode === "edit" ? state.category.kind : (state?.kind ?? "expense");
useEffect(() => {
if (!state) return;
if (state.mode === "edit") {
const c = state.category;
form.reset({
kind: c.kind,
name: c.name,
parentId: c.parentId ?? "",
icon: c.icon,
color: c.color,
});
} else {
const parent = categories.find((c) => c.id === state.parentId);
form.reset({
kind: state.kind,
name: "",
parentId: state.parentId ?? "",
icon: parent?.icon ?? "tag",
color: parent?.color ?? "blue",
});
}
}, [state, categories, form]);
/** Üst kategori seçenekleri: aynı tür, aktif; düzenlemede kendisi ve alt kategorileri hariç. */
const parentOptions = useMemo(() => {
const sameKind = categories.filter((c) => c.kind === kind);
const excluded = new Set(
state?.mode === "edit"
? [state.category.id, ...descendantIds(sameKind, state.category.id)]
: [],
);
return toOptions(buildTree(sameKind)).filter(
(o) => !excluded.has(o.id) && o.depth < MAX_DEPTH - 1,
);
}, [categories, kind, state]);
/** Ham form değerleri gönderilir; sunucu aynı şemayla yeniden ayrıştırır (tek doğruluk kaynağı). */
async function onSubmit() {
const values = form.getValues();
const result =
state?.mode === "edit"
? await updateCategoryAction(state.category.id, values)
: await createCategoryAction(values);
if (result.ok) {
toast.success(state?.mode === "edit" ? t.updated(values.name) : t.created(values.name));
onOpenChange(false);
return;
}
for (const [name, message] of Object.entries(result.fieldErrors ?? {})) {
if (message) form.setError(name as keyof CategoryFormInput, { message });
}
if (!result.fieldErrors) form.setError("root", { message: result.error });
}
const color = useWatch({ control: form.control, name: "color" }) ?? "blue";
return (
<ResponsiveDialog
open={Boolean(state)}
onOpenChange={onOpenChange}
title={state?.mode === "edit" ? t.editTitle : t.createTitle}
description={t.formDescription}
footer={
<>
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
{tr.common.cancel}
</Button>
<Button type="submit" form="category-form" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
{state?.mode === "edit" ? tr.common.save : tr.common.create}
</Button>
</>
}
>
<form id="category-form" onSubmit={form.handleSubmit(onSubmit)} noValidate>
<FieldGroup>
<Controller
name="name"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="cat-name">{t.name}</FieldLabel>
<Input
{...field}
value={field.value ?? ""}
id="cat-name"
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="parentId"
control={form.control}
render={({ field, fieldState }) => {
const current = parentOptions.find((o) => o.id === field.value);
return (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="cat-parent">{t.parent}</FieldLabel>
<Select
value={field.value || ROOT}
onValueChange={(v) => field.onChange(v === ROOT ? "" : v)}
>
<SelectTrigger
id="cat-parent"
className="w-full"
aria-invalid={fieldState.invalid}
>
<SelectValue>{current?.path ?? t.noParent}</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
<SelectItem value={ROOT}>{t.noParent}</SelectItem>
{parentOptions.map((o) => (
<SelectItem key={o.id} value={o.id}>
<span style={{ paddingInlineStart: `${o.depth * 0.75}rem` }}>
{o.label}
</span>
</SelectItem>
))}
</SelectContent>
</Select>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
);
}}
/>
<Controller
name="color"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel id="cat-color-label">{t.color}</FieldLabel>
<SwatchPicker
value={field.value}
onChange={field.onChange}
labelledBy="cat-color-label"
/>
</Field>
)}
/>
<Controller
name="icon"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel id="cat-icon-label">{t.icon}</FieldLabel>
<IconPicker
value={field.value}
color={color}
onChange={field.onChange}
labelledBy="cat-icon-label"
/>
<FieldDescription className="sr-only">{t.icon}</FieldDescription>
</Field>
)}
/>
{form.formState.errors.root ? (
<FieldError>{form.formState.errors.root.message}</FieldError>
) : null}
</FieldGroup>
</form>
</ResponsiveDialog>
);
}
+117
View File
@@ -0,0 +1,117 @@
import type { IconKey, Swatch } from "@/shared/appearance";
import type { CategoryKind } from "@/shared/schemas/category";
/**
* Hane oluşturulunca yüklenen varsayılan Türkçe kategori seti (Bölüm 6.2).
* `key` sabittir: set tekrar yüklendiğinde kopya oluşmaz, kullanıcı adı değiştirse bile tanınır.
*/
export type DefaultCategory = {
key: string;
name: string;
icon: IconKey;
color: Swatch;
children?: Omit<DefaultCategory, "children">[];
};
export const DEFAULT_CATEGORIES: Record<CategoryKind, DefaultCategory[]> = {
expense: [
{
key: "market",
name: "Market",
icon: "shopping-cart",
color: "green",
children: [
{ key: "market.gida", name: "Gıda", icon: "shopping-basket", color: "green" },
{ key: "market.temizlik", name: "Temizlik", icon: "spray-can", color: "teal" },
{ key: "market.kisisel-bakim", name: "Kişisel bakım", icon: "sparkles", color: "pink" },
],
},
{
key: "faturalar",
name: "Faturalar",
icon: "receipt",
color: "amber",
children: [
{ key: "faturalar.elektrik", name: "Elektrik", icon: "zap", color: "amber" },
{ key: "faturalar.su", name: "Su", icon: "droplet", color: "sky" },
{ key: "faturalar.dogalgaz", name: "Doğalgaz", icon: "flame", color: "orange" },
{ key: "faturalar.internet", name: "İnternet", icon: "wifi", color: "indigo" },
{ key: "faturalar.telefon", name: "Telefon", icon: "smartphone", color: "purple" },
],
},
{ key: "kira", name: "Kira", icon: "house", color: "blue" },
{ key: "aidat", name: "Aidat", icon: "building", color: "slate" },
{
key: "ulasim",
name: "Ulaşım",
icon: "car",
color: "sky",
children: [
{ key: "ulasim.yakit", name: "Yakıt", icon: "fuel", color: "orange" },
{ key: "ulasim.toplu-tasima", name: "Toplu taşıma", icon: "bus", color: "sky" },
{ key: "ulasim.arac-bakim", name: "Araç bakım ve sigorta", icon: "wrench", color: "slate" },
],
},
{
key: "saglik",
name: "Sağlık",
icon: "heart-pulse",
color: "red",
children: [
{ key: "saglik.ilac", name: "İlaç", icon: "pill", color: "red" },
{ key: "saglik.muayene", name: "Muayene ve tahlil", icon: "heart-pulse", color: "rose" },
],
},
{ key: "egitim", name: "Eğitim", icon: "graduation-cap", color: "indigo" },
{ key: "giyim", name: "Giyim", icon: "shirt", color: "purple" },
{
key: "eglence",
name: "Eğlence",
icon: "film",
color: "pink",
children: [
{
key: "eglence.disarida-yemek",
name: "Dışarıda yemek",
icon: "utensils",
color: "orange",
},
{ key: "eglence.kafe", name: "Kafe", icon: "coffee", color: "amber" },
{ key: "eglence.tatil", name: "Tatil", icon: "plane", color: "sky" },
],
},
{ key: "abonelikler", name: "Abonelikler", icon: "repeat", color: "purple" },
{ key: "ev", name: "Ev ve mobilya", icon: "sofa", color: "teal" },
{ key: "cocuk", name: "Çocuk", icon: "baby", color: "rose" },
{ key: "evcil-hayvan", name: "Evcil hayvan", icon: "paw-print", color: "lime" },
{ key: "hediye", name: "Hediye ve bağış", icon: "gift", color: "pink" },
{
key: "banka",
name: "Banka ve kart giderleri",
icon: "percent",
color: "slate",
children: [
{ key: "banka.faiz", name: "Faiz", icon: "percent", color: "red" },
{ key: "banka.vergi", name: "KKDF / BSMV", icon: "receipt", color: "slate" },
{
key: "banka.ucret",
name: "Kart ve hesap ücretleri",
icon: "credit-card",
color: "slate",
},
],
},
{ key: "vergi", name: "Vergi ve harçlar", icon: "landmark", color: "slate" },
{ key: "diger-gider", name: "Diğer", icon: "circle-ellipsis", color: "slate" },
],
income: [
{ key: "maas", name: "Maaş", icon: "briefcase", color: "green" },
{ key: "ek-gelir", name: "Ek gelir", icon: "coins", color: "teal" },
{ key: "yemek-karti", name: "Yemek kartı yüklemesi", icon: "utensils", color: "lime" },
{ key: "kira-geliri", name: "Kira geliri", icon: "house", color: "blue" },
{ key: "getiri", name: "Faiz ve getiri", icon: "trending-up", color: "indigo" },
{ key: "iade", name: "İade", icon: "undo", color: "sky" },
{ key: "hediye-gelir", name: "Hediye", icon: "gift", color: "pink" },
{ key: "diger-gelir", name: "Diğer", icon: "circle-ellipsis", color: "slate" },
],
};
+159
View File
@@ -0,0 +1,159 @@
import { Types } from "mongoose";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { CategoryModel } from "@/models/category";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
createCategory,
installDefaultCategories,
listCategories,
setCategoryArchived,
updateCategory,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let annemler = "";
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
annemler = ids.household("Annemler");
});
afterAll(teardownDb);
const byKey = (key: string, householdId = cakir) =>
CategoryModel.findOne({ householdId, defaultKey: key })
.lean()
.then((c) => String(c!._id));
const form = (over: Partial<Parameters<typeof createCategory>[2]> = {}) => ({
kind: "expense" as const,
name: "Test",
parentId: null,
icon: "tag" as const,
color: "blue" as const,
...over,
});
describe("varsayılan kategoriler", () => {
it("tekrar yüklemede kopya oluşmaz", async () => {
const before = await CategoryModel.countDocuments({ householdId: cakir });
const added = await installDefaultCategories(
new Types.ObjectId(cakir),
new Types.ObjectId(ids.user("admin")),
);
expect(added).toBe(0);
expect(await CategoryModel.countDocuments({ householdId: cakir })).toBe(before);
});
it("alt kategoriler doğru ancestors zinciriyle yüklenir", async () => {
const elektrik = await CategoryModel.findOne({
householdId: cakir,
defaultKey: "faturalar.elektrik",
}).lean();
const faturalar = await byKey("faturalar");
expect(elektrik?.ancestors.map(String)).toEqual([faturalar]);
});
});
describe("izolasyon ve roller", () => {
it("başka hanenin kategorilerini okuyamaz ve değiştiremez", async () => {
expect(await listCategories(ids.user("fatma"), cakir)).toBeNull();
const kira = await byKey("kira");
// fatma kendi hanesinin kimliğiyle, Çakır'ın kategorisini hedefler → bulunamaz.
const r = await updateCategory(
ids.user("fatma"),
annemler,
kira,
form({ name: "Ele geçirildi" }),
);
expect(r.ok).toBe(false);
expect((await CategoryModel.findById(kira).lean())?.name).toBe("Kira");
const r2 = await setCategoryArchived(ids.user("fatma"), annemler, kira, true);
expect(r2.ok).toBe(false);
});
it("izleyici ekleyemez, üye ekler", async () => {
expect((await createCategory(ids.user("zeynep"), cakir, form({ name: "Harçlık" }))).ok).toBe(
false,
);
expect((await createCategory(ids.user("emre"), cakir, form({ name: "Harçlık" }))).ok).toBe(
true,
);
});
it("başka hanenin kategorisini üst kategori yapamaz", async () => {
const annemlerMarket = await byKey("market", annemler);
const r = await createCategory(
ids.user("ayse"),
cakir,
form({ name: "Sızma", parentId: annemlerMarket }),
);
expect(r.ok).toBe(false);
});
});
describe("ağaç kuralları", () => {
it("aynı düzeyde aynı ad (Türkçe normalize) reddedilir", async () => {
const r = await createCategory(ids.user("ayse"), cakir, form({ name: " KİRA " }));
expect(r.ok).toBe(false);
// farklı düzeyde aynı ad serbest
const market = await byKey("market");
expect(
(await createCategory(ids.user("ayse"), cakir, form({ name: "Kira", parentId: market }))).ok,
).toBe(true);
});
it("taşıma alt ağacın ancestors alanlarını günceller", async () => {
const ulasim = await byKey("ulasim");
const yakit = await byKey("ulasim.yakit");
const created = await createCategory(
ids.user("ayse"),
cakir,
form({ name: "LPG", parentId: yakit }),
);
const lpg = created.ok ? created.data.id : "";
const ev = await byKey("ev");
// Yakıt'ı (alt kategorisi LPG ile) "Ev ve mobilya" altına taşı.
const r = await updateCategory(
ids.user("ayse"),
cakir,
yakit,
form({ name: "Yakıt", parentId: ev, icon: "fuel" }),
);
expect(r.ok).toBe(true);
expect((await CategoryModel.findById(yakit).lean())?.ancestors.map(String)).toEqual([ev]);
expect((await CategoryModel.findById(lpg).lean())?.ancestors.map(String)).toEqual([ev, yakit]);
expect((await CategoryModel.findById(yakit).lean())?.parentId?.toString()).not.toBe(ulasim);
});
it("döngü ve tür uyuşmazlığı reddedilir", async () => {
const market = await byKey("market");
const gida = await byKey("market.gida");
expect(
(
await updateCategory(
ids.user("ayse"),
cakir,
market,
form({ name: "Market", parentId: gida }),
)
).ok,
).toBe(false);
const maas = await byKey("maas");
expect(
(await updateCategory(ids.user("ayse"), cakir, gida, form({ name: "Gıda", parentId: maas })))
.ok,
).toBe(false);
});
it("arşivleme alt ağaçla birlikte yapılır; üstü arşivliyken alt kategori geri alınamaz", async () => {
const saglik = await byKey("saglik");
const ilac = await byKey("saglik.ilac");
expect((await setCategoryArchived(ids.user("emre"), cakir, saglik, true)).ok).toBe(true);
const active = (await listCategories(ids.user("emre"), cakir))!.map((c) => c.id);
expect(active).not.toContain(saglik);
expect(active).not.toContain(ilac);
expect((await setCategoryArchived(ids.user("emre"), cakir, ilac, false)).ok).toBe(false);
expect((await setCategoryArchived(ids.user("emre"), cakir, saglik, false)).ok).toBe(true);
});
});
+331
View File
@@ -0,0 +1,331 @@
import "server-only";
import { Types, type ClientSession } from "mongoose";
import { resolveMembership } 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 { CategoryModel } from "@/models/category";
import type { IconKey, Swatch } from "@/shared/appearance";
import type { CategoryForm, CategoryKind } from "@/shared/schemas/category";
import { foldTr } from "@/shared/search";
import { DEFAULT_CATEGORIES } from "./defaults";
import {
checkCreate,
checkMove,
descendantIds,
type FlatCategory,
type MoveViolation,
} from "./tree";
/**
* Kategori servisi. Okuma: viewer; yazma: member. Hane kapsamı her fonksiyonda doğrulanır.
* Silme yoktur: arşivleme (alt ağaçla birlikte). İşlemler arşivli kategoriyi göstermeye devam eder.
*/
const t = tr.categories;
export type CategoryView = FlatCategory & { icon: IconKey; color: Swatch; isDefault: boolean };
type Lean = {
_id: Types.ObjectId;
kind: CategoryKind;
name: string;
parentId: Types.ObjectId | null;
order: number;
archivedAt: Date | null;
icon: string;
color: string;
defaultKey: string | null;
ancestors: Types.ObjectId[];
};
const toView = (c: Lean): CategoryView => ({
id: String(c._id),
kind: c.kind,
name: c.name,
parentId: c.parentId ? String(c.parentId) : null,
order: c.order,
archived: Boolean(c.archivedAt),
icon: c.icon as IconKey,
color: c.color as Swatch,
isDefault: Boolean(c.defaultKey),
});
const violationMessage = (v: MoveViolation) => t.violations[v];
export async function listCategories(
userId: string,
householdId: string,
opts: { kind?: CategoryKind; includeArchived?: boolean } = {},
): Promise<CategoryView[] | null> {
const m = await resolveMembership(userId, householdId, "viewer");
if (!m) return null;
const filter: Record<string, unknown> = { householdId: m.householdId };
if (opts.kind) filter.kind = opts.kind;
if (!opts.includeArchived) filter.archivedAt = null;
const rows = await CategoryModel.find(filter).lean<Lean[]>();
return rows.map(toView);
}
async function loadKind(householdId: Types.ObjectId, kind: CategoryKind, session?: ClientSession) {
return CategoryModel.find({ householdId, kind })
.session(session ?? null)
.lean<Lean[]>();
}
function hasSiblingNamed(all: Lean[], parentId: string | null, name: string, exceptId?: string) {
const key = foldTr(name);
return all.some(
(c) =>
!c.archivedAt &&
String(c._id) !== exceptId &&
(c.parentId ? String(c.parentId) : null) === parentId &&
foldTr(c.name) === key,
);
}
/**
* Varsayılan seti yükler (idempotent: defaultKey'e göre). Yeni hane oluşturulurken aynı
* transaction içinde (session) ya da migration/seed'den çağrılır. Eklenen kategori sayısını döner.
*/
export async function installDefaultCategories(
householdId: Types.ObjectId,
actor: Types.ObjectId,
session?: ClientSession,
): Promise<number> {
await connectMongoose();
let inserted = 0;
const upsert = async (
kind: CategoryKind,
def: { key: string; name: string; icon: string; color: string },
order: number,
parent: { _id: Types.ObjectId; ancestors: Types.ObjectId[] } | null,
) => {
const res = await CategoryModel.findOneAndUpdate(
{ householdId, defaultKey: def.key },
{
$setOnInsert: {
householdId,
kind,
name: def.name,
nameKey: foldTr(def.name),
parentId: parent?._id ?? null,
ancestors: parent ? [...parent.ancestors, parent._id] : [],
icon: def.icon,
color: def.color,
order,
defaultKey: def.key,
createdBy: actor,
updatedBy: actor,
},
},
{ upsert: true, returnDocument: "after", includeResultMetadata: true, session },
);
if (!res.lastErrorObject?.updatedExisting) inserted++;
return res.value!;
};
for (const kind of ["expense", "income"] as const) {
for (const [i, def] of DEFAULT_CATEGORIES[kind].entries()) {
const parent = await upsert(kind, def, i, null);
for (const [j, child] of (def.children ?? []).entries()) {
await upsert(kind, child, j, { _id: parent._id, ancestors: parent.ancestors });
}
}
}
return inserted;
}
export async function createCategory(
actorId: string,
householdId: string,
input: CategoryForm,
): Promise<ActionResult<{ id: string }>> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const all = await loadKind(m.householdId, input.kind);
const violation = checkCreate(all.map(toView), input.kind, input.parentId);
if (violation)
return fail(violationMessage(violation), { parentId: violationMessage(violation) });
if (hasSiblingNamed(all, input.parentId, input.name))
return fail(t.duplicate, { name: t.duplicate });
const parent = input.parentId ? all.find((c) => String(c._id) === input.parentId) : null;
const siblings = all.filter((c) => (c.parentId ? String(c.parentId) : null) === input.parentId);
const actor = new Types.ObjectId(actorId);
const doc = await CategoryModel.create({
householdId: m.householdId,
kind: input.kind,
name: input.name,
nameKey: foldTr(input.name),
parentId: parent?._id ?? null,
ancestors: parent ? [...parent.ancestors, parent._id] : [],
icon: input.icon,
color: input.color,
order: siblings.length ? Math.max(...siblings.map((s) => s.order)) + 1 : 0,
createdBy: actor,
updatedBy: actor,
});
return ok({ id: String(doc._id) });
}
async function loadOne(householdId: Types.ObjectId, categoryId: string) {
const id = toObjectId(categoryId);
if (!id) return null;
// householdId filtresi: başka hanenin kategorisi asla bulunmaz.
return CategoryModel.findOne({ _id: id, householdId }).lean<Lean>();
}
/** Ad, ikon, renk ve (değiştiyse) üst kategori. Taşıma alt ağaçla birlikte transaction'da. */
export async function updateCategory(
actorId: string,
householdId: string,
categoryId: string,
input: CategoryForm,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const current = await loadOne(m.householdId, categoryId);
if (!current || current.kind !== input.kind) return fail(tr.common.notFound);
const all = await loadKind(m.householdId, current.kind);
const currentParent = current.parentId ? String(current.parentId) : null;
const moving = currentParent !== input.parentId;
if (moving) {
const violation = checkMove(all.map(toView), categoryId, input.parentId);
if (violation)
return fail(violationMessage(violation), { parentId: violationMessage(violation) });
}
if (hasSiblingNamed(all, input.parentId, input.name, categoryId))
return fail(t.duplicate, { name: t.duplicate });
const actor = new Types.ObjectId(actorId);
const mongoose = await connectMongoose();
await mongoose.connection.transaction(async (session) => {
const set: Record<string, unknown> = {
name: input.name,
nameKey: foldTr(input.name),
icon: input.icon,
color: input.color,
updatedBy: actor,
};
if (moving) {
const parent = input.parentId ? all.find((c) => String(c._id) === input.parentId)! : null;
const newAncestors = parent ? [...parent.ancestors, parent._id] : [];
const siblings = all.filter(
(c) => (c.parentId ? String(c.parentId) : null) === input.parentId,
);
Object.assign(set, {
parentId: parent?._id ?? null,
ancestors: newAncestors,
order: siblings.length ? Math.max(...siblings.map((s) => s.order)) + 1 : 0,
});
// Alt ağaç: yeni üst zincir + (taşınan düğüm) + düğümün altındaki eski yol.
for (const d of all.filter((c) => c.ancestors.some((a) => a.equals(current._id)))) {
const idx = d.ancestors.findIndex((a) => a.equals(current._id));
await CategoryModel.updateOne(
{ _id: d._id, householdId: m.householdId },
{ $set: { ancestors: [...newAncestors, current._id, ...d.ancestors.slice(idx + 1)] } },
{ session },
);
}
await writeAudit(
{
action: "category.move",
actorId: actor,
householdId: m.householdId,
targetType: "category",
targetId: categoryId,
diff: { parentId: { from: currentParent, to: input.parentId } },
},
session,
);
}
await CategoryModel.updateOne(
{ _id: current._id, householdId: m.householdId },
{ $set: set },
{ session },
);
});
return ok(undefined);
}
/** Kardeşler arasında bir yukarı/aşağı taşır. */
export async function reorderCategory(
actorId: string,
householdId: string,
categoryId: string,
direction: "up" | "down",
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const current = await loadOne(m.householdId, categoryId);
if (!current) return fail(tr.common.notFound);
const siblings = (await loadKind(m.householdId, current.kind))
.filter((c) => !c.archivedAt && String(c.parentId ?? "") === String(current.parentId ?? ""))
.sort((a, b) => a.order - b.order || a.name.localeCompare(b.name, "tr"));
const i = siblings.findIndex((c) => c._id.equals(current._id));
const j = direction === "up" ? i - 1 : i + 1;
if (i < 0 || j < 0 || j >= siblings.length) return ok(undefined);
[siblings[i], siblings[j]] = [siblings[j]!, siblings[i]!];
await CategoryModel.bulkWrite(
siblings.map((c, order) => ({
updateOne: {
filter: { _id: c._id, householdId: m.householdId },
update: { $set: { order } },
},
})),
);
return ok(undefined);
}
/** Arşivler (alt kategorilerle birlikte) veya arşivden çıkarır (üstü aktif olmalı). */
export async function setCategoryArchived(
actorId: string,
householdId: string,
categoryId: string,
archived: boolean,
): Promise<ActionResult> {
const m = await resolveMembership(actorId, householdId, "member");
if (!m) return fail(tr.common.unauthorized);
const current = await loadOne(m.householdId, categoryId);
if (!current) return fail(tr.common.notFound);
const all = await loadKind(m.householdId, current.kind);
if (!archived && current.parentId) {
const parent = all.find((c) => c._id.equals(current.parentId!));
if (parent?.archivedAt) return fail(t.violations.parentArchived);
}
if (
!archived &&
hasSiblingNamed(
all,
current.parentId ? String(current.parentId) : null,
current.name,
categoryId,
)
) {
return fail(t.duplicate);
}
const ids = [
current._id,
...descendantIds(all.map(toView), categoryId).map((id) => new Types.ObjectId(id)),
];
const actor = new Types.ObjectId(actorId);
await CategoryModel.updateMany(
{ _id: { $in: ids }, householdId: m.householdId },
{ $set: { archivedAt: archived ? new Date() : null, updatedBy: actor } },
);
await writeAudit({
action: archived ? "category.archive" : "category.unarchive",
actorId: actor,
householdId: m.householdId,
targetType: "category",
targetId: categoryId,
diff: { name: current.name, affected: ids.length },
});
return ok(undefined);
}
+121
View File
@@ -0,0 +1,121 @@
import { describe, expect, it } from "vitest";
import {
ancestorIds,
buildTree,
checkCreate,
checkMove,
descendantIds,
rollupTotals,
toOptions,
type FlatCategory,
} from "./tree";
const c = (
id: string,
name: string,
parentId: string | null,
order = 0,
kind: "expense" | "income" = "expense",
): FlatCategory => ({
id,
kind,
name,
parentId,
order,
archived: false,
});
const items: FlatCategory[] = [
c("fat", "Faturalar", null, 1),
c("elk", "Elektrik", "fat", 0),
c("su", "Su", "fat", 1),
c("mar", "Market", null, 0),
c("gida", "Gıda", "mar", 0),
c("meyve", "Meyve", "gida", 0),
c("maas", "Maaş", null, 0, "income"),
];
describe("buildTree / toOptions", () => {
it("sıra ve derinlikle ağaç kurar, yol etiketleri üretir", () => {
const tree = buildTree(items.filter((i) => i.kind === "expense"));
expect(tree.map((n) => n.name)).toEqual(["Market", "Faturalar"]);
expect(toOptions(tree).map((o) => [o.path, o.depth])).toEqual([
["Market", 0],
["Market › Gıda", 1],
["Market › Gıda › Meyve", 2],
["Faturalar", 0],
["Faturalar › Elektrik", 1],
["Faturalar › Su", 1],
]);
});
it("arşivlenenleri varsayılan olarak seçeneklere koymaz", () => {
const tree = buildTree([c("a", "A", null), { ...c("b", "B", "a"), archived: true }]);
expect(toOptions(tree).map((o) => o.id)).toEqual(["a"]);
expect(toOptions(tree, { includeArchived: true }).map((o) => o.id)).toEqual(["a", "b"]);
});
it("üstü olmayan düğümü köke alır, döngüde takılmaz", () => {
const loop = [c("x", "X", "y"), c("y", "Y", "x"), c("z", "Z", "yok")];
expect(() => buildTree(loop)).not.toThrow();
expect(buildTree(loop).map((n) => n.id)).toContain("z");
});
});
describe("ancestorIds / descendantIds", () => {
it("üst ve alt kategorileri bulur", () => {
expect(ancestorIds(items, "meyve")).toEqual(["mar", "gida"]);
expect(descendantIds(items, "mar").sort()).toEqual(["gida", "meyve"]);
expect(descendantIds(items, "elk")).toEqual([]);
});
});
describe("checkMove", () => {
it("kendine, alt kategorisine ve farklı türe taşımayı reddeder", () => {
expect(checkMove(items, "mar", "mar")).toBe("self");
expect(checkMove(items, "mar", "meyve")).toBe("descendant");
expect(checkMove(items, "elk", "maas")).toBe("kind");
expect(checkMove(items, "elk", "yok")).toBe("parentNotFound");
});
it("geçerli taşımaya ve köke taşımaya izin verir", () => {
expect(checkMove(items, "su", "mar")).toBeNull();
expect(checkMove(items, "gida", null)).toBeNull();
});
it("derinlik sınırını uygular (en fazla 5 seviye: derinlik 0–4)", () => {
const deep = [
c("1", "1", null),
c("2", "2", "1"),
c("3", "3", "2"),
c("4", "4", "3"),
c("5", "5", "4"),
c("x", "X", null),
c("y", "Y", "x"),
];
expect(checkCreate(deep, "expense", "4")).toBeNull(); // yeni düğüm derinlik 4
expect(checkCreate(deep, "expense", "5")).toBe("depth"); // derinlik 5
expect(checkMove(deep, "y", "4")).toBeNull();
expect(checkMove(deep, "y", "5")).toBe("depth");
expect(checkMove(deep, "x", "4")).toBe("depth"); // x derinlik 4, alt kategorisi y derinlik 5
expect(checkCreate(deep, "income", "3")).toBe("kind");
});
});
describe("rollupTotals", () => {
it("alt kategori tutarlarını üst kategorilere toplar", () => {
const totals = rollupTotals(
items,
new Map([
["meyve", 300],
["gida", 500],
["elk", 1000],
["su", 250],
]),
);
expect(totals.get("mar")).toBe(800);
expect(totals.get("gida")).toBe(800);
expect(totals.get("fat")).toBe(1250);
expect(totals.get("maas") ?? 0).toBe(0);
});
});
+163
View File
@@ -0,0 +1,163 @@
import type { CategoryKind } from "@/shared/schemas/category";
import { compareTr } from "@/shared/search";
/**
* Kategori ağacı saf fonksiyonları (framework'ten bağımsız, birim testli).
* Derinlik pratikte 3 seviye; güvenlik için en fazla MAX_DEPTH seviye.
*/
export const MAX_DEPTH = 5;
export type FlatCategory = {
id: string;
kind: CategoryKind;
name: string;
parentId: string | null;
order: number;
archived: boolean;
};
export type CategoryNode<T extends FlatCategory = FlatCategory> = T & {
depth: number;
children: CategoryNode<T>[];
};
const bySortOrder = (a: FlatCategory, b: FlatCategory) =>
a.order - b.order || compareTr(a.name, b.name);
/** Düz listeden ağaç kurar. Üstü bulunamayan (veya döngülü) düğümler köke alınır. */
export function buildTree<T extends FlatCategory>(items: readonly T[]): CategoryNode<T>[] {
const nodes = new Map(
items.map((c) => [c.id, { ...c, depth: 0, children: [] as CategoryNode<T>[] }]),
);
const roots: CategoryNode<T>[] = [];
for (const node of nodes.values()) {
const parent = node.parentId ? nodes.get(node.parentId) : undefined;
if (parent && parent !== node) parent.children.push(node);
else roots.push(node);
}
const visit = (list: CategoryNode<T>[], depth: number, seen: Set<string>) => {
list.sort(bySortOrder);
for (const n of list) {
if (seen.has(n.id)) continue;
seen.add(n.id);
n.depth = depth;
visit(n.children, depth + 1, seen);
}
};
visit(roots, 0, new Set());
return roots;
}
export type CategoryOption = {
id: string;
label: string;
path: string;
depth: number;
kind: CategoryKind;
};
/** Seçim listesi (işlem formları): derinlik sırasıyla, "Faturalar › Elektrik" yoluyla. */
export function toOptions<T extends FlatCategory>(
tree: CategoryNode<T>[],
{ includeArchived = false } = {},
): CategoryOption[] {
const out: CategoryOption[] = [];
const walk = (list: CategoryNode<T>[], prefix: string[]) => {
for (const n of list) {
if (n.archived && !includeArchived) continue;
const path = [...prefix, n.name];
out.push({ id: n.id, label: n.name, path: path.join(" › "), depth: n.depth, kind: n.kind });
walk(n.children, path);
}
};
walk(tree, []);
return out;
}
/** `id`'nin tüm alt kategorileri (kendisi hariç). */
export function descendantIds(items: readonly FlatCategory[], id: string): string[] {
const children = new Map<string, string[]>();
for (const c of items)
if (c.parentId) children.set(c.parentId, [...(children.get(c.parentId) ?? []), c.id]);
const out: string[] = [];
const stack = [...(children.get(id) ?? [])];
while (stack.length) {
const next = stack.pop()!;
if (out.includes(next)) continue;
out.push(next);
stack.push(...(children.get(next) ?? []));
}
return out;
}
/** Kökten `id`'ye kadar üst kategori kimlikleri (id hariç). */
export function ancestorIds(items: readonly FlatCategory[], id: string): string[] {
const byId = new Map(items.map((c) => [c.id, c]));
const out: string[] = [];
let cur = byId.get(id)?.parentId ?? null;
while (cur && !out.includes(cur)) {
out.unshift(cur);
cur = byId.get(cur)?.parentId ?? null;
}
return out;
}
/** Alt ağacın yüksekliği (yaprak = 0). */
function subtreeHeight(items: readonly FlatCategory[], id: string): number {
const kids = items.filter((c) => c.parentId === id);
return kids.length ? 1 + Math.max(...kids.map((k) => subtreeHeight(items, k.id))) : 0;
}
export type MoveViolation =
"self" | "descendant" | "kind" | "depth" | "parentNotFound" | "parentArchived";
/** `id` kategorisi `newParentId` altına (null = kök) taşınabilir mi? */
export function checkMove(
items: readonly FlatCategory[],
id: string,
newParentId: string | null,
): MoveViolation | null {
if (newParentId === null) return null;
if (newParentId === id) return "self";
const parent = items.find((c) => c.id === newParentId);
const self = items.find((c) => c.id === id);
if (!parent || !self) return "parentNotFound";
if (parent.kind !== self.kind) return "kind";
if (parent.archived) return "parentArchived";
if (descendantIds(items, id).includes(newParentId)) return "descendant";
const newDepth = ancestorIds(items, newParentId).length + 1;
if (newDepth + subtreeHeight(items, id) >= MAX_DEPTH) return "depth";
return null;
}
/** Yeni kategori `parentId` altına eklenebilir mi? */
export function checkCreate(
items: readonly FlatCategory[],
kind: CategoryKind,
parentId: string | null,
): MoveViolation | null {
if (!parentId) return null;
const parent = items.find((c) => c.id === parentId);
if (!parent) return "parentNotFound";
if (parent.kind !== kind) return "kind";
if (parent.archived) return "parentArchived";
if (ancestorIds(items, parentId).length + 1 >= MAX_DEPTH) return "depth";
return null;
}
/**
* Kategori bazlı tutarları üst kategorilere toplar (raporlar ve bütçe için):
* her kategori kendi tutarı + tüm alt kategorilerinin tutarı.
*/
export function rollupTotals(
items: readonly FlatCategory[],
totals: ReadonlyMap<string, number>,
): Map<string, number> {
const out = new Map<string, number>();
for (const c of items) {
const own = totals.get(c.id) ?? 0;
for (const target of [c.id, ...ancestorIds(items, c.id)])
out.set(target, (out.get(target) ?? 0) + own);
}
return out;
}
+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>
);
}
+272
View File
@@ -0,0 +1,272 @@
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;
}
+60
View File
@@ -0,0 +1,60 @@
"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 { writeActiveHouseholdId } from "@/lib/active-household";
import { getCurrentUser, getHouseholdActionContext } from "@/lib/dal";
import { householdRoleSchema, householdSettingsSchema } from "@/shared/schemas/household";
import { removeMember, resolveMembership, setMemberRole, updateHouseholdSettings } from "./service";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
/** Aktif haneyi değiştirir: önce üyelik doğrulanır, sonra cookie yazılır. */
export async function switchHouseholdAction(
householdId: unknown,
): Promise<ActionResult<{ name: string }>> {
const user = await getCurrentUser();
const id = idSchema.safeParse(householdId);
if (!user || !id.success) return fail(tr.common.unauthorized);
const membership = await resolveMembership(user.id, id.data, "viewer");
if (!membership) return fail(tr.common.unauthorized);
await writeActiveHouseholdId(id.data);
revalidatePath("/", "layout");
return ok({ name: membership.name });
}
/** Owner: hane adı ve ayarları (aktif hane). */
export async function updateHouseholdSettingsAction(input: unknown): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = householdSettingsSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields);
const result = await updateHouseholdSettings(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
/** Owner: aktif hanedeki üyenin rolü. */
export async function setMemberRoleAction(userId: unknown, role: unknown): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const uid = idSchema.safeParse(userId);
const r = householdRoleSchema.safeParse(role);
if (!uid.success || !r.success) return fail(tr.common.genericError);
const result = await setMemberRole(ctx.user.id, ctx.household.id, uid.data, r.data);
if (result.ok) revalidatePath("/ayarlar");
return result;
}
/** Owner: üyeyi aktif haneden çıkarır. */
export async function removeMemberAction(userId: unknown): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("owner");
if (!ctx) return fail(tr.common.unauthorized);
const uid = idSchema.safeParse(userId);
if (!uid.success) return fail(tr.common.genericError);
const result = await removeMember(ctx.user.id, ctx.household.id, uid.data);
if (result.ok) revalidatePath("/", "layout");
return result;
}
@@ -0,0 +1,228 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2 } from "lucide-react";
import { Controller, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
Field,
FieldDescription,
FieldError,
FieldGroup,
FieldLabel,
FieldSet,
} 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 { householdSettingsSchema, type HouseholdSettings } from "@/shared/schemas/household";
import { updateHouseholdSettingsAction } from "../actions";
const t = tr.settings.fields;
/** Form şeması: eşik TL (tam sayı) olarak girilir, kuruşa sunucuya giderken çevrilir. */
const formSchema = householdSettingsSchema
.omit({ extraStoreSavingThresholdMinor: true, budgetMonthStartDay: true })
.extend({
budgetMonthStartDay: z.number().int().min(1).max(28),
extraStoreSavingThresholdTl: z
.number({ error: tr.validation.wholeNumber })
.int(tr.validation.wholeNumber)
.min(0)
.max(100_000),
});
type FormValues = z.infer<typeof formSchema>;
const DAYS = Array.from({ length: 28 }, (_, i) => i + 1);
export function HouseholdSettingsForm({
settings,
canEdit,
}: {
settings: HouseholdSettings;
canEdit: boolean;
}) {
const form = useForm<FormValues>({
resolver: zodResolver(formSchema),
defaultValues: {
name: settings.name,
budgetMonthStartDay: settings.budgetMonthStartDay,
installmentBudgetMode: settings.installmentBudgetMode,
dailyPlanMode: settings.dailyPlanMode,
includePrivateAccountsInTotals: settings.includePrivateAccountsInTotals,
extraStoreSavingThresholdTl: Math.round(settings.extraStoreSavingThresholdMinor / 100),
},
});
async function onSubmit({ extraStoreSavingThresholdTl, ...rest }: FormValues) {
const result = await updateHouseholdSettingsAction({
...rest,
extraStoreSavingThresholdMinor: extraStoreSavingThresholdTl * 100,
});
if (result.ok) {
toast.success(tr.settings.saved);
form.reset({ ...rest, extraStoreSavingThresholdTl });
} else {
toast.error(result.error);
}
}
const submitting = form.formState.isSubmitting;
return (
<form onSubmit={form.handleSubmit(onSubmit)} noValidate>
{/* Sahip olmayanlar için tüm alanlar salt okunur. */}
<FieldSet disabled={!canEdit || submitting}>
<FieldGroup>
<Controller
name="name"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="hh-name">{t.name}</FieldLabel>
<Input {...field} id="hh-name" aria-invalid={fieldState.invalid} />
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="budgetMonthStartDay"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="hh-start-day">{t.budgetMonthStartDay}</FieldLabel>
<Select
value={String(field.value)}
onValueChange={(v) => field.onChange(Number(v))}
disabled={!canEdit}
>
<SelectTrigger
id="hh-start-day"
className="w-28"
aria-describedby="hh-start-day-hint"
>
<SelectValue>{field.value}</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-64">
{DAYS.map((d) => (
<SelectItem key={d} value={String(d)}>
{d}
</SelectItem>
))}
</SelectContent>
</Select>
<FieldDescription id="hh-start-day-hint">
{t.budgetMonthStartDayHint}
</FieldDescription>
</Field>
)}
/>
<Controller
name="installmentBudgetMode"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="hh-installment">{t.installmentBudgetMode}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange} disabled={!canEdit}>
<SelectTrigger id="hh-installment" className="w-full sm:w-80">
<SelectValue>{t.installmentModes[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{(["per_installment", "purchase_month"] as const).map((m) => (
<SelectItem key={m} value={m}>
{t.installmentModes[m]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
<Controller
name="dailyPlanMode"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="hh-daily">{t.dailyPlanMode}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange} disabled={!canEdit}>
<SelectTrigger id="hh-daily" className="w-full sm:w-80">
<SelectValue>{t.dailyPlanModes[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{(["even", "previous_month_pattern"] as const).map((m) => (
<SelectItem key={m} value={m}>
{t.dailyPlanModes[m]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
<Controller
name="extraStoreSavingThresholdTl"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="hh-threshold">{t.extraStoreSavingThreshold}</FieldLabel>
<Input
id="hh-threshold"
type="number"
inputMode="numeric"
min={0}
step={1}
className="w-36 tabular-nums"
name={field.name}
ref={field.ref}
onBlur={field.onBlur}
value={Number.isNaN(field.value) ? "" : field.value}
onChange={(e) => field.onChange(e.target.valueAsNumber)}
aria-invalid={fieldState.invalid}
aria-describedby="hh-threshold-hint"
/>
<FieldDescription id="hh-threshold-hint">
{t.extraStoreSavingThresholdHint}
</FieldDescription>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="includePrivateAccountsInTotals"
control={form.control}
render={({ field }) => (
<Field orientation="horizontal">
<Checkbox
id="hh-private"
checked={field.value}
onCheckedChange={(v) => field.onChange(v === true)}
disabled={!canEdit}
/>
<FieldLabel htmlFor="hh-private" className="font-normal">
{t.includePrivateAccountsInTotals}
</FieldLabel>
</Field>
)}
/>
{canEdit ? (
<div>
<Button type="submit" disabled={submitting || !form.formState.isDirty}>
{submitting ? <Loader2 className="animate-spin" /> : null}
{tr.common.save}
</Button>
</div>
) : null}
</FieldGroup>
</FieldSet>
</form>
);
}
@@ -0,0 +1,169 @@
"use client";
import { UserMinus } from "lucide-react";
import { useState, useTransition } from "react";
import { toast } from "sonner";
import {
AlertDialog,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Avatar, AvatarFallback } from "@/components/ui/avatar";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { initials } from "@/components/layout/user-menu";
import { tr } from "@/i18n/tr";
import type { ActionResult } from "@/lib/action-result";
import { HOUSEHOLD_ROLES, type HouseholdRole } from "../types";
export type MemberRow = {
userId: string;
name: string;
username: string;
role: HouseholdRole;
banned: boolean;
};
type Props = {
members: MemberRow[];
householdName: string;
currentUserId: string;
canManage: boolean;
onSetRole: (userId: string, role: HouseholdRole) => Promise<ActionResult>;
onRemove: (userId: string) => Promise<ActionResult>;
};
/** Hane üyeleri: owner (veya admin) rol değiştirir / haneden çıkarır. Kurallar sunucuda. */
export function MembersList({
members,
householdName,
currentUserId,
canManage,
onSetRole,
onRemove,
}: Props) {
const [pending, startTransition] = useTransition();
const [removing, setRemoving] = useState<MemberRow | null>(null);
const t = tr.settings;
function changeRole(member: MemberRow, role: HouseholdRole) {
startTransition(async () => {
const result = await onSetRole(member.userId, role);
if (result.ok) toast.success(t.roleChanged(member.name));
else toast.error(result.error);
});
}
function confirmRemove() {
const member = removing;
if (!member) return;
startTransition(async () => {
const result = await onRemove(member.userId);
if (result.ok) {
toast.success(t.memberRemoved(member.name));
setRemoving(null);
} else {
toast.error(result.error);
}
});
}
return (
<>
<ul className="divide-y rounded-xl border" aria-busy={pending}>
{members.map((m) => (
<li key={m.userId} className="flex flex-wrap items-center gap-3 p-3">
<Avatar>
<AvatarFallback className="bg-primary/10 text-xs font-medium text-primary">
{initials(m.name)}
</AvatarFallback>
</Avatar>
<div className="min-w-0 flex-1">
<p className="truncate font-medium">
{m.name}
{m.userId === currentUserId ? (
<span className="ml-1.5 text-xs font-normal text-muted-foreground">
({tr.adminUsers.you})
</span>
) : null}
</p>
<p className="truncate text-xs text-muted-foreground">@{m.username}</p>
</div>
{m.banned ? <Badge variant="destructive">{t.banned}</Badge> : null}
{canManage ? (
<div className="flex items-center gap-1">
<Select
value={m.role}
onValueChange={(v) => changeRole(m, v as HouseholdRole)}
disabled={pending}
>
<SelectTrigger
size="sm"
className="w-32"
aria-label={`${m.name} — ${t.changeRole}`}
>
<SelectValue>{tr.household.roles[m.role]}</SelectValue>
</SelectTrigger>
<SelectContent align="end">
{HOUSEHOLD_ROLES.map((r) => (
<SelectItem key={r} value={r}>
<span className="flex flex-col">
<span>{tr.household.roles[r]}</span>
<span className="text-xs text-muted-foreground">
{tr.household.roleHints[r]}
</span>
</span>
</SelectItem>
))}
</SelectContent>
</Select>
<Button
variant="ghost"
size="icon-sm"
onClick={() => setRemoving(m)}
disabled={pending}
aria-label={`${m.name} — ${t.removeMember}`}
title={t.removeMember}
>
<UserMinus />
</Button>
</div>
) : (
<Badge variant={m.role === "owner" ? "default" : "secondary"}>
{tr.household.roles[m.role]}
</Badge>
)}
</li>
))}
</ul>
<AlertDialog open={Boolean(removing)} onOpenChange={(open) => !open && setRemoving(null)}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.removeTitle}</AlertDialogTitle>
<AlertDialogDescription>
{removing ? t.removeDescription(removing.name, householdName) : null}
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel disabled={pending}>{tr.common.cancel}</AlertDialogCancel>
<Button variant="destructive" onClick={confirmRemove} disabled={pending}>
{t.removeConfirm}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</>
);
}
@@ -0,0 +1,21 @@
"use client";
import { removeMemberAction, setMemberRoleAction } from "../actions";
import type { HouseholdRole } from "../types";
import { MembersList, type MemberRow } from "./members-list";
/** /ayarlar: aktif hanenin üyeleri (owner action'larına bağlı). */
export function SettingsMembers(props: {
members: MemberRow[];
householdName: string;
currentUserId: string;
canManage: boolean;
}) {
return (
<MembersList
{...props}
onSetRole={(userId, role: HouseholdRole) => setMemberRoleAction(userId, role)}
onRemove={(userId) => removeMemberAction(userId)}
/>
);
}
-7
View File
@@ -1,7 +0,0 @@
import type { HouseholdSummary } from "./types";
/** FAZ 2 GEÇİCİ: Faz 5'te kullanıcının üye olduğu hanelerle değiştirilecek. */
export const MOCK_HOUSEHOLDS: HouseholdSummary[] = [
{ id: "h_cakir", name: "Çakır Ailesi", role: "owner" },
{ id: "h_anne", name: "Annemler", role: "viewer" },
];
+54
View File
@@ -0,0 +1,54 @@
import { describe, expect, it } from "vitest";
import { checkMemberChange, hasHouseholdRole, pickActiveHousehold } from "./roles";
describe("hasHouseholdRole", () => {
it("viewer < member < owner sırasını uygular", () => {
expect(hasHouseholdRole("owner", "member")).toBe(true);
expect(hasHouseholdRole("member", "member")).toBe(true);
expect(hasHouseholdRole("viewer", "member")).toBe(false);
expect(hasHouseholdRole("member", "owner")).toBe(false);
expect(hasHouseholdRole("viewer", "viewer")).toBe(true);
});
});
describe("checkMemberChange", () => {
it("son sahip düşürülemez veya çıkarılamaz", () => {
const ctx = { targetRole: "owner" as const, ownerCount: 1 };
expect(checkMemberChange({ type: "remove" }, ctx)).toBe("lastOwner");
expect(checkMemberChange({ type: "setRole", role: "member" }, ctx)).toBe("lastOwner");
expect(checkMemberChange({ type: "setRole", role: "owner" }, ctx)).toBeNull();
});
it("birden çok sahip varken biri düşürülebilir; sahip olmayanlar serbest", () => {
expect(
checkMemberChange({ type: "remove" }, { targetRole: "owner", ownerCount: 2 }),
).toBeNull();
expect(
checkMemberChange({ type: "remove" }, { targetRole: "viewer", ownerCount: 1 }),
).toBeNull();
expect(
checkMemberChange(
{ type: "setRole", role: "owner" },
{ targetRole: "member", ownerCount: 1 },
),
).toBeNull();
});
});
describe("pickActiveHousehold", () => {
const list = [
{ id: "a", role: "viewer" as const },
{ id: "b", role: "owner" as const },
{ id: "c", role: "owner" as const },
];
it("üyesi olunan tercih edilen haneyi seçer", () => {
expect(pickActiveHousehold(list, "a")?.id).toBe("a");
});
it("tercih yoksa veya uydurmaysa en yüksek rolün olduğu ilk haneye düşer", () => {
expect(pickActiveHousehold(list, "x")?.id).toBe("b");
expect(pickActiveHousehold(list, undefined)?.id).toBe("b");
});
it("hiç üyelik yoksa null", () => {
expect(pickActiveHousehold([], "a")).toBeNull();
});
});
+43
View File
@@ -0,0 +1,43 @@
import type { HouseholdRole } from "./types";
/** Hane içi yetki sırası: viewer < member < owner. */
const RANK: Record<HouseholdRole, number> = { viewer: 0, member: 1, owner: 2 };
/** `role`, en az `min` yetkisine sahip mi? */
export function hasHouseholdRole(role: HouseholdRole, min: HouseholdRole): boolean {
return RANK[role] >= RANK[min];
}
export type MemberChange = { type: "setRole"; role: HouseholdRole } | { type: "remove" };
export type MemberChangeViolation = "lastOwner";
/**
* Üyelik değişikliği kuralı: hanenin son sahibi (owner) düşürülemez veya çıkarılamaz.
* Böylece her hanenin ayarlarını ve üyelerini yönetebilecek en az bir kişi kalır.
*/
export function checkMemberChange(
change: MemberChange,
ctx: { targetRole: HouseholdRole; ownerCount: number },
): MemberChangeViolation | null {
const removesOwner =
ctx.targetRole === "owner" &&
(change.type === "remove" || (change.type === "setRole" && change.role !== "owner"));
return removesOwner && ctx.ownerCount <= 1 ? "lastOwner" : null;
}
/**
* Aktif hane seçimi: tercih edilen (cookie) hane kullanıcının üyelikleri arasındaysa o;
* değilse en yüksek rolün olduğu hane (eşitlikte listedeki ilk). Uydurma veya artık üye
* olunmayan bir hane kimliği asla seçilmez.
*/
export function pickActiveHousehold<T extends { id: string; role: HouseholdRole }>(
memberships: T[],
preferredId: string | undefined,
): T | null {
const preferred = memberships.find((m) => m.id === preferredId);
if (preferred) return preferred;
let best: T | null = null;
for (const m of memberships) if (!best || RANK[m.role] > RANK[best.role]) best = m;
return best;
}
+207
View File
@@ -0,0 +1,207 @@
import mongoose, { Types } from "mongoose";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { getDb, getMongoClient } from "@/lib/db/mongo";
import { AuditLogModel } from "@/models/audit-log";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import { runSeed } from "../../../scripts/seed/run";
import {
adminCreateHousehold,
adminSetMemberRole,
getHouseholdDetail,
listMemberships,
removeAllMembershipsOfUser,
removeMember,
resolveMembership,
setMemberRole,
updateHouseholdSettings,
} from "./service";
/**
* VERİ İZOLASYONU (Bölüm 5): başka hanenin verisine erişim imkânsız olmalı.
* Seed verisi: Çakır Ailesi (admin+ayse owner, emre member, zeynep viewer, ozan member),
* Annemler (fatma owner, mehmet member, ayse viewer), burak = hanesi olmayan admin.
*/
const ids = new Map<string, string>();
let cakir = "";
let annemler = "";
const settings = {
name: "Çakır Ailesi",
budgetMonthStartDay: 15,
installmentBudgetMode: "purchase_month" as const,
dailyPlanMode: "even" as const,
includePrivateAccountsInTotals: false,
extraStoreSavingThresholdMinor: 25_000,
};
beforeAll(async () => {
expect(getDb().databaseName).toBe("butcem_test");
await getDb().dropDatabase();
await runSeed({ log: () => {} });
for (const u of await getDb().collection("user").find().toArray())
ids.set(String(u.username), String(u._id));
cakir = String((await HouseholdModel.findOne({ name: "Çakır Ailesi" }))!._id);
annemler = String((await HouseholdModel.findOne({ name: "Annemler" }))!._id);
});
afterAll(async () => {
await getDb().dropDatabase();
await mongoose.disconnect();
await getMongoClient().close();
});
const id = (username: string) => ids.get(username)!;
describe("üyelik çözümleme (izolasyon çekirdeği)", () => {
it("üye olmayan kullanıcı başka hanenin üyeliğini çözemez", async () => {
expect(await resolveMembership(id("fatma"), cakir)).toBeNull();
expect(await resolveMembership(id("emre"), annemler)).toBeNull();
});
it("rol yetmezse null döner", async () => {
expect((await resolveMembership(id("ayse"), annemler, "viewer"))?.role).toBe("viewer");
expect(await resolveMembership(id("ayse"), annemler, "member")).toBeNull();
expect(await resolveMembership(id("zeynep"), cakir, "member")).toBeNull();
expect((await resolveMembership(id("emre"), cakir, "member"))?.role).toBe("member");
});
it("hanesi olmayan admin hiçbir haneyi göremez (admin ayrıcalığı yok)", async () => {
expect(await listMemberships(id("burak"))).toEqual([]);
expect(await resolveMembership(id("burak"), cakir)).toBeNull();
expect(await getHouseholdDetail(id("burak"), cakir)).toBeNull();
});
it("geçersiz ve uydurma kimlikler reddedilir", async () => {
const forged = new Types.ObjectId().toHexString();
expect(await resolveMembership(id("ayse"), forged)).toBeNull();
expect(await resolveMembership(id("ayse"), "not-an-id")).toBeNull();
expect(await resolveMembership(id("ayse"), { $ne: null } as unknown as string)).toBeNull();
expect(await resolveMembership("", cakir)).toBeNull();
});
it("kullanıcı yalnızca kendi hanelerini listeler", async () => {
expect((await listMemberships(id("ayse"))).map((m) => [m.name, m.role])).toEqual([
["Annemler", "viewer"],
["Çakır Ailesi", "owner"],
]);
expect((await listMemberships(id("fatma"))).map((m) => m.name)).toEqual(["Annemler"]);
});
});
describe("hane ayrıntısı ve ayarlar", () => {
it("başka hanenin ayrıntısı okunamaz", async () => {
expect(await getHouseholdDetail(id("fatma"), cakir)).toBeNull();
const own = await getHouseholdDetail(id("emre"), cakir);
expect(own?.members.map((m) => m.username).sort()).toEqual([
"admin",
"ayse",
"emre",
"ozan",
"zeynep",
]);
});
it("başka hanenin sahibi, üye ve izleyici ayarları değiştiremez", async () => {
for (const u of ["fatma", "emre", "zeynep", "burak"]) {
const res = await updateHouseholdSettings(id(u), cakir, settings);
expect(res.ok, u).toBe(false);
}
const h = await HouseholdModel.findById(cakir).lean();
expect(h?.settings?.budgetMonthStartDay).toBe(1);
});
it("sahip ayarları değiştirir ve denetim kaydı yazılır", async () => {
const res = await updateHouseholdSettings(id("ayse"), cakir, settings);
expect(res.ok).toBe(true);
const h = await HouseholdModel.findById(cakir).lean();
expect(h?.settings?.budgetMonthStartDay).toBe(15);
const audit = await AuditLogModel.findOne({
action: "household.settings.update",
householdId: cakir,
}).lean();
expect(audit?.actorId.toString()).toBe(id("ayse"));
expect((audit?.diff as Record<string, unknown>).budgetMonthStartDay).toEqual({
from: 1,
to: 15,
});
});
});
describe("üyelik değişiklikleri", () => {
it("üye ve izleyici rol değiştiremez, üye çıkaramaz", async () => {
expect((await setMemberRole(id("emre"), cakir, id("zeynep"), "owner")).ok).toBe(false);
expect((await removeMember(id("zeynep"), cakir, id("emre"))).ok).toBe(false);
});
it("bir hanenin sahibi başka hanedeki üyeliği etkileyemez", async () => {
// ayse Çakır'ın sahibi; fatma Çakır üyesi değil → işlem bulunamaz, Annemler'deki rolü değişmez.
expect((await setMemberRole(id("ayse"), cakir, id("fatma"), "viewer")).ok).toBe(false);
expect((await removeMember(id("ayse"), cakir, id("mehmet"))).ok).toBe(false);
// fatma Annemler'in sahibi; Çakır üzerinde yetkisi yok.
expect((await setMemberRole(id("fatma"), cakir, id("emre"), "viewer")).ok).toBe(false);
const fatma = await HouseholdMemberModel.findOne({
householdId: annemler,
userId: id("fatma"),
}).lean();
const mehmet = await HouseholdMemberModel.findOne({
householdId: annemler,
userId: id("mehmet"),
}).lean();
const emre = await HouseholdMemberModel.findOne({
householdId: cakir,
userId: id("emre"),
}).lean();
expect([fatma?.role, mehmet?.role, emre?.role]).toEqual(["owner", "member", "member"]);
});
it("son sahip düşürülemez; birden çok sahip varken düşürülebilir", async () => {
expect((await adminSetMemberRole(id("admin"), annemler, id("fatma"), "member")).ok).toBe(false);
expect((await setMemberRole(id("fatma"), annemler, id("fatma"), "member")).ok).toBe(false);
// Çakır'da iki sahip var (admin + ayse).
expect((await setMemberRole(id("ayse"), cakir, id("admin"), "member")).ok).toBe(true);
// Artık ayse son sahip.
expect((await setMemberRole(id("ayse"), cakir, id("ayse"), "member")).ok).toBe(false);
expect((await setMemberRole(id("ayse"), cakir, id("admin"), "owner")).ok).toBe(true);
expect(
await AuditLogModel.countDocuments({ action: "household.member.role", householdId: cakir }),
).toBe(2);
});
it("sahip üyeyi haneden çıkarır; kullanıcı artık haneyi göremez", async () => {
expect((await removeMember(id("ayse"), cakir, id("ozan"))).ok).toBe(true);
expect(await resolveMembership(id("ozan"), cakir)).toBeNull();
expect(await listMemberships(id("ozan"))).toEqual([]);
});
});
describe("admin işlemleri", () => {
it("hane + ilk sahip + denetim kaydı tek transaction'da oluşur", async () => {
const res = await adminCreateHousehold(id("admin"), {
name: "Yazlık",
ownerUserId: id("burak"),
});
expect(res.ok).toBe(true);
const hid = res.ok ? res.data.id : "";
expect((await resolveMembership(id("burak"), hid, "owner"))?.name).toBe("Yazlık");
expect(
await AuditLogModel.countDocuments({ action: "household.create", householdId: hid }),
).toBe(1);
});
it("var olmayan kullanıcıyla hane oluşturulmaz", async () => {
const before = await HouseholdModel.countDocuments();
const res = await adminCreateHousehold(id("admin"), {
name: "Hayalet",
ownerUserId: new Types.ObjectId().toHexString(),
});
expect(res.ok).toBe(false);
expect(await HouseholdModel.countDocuments()).toBe(before);
});
it("kullanıcı silinince tüm üyelikleri temizlenir", async () => {
expect(await removeAllMembershipsOfUser(id("mehmet"))).toBe(1);
expect(await listMemberships(id("mehmet"))).toEqual([]);
});
});
+401
View File
@@ -0,0 +1,401 @@
import "server-only";
import { Types } from "mongoose";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { diffFields, writeAudit } from "@/lib/audit";
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 { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import type { HouseholdSettings } from "@/shared/schemas/household";
import { compareTr } from "@/shared/search";
import { checkMemberChange, hasHouseholdRole, type MemberChange } from "./roles";
import type { HouseholdRole, HouseholdSummary } from "./types";
/**
* Hane servisi — framework'ten bağımsız (web Server Action'ları ve ileride /api/v1 aynı
* fonksiyonları çağırır). Hane kapsamlı her fonksiyon üyeliği KENDİSİ de doğrular:
* çağıran taraf DAL kontrolünü atlasa bile başka hanenin verisine erişilemez.
*/
const t = tr.households;
export type Membership = { householdId: Types.ObjectId; role: HouseholdRole; name: string };
export type HouseholdMemberView = {
userId: string;
name: string;
username: string;
role: HouseholdRole;
banned: boolean;
};
export type HouseholdDetail = {
id: string;
name: string;
settings: HouseholdSettings;
members: HouseholdMemberView[];
};
/** Kullanıcının üye olduğu (arşivlenmemiş) haneler, ada göre sıralı. */
export async function listMemberships(userId: string): Promise<HouseholdSummary[]> {
const uid = toObjectId(userId);
if (!uid) return [];
await connectMongoose();
const memberships = await HouseholdMemberModel.find({ userId: uid }).lean();
if (!memberships.length) return [];
const households = await HouseholdModel.find({
_id: { $in: memberships.map((m) => m.householdId) },
archivedAt: null,
})
.select({ name: 1 })
.lean();
const roleOf = new Map(memberships.map((m) => [String(m.householdId), m.role]));
return households
.map((h) => ({ id: String(h._id), name: h.name, role: roleOf.get(String(h._id))! }))
.sort((a, b) => compareTr(a.name, b.name));
}
/**
* VERİ İZOLASYONUNUN ÇEKİRDEĞİ: kullanıcı bu hanenin en az `minRole` yetkili üyesi mi?
* Değilse null. Geçersiz/uydurma kimlikler de null döner.
*/
export async function resolveMembership(
userId: string,
householdId: string,
minRole: HouseholdRole = "viewer",
): Promise<Membership | null> {
const uid = toObjectId(userId);
const hid = toObjectId(householdId);
if (!uid || !hid) return null;
await connectMongoose();
const member = await HouseholdMemberModel.findOne({ userId: uid, householdId: hid }).lean();
if (!member || !hasHouseholdRole(member.role, minRole)) return null;
const household = await HouseholdModel.findOne({ _id: hid, archivedAt: null })
.select({ name: 1 })
.lean();
if (!household) return null;
return { householdId: hid, role: member.role, name: household.name };
}
async function memberViews(householdId: Types.ObjectId): Promise<HouseholdMemberView[]> {
const members = await HouseholdMemberModel.find({ householdId }).lean();
const users = await getDb()
.collection("user")
.find(
{ _id: { $in: members.map((m) => m.userId) } },
{ projection: { name: 1, username: 1, banned: 1 } },
)
.toArray();
const byId = new Map(users.map((u) => [String(u._id), u]));
return members
.map((m) => {
const u = byId.get(String(m.userId));
return {
userId: String(m.userId),
name: (u?.name as string | undefined) ?? "—",
username: (u?.username as string | undefined) ?? "",
role: m.role,
banned: Boolean(u?.banned),
};
})
.sort((a, b) => compareTr(a.name, b.name));
}
function toSettings(h: {
name: string;
settings?: Partial<HouseholdSettings> | null;
}): HouseholdSettings {
const s = h.settings ?? {};
return {
name: h.name,
budgetMonthStartDay: s.budgetMonthStartDay ?? 1,
installmentBudgetMode: s.installmentBudgetMode ?? "per_installment",
dailyPlanMode: s.dailyPlanMode ?? "even",
includePrivateAccountsInTotals: s.includePrivateAccountsInTotals ?? true,
extraStoreSavingThresholdMinor: s.extraStoreSavingThresholdMinor ?? 10_000,
};
}
/** Üye için hane ayrıntısı (ayarlar + üyeler). Üye değilse null. */
export async function getHouseholdDetail(
userId: string,
householdId: string,
): Promise<HouseholdDetail | null> {
const membership = await resolveMembership(userId, householdId, "viewer");
if (!membership) return null;
const household = await HouseholdModel.findById(membership.householdId).lean();
if (!household) return null;
return {
id: String(household._id),
name: household.name,
settings: toSettings(household),
members: await memberViews(membership.householdId),
};
}
/** Owner: hane adı ve ayarları. */
export async function updateHouseholdSettings(
actorId: string,
householdId: string,
input: HouseholdSettings,
): Promise<ActionResult> {
const membership = await resolveMembership(actorId, householdId, "owner");
if (!membership) return fail(tr.common.unauthorized);
const before = await HouseholdModel.findById(membership.householdId).lean();
if (!before) return fail(tr.common.notFound);
const { name, ...settings } = input;
const actor = new Types.ObjectId(actorId);
await HouseholdModel.updateOne(
{ _id: membership.householdId },
{ $set: { name, settings, updatedBy: actor } },
);
await writeAudit({
action: "household.settings.update",
actorId: actor,
householdId: membership.householdId,
targetType: "household",
targetId: String(membership.householdId),
diff: diffFields(toSettings(before), input),
});
return ok(undefined);
}
/** Ortak üyelik değişikliği (owner yolu ve admin yolu aynı kuralı uygular). */
async function applyMemberChange(
actor: Types.ObjectId,
householdId: Types.ObjectId,
targetUserId: string,
change: MemberChange,
): Promise<ActionResult> {
const target = toObjectId(targetUserId);
if (!target) return fail(tr.common.notFound);
const member = await HouseholdMemberModel.findOne({ householdId, userId: target }).lean();
if (!member) return fail(tr.common.notFound);
if (change.type === "setRole" && change.role === member.role) return ok(undefined);
const ownerCount = await HouseholdMemberModel.countDocuments({ householdId, role: "owner" });
if (checkMemberChange(change, { targetRole: member.role, ownerCount })) return fail(t.lastOwner);
if (change.type === "remove") {
await HouseholdMemberModel.deleteOne({ _id: member._id });
} else {
await HouseholdMemberModel.updateOne(
{ _id: member._id },
{ $set: { role: change.role, updatedBy: actor } },
);
}
await writeAudit({
action: change.type === "remove" ? "household.member.remove" : "household.member.role",
actorId: actor,
householdId,
targetType: "user",
targetId: targetUserId,
diff:
change.type === "remove"
? { role: { from: member.role, to: null } }
: { role: { from: member.role, to: change.role } },
});
return ok(undefined);
}
/** Owner: üyenin hane içi rolünü değiştirir. */
export async function setMemberRole(
actorId: string,
householdId: string,
targetUserId: string,
role: HouseholdRole,
): Promise<ActionResult> {
const membership = await resolveMembership(actorId, householdId, "owner");
if (!membership) return fail(tr.common.unauthorized);
return applyMemberChange(new Types.ObjectId(actorId), membership.householdId, targetUserId, {
type: "setRole",
role,
});
}
/** Owner: üyeyi haneden çıkarır. */
export async function removeMember(
actorId: string,
householdId: string,
targetUserId: string,
): Promise<ActionResult> {
const membership = await resolveMembership(actorId, householdId, "owner");
if (!membership) return fail(tr.common.unauthorized);
return applyMemberChange(new Types.ObjectId(actorId), membership.householdId, targetUserId, {
type: "remove",
});
}
// --- Sistem admini (yönetim) — çağıran Server Action admin rolünü doğrular. ---
// Admin haneleri ve üyelikleri yönetir; hanenin finansal verisini GÖRMEZ (Faz 0 kararı).
export type AdminHouseholdRow = {
id: string;
name: string;
memberCount: number;
owners: string[];
members: HouseholdMemberView[];
createdAt: string;
};
export async function adminListHouseholds(): Promise<AdminHouseholdRow[]> {
await connectMongoose();
const households = await HouseholdModel.find({ archivedAt: null }).sort({ name: 1 }).lean();
const rows = await Promise.all(
households.map(async (h) => {
const members = await memberViews(h._id);
return {
id: String(h._id),
name: h.name,
memberCount: members.length,
owners: members.filter((m) => m.role === "owner").map((m) => m.name),
members,
createdAt: new Date(h.createdAt).toISOString(),
};
}),
);
return rows.sort((a, b) => compareTr(a.name, b.name));
}
export type UserOption = { id: string; name: string; username: string; banned: boolean };
export async function adminListUserOptions(): Promise<UserOption[]> {
const users = await getDb()
.collection("user")
.find({}, { projection: { name: 1, username: 1, banned: 1 } })
.toArray();
return users
.map((u) => ({
id: String(u._id),
name: String(u.name ?? ""),
username: String(u.username ?? ""),
banned: Boolean(u.banned),
}))
.sort((a, b) => compareTr(a.name, b.name));
}
/** Admin: hane + ilk sahip üyeliği tek transaction'da. */
export async function adminCreateHousehold(
actorId: string,
input: { name: string; ownerUserId: string },
): Promise<ActionResult<{ id: string }>> {
const actor = new Types.ObjectId(actorId);
const owner = toObjectId(input.ownerUserId);
if (!owner) return fail(tr.validation.selectUser);
const ownerExists = await getDb().collection("user").countDocuments({ _id: owner }, { limit: 1 });
if (!ownerExists) return fail(tr.validation.selectUser);
const mongoose = await connectMongoose();
let createdId = "";
await mongoose.connection.transaction(async (session) => {
const [household] = await HouseholdModel.create(
[{ name: input.name, createdBy: actor, updatedBy: actor }],
{
session,
},
);
createdId = String(household!._id);
await HouseholdMemberModel.create(
[
{
householdId: household!._id,
userId: owner,
role: "owner",
createdBy: actor,
updatedBy: actor,
},
],
{ session },
);
await writeAudit(
{
action: "household.create",
actorId: actor,
householdId: household!._id,
targetType: "household",
targetId: createdId,
diff: { name: input.name, ownerUserId: input.ownerUserId },
},
session,
);
// Varsayılan Türkçe kategori seti aynı transaction'da (Bölüm 6.2).
await installDefaultCategories(household!._id, actor, session);
});
return ok({ id: createdId });
}
/** Admin: kullanıcıyı haneye ekler (zaten üyeyse rolünü günceller). */
export async function adminAddMember(
actorId: string,
householdId: string,
input: { userId: string; role: HouseholdRole },
): Promise<ActionResult> {
const actor = new Types.ObjectId(actorId);
const hid = toObjectId(householdId);
const uid = toObjectId(input.userId);
if (!hid || !uid) return fail(tr.common.notFound);
await connectMongoose();
const household = await HouseholdModel.exists({ _id: hid, archivedAt: null });
const user = await getDb().collection("user").countDocuments({ _id: uid }, { limit: 1 });
if (!household || !user) return fail(tr.common.notFound);
const existing = await HouseholdMemberModel.findOne({ householdId: hid, userId: uid }).lean();
if (existing)
return applyMemberChange(actor, hid, input.userId, { type: "setRole", role: input.role });
await HouseholdMemberModel.create({
householdId: hid,
userId: uid,
role: input.role,
createdBy: actor,
updatedBy: actor,
});
await writeAudit({
action: "household.member.add",
actorId: actor,
householdId: hid,
targetType: "user",
targetId: input.userId,
diff: { role: { from: null, to: input.role } },
});
return ok(undefined);
}
export async function adminSetMemberRole(
actorId: string,
householdId: string,
targetUserId: string,
role: HouseholdRole,
): Promise<ActionResult> {
const hid = toObjectId(householdId);
if (!hid) return fail(tr.common.notFound);
await connectMongoose();
return applyMemberChange(new Types.ObjectId(actorId), hid, targetUserId, {
type: "setRole",
role,
});
}
export async function adminRemoveMember(
actorId: string,
householdId: string,
targetUserId: string,
): Promise<ActionResult> {
const hid = toObjectId(householdId);
if (!hid) return fail(tr.common.notFound);
await connectMongoose();
return applyMemberChange(new Types.ObjectId(actorId), hid, targetUserId, { type: "remove" });
}
/** Kullanıcı silindiğinde tüm üyeliklerini temizler (admin kullanıcı silme akışı). */
export async function removeAllMembershipsOfUser(userId: string): Promise<number> {
const uid = toObjectId(userId);
if (!uid) return 0;
await connectMongoose();
const res = await HouseholdMemberModel.deleteMany({ userId: uid });
return res.deletedCount;
}
+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,713 @@
"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 { 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 { 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). */
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;
}
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);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
const r = await recordPaymentAction(item.id, {
method,
date: v.date,
quantity: method === "cash" ? "" : v.quantity,
amount: v.amount,
accountId: v.amount ? v.accountId || accounts?.[0]?.id || "" : "",
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}
<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 === "cash" || v.amount ? (
<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>
);
}
+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);
});
});
+573
View File
@@ -0,0 +1,573 @@
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 {
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 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;
}
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 } },
);
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,
);
await mongoose.connection.transaction(async (session) => {
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,
);
});
return ok({ closed });
}
/** 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;
}
+137
View File
@@ -0,0 +1,137 @@
"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 { confirmOccurrenceSchema, recurringRuleFormSchema } from "@/shared/schemas/recurring";
import {
confirmOccurrence,
createRule,
deleteRule,
getRuleForm,
postponeOccurrence,
skipOccurrence,
updateRule,
type RuleFormValues,
} from "./service";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
const optionalId = idSchema.optional();
const scopeSchema = z.enum(["all", "following"]);
const ymd = z.string().regex(/^\d{4}-\d{2}-\d{2}$/);
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 createRuleAction(input: unknown): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = recurringRuleFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await createRule(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidate();
return result.ok ? ok({ id: result.data.id }) : result;
}
export async function updateRuleAction(
ruleId: unknown,
input: unknown,
scope: unknown,
fromTransactionId?: unknown,
): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
const s = scopeSchema.safeParse(scope);
const from = optionalId.safeParse(fromTransactionId ?? undefined);
if (!id.success || !s.success || !from.success) return fail(tr.common.notFound);
const parsed = recurringRuleFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await updateRule(
ctx.user.id,
ctx.household.id,
id.data,
parsed.data,
s.data,
from.data,
);
if (result.ok) revalidate();
return result;
}
export async function deleteRuleAction(
ruleId: unknown,
scope: unknown,
fromTransactionId?: unknown,
): Promise<ActionResult<{ removed: number }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
const s = scopeSchema.safeParse(scope);
const from = optionalId.safeParse(fromTransactionId ?? undefined);
if (!id.success || !s.success || !from.success) return fail(tr.common.notFound);
const result = await deleteRule(ctx.user.id, ctx.household.id, id.data, s.data, from.data);
if (result.ok) revalidate();
return result;
}
export async function getRuleFormAction(ruleId: unknown): Promise<ActionResult<RuleFormValues>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
if (!id.success) return fail(tr.common.notFound);
const values = await getRuleForm(ctx.user.id, ctx.household.id, id.data);
return values ? ok(values) : fail(tr.common.notFound);
}
export async function confirmOccurrenceAction(
transactionId: unknown,
input: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
if (!id.success) return fail(tr.common.notFound);
const parsed = confirmOccurrenceSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await confirmOccurrence(ctx.user.id, ctx.household.id, id.data, parsed.data);
if (result.ok) revalidate();
return result;
}
export async function skipOccurrenceAction(transactionId: unknown): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
if (!id.success) return fail(tr.common.notFound);
const result = await skipOccurrence(ctx.user.id, ctx.household.id, id.data);
if (result.ok) revalidate();
return result;
}
export async function postponeOccurrenceAction(
transactionId: unknown,
date: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
const d = ymd.safeParse(date);
if (!id.success) return fail(tr.common.notFound);
if (!d.success) return fail(tr.validation.date, { date: tr.validation.date });
const result = await postponeOccurrence(ctx.user.id, ctx.household.id, id.data, d.data);
if (result.ok) revalidate();
return result;
}

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