34 Commits

Author SHA1 Message Date
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
suphicakir 291a117b4f feat: Faz 4 - örnek test verisi
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:14:10 +03:00
suphicakir cd98694f0d docs: CHANGELOG ve README (0.4.0)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:14:10 +03:00
suphicakir 2b648975ae feat(seed): örnek aile kullanıcıları, haneler ve roller (idempotent)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:14:10 +03:00
suphicakir 38e2a7a26d feat(models): households ve householdMembers Mongoose modelleri
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:14:10 +03:00
suphicakir 3e11a34235 feat: Faz 3 - backend, kimlik doğrulama ve güvenlik
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:08 +03:00
suphicakir cdbd7a0446 docs: CHANGELOG ve README (0.3.0)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:00 +03:00
suphicakir fc3e0ae21b test: admin seed ve kimlik doğrulama entegrasyon testleri
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:00 +03:00
suphicakir 97e7ebe9aa feat(security): CSP ve güvenlik başlıkları, health DB ping
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:00 +03:00
suphicakir 2035f73e7d feat(admin): Server Action'larla kullanıcı yönetimi ve gerçek oturumlu sayfalar
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:00 +03:00
suphicakir 5191a5cce1 feat(auth): Better Auth, kullanıcı adı ile giriş, DAL ve proxy
- MongoDB/Mongoose bağlantıları, kayıt kapalı, admin + username plugin, rate limit
- DAL: getCurrentUser, requireSession, requireRole, getActionUser
- Kullanıcı adı normalizasyonu: İ/I/ı → i (tr-TR 'ADMIN' → 'admın' hatası)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 02:02:00 +03:00
suphicakir 381214c2cb feat(brand): BÜTÇEM logosu ve ikon seti
- public/brand: logo.svg, logo-dark.svg, icon.svg, icon-maskable.svg (yazı Noto Sans Bold yolları, OFL)
- npm run icons artık icon.svg / icon-maskable.svg'den üretir; maskable ve Apple ikonları köşesiz

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 01:44:59 +03:00
174 changed files with 15942 additions and 419 deletions
+2
View File
@@ -12,6 +12,8 @@ BETTER_AUTH_URL="http://localhost:3000"
# Faz 4 seed'i için ilk admin hesabı
SEED_ADMIN_EMAIL="admin@butcem.local"
SEED_ADMIN_PASSWORD=""
# Örnek aile kullanıcılarının ortak şifresi (yalnızca geliştirme; production'da örnek kullanıcı oluşturulmaz)
SEED_USER_PASSWORD=""
# Ek dosyalar (canlıda Docker volume: /app/uploads)
UPLOAD_DIR="./uploads"
+135 -1
View File
@@ -6,6 +6,137 @@ Biçim [Keep a Changelog](https://keepachangelog.com/tr-TR/1.1.0/) esas alınır
## [Yayınlanmamış]
## [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.
### Eklendi
- Seed (`npm run seed`): admin + 7 örnek kullanıcı (biri askıda, biri hanesi olmayan ikinci admin, ikisi e-postasız ve kullanıcı adıyla giriş yapan), 2 hane ("Çakır Ailesi", "Annemler") ve hane içi roller (owner / member / viewer; bir kullanıcı iki hanede farklı rollerle).
- Seed idempotenttir (kullanıcı adı, hane adı ve üyelik çiftine göre); kullanıcılar Better Auth API'siyle oluşturulur. Geliştirme hesapları konsolda tablo olarak gösterilir.
- `npm run seed:reset`: kimlik doğrulama ve hane koleksiyonlarını temizleyip yeniden doldurur; production'da reddedilir. Production'da seed yalnızca admini oluşturur.
- Mongoose modelleri: `households` (ayarlar: bütçe ayı başlangıcı, taksit ve günlük plan tercihleri, özel hesaplar, ek mağaza eşiği) ve `householdMembers` (benzersiz `{householdId, userId}` index'i).
- `SEED_USER_PASSWORD` ortam değişkeni (örnek kullanıcıların ortak geliştirme şifresi).
- Seed entegrasyon testleri (idempotentlik, roller, askı, e-postasız giriş, reset).
## [0.3.0] - 2026-11-05
Faz 3: Backend — kimlik doğrulama, yetki katmanı ve güvenlik.
### Eklendi
- Better Auth (MongoDB adaptörü, replica set transaction): e-posta veya **kullanıcı adı** ile giriş, kayıt (sign-up) kapalı, admin plugin, 30 günlük oturum, `HttpOnly`/`Secure`/`SameSite=Lax` cookie.
- Rate limit (veritabanında): genel 100 istek/dk, giriş denemeleri 5/dk.
- Data Access Layer (`lib/dal.ts`): `getCurrentUser` (istek başına tek okuma), `requireSession`, `requireRole`, `getActionUser`. Askıdaki kullanıcının oturumu reddedilir.
- `proxy.ts`: iyimser oturum cookie kontrolü (oturumsuz → `/login`); asıl kontrol DAL'da.
- Admin kullanıcı yönetimi Server Action'ları: oluşturma, düzenleme, rol, şifre sıfırlama (diğer oturumları kapatır), askıya alma/kaldırma, silme. Kendini silememe/askıya alamama ve son admini düşürememe sunucuda da uygulanır; Better Auth hataları Türkçe alan hatalarına çevrilir.
- E-postası olmayan kullanıcılar için `.invalid` yer tutucu adres (arayüzde gizlenir).
- MongoDB (`lib/db/mongo.ts`) ve Mongoose (`lib/db/mongoose.ts`) bağlantıları (HMR güvenli tekil örnek, tembel oluşturma).
- Güvenlik başlıkları: CSP (nonce'suz, Cache Components uyumlu), `X-Content-Type-Options`, `Referrer-Policy`, `X-Frame-Options`, `Permissions-Policy`, `Cross-Origin-Opener-Policy`; production'da HSTS.
- `GET /api/health` veritabanı ping'i; erişilemezse 503.
- `npm run seed`: ilk admini (`SEED_ADMIN_*`, kullanıcı adı `admin`) idempotent olarak oluşturur.
- `npm run test:integration`: gerçek MongoDB'de (`butcem_test`) kimlik doğrulama sözleşmesi testleri (kayıt kapalı, giriş, askı, admin yetkisi, rate limit).
- BÜTÇEM logosu ve ikon seti (`logo.svg`, `logo-dark.svg`, `icon.svg`, `icon-maskable.svg`); `npm run icons` SVG kaynaktan üretir.
### Değişti
- Giriş, çıkış, dashboard ve admin sayfaları mock yerine gerçek oturum ve verilerle çalışır; oturuma bağlı kabuk Suspense içinde akış olarak gelir.
### Düzeltildi
- Kullanıcı adı normalizasyonu: `tr-TR` küçük harf dönüşümü "ADMIN"i "admın" yapıyordu; artık İ/I/ı → i ve ASCII küçük harf.
### Kaldırıldı
- Oturum ve admin kullanıcı listesi mock verileri (hane mock'u Faz 5'e kadar duruyor).
## [0.2.0] - 2026-11-05
Faz 2: Frontend iskeleti (veriler Faz 3'e kadar mock).
@@ -50,6 +181,9 @@ 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.2.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
[0.1.0]: https://gitea.ta1sph.info/suphicakir/butcem/releases/tag/v0.1.0
+42 -13
View File
@@ -26,26 +26,55 @@ cp .env.example .env.local
# 3) MongoDB (tek düğümlü replica set rs0, host portu 27019) — sağlıklı olana kadar bekler
npm run db:up
# 4) Uygulama
npm run dev # http://localhost:3000
# 4) Örnek veri: admin + aile kullanıcıları + 2 hane (tekrar çalıştırmak güvenli)
npm run seed
# 5) Uygulama
npm run dev # http://localhost:3000 → /login
```
### Geliştirme hesapları (`npm run seed`)
| Kullanıcı adı | Rol | Hane(ler) | Not |
| ------------- | ----- | --------------------------------------- | ------------------------------- |
| `admin` | admin | Çakır Ailesi (owner) | şifre `SEED_ADMIN_PASSWORD` |
| `ayse` | user | Çakır Ailesi (owner), Annemler (viewer) | |
| `emre` | user | Çakır Ailesi (member) | e-postasız |
| `zeynep` | user | Çakır Ailesi (viewer) | e-postasız |
| `fatma` | user | Annemler (owner) | |
| `mehmet` | user | Annemler (member) | |
| `burak` | admin | — | hanesi yok → hane verisi görmez |
| `ozan` | user | Çakır Ailesi (member) | askıda, giriş yapamaz |
Admin dışındaki hesapların şifresi `SEED_USER_PASSWORD` (`.env.local`). Production'da yalnızca admin oluşturulur.
Giriş kullanıcı adı **veya** e-posta ile yapılır. Kayıt kapalıdır; kullanıcıları admin `/admin/kullanicilar` sayfasından oluşturur.
## 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ı
`public/brand/` altındaki `logo.svg`, `logo-dark.svg` ve `icon.png` (512×512) şu an **yer tutucudur**. Gerçek logoları aynı adlarla koyup `npm run icons` çalıştırın.
`public/brand/`: `logo.svg` (açık tema), `logo-dark.svg` (koyu tema), `icon.svg` (uygulama ikonu), `icon-maskable.svg` (Android/iOS, köşesiz). Yazı Noto Sans Bold (OFL) harf yollarıdır. İkonları değiştirdikten sonra `npm run icons` çalıştırın; favicon ve PWA ikonları bu kaynaklardan üretilir.
## Docker imajı
+1
View File
@@ -317,6 +317,7 @@ 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.
- **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir.
---
+68
View File
@@ -1,9 +1,65 @@
import type { NextConfig } from "next";
const isDev = process.env.NODE_ENV === "development";
/**
* Content-Security-Policy (nonce'suz): Cache Components'in statik kabuğu ile uyumlu.
* 'unsafe-inline' script: Next.js'in satır içi hydration verisi ve next-themes'in tema betiği için.
* Grafikler (Recharts, SVG) ve carousel (Embla) ek kaynak gerektirmez; ek dosyalar
* kendi origin'imizden (/api/files/...) ve blob: önizlemelerle servis edilir.
*/
const csp = [
"default-src 'self'",
`script-src 'self' 'unsafe-inline'${isDev ? " 'unsafe-eval'" : ""}`,
"style-src 'self' 'unsafe-inline'",
"img-src 'self' blob: data:",
"font-src 'self'",
"connect-src 'self'",
"media-src 'self' blob:",
"worker-src 'self' blob:",
"manifest-src 'self'",
"object-src 'none'",
"base-uri 'self'",
"form-action 'self'",
"frame-ancestors 'none'",
...(isDev ? [] : ["upgrade-insecure-requests"]),
].join("; ");
const securityHeaders = [
{ key: "Content-Security-Policy", value: csp },
{ key: "X-Content-Type-Options", value: "nosniff" },
{ key: "Referrer-Policy", value: "strict-origin-when-cross-origin" },
{ key: "X-Frame-Options", value: "DENY" },
{ key: "Cross-Origin-Opener-Policy", value: "same-origin" },
// Kamera: Faz 6'da fiş fotoğrafı için yalnızca kendi origin'imiz.
{
key: "Permissions-Policy",
value: "camera=(self), microphone=(), geolocation=(), payment=(), usb=()",
},
...(isDev
? []
: // includeSubDomains/preload bilinçli olarak yok: ta1sph.website'in diğer alt alanlarını bağlamasın.
[{ 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,
},
@@ -17,6 +73,18 @@ const nextConfig: NextConfig = {
},
},
},
async headers() {
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 },
],
},
];
},
};
export default nextConfig;
+53 -2
View File
@@ -1,18 +1,20 @@
{
"name": "butcem",
"version": "0.1.0",
"version": "0.6.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "butcem",
"version": "0.1.0",
"version": "0.6.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",
+10 -5
View File
@@ -1,6 +1,6 @@
{
"name": "butcem",
"version": "0.2.0",
"version": "0.6.0",
"private": true,
"description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması",
"engines": {
@@ -11,16 +11,19 @@
"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 .",
"format:check": "prettier --check .",
"db:up": "docker compose up -d --wait",
"db:down": "docker compose down",
"seed": "tsx --env-file=.env.local scripts/seed.ts",
"seed:reset": "tsx --env-file=.env.local scripts/seed.ts --reset",
"icons": "tsx scripts/generate-icons.ts"
"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",
"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",
@@ -28,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",
+10
View File
@@ -0,0 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512" role="img" aria-label="BÜTÇEM">
<!-- BÜTÇEM maskable/Apple ikonu (köşesiz, tam zemin). Kaynak: npm run icons -->
<defs><linearGradient id="mg" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#1d7cd5"/><stop offset="1" stop-color="#0e49a5"/></linearGradient></defs>
<rect width="512" height="512" fill="url(#mg)"/>
<path d="M108 240 256 124 404 240" fill="none" stroke="#ffffff" stroke-width="38" stroke-linecap="round" stroke-linejoin="round"/>
<rect x="152" y="318" width="52" height="76" rx="13" fill="#ffffff"/>
<rect x="230" y="280" width="52" height="114" rx="13" fill="#ffffff"/>
<rect x="308" y="240" width="52" height="154" rx="13" fill="#8fd5fd"/>
</svg>

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 22 KiB

+10
View File
@@ -0,0 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512" role="img" aria-label="BÜTÇEM">
<!-- BÜTÇEM uygulama ikonu: hane (çatı) + yükselen bütçe/birikim sütunları. Kaynak: npm run icons -->
<defs><linearGradient id="ig" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#1d7cd5"/><stop offset="1" stop-color="#0e49a5"/></linearGradient></defs>
<rect width="512" height="512" rx="112" fill="url(#ig)"/>
<path d="M108 240 256 124 404 240" fill="none" stroke="#ffffff" stroke-width="38" stroke-linecap="round" stroke-linejoin="round"/>
<rect x="152" y="318" width="52" height="76" rx="13" fill="#ffffff"/>
<rect x="230" y="280" width="52" height="114" rx="13" fill="#ffffff"/>
<rect x="308" y="240" width="52" height="154" rx="13" fill="#8fd5fd"/>
</svg>

After

Width:  |  Height:  |  Size: 820 B

+13 -4
View File
@@ -1,5 +1,14 @@
<!-- YER TUTUCU: gerçek BÜTÇEM logosu ile değiştirin (koyu tema). -->
<svg xmlns="http://www.w3.org/2000/svg" width="240" height="64" viewBox="0 0 240 64" role="img" aria-label="BÜTÇEM">
<rect x="1" y="1" width="238" height="62" rx="12" fill="none" stroke="#6bb9f8" stroke-width="2" stroke-dasharray="6 4"/>
<text x="120" y="40" text-anchor="middle" font-family="sans-serif" font-size="26" font-weight="700" fill="#6bb9f8">BÜTÇEM</text>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 227 64" width="227" height="64" role="img" aria-label="BÜTÇEM">
<!-- BÜTÇEM logosu (koyu tema). Yazı Noto Sans Bold (OFL) yollarıdır; font gerektirmez. -->
<g transform="scale(0.125)">
<defs><linearGradient id="dg" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#1d7cd5"/><stop offset="1" stop-color="#0e49a5"/></linearGradient></defs>
<rect width="512" height="512" rx="112" fill="url(#dg)"/>
<path d="M108 240 256 124 404 240" fill="none" stroke="#ffffff" stroke-width="38" stroke-linecap="round" stroke-linejoin="round"/>
<rect x="152" y="318" width="52" height="76" rx="13" fill="#ffffff"/>
<rect x="230" y="280" width="52" height="114" rx="13" fill="#ffffff"/>
<rect x="308" y="240" width="52" height="154" rx="13" fill="#8fd5fd"/>
</g>
<path fill="#edf2f8" d="M88.744 19.863999999999997Q93.742 19.863999999999997 96.02000000000001 21.342999999999996Q98.298 22.822 98.298 25.916Q98.298 28.194 97.09100000000001 29.537Q95.884 30.88 94.184 31.253999999999998V31.424Q95.374 31.662 96.46199999999999 32.274Q97.55 32.885999999999996 98.22999999999999 34.042Q98.91 35.198 98.91 37.102000000000004Q98.91 40.434 96.513 42.287Q94.116 44.14 89.968 44.14H80.89V19.863999999999997ZM89.016 29.588Q91.226 29.588 92.093 28.772Q92.96000000000001 27.956 92.96000000000001 26.63Q92.96000000000001 25.236 91.94 24.573Q90.92 23.91 88.778 23.91H86.092V29.588ZM86.092 33.498V40.026H89.39Q91.702 40.026 92.60300000000001 39.091Q93.504 38.156 93.504 36.694Q93.504 35.368 92.58600000000001 34.433Q91.668 33.498 89.22 33.498Z M124.10400000000001 35.572Q124.10400000000001 38.088 122.99900000000001 40.111000000000004Q121.894 42.134 119.667 43.307Q117.44000000000001 44.480000000000004 114.04 44.480000000000004Q109.212 44.480000000000004 106.696 42.015Q104.18 39.55 104.18 35.504V19.863999999999997H109.31400000000001V34.722Q109.31400000000001 37.714 110.53800000000001 38.938Q111.762 40.162 114.176 40.162Q116.69200000000001 40.162 117.831 38.836Q118.97 37.51 118.97 34.688V19.863999999999997H124.10400000000001ZM108.05600000000001 15.103999999999996Q108.05600000000001 13.913999999999994 108.71900000000001 13.369999999999996Q109.382 12.825999999999997 110.40200000000002 12.825999999999997Q111.32000000000001 12.825999999999997 112.03400000000002 13.369999999999996Q112.74800000000002 13.913999999999994 112.74800000000002 15.103999999999996Q112.74800000000002 16.225999999999996 112.03400000000002 16.769999999999996Q111.32000000000001 17.313999999999997 110.40200000000002 17.313999999999997Q109.382 17.313999999999997 108.71900000000001 16.769999999999996Q108.05600000000001 16.225999999999996 108.05600000000001 15.103999999999996ZM115.4 15.103999999999996Q115.4 13.913999999999994 116.08000000000001 13.369999999999996Q116.76000000000002 12.825999999999997 117.74600000000001 12.825999999999997Q118.69800000000001 12.825999999999997 119.39500000000001 13.369999999999996Q120.09200000000001 13.913999999999994 120.09200000000001 15.103999999999996Q120.09200000000001 16.225999999999996 119.39500000000001 16.769999999999996Q118.69800000000001 17.313999999999997 117.74600000000001 17.313999999999997Q116.76000000000002 17.313999999999997 116.08000000000001 16.769999999999996Q115.4 16.225999999999996 115.4 15.103999999999996Z M140.084 44.14H134.882V24.182H128.32V19.863999999999997H146.64600000000002V24.182H140.084Z M161.50400000000002 23.842Q158.58 23.842 156.897 26.035Q155.214 28.228 155.214 32.07Q155.214 35.912 156.829 38.037Q158.44400000000002 40.162 161.708 40.162Q163.306 40.162 164.78500000000003 39.788Q166.264 39.414 167.76000000000002 38.836V43.256Q164.87 44.480000000000004 161.13 44.480000000000004Q157.25400000000002 44.480000000000004 154.755 42.93300000000001Q152.256 41.386 151.049 38.581Q149.842 35.775999999999996 149.842 32.036Q149.842 28.363999999999997 151.202 25.541999999999998Q152.562 22.72 155.18 21.122Q157.798 19.523999999999997 161.572 19.523999999999997Q163.37400000000002 19.523999999999997 165.22700000000003 19.915Q167.08 20.305999999999997 168.746 21.122L167.04600000000002 25.27Q165.822 24.692 164.445 24.267Q163.068 23.842 161.50400000000002 23.842ZM164.496 48.526Q164.496 50.26 163.238 51.28Q161.98000000000002 52.3 159.73600000000002 52.3Q158.818 52.3 158.07000000000002 52.181Q157.32200000000003 52.062 156.846 51.892V49.206Q157.83200000000002 49.512 158.88600000000002 49.512Q160.68800000000002 49.512 160.68800000000002 48.322Q160.68800000000002 47.642 160.00800000000004 47.268Q159.32800000000003 46.894 158.03600000000003 46.69L159.22600000000003 44.14H161.94600000000003L161.436 45.466Q162.15 45.636 162.86400000000003 45.976Q163.57800000000003 46.316 164.03700000000003 46.928Q164.496 47.54 164.496 48.526Z"/>
<path fill="#6bb9f8" d="M187.514 44.14H173.54000000000002V19.863999999999997H187.514V24.08H178.674V29.418H186.90200000000002V33.634H178.674V39.89H187.514Z M203.52800000000002 44.14 197.68 25.099999999999998H197.544Q197.57800000000003 25.779999999999998 197.64600000000002 27.14Q197.71400000000003 28.5 197.78200000000004 30.047Q197.85000000000002 31.594 197.85000000000002 32.852000000000004V44.14H193.26000000000002V19.863999999999997H200.264L206.01000000000002 38.428H206.11200000000002L212.198 19.863999999999997H219.20200000000003V44.14H214.40800000000002V32.647999999999996Q214.40800000000002 31.491999999999997 214.459 29.996Q214.51000000000002 28.5 214.56100000000004 27.157Q214.61200000000002 25.814 214.64600000000002 25.134H214.51000000000002L208.25400000000002 44.14Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 457 B

After

Width:  |  Height:  |  Size: 5.4 KiB

+13 -4
View File
@@ -1,5 +1,14 @@
<!-- YER TUTUCU: gerçek BÜTÇEM logosu ile değiştirin (açık tema). -->
<svg xmlns="http://www.w3.org/2000/svg" width="240" height="64" viewBox="0 0 240 64" role="img" aria-label="BÜTÇEM">
<rect x="1" y="1" width="238" height="62" rx="12" fill="none" stroke="#105bbe" stroke-width="2" stroke-dasharray="6 4"/>
<text x="120" y="40" text-anchor="middle" font-family="sans-serif" font-size="26" font-weight="700" fill="#105bbe">BÜTÇEM</text>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 227 64" width="227" height="64" role="img" aria-label="BÜTÇEM">
<!-- BÜTÇEM logosu (açık tema). Yazı Noto Sans Bold (OFL) yollarıdır; font gerektirmez. -->
<g transform="scale(0.125)">
<defs><linearGradient id="lg" x1="0" y1="0" x2="1" y2="1">
<stop offset="0" stop-color="#1d7cd5"/><stop offset="1" stop-color="#0e49a5"/></linearGradient></defs>
<rect width="512" height="512" rx="112" fill="url(#lg)"/>
<path d="M108 240 256 124 404 240" fill="none" stroke="#ffffff" stroke-width="38" stroke-linecap="round" stroke-linejoin="round"/>
<rect x="152" y="318" width="52" height="76" rx="13" fill="#ffffff"/>
<rect x="230" y="280" width="52" height="114" rx="13" fill="#ffffff"/>
<rect x="308" y="240" width="52" height="154" rx="13" fill="#8fd5fd"/>
</g>
<path fill="#101a2d" d="M88.744 19.863999999999997Q93.742 19.863999999999997 96.02000000000001 21.342999999999996Q98.298 22.822 98.298 25.916Q98.298 28.194 97.09100000000001 29.537Q95.884 30.88 94.184 31.253999999999998V31.424Q95.374 31.662 96.46199999999999 32.274Q97.55 32.885999999999996 98.22999999999999 34.042Q98.91 35.198 98.91 37.102000000000004Q98.91 40.434 96.513 42.287Q94.116 44.14 89.968 44.14H80.89V19.863999999999997ZM89.016 29.588Q91.226 29.588 92.093 28.772Q92.96000000000001 27.956 92.96000000000001 26.63Q92.96000000000001 25.236 91.94 24.573Q90.92 23.91 88.778 23.91H86.092V29.588ZM86.092 33.498V40.026H89.39Q91.702 40.026 92.60300000000001 39.091Q93.504 38.156 93.504 36.694Q93.504 35.368 92.58600000000001 34.433Q91.668 33.498 89.22 33.498Z M124.10400000000001 35.572Q124.10400000000001 38.088 122.99900000000001 40.111000000000004Q121.894 42.134 119.667 43.307Q117.44000000000001 44.480000000000004 114.04 44.480000000000004Q109.212 44.480000000000004 106.696 42.015Q104.18 39.55 104.18 35.504V19.863999999999997H109.31400000000001V34.722Q109.31400000000001 37.714 110.53800000000001 38.938Q111.762 40.162 114.176 40.162Q116.69200000000001 40.162 117.831 38.836Q118.97 37.51 118.97 34.688V19.863999999999997H124.10400000000001ZM108.05600000000001 15.103999999999996Q108.05600000000001 13.913999999999994 108.71900000000001 13.369999999999996Q109.382 12.825999999999997 110.40200000000002 12.825999999999997Q111.32000000000001 12.825999999999997 112.03400000000002 13.369999999999996Q112.74800000000002 13.913999999999994 112.74800000000002 15.103999999999996Q112.74800000000002 16.225999999999996 112.03400000000002 16.769999999999996Q111.32000000000001 17.313999999999997 110.40200000000002 17.313999999999997Q109.382 17.313999999999997 108.71900000000001 16.769999999999996Q108.05600000000001 16.225999999999996 108.05600000000001 15.103999999999996ZM115.4 15.103999999999996Q115.4 13.913999999999994 116.08000000000001 13.369999999999996Q116.76000000000002 12.825999999999997 117.74600000000001 12.825999999999997Q118.69800000000001 12.825999999999997 119.39500000000001 13.369999999999996Q120.09200000000001 13.913999999999994 120.09200000000001 15.103999999999996Q120.09200000000001 16.225999999999996 119.39500000000001 16.769999999999996Q118.69800000000001 17.313999999999997 117.74600000000001 17.313999999999997Q116.76000000000002 17.313999999999997 116.08000000000001 16.769999999999996Q115.4 16.225999999999996 115.4 15.103999999999996Z M140.084 44.14H134.882V24.182H128.32V19.863999999999997H146.64600000000002V24.182H140.084Z M161.50400000000002 23.842Q158.58 23.842 156.897 26.035Q155.214 28.228 155.214 32.07Q155.214 35.912 156.829 38.037Q158.44400000000002 40.162 161.708 40.162Q163.306 40.162 164.78500000000003 39.788Q166.264 39.414 167.76000000000002 38.836V43.256Q164.87 44.480000000000004 161.13 44.480000000000004Q157.25400000000002 44.480000000000004 154.755 42.93300000000001Q152.256 41.386 151.049 38.581Q149.842 35.775999999999996 149.842 32.036Q149.842 28.363999999999997 151.202 25.541999999999998Q152.562 22.72 155.18 21.122Q157.798 19.523999999999997 161.572 19.523999999999997Q163.37400000000002 19.523999999999997 165.22700000000003 19.915Q167.08 20.305999999999997 168.746 21.122L167.04600000000002 25.27Q165.822 24.692 164.445 24.267Q163.068 23.842 161.50400000000002 23.842ZM164.496 48.526Q164.496 50.26 163.238 51.28Q161.98000000000002 52.3 159.73600000000002 52.3Q158.818 52.3 158.07000000000002 52.181Q157.32200000000003 52.062 156.846 51.892V49.206Q157.83200000000002 49.512 158.88600000000002 49.512Q160.68800000000002 49.512 160.68800000000002 48.322Q160.68800000000002 47.642 160.00800000000004 47.268Q159.32800000000003 46.894 158.03600000000003 46.69L159.22600000000003 44.14H161.94600000000003L161.436 45.466Q162.15 45.636 162.86400000000003 45.976Q163.57800000000003 46.316 164.03700000000003 46.928Q164.496 47.54 164.496 48.526Z"/>
<path fill="#105bbe" d="M187.514 44.14H173.54000000000002V19.863999999999997H187.514V24.08H178.674V29.418H186.90200000000002V33.634H178.674V39.89H187.514Z M203.52800000000002 44.14 197.68 25.099999999999998H197.544Q197.57800000000003 25.779999999999998 197.64600000000002 27.14Q197.71400000000003 28.5 197.78200000000004 30.047Q197.85000000000002 31.594 197.85000000000002 32.852000000000004V44.14H193.26000000000002V19.863999999999997H200.264L206.01000000000002 38.428H206.11200000000002L212.198 19.863999999999997H219.20200000000003V44.14H214.40800000000002V32.647999999999996Q214.40800000000002 31.491999999999997 214.459 29.996Q214.51000000000002 28.5 214.56100000000004 27.157Q214.61200000000002 25.814 214.64600000000002 25.134H214.51000000000002L208.25400000000002 44.14Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

+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();
});
+40 -5
View File
@@ -1,23 +1,30 @@
/**
* Uygulama ikonlarını logodan üretir: npm run icons
*
* Kaynak: public/brand/icon.png (kare, en az 512×512).
* Kaynak: public/brand/icon.svg (varsa; önce 512×512 icon.png olarak render edilir)
* veya doğrudan public/brand/icon.png (kare, en az 512×512).
* Çıktılar (commit edilir):
* public/brand/icon.png 512 px (icon.svg varsa ondan üretilir)
* src/app/favicon.ico 16/32/48 px (PNG gömülü ICO)
* src/app/icon.png 192 px → <link rel="icon">
* src/app/apple-icon.png 180 px, saydamsız → iOS ana ekran
* public/icons/icon-192.png PWA manifest
* public/icons/icon-512.png PWA manifest
* public/icons/maskable-512.png PWA manifest (purpose: maskable, %80 güvenli alan)
* public/icons/maskable-512.png PWA manifest (purpose: maskable)
*
* public/brand/icon-maskable.svg (köşesiz, tam zemin) varsa maskable ve Apple ikonları ondan
* üretilir; yoksa icon.png marka mavisi zemine %80 güvenli alanla yerleştirilir.
*
* Logoyu değiştirdikten sonra bu betiği yeniden çalıştırın.
*/
import { mkdir, writeFile } from "node:fs/promises";
import { access, mkdir, writeFile } from "node:fs/promises";
import path from "node:path";
import sharp from "sharp";
const ROOT = process.cwd();
const SOURCE = path.join(ROOT, "public/brand/icon.png");
const SOURCE_SVG = path.join(ROOT, "public/brand/icon.svg");
const MASKABLE_SVG = path.join(ROOT, "public/brand/icon-maskable.svg");
/** Saydamlık kabul etmeyen ikonlarda arka plan: marka mavisi (--primary, açık tema). */
const BRAND_BG = "#105bbe";
@@ -60,19 +67,47 @@ function toIco(images: { size: number; data: Buffer }[]): Buffer {
return Buffer.concat([header, ...entries, ...images.map((i) => i.data)]);
}
async function exists(file: string) {
return access(file).then(
() => true,
() => false,
);
}
async function main() {
if (await exists(SOURCE_SVG)) {
// Vektörden yüksek yoğunlukta render: küçük boyutlarda da keskin kenarlar.
const png512 = await sharp(SOURCE_SVG, { density: 288 }).resize(512, 512).png().toBuffer();
await writeFile(SOURCE, png512);
console.log(`✓ public/brand/icon.png ← icon.svg (${png512.length} bayt)`);
}
const meta = await sharp(SOURCE).metadata();
if (!meta.width || !meta.height || meta.width !== meta.height || meta.width < 512) {
throw new Error(`${SOURCE} kare ve en az 512×512 olmalı (şu an ${meta.width}×${meta.height}).`);
}
await mkdir(path.join(ROOT, "public/icons"), { recursive: true });
const fullBleed = (await exists(MASKABLE_SVG))
? (size: number) =>
sharp(MASKABLE_SVG, { density: 288 })
.resize(size, size)
.flatten({ background: BRAND_BG })
.png()
.toBuffer()
: null;
const out: [string, Buffer][] = [
["src/app/icon.png", await png(192)],
["src/app/apple-icon.png", await png(180, { flatten: true })],
[
"src/app/apple-icon.png",
fullBleed ? await fullBleed(180) : await png(180, { flatten: true }),
],
["public/icons/icon-192.png", await png(192)],
["public/icons/icon-512.png", await png(512)],
["public/icons/maskable-512.png", await png(512, { padding: 0.1 })],
[
"public/icons/maskable-512.png",
fullBleed ? await fullBleed(512) : await png(512, { padding: 0.1 }),
],
[
"src/app/favicon.ico",
toIco(await Promise.all([16, 32, 48].map(async (size) => ({ size, data: await png(size) })))),
+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 } });
},
};
+38
View File
@@ -0,0 +1,38 @@
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 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];
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>;
};
+32 -6
View File
@@ -1,10 +1,36 @@
/**
* Seed betiği — Faz 4'te doldurulacak (admin, örnek hane, aile üyeleri ve alan verisi).
* Çalıştırma: npm run seed | Sıfırlayıp doldurma: npm run seed:reset
* Seed: npm run seed | Sıfırlayıp doldurma: npm run seed:reset (production'da reddedilir)
*
* Oluşturulanlar: admin (SEED_ADMIN_*), 7 örnek kullanıcı (biri askıda, biri ikinci admin),
* 2 hane ve hane içi rolleri. Ayrıntı: scripts/seed/fixtures.ts
* `server-only` modülleri Next dışında yükleyebilmek için --conditions=react-server ile çalışır.
*/
if (process.env.NODE_ENV === "production" && process.argv.includes("--reset")) {
console.error("seed:reset production ortamında çalıştırılamaz.");
process.exit(1);
import { getMongoClient } from "@/lib/db/mongo";
import { env } from "@/lib/env";
import { closeSeedConnections, runSeed } from "./seed/run";
async function main() {
const summary = await runSeed({ reset: process.argv.includes("--reset") });
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) {
console.log(
"\nGeliştirme hesapları (şifreler: admin → SEED_ADMIN_PASSWORD, diğerleri → SEED_USER_PASSWORD):",
);
console.table(summary.accounts);
}
}
console.log("Seed henüz uygulanmadı (Faz 4).");
main()
.catch((err: unknown) => {
console.error(err instanceof Error ? err.message : err);
process.exitCode = 1;
})
.finally(async () => {
await closeSeedConnections();
await getMongoClient().close();
});
+154
View File
@@ -0,0 +1,154 @@
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. */
export type SeedUser = {
username: string;
name: string;
email?: string;
role: SystemRole;
banReason?: string;
};
export const SEED_USERS: SeedUser[] = [
{ username: "ayse", name: "Ayşe Çakır", email: "ayse@butcem.local", role: "user" },
{ username: "emre", name: "Emre Çakır", role: "user" },
{ username: "zeynep", name: "Zeynep Çakır", role: "user" },
{ username: "fatma", name: "Fatma Demir", email: "fatma@butcem.local", role: "user" },
{ username: "mehmet", name: "Mehmet Demir", email: "mehmet@butcem.local", role: "user" },
// İkinci admin: hiçbir haneye üye değil → hane verisini göremez (Faz 0 kararı).
{ username: "burak", name: "Burak Öztürk", email: "burak@butcem.local", role: "admin" },
{
username: "ozan",
name: "Ozan Kaya",
email: "ozan@butcem.local",
role: "user",
banReason: "Ev arkadaşlığı sona erdi; erişim kaldırıldı.",
},
];
/** Seed admin'in kullanıcı adı (SEED_ADMIN_EMAIL ile oluşturulur). */
export const ADMIN_USERNAME = "admin";
export type SeedHousehold = {
name: string;
members: { username: string; role: HouseholdRole }[];
};
export const SEED_HOUSEHOLDS: SeedHousehold[] = [
{
name: "Çakır Ailesi",
members: [
{ username: ADMIN_USERNAME, role: "owner" },
{ username: "ayse", role: "owner" },
{ username: "emre", role: "member" },
{ username: "zeynep", role: "viewer" },
{ username: "ozan", role: "member" },
],
},
{
name: "Annemler",
members: [
{ username: "fatma", role: "owner" },
{ username: "mehmet", role: "member" },
// Bir kullanıcı birden çok haneye üye olabilir.
{ username: "ayse", role: "viewer" },
],
},
];
/** Ö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",
},
];
+94
View File
@@ -0,0 +1,94 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { getAuth } from "@/lib/auth";
import { authErrorCode } from "@/lib/auth-errors";
import { getDb, getMongoClient } from "@/lib/db/mongo";
import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member";
import { closeSeedConnections, runSeed } from "./run";
import { SEED_HOUSEHOLDS, SEED_USERS } from "./fixtures";
const silent = () => {};
beforeAll(async () => {
expect(getDb().databaseName).toBe("butcem_test");
await getDb().dropDatabase();
});
afterAll(async () => {
await getDb().dropDatabase();
await closeSeedConnections();
await getMongoClient().close();
});
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).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,
categories: 0,
accounts: 0,
transactions: 0,
});
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length);
});
it("roller ve askı durumu doğru", async () => {
const users = await getDb()
.collection("user")
.find({}, { projection: { username: 1, role: 1, banned: 1 } })
.toArray();
const by = new Map(users.map((u) => [u.username as string, u]));
expect(by.get("admin")?.role).toBe("admin");
expect(by.get("burak")?.role).toBe("admin");
expect(by.get("ozan")?.banned).toBe(true);
expect(users.filter((u) => u.banned)).toHaveLength(1);
// Bir kullanıcı birden çok hanede, farklı rollerle.
const ayse = by.get("ayse")!;
const roles = await HouseholdMemberModel.find({ userId: ayse._id }).lean();
expect(roles.map((m) => m.role).sort()).toEqual(["owner", "viewer"]);
// Hanesi olmayan admin.
expect(await HouseholdMemberModel.countDocuments({ userId: by.get("burak")!._id })).toBe(0);
});
it("e-postası olmayan kullanıcı kullanıcı adıyla girer; askıdaki kullanıcı giremez", async () => {
const api = getAuth().api;
const emre = await api.signInUsername({
body: { username: "emre", password: "Test-User-12345" },
});
expect(emre.user.name).toBe("Emre Çakır");
const error = await api
.signInUsername({ body: { username: "ozan", password: "Test-User-12345" } })
.then(
() => null,
(e: unknown) => e,
);
expect(authErrorCode(error)).toBe("BANNED_USER");
});
it("reset koleksiyonları temizleyip yeniden doldurur", async () => {
const summary = await runSeed({ reset: true, log: silent });
expect(summary.created.users).toBe(SEED_USERS.length + 1);
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
});
});
+294
View File
@@ -0,0 +1,294 @@
import mongoose, { Types } from "mongoose";
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 { runMigrations } from "../migrations";
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);
* tekrar çalıştırınca kopya oluşturmaz (kullanıcı adı / hane adı / üyelik çiftine göre).
* Production'da yalnızca admin oluşturulur; örnek kullanıcı ve hane oluşturulmaz.
*/
export type SeedOptions = { reset?: boolean; log?: (line: string) => void };
export type SeedAccountRow = {
rol: string;
kullaniciAdi: string;
eposta: string;
durum: string;
haneler: string;
};
export type SeedSummary = {
created: {
users: number;
households: number;
memberships: number;
categories: number;
accounts: number;
transactions: number;
};
accounts: SeedAccountRow[];
};
const AUTH_COLLECTIONS = ["user", "account", "session", "verification", "rateLimit"];
const DOMAIN_COLLECTIONS = [
"households",
"householdMembers",
"auditLogs",
"categories",
"accounts",
"transactions",
"payees",
"attachments",
"reconciliations",
];
type AuthApi = ReturnType<typeof getAuth>["api"];
async function findUserIdByUsername(username: string): Promise<string | null> {
const doc = await getDb()
.collection("user")
.findOne({ username }, { projection: { _id: 1 } });
return doc ? String(doc._id) : null;
}
/** Admin olarak giriş yapıp oturum başlıklarını döner (ban gibi oturum isteyen admin API'leri için). */
async function adminHeaders(api: AuthApi, password: string): Promise<Headers> {
const { headers } = await api.signInUsername({
body: { username: ADMIN_USERNAME, password },
returnHeaders: true,
});
const cookie = headers
.getSetCookie()
.map((c) => c.split(";")[0])
.join("; ");
return new Headers({ cookie });
}
export async function runSeed({
reset = false,
log = console.log,
}: SeedOptions = {}): Promise<SeedSummary> {
const e = env();
const isProd = e.NODE_ENV === "production";
if (reset && isProd) throw new Error("seed:reset production ortamında çalıştırılamaz.");
if (!e.SEED_ADMIN_EMAIL || !e.SEED_ADMIN_PASSWORD) {
throw new Error("SEED_ADMIN_EMAIL ve SEED_ADMIN_PASSWORD tanımlı olmalı.");
}
if (!isProd && !e.SEED_USER_PASSWORD) {
throw new Error("SEED_USER_PASSWORD tanımlı olmalı (örnek kullanıcıların ortak şifresi).");
}
const api = getAuth().api;
const db = getDb();
await connectMongoose();
const summary: SeedSummary = {
created: {
users: 0,
households: 0,
memberships: 0,
categories: 0,
accounts: 0,
transactions: 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 ve şema değişiklikleri (production'da Mongoose autoIndex kapalı).
await runMigrations(log);
// 1) Admin
const adminEmail = e.SEED_ADMIN_EMAIL.toLowerCase();
let adminId = await findUserIdByUsername(ADMIN_USERNAME);
if (!adminId) {
const res = await api.createUser({
body: {
email: adminEmail,
password: e.SEED_ADMIN_PASSWORD,
name: "Yönetici",
role: "admin",
data: { username: ADMIN_USERNAME },
},
});
adminId = res.user.id;
summary.created.users++;
log(`✓ Admin oluşturuldu: ${adminEmail} (kullanıcı adı: ${ADMIN_USERNAME})`);
} else {
log(`• Admin zaten var: ${ADMIN_USERNAME}`);
}
if (isProd) {
log("• Production: örnek kullanıcı ve hane oluşturulmadı.");
return summary;
}
// 2) Örnek kullanıcılar
const ids = new Map<string, string>([[ADMIN_USERNAME, adminId]]);
const toBan: SeedUser[] = [];
for (const u of SEED_USERS) {
let id = await findUserIdByUsername(u.username);
if (!id) {
const res = await api.createUser({
body: {
email: storedEmail(u.username, u.email),
password: e.SEED_USER_PASSWORD!,
name: u.name,
role: u.role,
data: { username: u.username },
},
});
id = res.user.id;
summary.created.users++;
log(`✓ Kullanıcı: ${u.name} (@${u.username})`);
}
ids.set(u.username, id);
if (u.banReason) toBan.push(u);
}
// 3) Askıdaki kullanıcı(lar) — admin API'si oturum ister.
const pendingBans: { user: SeedUser; id: string }[] = [];
for (const u of toBan) {
const id = ids.get(u.username)!;
const doc = await db
.collection("user")
.findOne({ _id: new Types.ObjectId(id) }, { projection: { banned: 1 } });
if (!doc?.banned) pendingBans.push({ user: u, id });
}
if (pendingBans.length) {
const headers = await adminHeaders(api, e.SEED_ADMIN_PASSWORD);
for (const { user, id } of pendingBans) {
await api.banUser({ headers, body: { userId: id, banReason: user.banReason } });
log(`✓ Askıya alındı: @${user.username}`);
}
}
// 4) Haneler ve üyelikler
const memberships = new Map<string, string[]>();
const actor = new Types.ObjectId(adminId);
for (const h of SEED_HOUSEHOLDS) {
let household = await HouseholdModel.findOne({ name: h.name });
if (!household) {
household = await HouseholdModel.create({ name: h.name, createdBy: actor, updatedBy: actor });
summary.created.households++;
log(`✓ Hane: ${h.name}`);
}
for (const m of h.members) {
const userId = new Types.ObjectId(ids.get(m.username)!);
const result = await HouseholdMemberModel.updateOne(
{ householdId: household._id, userId },
{
$setOnInsert: { householdId: household._id, userId, createdBy: actor },
$set: { role: m.role, updatedBy: actor },
},
{ upsert: true },
);
if (result.upsertedCount) summary.created.memberships++;
memberships.set(m.username, [
...(memberships.get(m.username) ?? []),
`${h.name} (${m.role})`,
]);
}
}
// 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}`);
// 7) Geliştirme hesapları tablosu
const all = [
{ username: ADMIN_USERNAME, name: "Yönetici", email: adminEmail, role: "admin" as const },
...SEED_USERS,
];
summary.accounts = all.map((u) => ({
rol: u.role,
kullaniciAdi: u.username,
eposta: u.email ?? "—",
durum: "banReason" in u && u.banReason ? "askıda" : "aktif",
haneler: (memberships.get(u.username) ?? ["—"]).join(", "),
}));
return summary;
}
/** Seed sonrası bağlantıları kapatır (CLI ve testler). */
export async function closeSeedConnections() {
await mongoose.disconnect();
}
+496
View File
@@ -0,0 +1,496 @@
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.
add({
type: "transfer",
ymd: d(2),
amountMinor: 2_000_00,
account: "Ziraat Maaş",
toAccount: "Cüzdan",
description: "ATM",
by: "admin",
});
add({
type: "transfer",
ymd: d(9),
amountMinor: tl(11_000, 15_000),
account: "Ziraat Maaş",
toAccount: "Garanti Bonus",
description: "Kart borcu ödemesi",
by: "admin",
});
add({
type: "transfer",
ymd: d(16),
amountMinor: 5_000_00,
account: "Ziraat Maaş",
toAccount: "Birikim (Vadeli)",
description: "Aylık birikim",
by: "ayse",
});
// 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} />
</>
);
}
+5 -5
View File
@@ -1,18 +1,18 @@
import type { Metadata } from "next";
import { PageHeader } from "@/components/page-header";
import { UsersTable } from "@/features/admin-users/components/users-table";
import { MOCK_ADMIN_USERS } from "@/features/admin-users/mock";
import { MOCK_SESSION_USER } from "@/features/auth/mock";
import { listAdminUsers } from "@/features/admin-users/queries";
import { tr } from "@/i18n/tr";
import { requireRole } from "@/lib/dal";
export const metadata: Metadata = { title: tr.adminUsers.title };
export default function AdminUsersPage() {
// FAZ 3: const users = await listUsers() (Better Auth admin API)
export default async function AdminUsersPage() {
const [admin, users] = await Promise.all([requireRole("admin"), listAdminUsers()]);
return (
<>
<PageHeader title={tr.adminUsers.title} description={tr.adminUsers.description} />
<UsersTable initialUsers={MOCK_ADMIN_USERS} currentUserId={MOCK_SESSION_USER.id} />
<UsersTable users={users} currentUserId={admin.id} />
</>
);
}
+4 -8
View File
@@ -1,11 +1,7 @@
import { notFound } from "next/navigation";
import { MOCK_SESSION_USER } from "@/features/auth/mock";
import { requireRole } from "@/lib/dal";
/**
* Yalnızca sistem admini. Admin olmayana 404 (sayfanın varlığını bile göstermez).
* FAZ 3: `await requireRole("admin")` (lib/dal.ts) — sunucu tarafı gerçek kontrol.
*/
export default function AdminLayout({ children }: { children: React.ReactNode }) {
if (MOCK_SESSION_USER.role !== "admin") notFound();
/** Yalnızca sistem admini; diğerlerine 404. Sayfalar ayrıca kendi kontrolünü yapar. */
export default async function AdminLayout({ children }: { children: React.ReactNode }) {
await requireRole("admin");
return children;
}
+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>
</>
);
}
+4 -4
View File
@@ -2,9 +2,9 @@ import type { Metadata } from "next";
import { Suspense } from "react";
import { PageHeader } from "@/components/page-header";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { MOCK_SESSION_USER } from "@/features/auth/mock";
import { SummaryCardsSkeleton } from "@/features/dashboard/components/summary-cards-skeleton";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
import { cn } from "@/lib/utils";
import { formatMoney } from "@/shared/format";
@@ -51,13 +51,13 @@ async function SummaryCards() {
);
}
export default function DashboardPage() {
const user = MOCK_SESSION_USER;
export default async function DashboardPage() {
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={<SummaryCardsSkeleton />}>
<SummaryCards />
+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>
);
}
+31
View File
@@ -0,0 +1,31 @@
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 { 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();
return (
<StatementView
key={`${id}-${month}`}
statement={statement}
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")}
/>
</>
);
}
+28 -7
View File
@@ -1,28 +1,49 @@
import { redirect } from "next/navigation";
import { Suspense } from "react";
import { AppHeader } from "@/components/layout/app-header";
import { AppShellFallback } from "@/components/layout/app-shell-fallback";
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_SESSION_USER } from "@/features/auth/mock";
import { MOCK_HOUSEHOLDS } from "@/features/households/mock";
import { hasHouseholdRole } from "@/features/households/roles";
import { getHouseholdContext } from "@/lib/dal";
import { APP_VERSION } from "@/lib/version";
/**
* Oturum gerektiren alan: yan menü (masaüstü), üst bar, alt menü (mobil), hızlı ekle.
* FAZ 3: `const session = await requireSession()` — oturum yoksa /login.
* Oturum gerektiren alan. Oturum okuması istek anında yapılır (Cache Components), bu yüzden
* kullanıcıya bağlı kabuk Suspense içinde render edilir. Her sayfa ayrıca kendi yetkisini
* DAL üzerinden kontrol eder (layout istemci gezinmesinde yeniden çalışmaz).
*/
export default function AppLayout({ children }: { children: React.ReactNode }) {
const user = MOCK_SESSION_USER;
return (
<Suspense fallback={<AppShellFallback />}>
<AuthenticatedShell>{children}</AuthenticatedShell>
</Suspense>
);
}
async function AuthenticatedShell({ children }: { children: React.ReactNode }) {
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>
<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>
);
+17 -3
View File
@@ -10,6 +10,8 @@ import { Button } from "@/components/ui/button";
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import { tr } from "@/i18n/tr";
import { authClient } from "@/lib/auth-client";
import { looksLikeEmail, normalizeUsername } from "@/shared/schemas/common";
import { loginSchema, type LoginInput } from "@/shared/schemas/auth";
export function LoginForm() {
@@ -20,11 +22,23 @@ export function LoginForm() {
defaultValues: { identifier: "", password: "" },
});
async function onSubmit(_values: LoginInput) {
async function onSubmit({ identifier, password }: LoginInput) {
setFormError(null);
// FAZ 3: looksLikeEmail(identifier) ? authClient.signIn.email : authClient.signIn.username
await new Promise((r) => setTimeout(r, 400));
const value = identifier.trim();
const { error } = looksLikeEmail(value)
? await authClient.signIn.email({ email: value.toLowerCase(), password })
: await authClient.signIn.username({ username: normalizeUsername(value), password });
if (error) {
// Hangi bilginin yanlış olduğu söylenmez (hesap tahmini zorlaşır).
if (error.status === 429) setFormError(tr.auth.tooManyAttempts);
else if (error.code === "BANNED_USER") setFormError(tr.auth.banned);
else setFormError(tr.auth.invalidCredentials);
form.setValue("password", "");
return;
}
router.replace("/dashboard");
router.refresh();
}
const submitting = form.formState.isSubmitting;
+13
View File
@@ -1,14 +1,27 @@
import type { Metadata } from "next";
import { redirect } from "next/navigation";
import { Suspense } from "react";
import { Logo } from "@/components/brand/logo";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { tr } from "@/i18n/tr";
import { getCurrentUser } from "@/lib/dal";
import { LoginForm } from "./login-form";
export const metadata: Metadata = { title: tr.auth.loginTitle };
/** Oturum açıksa dashboard'a yönlendirir (istek anında, Suspense içinde). */
async function RedirectIfSignedIn() {
const user = await getCurrentUser();
if (user) redirect("/dashboard");
return null;
}
export default function LoginPage() {
return (
<main className="flex w-full max-w-sm flex-col items-center gap-6">
<Suspense fallback={null}>
<RedirectIfSignedIn />
</Suspense>
<Logo priority className="scale-125" />
<Card className="w-full">
<CardHeader>
+11
View File
@@ -0,0 +1,11 @@
import { toNextJsHandler } from "better-auth/next-js";
import { getAuth } from "@/lib/auth";
/** Better Auth uç noktaları (/api/auth/*). Kayıt (sign-up) yapılandırmada kapalıdır. */
export function GET(request: Request) {
return toNextJsHandler(getAuth()).GET(request);
}
export function POST(request: Request) {
return toNextJsHandler(getAuth()).POST(request);
}
+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;
}
}
+7 -4
View File
@@ -1,20 +1,23 @@
import { connection } from "next/server";
import { pingDb } from "@/lib/db/mongo";
import { APP_COMMIT, APP_VERSION } from "@/lib/version";
/**
* Sağlık kontrolü (Dokploy / Docker HEALTHCHECK).
* Faz 3'te veritabanı ping'i eklenecek; DB erişilemezse 503 dönecek.
* Sağlık kontrolü (Dokploy / Docker HEALTHCHECK). Veritabanına erişilemezse 503.
* İç hata detayı döndürülmez.
*/
export async function GET() {
// Cache Components açıkken GET handler'ı build'de prerender edilmesin.
await connection();
const dbOk = await pingDb();
return Response.json(
{
status: "ok",
status: dbOk ? "ok" : "degraded",
db: dbOk ? "ok" : "unreachable",
version: APP_VERSION,
commit: APP_COMMIT,
time: new Date().toISOString(),
},
{ headers: { "Cache-Control": "no-store" } },
{ status: dbOk ? 200 : 503, headers: { "Cache-Control": "no-store" } },
);
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

+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);
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

+2 -2
View File
@@ -1,6 +1,6 @@
import { redirect } from "next/navigation";
/** Uygulama her zaman login ile açılır. FAZ 3: oturum varsa /dashboard'a yönlenecek. */
/** Oturum yoksa proxy zaten /login'e yönlendirir; varsa dashboard. */
export default function Home() {
redirect("/login");
redirect("/dashboard");
}
+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>
);
}
+1 -1
View File
@@ -7,7 +7,7 @@ import { tr } from "@/i18n/tr";
* hydration uyumsuzluğu olmaz). Dosyalar public/brand/ altında.
*/
export function Logo({ className, priority }: { className?: string; priority?: boolean }) {
const common = { width: 120, height: 32, priority, unoptimized: true } as const;
const common = { width: 114, height: 32, priority, unoptimized: true } as const;
return (
<span className={cn("inline-flex items-center", className)}>
<Image
+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>
@@ -0,0 +1,26 @@
import { Skeleton } from "@/components/ui/skeleton";
import { tr } from "@/i18n/tr";
/** Oturum okunurken gösterilen kabuk iskeleti (yan menü + üst bar + içerik). */
export function AppShellFallback() {
return (
<div role="status" aria-label={tr.common.loading} className="flex min-h-dvh w-full">
<div className="hidden w-64 shrink-0 flex-col gap-3 border-r bg-sidebar p-3 md:flex">
<Skeleton className="h-8 w-28" />
{Array.from({ length: 8 }, (_, i) => (
<Skeleton key={i} className="h-7 w-full" />
))}
</div>
<div className="flex flex-1 flex-col">
<div className="flex h-14 items-center gap-2 border-b px-4">
<Skeleton className="h-8 w-48" />
<Skeleton className="ml-auto size-8 rounded-full" />
</div>
<div className="flex flex-col gap-4 p-4 md:p-6">
<Skeleton className="h-8 w-56" />
<Skeleton className="h-24 w-full" />
</div>
</div>
</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>
+10 -5
View File
@@ -8,6 +8,7 @@ import {
Package,
Settings,
ShoppingCart,
Tags,
Target,
UserCog,
Users,
@@ -25,14 +26,16 @@ 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 = 6.3;
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: "/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 },
{ href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8 },
{ href: "/birikim", label: tr.nav.savings, icon: Coins, phase: 9 },
@@ -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>
+9 -3
View File
@@ -15,6 +15,7 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import type { SessionUser } from "@/features/auth/types";
import { authClient } from "@/lib/auth-client";
import { tr } from "@/i18n/tr";
export function initials(name: string) {
@@ -30,10 +31,15 @@ export function initials(name: string) {
export function UserMenu({ user, version }: { user: SessionUser; version: string }) {
const router = useRouter();
function logout() {
// FAZ 3: authClient.signOut() sonrası yönlendirme.
async function logout() {
const { error } = await authClient.signOut();
if (error) {
toast.error(tr.common.genericError);
return;
}
toast.success(tr.userMenu.loggedOut);
router.replace("/login");
router.refresh();
}
return (
@@ -61,7 +67,7 @@ export function UserMenu({ user, version }: { user: SessionUser; version: string
</Badge>
</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem variant="destructive" onSelect={logout}>
<DropdownMenuItem variant="destructive" onSelect={() => void logout()}>
<LogOut />
{tr.userMenu.logout}
</DropdownMenuItem>
+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,678 @@
"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;
};
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: "",
};
}
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 ?? "",
};
}
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>
)}
/>
</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>
);
}
+161
View File
@@ -0,0 +1,161 @@
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,
};
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);
});
});
+380
View File
@@ -0,0 +1,380 @@
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;
} | 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,
}
: 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 };
}
+302
View File
@@ -0,0 +1,302 @@
"use server";
import { revalidatePath } from "next/cache";
import { headers } from "next/headers";
import { z } from "zod";
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 {
banUserSchema,
setPasswordSchema,
userCreateSchema,
userUpdateSchema,
} from "@/shared/schemas/user";
import { checkAdminAction, type AdminAction, type GuardViolation } from "./guards";
/**
* Admin kullanıcı yönetimi Server Action'ları.
* Sıra: yetki (sunucuda) → zod doğrulama → iş kuralları (guards) → Better Auth admin API → revalidate.
*/
const t = tr.adminUsers;
const PATH = "/admin/kullanicilar";
const userIdSchema = z.string().min(1).max(64);
const guardMessage = (v: GuardViolation) => (v === "self" ? t.guards.self : t.guards.lastAdmin);
/** Bilinen Better Auth hata kodlarını kullanıcıya gösterilecek alan hatalarına çevirir. */
function mapAuthError(error: unknown): ActionResult<never> {
const code = authErrorCode(error);
switch (code) {
case "USERNAME_IS_ALREADY_TAKEN":
return fail(t.errors.checkFields, { username: t.errors.usernameTaken });
case "USER_ALREADY_EXISTS":
case "USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL":
return fail(t.errors.checkFields, { email: t.errors.emailTaken });
case "INVALID_USERNAME":
case "USERNAME_TOO_SHORT":
case "USERNAME_TOO_LONG":
return fail(t.errors.checkFields, { username: tr.validation.usernameFormat });
case "INVALID_EMAIL":
return fail(t.errors.checkFields, { email: tr.validation.email });
case "PASSWORD_TOO_SHORT":
case "PASSWORD_TOO_LONG":
return fail(t.errors.checkFields, { password: tr.validation.passwordMin });
case "YOU_CANNOT_BAN_YOURSELF":
case "YOU_CANNOT_REMOVE_YOURSELF":
return fail(t.guards.self);
default:
// İç detay kullanıcıya sızdırılmaz; sunucuda loglanır.
console.error("[admin-users] beklenmeyen hata", code ?? error);
return fail(tr.common.genericError);
}
}
/** Fiziksel kontrol: oturumdaki kullanıcı admin mi? Değilse işlem yapılmaz. */
async function adminContext() {
const actor = await getActionUser("admin");
if (!actor) return null;
return { actor, headers: await headers(), api: getAuth().api };
}
type Ctx = NonNullable<Awaited<ReturnType<typeof adminContext>>>;
async function loadTarget(ctx: Ctx, userId: string) {
try {
const user = await ctx.api.getUser({ headers: ctx.headers, query: { id: userId } });
return user
? {
id: user.id,
role: (user.role === "admin" ? "admin" : "user") as SystemRole,
name: user.name,
}
: null;
} catch {
return null;
}
}
async function countAdmins(ctx: Ctx): Promise<number> {
const result = await ctx.api.listUsers({
headers: ctx.headers,
query: { filterField: "role", filterOperator: "eq", filterValue: "admin", limit: 1 },
});
return result.total;
}
async function guard(ctx: Ctx, action: AdminAction, target: { id: string; role: SystemRole }) {
const adminCount = target.role === "admin" ? await countAdmins(ctx) : Number.POSITIVE_INFINITY;
return checkAdminAction(action, { actorId: ctx.actor.id, target, adminCount });
}
// --- Action'lar ---
export async function createUserAction(input: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const parsed = userCreateSchema.safeParse(input);
if (!parsed.success) return fail(t.errors.checkFields);
const v = parsed.data;
let createdId = "";
try {
const created = await ctx.api.createUser({
headers: ctx.headers,
body: {
name: v.name,
email: storedEmail(v.username, v.email),
password: v.password,
role: v.role,
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);
}
export async function updateUserAction(userId: unknown, input: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
const parsed = userUpdateSchema.safeParse(input);
if (!id.success || !parsed.success) return fail(t.errors.checkFields);
const target = await loadTarget(ctx, id.data);
if (!target) return fail(tr.common.notFound);
const v = parsed.data;
if (v.role !== target.role) {
const violation = await guard(ctx, { type: "setRole", role: v.role }, target);
if (violation) return fail(guardMessage(violation), { role: guardMessage(violation) });
}
try {
await ctx.api.adminUpdateUser({
headers: ctx.headers,
body: {
userId: target.id,
data: { name: v.name, username: v.username, email: storedEmail(v.username, v.email) },
},
});
if (v.role !== target.role) {
await ctx.api.setRole({ headers: ctx.headers, body: { userId: target.id, role: v.role } });
}
} 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);
}
export async function setRoleAction(userId: unknown, role: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
const r = systemRoleSchema.safeParse(role);
if (!id.success || !r.success) return fail(tr.common.genericError);
const target = await loadTarget(ctx, id.data);
if (!target) return fail(tr.common.notFound);
const violation = await guard(ctx, { type: "setRole", role: r.data }, target);
if (violation) return fail(guardMessage(violation));
try {
await ctx.api.setRole({ headers: ctx.headers, body: { userId: target.id, role: r.data } });
} 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);
}
export async function setPasswordAction(userId: unknown, input: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
const parsed = setPasswordSchema.safeParse(input);
if (!id.success || !parsed.success) return fail(t.errors.checkFields);
const target = await loadTarget(ctx, id.data);
if (!target) return fail(tr.common.notFound);
try {
await ctx.api.setUserPassword({
headers: ctx.headers,
body: { userId: target.id, newPassword: parsed.data.password },
});
// Başka bir kullanıcının şifresi sıfırlandıysa açık oturumlarını kapat.
if (target.id !== ctx.actor.id) {
await ctx.api.revokeUserSessions({ headers: ctx.headers, body: { userId: target.id } });
}
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.password.reset",
actorId: ctx.actor.id,
targetType: "user",
targetId: target.id,
});
return ok(undefined);
}
export async function banUserAction(userId: unknown, input: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
const parsed = banUserSchema.safeParse(input);
if (!id.success || !parsed.success) return fail(t.errors.checkFields);
const target = await loadTarget(ctx, id.data);
if (!target) return fail(tr.common.notFound);
const violation = await guard(ctx, { type: "ban" }, target);
if (violation) return fail(guardMessage(violation));
try {
// banUser açık oturumları da sonlandırır.
await ctx.api.banUser({
headers: ctx.headers,
body: { userId: target.id, banReason: parsed.data.reason },
});
} 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);
}
export async function unbanUserAction(userId: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
if (!id.success) return fail(tr.common.genericError);
try {
await ctx.api.unbanUser({ headers: ctx.headers, body: { userId: id.data } });
} catch (error) {
return mapAuthError(error);
}
await writeAudit({
action: "user.unban",
actorId: ctx.actor.id,
targetType: "user",
targetId: id.data,
});
revalidatePath(PATH);
return ok(undefined);
}
export async function removeUserAction(userId: unknown): Promise<ActionResult> {
const ctx = await adminContext();
if (!ctx) return fail(tr.common.unauthorized);
const id = userIdSchema.safeParse(userId);
if (!id.success) return fail(tr.common.genericError);
const target = await loadTarget(ctx, id.data);
if (!target) return fail(tr.common.notFound);
const violation = await guard(ctx, { type: "delete" }, target);
if (violation) return fail(guardMessage(violation));
try {
await ctx.api.removeUser({ headers: ctx.headers, body: { userId: target.id } });
} 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);
}
@@ -59,18 +59,22 @@ import {
TableRow,
} from "@/components/ui/table";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { fail, type ActionResult } from "@/lib/action-result";
import { cn } from "@/lib/utils";
import { formatDate } from "@/shared/format";
import type { SystemRole } from "@/shared/schemas/common";
import type { UserCreate, UserUpdate } from "@/shared/schemas/user";
import { compareTr, includesTr } from "@/shared/search";
import {
checkAdminAction,
findUniqueConflicts,
type AdminAction,
type GuardViolation,
} from "../guards";
banUserAction,
createUserAction,
removeUserAction,
setPasswordAction,
setRoleAction,
unbanUserAction,
updateUserAction,
} from "../actions";
import { checkAdminAction, type AdminAction, type GuardViolation } from "../guards";
import type { AdminUser } from "../types";
import { BanUserDialog, DeleteUserDialog, SetPasswordDialog } from "./user-action-dialogs";
import { UserFormDialog } from "./user-form-dialog";
@@ -311,15 +315,14 @@ const columns = helper.columns([
]);
export function UsersTable({
initialUsers,
users,
currentUserId,
}: {
initialUsers: AdminUser[];
users: AdminUser[];
currentUserId: string;
}) {
// FAZ 3: yerel durum yerine Server Action + revalidatePath.
const [users, setUsers] = useState(initialUsers);
const [dialog, setDialog] = useState<DialogState>(null);
// Arayüzdeki kural kontrolü yalnızca erken geri bildirim içindir; asıl kontrol sunucuda.
const adminCount = users.filter((u) => u.role === "admin").length;
const guard = (action: AdminAction, target: AdminUser): GuardViolation | null =>
@@ -327,84 +330,41 @@ export function UsersTable({
const guardMessage = (v: GuardViolation) => (v === "self" ? t.guards.self : t.guards.lastAdmin);
// --- Mock işlemler (FAZ 3'te Server Action'lara taşınacak; aynı ActionResult sözleşmesi) ---
async function createUser(values: UserCreate): Promise<ActionResult> {
const conflicts = findUniqueConflicts(users, values);
if (conflicts.username || conflicts.email) {
return fail(t.errors.checkFields, {
username: conflicts.username && t.errors.usernameTaken,
email: conflicts.email && t.errors.emailTaken,
});
/** Server Action'ı çağırır; başarıda bildirim gösterir. Sayfa revalidatePath ile tazelenir. */
async function run(promise: Promise<ActionResult>, success: string): Promise<ActionResult> {
try {
const result = await promise;
if (result.ok) toast.success(success);
return result;
} catch {
return fail(tr.common.genericError);
}
const { password: _password, ...rest } = values;
setUsers((prev) => [
{
...rest,
id: `u_${crypto.randomUUID().slice(0, 8)}`,
banned: false,
createdAt: new Date().toISOString(),
},
...prev,
]);
toast.success(t.toast.created(values.name));
return ok(undefined);
}
async function updateUser(id: string, values: UserUpdate): Promise<ActionResult> {
const target = users.find((u) => u.id === id);
if (!target) return fail(tr.common.genericError);
const conflicts = findUniqueConflicts(users, values, id);
if (conflicts.username || conflicts.email) {
return fail(t.errors.checkFields, {
username: conflicts.username && t.errors.usernameTaken,
email: conflicts.email && t.errors.emailTaken,
});
}
const v =
values.role !== target.role ? guard({ type: "setRole", role: values.role }, target) : null;
if (v) return fail(guardMessage(v), { role: guardMessage(v) });
setUsers((prev) => prev.map((u) => (u.id === id ? { ...u, ...values } : u)));
toast.success(t.toast.updated(values.name));
return ok(undefined);
const createUser = (values: UserCreate) =>
run(createUserAction(values), t.toast.created(values.name));
const updateUser = (id: string, values: UserUpdate) =>
run(updateUserAction(id, values), t.toast.updated(values.name));
async function setRole(user: AdminUser, role: SystemRole) {
const result = await run(setRoleAction(user.id, role), t.toast.roleChanged(user.name));
if (!result.ok) toast.error(result.error);
}
function setRole(user: AdminUser, role: SystemRole) {
const v = guard({ type: "setRole", role }, user);
if (v) return void toast.error(guardMessage(v));
setUsers((prev) => prev.map((u) => (u.id === user.id ? { ...u, role } : u)));
toast.success(t.toast.roleChanged(user.name));
const setPassword = (user: AdminUser, values: { password: string }) =>
run(setPasswordAction(user.id, values), t.toast.passwordSet(user.name));
const banUser = (user: AdminUser, values: { reason?: string }) =>
run(banUserAction(user.id, values), t.toast.banned(user.name));
async function unbanUser(user: AdminUser) {
const result = await run(unbanUserAction(user.id), t.toast.unbanned(user.name));
if (!result.ok) toast.error(result.error);
}
async function setPassword(user: AdminUser): Promise<ActionResult> {
toast.success(t.toast.passwordSet(user.name));
return ok(undefined);
}
async function banUser(user: AdminUser, { reason }: { reason?: string }): Promise<ActionResult> {
const v = guard({ type: "ban" }, user);
if (v) return fail(guardMessage(v));
setUsers((prev) =>
prev.map((u) => (u.id === user.id ? { ...u, banned: true, banReason: reason } : u)),
);
toast.success(t.toast.banned(user.name));
return ok(undefined);
}
function unbanUser(user: AdminUser) {
setUsers((prev) =>
prev.map((u) => (u.id === user.id ? { ...u, banned: false, banReason: undefined } : u)),
);
toast.success(t.toast.unbanned(user.name));
}
async function removeUser(user: AdminUser): Promise<ActionResult> {
const v = guard({ type: "delete" }, user);
if (v) return fail(guardMessage(v));
setUsers((prev) => prev.filter((u) => u.id !== user.id));
toast.success(t.toast.removed(user.name));
return ok(undefined);
}
const removeUser = (user: AdminUser) =>
run(removeUserAction(user.id), t.toast.removed(user.name));
const table = useTable({
features,
+1 -18
View File
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
import { checkAdminAction, findUniqueConflicts } from "./guards";
import { checkAdminAction } from "./guards";
const admin = { id: "a1", role: "admin" as const };
const user = { id: "u1", role: "user" as const };
@@ -40,20 +40,3 @@ describe("checkAdminAction", () => {
expect(checkAdminAction({ type: "setRole", role: "admin" }, ctx)).toBeNull();
});
});
describe("findUniqueConflicts", () => {
const users = [
{ id: "1", username: "ayse", email: "ayse@x.com" },
{ id: "2", username: "emre" },
];
it("çakışan kullanıcı adı ve e-postayı bulur", () => {
expect(findUniqueConflicts(users, { username: "ayse", email: "ayse@x.com" })).toEqual({
username: "taken",
email: "taken",
});
});
it("düzenlenen kaydın kendisini saymaz, boş e-postayı kontrol etmez", () => {
expect(findUniqueConflicts(users, { username: "ayse", email: "ayse@x.com" }, "1")).toEqual({});
expect(findUniqueConflicts(users, { username: "yeni" })).toEqual({});
});
});
-15
View File
@@ -35,18 +35,3 @@ export function checkAdminAction(action: AdminAction, ctx: GuardContext): GuardV
if (removesAdmin && ctx.adminCount <= 1) return "lastAdmin";
return null;
}
/** Kullanıcı adı / e-posta benzersizlik kontrolü (normalize edilmiş değerlerle). */
export function findUniqueConflicts(
users: ReadonlyArray<{ id: string; username: string; email?: string }>,
values: { username: string; email?: string },
excludeId?: string,
): { username?: "taken"; email?: "taken" } {
const others = users.filter((u) => u.id !== excludeId);
return {
...(others.some((u) => u.username === values.username) ? { username: "taken" as const } : {}),
...(values.email && others.some((u) => u.email === values.email)
? { email: "taken" as const }
: {}),
};
}
+27
View File
@@ -0,0 +1,27 @@
import { visibleEmail } from "@/shared/account-email";
import type { AdminUser } from "./types";
type RawAdminUser = {
id: string;
name: string;
email: string;
username?: string | null;
role?: string | null;
banned?: boolean | null;
banReason?: string | null;
createdAt: Date | string;
};
/** Better Auth kullanıcı kaydını arayüz satırına çevirir (yer tutucu e-posta gizlenir). */
export function toAdminUser(u: RawAdminUser): AdminUser {
return {
id: u.id,
name: u.name,
username: u.username ?? "",
email: visibleEmail(u.email),
role: u.role === "admin" ? "admin" : "user",
banned: Boolean(u.banned),
banReason: u.banReason ?? undefined,
createdAt: new Date(u.createdAt).toISOString(),
};
}
-111
View File
@@ -1,111 +0,0 @@
import type { AdminUser } from "./types";
/** FAZ 2 GEÇİCİ: Faz 3'te Better Auth admin API'sinden gelen listeyle değiştirilecek. */
export const MOCK_ADMIN_USERS: AdminUser[] = [
{
id: "u_admin",
name: "Suphi Çakır",
username: "suphi",
email: "admin@butcem.local",
role: "admin",
banned: false,
createdAt: "2026-05-02T08:00:00Z",
},
{
id: "u_ayse",
name: "Ayşe Çakır",
username: "ayse",
email: "ayse@butcem.local",
role: "user",
banned: false,
createdAt: "2026-05-02T08:10:00Z",
},
{
id: "u_emre",
name: "Emre Çakır",
username: "emre",
role: "user",
banned: false,
createdAt: "2026-05-03T17:45:00Z",
},
{
id: "u_zeynep",
name: "Zeynep Çakır",
username: "zeynep",
role: "user",
banned: false,
createdAt: "2026-05-03T17:50:00Z",
},
{
id: "u_fatma",
name: "Fatma Demir",
username: "fatma.demir",
email: "fatma@butcem.local",
role: "user",
banned: false,
createdAt: "2026-06-11T12:00:00Z",
},
{
id: "u_mehmet",
name: "Mehmet Demir",
username: "mehmet.demir",
email: "mehmet@butcem.local",
role: "user",
banned: false,
createdAt: "2026-06-11T12:05:00Z",
},
{
id: "u_ozan",
name: "Ozan Kaya",
username: "ozan",
email: "ozan@butcem.local",
role: "user",
banned: true,
banReason: "Eski ev arkadaşı",
createdAt: "2026-07-20T09:30:00Z",
},
{
id: "u_elif",
name: "Elif Şahin",
username: "elif_s",
email: "elif@butcem.local",
role: "user",
banned: false,
createdAt: "2026-08-14T19:15:00Z",
},
{
id: "u_burak",
name: "Burak Öztürk",
username: "burak",
email: "burak@butcem.local",
role: "admin",
banned: false,
createdAt: "2026-09-01T06:40:00Z",
},
{
id: "u_irem",
name: "İrem Güneş",
username: "irem",
role: "user",
banned: false,
createdAt: "2026-09-22T15:00:00Z",
},
{
id: "u_can",
name: "Can Yıldız",
username: "can.y",
email: "can@butcem.local",
role: "user",
banned: false,
createdAt: "2026-10-05T10:20:00Z",
},
{
id: "u_selin",
name: "Selin Aydın",
username: "selin",
email: "selin@butcem.local",
role: "user",
banned: false,
createdAt: "2026-10-30T21:05:00Z",
},
];
+16
View File
@@ -0,0 +1,16 @@
import "server-only";
import { headers } from "next/headers";
import { getAuth } from "@/lib/auth";
import { requireRole } from "@/lib/dal";
import { toAdminUser } from "./mapper";
import type { AdminUser } from "./types";
/** Admin: tüm kullanıcılar (en yeni önce). Kişisel kullanım ölçeğinde tek sayfa yeterli. */
export async function listAdminUsers(): Promise<AdminUser[]> {
await requireRole("admin");
const result = await getAuth().api.listUsers({
headers: await headers(),
query: { limit: 1000, sortBy: "createdAt", sortDirection: "desc" },
});
return result.users.map(toAdminUser);
}
@@ -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,326 @@
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: [],
...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 };
}
-13
View File
@@ -1,13 +0,0 @@
import type { SessionUser } from "./types";
/**
* FAZ 2 GEÇİCİ: Better Auth bağlanana kadar arayüzü besleyen sahte oturum.
* Faz 3'te `requireSession()` (lib/dal.ts) ile değiştirilecek ve bu dosya silinecek.
*/
export const MOCK_SESSION_USER: SessionUser = {
id: "u_admin",
name: "Suphi Çakır",
username: "suphi",
email: "admin@butcem.local",
role: "admin",
};
+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;
}
+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)}
/>
);
}

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