11 Commits

Author SHA1 Message Date
suphicakir b18f918baf feat: Faz 7b - kart ve KMH dönemleri, taksitler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir c711eb8d28 chore(release): 0.7.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 6ae98a1cb4 fix(seed): çakışan transfer seedRef'leri; örnek taksitli alışverişler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 0ad52757ad feat(ui): kart özeti, KMH paneli, taksit seçimi ve kalan taksit iptali
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir cc624af69f feat(cards): kart/KMH dönem hesabı, taksitli harcama, kart ve KMH özeti servisleri, 006 migration
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 11:19:17 +03:00
suphicakir 57067b0fd0 feat: Faz 7a - planlı ve düzenli işlemler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 8c4771908c chore: CHANGELOG (Faz 7a)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 5bd2c372bf feat(seed): örnek düzenli işlemler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir cfc2b2c974 feat(ui): planlı işlemler sayfası, kural formu ve vadesi geçmiş uyarısı
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir 04a17d2775 feat(recurring): düzenli işlem kuralları, planlı kayıt üretimi, onay/atla/ertele ve seri düzenleme
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
suphicakir eaafe5dd9b docs: Faz 7 kararlarını kaydet
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 10:55:05 +03:00
51 changed files with 4674 additions and 60 deletions
+37
View File
@@ -6,6 +6,43 @@ Biçim [Keep a Changelog](https://keepachangelog.com/tr-TR/1.1.0/) esas alınır
## [Yayınlanmamış] ## [Yayınlanmamış]
## [0.7.0] - 2026-11-05
Faz 7: planlı/düzenli işlemler, kredi kartı ve KMH dönemleri, taksitler (7a ve 7b alt fazları).
### Eklendi — Faz 7b: kart ve KMH dönemleri, taksitler
- Dönem hesabı (`shared/card-periods.ts`): kesim günü dahil "Hesap Kesim Dönemi", sonrası "Güncel Dönem"; kesim günü ayda yoksa ayın son günü; kesim günü bitmeden dönem kapanmış sayılmaz. Son ödeme: kesimden N gün sonra veya ayın sabit günü.
- Kart özeti (`/hesaplar/:id`, kredi kartı): toplam borç, kullanılabilir limit (gelecek taksitler dahil düşülür) ve kullanım çubuğu; hesap kesim dönemi borcu, asgari ödeme, ödenen, kalan, son ödeme tarihi ve kalan gün; güncel dönem harcaması; dönem dönem yaklaşan taksitler; planlı harcamalar; son 6 ekstre.
- Asgari ödeme: limit 50.000 TL altı %20, üstü %40; kart bazında oran girilebilir (hesap formu).
- "Borcu öde": ödeme hesabından karta transfer formu kalan dönem borcuyla dolu açılır; ödemeler dönem borcundan düşer (kısmi ödeme desteklenir).
- Taksitli harcama: kredi kartı giderinde taksit sayısı (2–36). Her taksit ayrı işlem ("Hepsiburada 4/9"); toplam kuruş kaybı olmadan bölünür; vadesi gelen taksit kendi döneminde otomatik gerçekleşir, gelecek taksitler planlıdır ve bakiyeyi etkilemez. Ayrıntıdan "Kalan taksitleri iptal et".
- KMH özeti (KMH'li banka hesabı): limit, kullanılan, kullanılabilir; geçen ve bu dönem için gün sonu eksi bakiyelerden tahmini faiz; "Faiz kaydı ekle" kesim tarihli, "Banka › Faiz" kategorili gider formunu doldurur (vergiler hariç not).
- `statements` koleksiyonu: kart/KMH dönem kayıtları (borç, asgari, ödenen, harcama, tahmini faiz); kart özeti okunurken işlemlerden yeniden hesaplanır.
- İşlem formuna ön doldurma desteği (kart ödemesi, faiz kaydı).
- Seed: iki taksitli kart alışverişi.
- `006` migration'ı: `statements` index'leri, taksit planı index'i.
- Testler: dönem/son ödeme/asgari/taksit planı/KMH faizi (birim); kart özeti tutarlılığı (bağımsız bakiye hesabıyla), ödeme etkisi, taksit üretimi ve otomatik gerçekleşme, taksit iptali, taksit kuralları, KMH faiz tahmini ve yetki (entegrasyon).
### Düzeltildi — Faz 7b
- Seed: aynı aydaki satıcısız/kategorisiz transferler aynı `seedRef`'i aldığı için kart borcu ödemesi ve aylık birikim transferleri hiç oluşmuyordu; artık oluşuyor (mevcut kayıtlar kopyalanmaz). Kart ödemesi son ödeme gününden önceye alındı.
### Eklendi — Faz 7a: planlı ve düzenli işlemler
- Düzenli işlem kuralları (`recurringRules`): gelir, gider, transfer; sabit veya tahmini tutar; günlük/haftalık/aylık/yıllık, "her N birimde bir", ayın N. günü (ayda yoksa son gün) veya ayın son günü; bitiş yok, tekrar sayısı (ör. 12) veya bitiş tarihi. Formda Türkçe tekrar açıklaması ve ilk tarihlerin önizlemesi.
- Her tekrar için `planned` durumunda planlı kayıt; bitiş tarihsiz kurallarda 12 ay ileriye kadar. Ufuk sayfa okunurken ilerletilir (zamanlanmış görev gerekmez); üretim idempotent (`recurringRuleId + occurrenceIndex` benzersiz). Planlı kayıtlar bakiyeyi etkilemez.
- `/planli`: vadesi geçmiş, yaklaşan (60 gün) ve kurallar sekmeleri; "Onayla" (tutar ve tarih düzeltilebilir), "Ertele", "Atla"; seri pozisyonu ("3/12") ve "Tahmini" rozetleri.
- Seri düzenleme: "Yalnızca bu" (kayıt seriden ayrılır), "Bu ve sonrakiler" (seri bölünür), "Tümü" (onaylanmamış planlı kayıtlar yeniden üretilir; gerçekleşen, atlanan ve ayrılmış kayıtlar korunur). Silmede "bu ve sonrakiler" / "tüm seri"; gerçekleşmiş kayıtlar silinmez.
- Dashboard'da vadesi geçmiş planlı işlem uyarısı.
- Seed: 11 örnek düzenli işlem (maaş, kira, aidat, tahmini faturalar, abonelikler, emekli maaşı; vadesi geçmiş örnek olarak 12 taksitli spor salonu).
- `005` migration'ı: `recurringRules` index'leri, işlemlerde tekrar alanları. Denetim kaydı: `recurring.delete`.
- Testler: tekrar tarihi hesabı (ay sonu, artık yıl, aralık, sayı/bitiş/ufuk) ve form şeması (birim); üretim, onay/atla/ertele, seri düzenleme ve silme, bakiye etkisizliği, yetki ve gizli hesap izolasyonu (entegrasyon).
### Değişti — Faz 7a
- İşlem listesi varsayılan olarak planlı kayıtları göstermez (durum filtresiyle görülebilir); özet toplamları seçili duruma göre hesaplanır.
## [0.6.0] - 2026-11-05 ## [0.6.0] - 2026-11-05
Faz 6: hesaplar, kategoriler, işlemler, ek dosyalar ve mutabakat (6a, 6b, 6c alt fazları). Faz 6: hesaplar, kategoriler, işlemler, ek dosyalar ve mutabakat (6a, 6b, 6c alt fazları).
+1
View File
@@ -318,6 +318,7 @@ Aşağıdakileri varsayılan olarak kabul ettim. Faz 0'da yalnızca bunlardan em
- **URL'ler:** ekran yolları Türkçe ASCII (`/islemler`, `/butce`); kod, koleksiyon adları ve `/api/v1` İngilizce. - **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ı). - **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. - **Aktif hane varsayılanı:** tercih (cookie) yoksa kullanıcının en yüksek rolde olduğu hane açılır.
- **Faz 7 kararları (2026-11-05):** 7a planlı/düzenli işlemler, 7b kart/KMH dönemleri ve taksitler; `v0.7.0` 7b sonunda. Taksitli harcamada her taksit ayrı işlem ("Hepsiburada 4/9"); vadesi gelen taksit kendi döneminde otomatik gerçekleşir, gelecek taksitler kullanılabilir limitten düşer ama güncel borçta görünmez. Bitiş tarihi olmayan düzenli işlemler 12 ay ileriye üretilir (ufuk okuma sırasında ilerletilir). Asgari ödeme varsayılanı: limit 50.000 TL altı %20, üstü %40; kart bazında değiştirilebilir.
- **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir. - **Lokal MongoDB portu:** host'ta `27019` (27017 ve 27018 geliştirme makinesinde dolu). `BUTCEM_MONGO_PORT` ile değiştirilebilir.
--- ---
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "butcem", "name": "butcem",
"version": "0.6.0", "version": "0.7.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "butcem", "name": "butcem",
"version": "0.6.0", "version": "0.7.0",
"dependencies": { "dependencies": {
"@hookform/resolvers": "^7.0.2", "@hookform/resolvers": "^7.0.2",
"@tanstack/react-table": "^9.3.1", "@tanstack/react-table": "^9.3.1",
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "butcem", "name": "butcem",
"version": "0.6.0", "version": "0.7.0",
"private": true, "private": true,
"description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması", "description": "BÜTÇEM — aile bütçe, cari, birikim, ev stoğu ve akıllı alışveriş uygulaması",
"engines": { "engines": {
+17
View File
@@ -0,0 +1,17 @@
import { RecurringRuleModel } from "@/models/recurring-rule";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "005-recurring",
description: "recurringRules index'leri; işlemlerde tekrar alanları ve benzersiz tekrar index'i",
async up(db) {
const tx = db.collection("transactions");
await tx.updateMany(
{ occurrenceIndex: { $exists: false } },
{ $set: { occurrenceIndex: null, detached: false, isEstimate: false } },
);
await RecurringRuleModel.createIndexes();
await TransactionModel.createIndexes();
},
};
+12
View File
@@ -0,0 +1,12 @@
import { CardStatementModel } from "@/models/card-statement";
import { TransactionModel } from "@/models/transaction";
import type { Migration } from "./types";
export const migration: Migration = {
name: "006-card-statements",
description: "statements (kart/KMH dönemleri) index'leri; taksit planı index'i",
async up() {
await CardStatementModel.createIndexes();
await TransactionModel.createIndexes();
},
};
+3 -1
View File
@@ -4,10 +4,12 @@ import { migration as m001 } from "./001-initial-indexes";
import { migration as m002 } from "./002-accounts-categories"; import { migration as m002 } from "./002-accounts-categories";
import { migration as m003 } from "./003-transactions"; import { migration as m003 } from "./003-transactions";
import { migration as m004 } from "./004-attachments-reconciliation"; import { migration as m004 } from "./004-attachments-reconciliation";
import { migration as m005 } from "./005-recurring";
import { migration as m006 } from "./006-card-statements";
import type { Migration } from "./types"; import type { Migration } from "./types";
/** Sıralı migration listesi. Yeni migration: dosyayı ekle ve buraya sırayla ekle. */ /** Sıralı migration listesi. Yeni migration: dosyayı ekle ve buraya sırayla ekle. */
export const MIGRATIONS: Migration[] = [m001, m002, m003, m004]; export const MIGRATIONS: Migration[] = [m001, m002, m003, m004, m005, m006];
const COLLECTION = "migrations"; const COLLECTION = "migrations";
+68
View File
@@ -0,0 +1,68 @@
import type { Types } from "mongoose";
import { createTransaction } from "@/features/transactions/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
/**
* Örnek taksitli kart harcamaları (Faz 7b): bir kısmı gerçekleşmiş, kalanı planlı taksitler.
* İdempotent: aynı satıcıyla taksit planı varsa atlanır.
*/
const PURCHASES = [
{
payee: "Hepsiburada",
description: "Çamaşır makinesi",
amountMinor: 18_000_00,
count: 9,
daysAgo: 75,
category: "ev",
by: "admin",
},
{
payee: "Teknosa",
description: "Telefon",
amountMinor: 12_000_00,
count: 6,
daysAgo: 20,
category: "diger-gider",
by: "emre",
},
];
export async function seedInstallments(
householdId: Types.ObjectId,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
const card = await AccountModel.findOne({ householdId, name: "Garanti Bonus" }).lean();
if (!card) return 0;
let created = 0;
for (const p of PURCHASES) {
const exists = await TransactionModel.exists({
householdId,
payeeName: p.payee,
"installment.planId": { $type: "objectId" },
});
if (exists) continue;
const category = await CategoryModel.findOne({ householdId, defaultKey: p.category }).lean();
const r = await createTransaction(userIds.get(p.by)!, String(householdId), {
type: "expense",
amount: p.amountMinor,
date: addDays(today, -p.daysAgo),
accountId: String(card._id),
toAccountId: null,
categoryId: String(category!._id),
splits: [],
payee: p.payee,
description: p.description,
tags: [],
installments: p.count,
attachmentIds: [],
});
if (!r.ok) throw new Error(`Seed taksiti oluşturulamadı (${p.payee}): ${r.error}`);
created++;
}
return created;
}
+201
View File
@@ -0,0 +1,201 @@
import type { Types } from "mongoose";
import { createRule } from "@/features/recurring/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { RecurringRuleModel } from "@/models/recurring-rule";
import { todayIstanbul } from "@/shared/dates";
import { addDays, addMonths } from "@/shared/recurrence";
import { recurringRuleFormSchema, type RecurringRuleFormInput } from "@/shared/schemas/recurring";
import { formatMoneyInput } from "@/shared/money";
/**
* Örnek düzenli işlemler (Faz 7a). Seed işlemleri bugüne kadarki günleri doldurur; kurallar bir
* sonraki gerçekleşme gününden başlar (çakışma yok). "Spor salonu" kasıtlı olarak 3 gün önce
* başlar: vadesi geçmiş planlı kayıt örneği. İdempotent (`seedRef`).
*/
type SeedRule = {
ref: string;
by: string;
type: "income" | "expense" | "transfer";
amountMinor: number;
account: string;
category?: string;
payee: string;
/** Ayın günü (bir sonraki gerçekleşme) veya bugüne göre gün farkı. */
day?: number;
offsetDays?: number;
isEstimate?: boolean;
count?: number;
};
const RULES: Record<string, SeedRule[]> = {
"Çakır Ailesi": [
{
ref: "maas",
by: "admin",
type: "income",
amountMinor: 52_000_00,
account: "Ziraat Maaş",
category: "maas",
payee: "Anadolu Yazılım A.Ş.",
day: 15,
},
{
ref: "kira",
by: "admin",
type: "expense",
amountMinor: 17_500_00,
account: "Ziraat Maaş",
category: "kira",
payee: "Ev sahibi",
day: 3,
},
{
ref: "aidat",
by: "admin",
type: "expense",
amountMinor: 1_250_00,
account: "Ziraat Maaş",
category: "aidat",
payee: "Site yönetimi",
day: 5,
},
{
ref: "elektrik",
by: "ayse",
type: "expense",
amountMinor: 1_200_00,
account: "Ziraat Maaş",
category: "faturalar.elektrik",
payee: "Enerjisa",
day: 10,
isEstimate: true,
},
{
ref: "su",
by: "ayse",
type: "expense",
amountMinor: 450_00,
account: "Ziraat Maaş",
category: "faturalar.su",
payee: "İSKİ",
day: 12,
isEstimate: true,
},
{
ref: "dogalgaz",
by: "ayse",
type: "expense",
amountMinor: 2_500_00,
account: "Ziraat Maaş",
category: "faturalar.dogalgaz",
payee: "İGDAŞ",
day: 14,
isEstimate: true,
},
{
ref: "internet",
by: "admin",
type: "expense",
amountMinor: 499_90,
account: "Garanti Bonus",
category: "faturalar.internet",
payee: "Türk Telekom",
day: 20,
},
{
ref: "netflix",
by: "admin",
type: "expense",
amountMinor: 229_99,
account: "Garanti Bonus",
category: "abonelikler",
payee: "Netflix",
day: 8,
},
{
ref: "spor",
by: "emre",
type: "expense",
amountMinor: 1_250_00,
account: "Garanti Bonus",
category: "eglence",
payee: "Spor salonu",
offsetDays: -3,
count: 12,
},
],
Annemler: [
{
ref: "emekli",
by: "fatma",
type: "income",
amountMinor: 24_350_00,
account: "Vakıfbank Emekli",
category: "maas",
payee: "SGK",
day: 17,
},
{
ref: "elektrik",
by: "fatma",
type: "expense",
amountMinor: 700_00,
account: "Vakıfbank Emekli",
category: "faturalar.elektrik",
payee: "Enerjisa",
day: 11,
isEstimate: true,
},
],
};
/** Bugünden sonraki ilk "ayın N. günü". */
function nextMonthDay(today: string, day: number): string {
const thisMonth = addMonths(today, 0, day);
return thisMonth > today ? thisMonth : addMonths(today, 1, day);
}
export async function seedRecurring(
householdIds: Map<string, Types.ObjectId>,
userIds: Map<string, string>,
): Promise<number> {
const today = todayIstanbul();
let created = 0;
for (const [household, rules] of Object.entries(RULES)) {
const householdId = householdIds.get(household)!;
const [accounts, categories] = await Promise.all([
AccountModel.find({ householdId }).select({ name: 1 }).lean(),
CategoryModel.find({ householdId, defaultKey: { $ne: null } })
.select({ defaultKey: 1 })
.lean(),
]);
for (const r of rules) {
const seedRef = `rule:${r.ref}`;
if (await RecurringRuleModel.exists({ householdId, seedRef })) continue;
const input: RecurringRuleFormInput = {
type: r.type,
amount: formatMoneyInput(r.amountMinor),
isEstimate: r.isEstimate ?? false,
accountId: String(accounts.find((a) => a.name === r.account)!._id),
categoryId: r.category
? String(categories.find((c) => c.defaultKey === r.category)!._id)
: null,
payee: r.payee,
startDate: r.day ? nextMonthDay(today, r.day) : addDays(today, r.offsetDays ?? 0),
frequency: "monthly",
endKind: r.count ? "count" : "never",
count: r.count ?? null,
};
const result = await createRule(
userIds.get(r.by)!,
String(householdId),
recurringRuleFormSchema.parse(input),
);
if (!result.ok) throw new Error(`Seed kuralı oluşturulamadı (${seedRef}): ${result.error}`);
await RecurringRuleModel.updateOne({ _id: result.data.id }, { $set: { seedRef } });
created++;
}
}
return created;
}
+17
View File
@@ -45,11 +45,28 @@ describe("seed", () => {
categories: 0, categories: 0,
accounts: 0, accounts: 0,
transactions: 0, transactions: 0,
recurringRules: 0,
installmentPlans: 0,
}); });
expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1); expect(await getDb().collection("user").countDocuments()).toBe(SEED_USERS.length + 1);
expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length); expect(await HouseholdModel.countDocuments()).toBe(SEED_HOUSEHOLDS.length);
}); });
it("aynı aydaki transferlerin hepsi oluşur (seedRef çakışması yok)", async () => {
const tx = getDb().collection("transactions");
const months = new Set(
(await tx.find({ description: "ATM" }).toArray()).map((t) => t.seedRef.split(":")[1]),
);
expect(months.size).toBeGreaterThanOrEqual(5);
// Her ay ATM'nin yanında kart ödemesi ve birikim de var (ayın 7'si geçmişse).
expect(await tx.countDocuments({ description: "Kart borcu ödemesi" })).toBeGreaterThanOrEqual(
months.size - 1,
);
expect(await tx.countDocuments({ description: "Aylık birikim" })).toBeGreaterThanOrEqual(
months.size - 1,
);
});
it("roller ve askı durumu doğru", async () => { it("roller ve askı durumu doğru", async () => {
const users = await getDb() const users = await getDb()
.collection("user") .collection("user")
+17
View File
@@ -10,6 +10,8 @@ import { HouseholdModel } from "@/models/household";
import { HouseholdMemberModel } from "@/models/household-member"; import { HouseholdMemberModel } from "@/models/household-member";
import { storedEmail } from "@/shared/account-email"; import { storedEmail } from "@/shared/account-email";
import { runMigrations } from "../migrations"; import { runMigrations } from "../migrations";
import { seedInstallments } from "./installments";
import { seedRecurring } from "./recurring";
import { seedTransactions } from "./transactions"; import { seedTransactions } from "./transactions";
import { import {
ADMIN_USERNAME, ADMIN_USERNAME,
@@ -43,6 +45,8 @@ export type SeedSummary = {
categories: number; categories: number;
accounts: number; accounts: number;
transactions: number; transactions: number;
recurringRules: number;
installmentPlans: number;
}; };
accounts: SeedAccountRow[]; accounts: SeedAccountRow[];
}; };
@@ -58,6 +62,8 @@ const DOMAIN_COLLECTIONS = [
"payees", "payees",
"attachments", "attachments",
"reconciliations", "reconciliations",
"recurringRules",
"statements",
]; ];
type AuthApi = ReturnType<typeof getAuth>["api"]; type AuthApi = ReturnType<typeof getAuth>["api"];
@@ -107,6 +113,8 @@ export async function runSeed({
categories: 0, categories: 0,
accounts: 0, accounts: 0,
transactions: 0, transactions: 0,
recurringRules: 0,
installmentPlans: 0,
}, },
accounts: [], accounts: [],
}; };
@@ -272,6 +280,15 @@ export async function runSeed({
const userIdMap = new Map([...ids.entries()]); const userIdMap = new Map([...ids.entries()]);
summary.created.transactions = await seedTransactions(householdIds, userIdMap); summary.created.transactions = await seedTransactions(householdIds, userIdMap);
if (summary.created.transactions) log(`✓ Örnek işlemler: ${summary.created.transactions}`); if (summary.created.transactions) log(`✓ Örnek işlemler: ${summary.created.transactions}`);
summary.created.recurringRules = await seedRecurring(householdIds, userIdMap);
if (summary.created.recurringRules)
log(`✓ Örnek düzenli işlemler: ${summary.created.recurringRules}`);
summary.created.installmentPlans = await seedInstallments(
householdIds.get("Çakır Ailesi")!,
userIdMap,
);
if (summary.created.installmentPlans)
log(`✓ Örnek taksitli alışverişler: ${summary.created.installmentPlans}`);
// 7) Geliştirme hesapları tablosu // 7) Geliştirme hesapları tablosu
const all = [ const all = [
+27 -19
View File
@@ -166,7 +166,8 @@ function cakirAiles(): SeedTx[] {
by: "emre", by: "emre",
}); });
// Transferler: nakit çekme, kart ödemesi, birikim. // Transferler: nakit çekme, kart ödemesi, birikim. Satıcı/kategori olmadığından seedRef
// türden üretilir; çakışmasın diye sıra numarası verilir (ATM 0 — mevcut veriyle uyumlu).
add({ add({
type: "transfer", type: "transfer",
ymd: d(2), ymd: d(2),
@@ -176,24 +177,31 @@ function cakirAiles(): SeedTx[] {
description: "ATM", description: "ATM",
by: "admin", by: "admin",
}); });
add({ add(
type: "transfer", {
ymd: d(9), type: "transfer",
amountMinor: tl(11_000, 15_000), // Kesim 29, son ödeme ~8: ödeme son ödeme gününden önce.
account: "Ziraat Maaş", ymd: d(7),
toAccount: "Garanti Bonus", amountMinor: tl(11_000, 15_000),
description: "Kart borcu ödemesi", account: "Ziraat Maaş",
by: "admin", toAccount: "Garanti Bonus",
}); description: "Kart borcu ödemesi",
add({ by: "admin",
type: "transfer", },
ymd: d(16), 1,
amountMinor: 5_000_00, );
account: "Ziraat Maaş", add(
toAccount: "Birikim (Vadeli)", {
description: "Aylık birikim", type: "transfer",
by: "ayse", ymd: d(16),
}); amountMinor: 5_000_00,
account: "Ziraat Maaş",
toAccount: "Birikim (Vadeli)",
description: "Aylık birikim",
by: "ayse",
},
2,
);
// Market: haftada 1–2; bir kısmı bölünmüş. // Market: haftada 1–2; bir kısmı bölünmüş.
const marketCount = faker.number.int({ min: 6, max: 8 }); const marketCount = faker.number.int({ min: 6, max: 8 });
+4
View File
@@ -3,6 +3,7 @@ import { Suspense } from "react";
import { PageHeader } from "@/components/page-header"; import { PageHeader } from "@/components/page-header";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { SummaryCardsSkeleton } from "@/features/dashboard/components/summary-cards-skeleton"; import { SummaryCardsSkeleton } from "@/features/dashboard/components/summary-cards-skeleton";
import { OverdueBanner } from "@/features/recurring/components/overdue-banner";
import { tr } from "@/i18n/tr"; import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal"; import { requireActiveHousehold } from "@/lib/dal";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
@@ -59,6 +60,9 @@ export default async function DashboardPage() {
title={tr.dashboard.welcome(user.name.split(" ")[0] ?? user.name)} title={tr.dashboard.welcome(user.name.split(" ")[0] ?? user.name)}
description={`${household.name} · ${tr.dashboard.welcomeDescription}`} description={`${household.name} · ${tr.dashboard.welcomeDescription}`}
/> />
<Suspense fallback={null}>
<OverdueBanner userId={user.id} householdId={household.id} />
</Suspense>
<Suspense fallback={<SummaryCardsSkeleton />}> <Suspense fallback={<SummaryCardsSkeleton />}>
<SummaryCards /> <SummaryCards />
</Suspense> </Suspense>
+11
View File
@@ -2,6 +2,7 @@ import type { Metadata } from "next";
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { hasHouseholdRole } from "@/features/households/roles"; import { hasHouseholdRole } from "@/features/households/roles";
import { StatementView } from "@/features/transactions/components/statement-view"; import { StatementView } from "@/features/transactions/components/statement-view";
import { getCardSummary, getOverdraftSummary } from "@/features/transactions/card";
import { currentMonth, getAccountStatement } from "@/features/transactions/statement"; import { currentMonth, getAccountStatement } from "@/features/transactions/statement";
import { tr } from "@/i18n/tr"; import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal"; import { requireActiveHousehold } from "@/lib/dal";
@@ -21,10 +22,20 @@ export default async function AccountStatementPage({
const month = requested > now ? now : requested; const month = requested > now ? now : requested;
const statement = await getAccountStatement(user.id, household.id, id, month); const statement = await getAccountStatement(user.id, household.id, id, month);
if (!statement) notFound(); if (!statement) notFound();
const [card, overdraft] = await Promise.all([
statement.account.type === "credit_card"
? getCardSummary(user.id, household.id, id)
: Promise.resolve(null),
statement.account.type === "bank"
? getOverdraftSummary(user.id, household.id, id)
: Promise.resolve(null),
]);
return ( return (
<StatementView <StatementView
key={`${id}-${month}`} key={`${id}-${month}`}
statement={statement} statement={statement}
card={card}
overdraft={overdraft}
canWrite={hasHouseholdRole(household.role, "member")} canWrite={hasHouseholdRole(household.role, "member")}
/> />
); );
+22
View File
@@ -0,0 +1,22 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { PageHeader } from "@/components/page-header";
import { hasHouseholdRole } from "@/features/households/roles";
import { PlannedView } from "@/features/recurring/components/planned-view";
import { getPlannedOverview } from "@/features/recurring/service";
import { tr } from "@/i18n/tr";
import { requireActiveHousehold } from "@/lib/dal";
export const metadata: Metadata = { title: tr.recurring.title };
export default async function PlannedPage() {
const { user, household } = await requireActiveHousehold("viewer");
const data = await getPlannedOverview(user.id, household.id);
if (!data) notFound();
return (
<>
<PageHeader title={tr.recurring.title} description={tr.recurring.description} />
<PlannedView data={data} canWrite={hasHouseholdRole(household.role, "member")} />
</>
);
}
+2 -2
View File
@@ -27,7 +27,7 @@ export type NavItem = {
/** Şu an tamamlanmış en yüksek faz — sayfalar eklendikçe artar. */ /** Şu an tamamlanmış en yüksek faz — sayfalar eklendikçe artar. */
/** Alt fazlar ondalıkla: 6.1 = Faz 6a. */ /** Alt fazlar ondalıkla: 6.1 = Faz 6a. */
export const CURRENT_PHASE = 6.3; export const CURRENT_PHASE = 7.2;
export const isAvailable = (item: NavItem) => item.phase <= CURRENT_PHASE; export const isAvailable = (item: NavItem) => item.phase <= CURRENT_PHASE;
@@ -36,7 +36,7 @@ export const MAIN_NAV: NavItem[] = [
{ href: "/islemler", label: tr.nav.transactions, icon: ArrowLeftRight, phase: 6.2 }, { href: "/islemler", label: tr.nav.transactions, icon: ArrowLeftRight, phase: 6.2 },
{ href: "/hesaplar", label: tr.nav.accounts, icon: Wallet, phase: 6.1 }, { href: "/hesaplar", label: tr.nav.accounts, icon: Wallet, phase: 6.1 },
{ href: "/kategoriler", label: tr.nav.categories, icon: Tags, 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: "/planli", label: tr.nav.planned, icon: CalendarClock, phase: 7.1 },
{ href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8 }, { href: "/cari", label: tr.nav.contacts, icon: Users, phase: 8 },
{ href: "/birikim", label: tr.nav.savings, icon: Coins, phase: 9 }, { href: "/birikim", label: tr.nav.savings, icon: Coins, phase: 9 },
{ href: "/butce", label: tr.nav.budget, icon: Target, phase: 10 }, { href: "/butce", label: tr.nav.budget, icon: Target, phase: 10 },
@@ -79,6 +79,7 @@ type FormValues = {
cardDueKind: AccountFormInput["cardDueKind"]; cardDueKind: AccountFormInput["cardDueKind"];
cardDueValue: string; cardDueValue: string;
cardPaymentAccountId: string; cardPaymentAccountId: string;
cardMinimumRate: string;
}; };
const money = (minor: number | null | undefined) => (minor ? formatMoneyInput(minor) : ""); const money = (minor: number | null | undefined) => (minor ? formatMoneyInput(minor) : "");
@@ -105,6 +106,7 @@ function toValues(a?: AccountView): FormValues {
cardDueKind: "daysAfter", cardDueKind: "daysAfter",
cardDueValue: "10", cardDueValue: "10",
cardPaymentAccountId: "", cardPaymentAccountId: "",
cardMinimumRate: "",
}; };
} }
const isCard = a.type === "credit_card"; const isCard = a.type === "credit_card";
@@ -133,6 +135,10 @@ function toValues(a?: AccountView): FormValues {
cardDueKind: a.creditCard?.dueRule.kind ?? "daysAfter", cardDueKind: a.creditCard?.dueRule.kind ?? "daysAfter",
cardDueValue: String(a.creditCard?.dueRule.value ?? 10), cardDueValue: String(a.creditCard?.dueRule.value ?? 10),
cardPaymentAccountId: a.creditCard?.paymentAccountId ?? "", cardPaymentAccountId: a.creditCard?.paymentAccountId ?? "",
cardMinimumRate:
a.creditCard?.minimumPaymentRateBp != null
? formatMoneyInput(a.creditCard.minimumPaymentRateBp)
: "",
}; };
} }
@@ -499,6 +505,28 @@ export function AccountFormDialog({
</Field> </Field>
)} )}
/> />
<Controller
name="cardMinimumRate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="acc-card-min">{f.cardMinimumRate}</FieldLabel>
<Input
{...field}
id="acc-card-min"
inputMode="decimal"
placeholder="20"
className="w-28 tabular-nums"
aria-describedby="acc-card-min-hint"
aria-invalid={fieldState.invalid}
/>
<FieldDescription id="acc-card-min-hint">
{f.cardMinimumRateHint}
</FieldDescription>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
</FieldGroup> </FieldGroup>
</FieldSet> </FieldSet>
) : null} ) : null}
@@ -35,6 +35,7 @@ const base = {
cardDueKind: "daysAfter" as const, cardDueKind: "daysAfter" as const,
cardDueValue: 10, cardDueValue: 10,
cardPaymentAccountId: null, cardPaymentAccountId: null,
cardMinimumRate: null,
}; };
const accountId = (name: string, householdId = cakir) => const accountId = (name: string, householdId = cakir) =>
+2
View File
@@ -55,6 +55,7 @@ export type AccountView = {
statementDay: number; statementDay: number;
dueRule: { kind: DueRuleKind; value: number }; dueRule: { kind: DueRuleKind; value: number };
paymentAccountId: string | null; paymentAccountId: string | null;
minimumPaymentRateBp: number | null;
} | null; } | null;
}; };
@@ -229,6 +230,7 @@ async function toDocFields(
statementDay: input.cardStatementDay, statementDay: input.cardStatementDay,
dueRule: { kind: input.cardDueKind, value: input.cardDueValue }, dueRule: { kind: input.cardDueKind, value: input.cardDueValue },
paymentAccountId, paymentAccountId,
minimumPaymentRateBp: input.cardMinimumRate,
} }
: null, : null,
}); });
@@ -67,6 +67,7 @@ async function form(over: Partial<TransactionForm>): Promise<TransactionForm> {
description: "", description: "",
tags: [], tags: [],
attachmentIds: [], attachmentIds: [],
installments: 1,
...over, ...over,
}; };
} }
+137
View File
@@ -0,0 +1,137 @@
"use server";
import { revalidatePath } from "next/cache";
import { z } from "zod";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { getHouseholdActionContext } from "@/lib/dal";
import { confirmOccurrenceSchema, recurringRuleFormSchema } from "@/shared/schemas/recurring";
import {
confirmOccurrence,
createRule,
deleteRule,
getRuleForm,
postponeOccurrence,
skipOccurrence,
updateRule,
type RuleFormValues,
} from "./service";
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
const optionalId = idSchema.optional();
const scopeSchema = z.enum(["all", "following"]);
const ymd = z.string().regex(/^\d{4}-\d{2}-\d{2}$/);
function fieldErrors(error: z.ZodError) {
const out: Record<string, string> = {};
for (const issue of error.issues) {
const key = issue.path.join(".");
if (key && !out[key]) out[key] = issue.message;
}
return out;
}
function revalidate() {
revalidatePath("/", "layout");
}
export async function createRuleAction(input: unknown): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const parsed = recurringRuleFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await createRule(ctx.user.id, ctx.household.id, parsed.data);
if (result.ok) revalidate();
return result.ok ? ok({ id: result.data.id }) : result;
}
export async function updateRuleAction(
ruleId: unknown,
input: unknown,
scope: unknown,
fromTransactionId?: unknown,
): Promise<ActionResult<{ id: string }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
const s = scopeSchema.safeParse(scope);
const from = optionalId.safeParse(fromTransactionId ?? undefined);
if (!id.success || !s.success || !from.success) return fail(tr.common.notFound);
const parsed = recurringRuleFormSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await updateRule(
ctx.user.id,
ctx.household.id,
id.data,
parsed.data,
s.data,
from.data,
);
if (result.ok) revalidate();
return result;
}
export async function deleteRuleAction(
ruleId: unknown,
scope: unknown,
fromTransactionId?: unknown,
): Promise<ActionResult<{ removed: number }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
const s = scopeSchema.safeParse(scope);
const from = optionalId.safeParse(fromTransactionId ?? undefined);
if (!id.success || !s.success || !from.success) return fail(tr.common.notFound);
const result = await deleteRule(ctx.user.id, ctx.household.id, id.data, s.data, from.data);
if (result.ok) revalidate();
return result;
}
export async function getRuleFormAction(ruleId: unknown): Promise<ActionResult<RuleFormValues>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(ruleId);
if (!id.success) return fail(tr.common.notFound);
const values = await getRuleForm(ctx.user.id, ctx.household.id, id.data);
return values ? ok(values) : fail(tr.common.notFound);
}
export async function confirmOccurrenceAction(
transactionId: unknown,
input: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
if (!id.success) return fail(tr.common.notFound);
const parsed = confirmOccurrenceSchema.safeParse(input);
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields, fieldErrors(parsed.error));
const result = await confirmOccurrence(ctx.user.id, ctx.household.id, id.data, parsed.data);
if (result.ok) revalidate();
return result;
}
export async function skipOccurrenceAction(transactionId: unknown): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
if (!id.success) return fail(tr.common.notFound);
const result = await skipOccurrence(ctx.user.id, ctx.household.id, id.data);
if (result.ok) revalidate();
return result;
}
export async function postponeOccurrenceAction(
transactionId: unknown,
date: unknown,
): Promise<ActionResult> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
const d = ymd.safeParse(date);
if (!id.success) return fail(tr.common.notFound);
if (!d.success) return fail(tr.validation.date, { date: tr.validation.date });
const result = await postponeOccurrence(ctx.user.id, ctx.household.id, id.data, d.data);
if (result.ok) revalidate();
return result;
}
@@ -0,0 +1,32 @@
import { TriangleAlert } from "lucide-react";
import Link from "next/link";
import { Button } from "@/components/ui/button";
import { tr } from "@/i18n/tr";
import { countOverdue, ensureHorizon } from "../service";
import { toObjectId } from "@/lib/object-id";
/** Dashboard: vadesi geçmiş onaylanmamış planlı işlemler uyarısı (Bölüm 6.7). */
export async function OverdueBanner({
userId,
householdId,
}: {
userId: string;
householdId: string;
}) {
const hid = toObjectId(householdId);
if (hid) await ensureHorizon(hid);
const n = await countOverdue(userId, householdId);
if (!n) return null;
return (
<div
role="status"
className="flex flex-wrap items-center gap-3 rounded-xl border border-expense/30 bg-expense/10 p-3 text-sm"
>
<TriangleAlert className="size-4 shrink-0 text-expense" aria-hidden />
<span className="flex-1">{tr.recurring.overdueBanner(n)}</span>
<Button asChild size="sm" variant="outline">
<Link href="/planli">{tr.recurring.overdueLink}</Link>
</Button>
</div>
);
}
@@ -0,0 +1,508 @@
"use client";
import {
CalendarClock,
Check,
EllipsisVertical,
Loader2,
Pencil,
Plus,
SkipForward,
Trash2,
Repeat,
} from "lucide-react";
import { useState, useTransition } from "react";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { useQuickAdd } from "@/components/layout/quick-add";
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 } from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { getTransactionAction } from "@/features/transactions/actions";
import {
Amount,
RowIcon,
rowSubtitle,
rowTitle,
} from "@/features/transactions/components/transaction-parts";
import { tr } from "@/i18n/tr";
import { todayIstanbul } from "@/shared/dates";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import { addDays } from "@/shared/recurrence";
import {
confirmOccurrenceAction,
deleteRuleAction,
getRuleFormAction,
postponeOccurrenceAction,
skipOccurrenceAction,
} from "../actions";
import type { PlannedItem, PlannedOverview, RuleView } from "../service";
import { RuleFormDialog, type RuleFormMode } from "./rule-form";
const t = tr.recurring;
const dateLabel = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
type Pending =
| { kind: "confirm"; item: PlannedItem }
| { kind: "postpone"; item: PlannedItem }
| { kind: "scope"; item: PlannedItem }
| { kind: "delete"; ruleId: string; item?: PlannedItem }
| null;
export function PlannedView({ data, canWrite }: { data: PlannedOverview; canWrite: boolean }) {
const [tab, setTab] = useState(data.overdue.length ? "overdue" : "upcoming");
const [pending, setPending] = useState<Pending>(null);
const [ruleForm, setRuleForm] = useState<RuleFormMode | null>(null);
const [, startTransition] = useTransition();
const { openTransactionForm } = useQuickAdd();
function skip(item: PlannedItem) {
startTransition(async () => {
const r = await skipOccurrenceAction(item.id);
if (r.ok) toast.success(t.toast.skipped);
else toast.error(r.error);
});
}
async function editScope(item: PlannedItem, scope: "one" | "following" | "all") {
setPending(null);
if (scope === "one" || !item.recurringRuleId) {
const d = await getTransactionAction(item.id);
if (d.ok) openTransactionForm({ kind: "edit", transaction: d.data });
else toast.error(d.error);
return;
}
const rule = await getRuleFormAction(item.recurringRuleId);
if (!rule.ok) return void toast.error(rule.error);
const [pos, total] = (item.seriesPosition ?? "").split("/").map(Number);
setRuleForm({
kind: "edit",
rule: rule.data,
scope,
fromTransactionId: scope === "following" ? item.id : undefined,
fromDate: scope === "following" ? item.date : undefined,
remainingCount: pos && total ? total - pos + 1 : null,
});
}
async function editRule(rule: RuleView) {
const r = await getRuleFormAction(rule.id);
if (r.ok) setRuleForm({ kind: "edit", rule: r.data, scope: "all" });
else toast.error(r.error);
}
const itemList = (items: PlannedItem[], empty: string) =>
items.length === 0 ? (
<Card>
<CardHeader>
<CardDescription>{empty}</CardDescription>
</CardHeader>
</Card>
) : (
<ul className="divide-y rounded-xl border bg-card">
{items.map((item) => (
<li key={item.id} className="flex items-center gap-3 p-3">
<RowIcon item={item} />
<span className="min-w-0 flex-1">
<span className="flex items-center gap-1.5">
<span className="truncate font-medium">{rowTitle(item)}</span>
{item.seriesPosition ? (
<Badge variant="outline" className="hidden sm:inline-flex">
{item.seriesPosition}
</Badge>
) : null}
{item.isEstimate ? (
<Badge variant="secondary" className="hidden sm:inline-flex">
{t.estimate}
</Badge>
) : null}
</span>
<span className="block truncate text-xs text-muted-foreground">
{/* Mobilde rozetler alt satırda (başlık daralmasın). */}
<span className="sm:hidden">
{item.seriesPosition ? `${item.seriesPosition} · ` : ""}
{item.isEstimate ? `${t.estimate} · ` : ""}
</span>
{dateLabel(item.date)} · {rowSubtitle(item)}
</span>
</span>
<Amount type={item.type} amountMinor={item.amountMinor} />
{canWrite ? (
<span className="flex items-center gap-1">
<Button
size="sm"
variant="outline"
onClick={() => setPending({ kind: "confirm", item })}
>
<Check />
<span className="hidden sm:inline">{t.actions.confirm}</span>
</Button>
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={t.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={() => setPending({ kind: "postpone", item })}>
<CalendarClock />
{t.actions.postpone}
</DropdownMenuItem>
<DropdownMenuItem onSelect={() => skip(item)}>
<SkipForward />
{t.actions.skip}
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() =>
item.recurringRuleId
? setPending({ kind: "scope", item })
: void editScope(item, "one")
}
>
<Pencil />
{t.actions.edit}
</DropdownMenuItem>
{item.recurringRuleId ? (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
onSelect={() =>
setPending({ kind: "delete", ruleId: item.recurringRuleId!, item })
}
>
<Trash2 />
{t.actions.delete}
</DropdownMenuItem>
</>
) : null}
</DropdownMenuContent>
</DropdownMenu>
</span>
) : null}
</li>
))}
</ul>
);
return (
<div className="flex flex-col gap-4">
{canWrite ? (
<div className="flex justify-end">
<Button onClick={() => setRuleForm({ kind: "create" })}>
<Plus />
{t.newRule}
</Button>
</div>
) : null}
<Tabs value={tab} onValueChange={setTab}>
<TabsList>
<TabsTrigger value="overdue">
{t.tabs.overdue}
{data.overdue.length ? (
<Badge variant="destructive" className="ml-1">
{data.overdue.length}
</Badge>
) : null}
</TabsTrigger>
<TabsTrigger value="upcoming">{t.tabs.upcoming}</TabsTrigger>
<TabsTrigger value="rules">{t.tabs.rules}</TabsTrigger>
</TabsList>
<TabsContent value="overdue" className="mt-3">
{itemList(data.overdue, t.empty.overdue)}
</TabsContent>
<TabsContent value="upcoming" className="mt-3">
{itemList(data.upcoming, t.empty.upcoming)}
</TabsContent>
<TabsContent value="rules" className="mt-3">
{data.rules.length === 0 ? (
<Card>
<CardHeader>
<CardDescription>{t.empty.rules}</CardDescription>
</CardHeader>
</Card>
) : (
<ul className="divide-y rounded-xl border bg-card">
{data.rules.map((rule) => (
<li key={rule.id} className="flex items-center gap-3 p-3">
<span className="inline-flex size-9 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
<Repeat className="size-4.5" />
</span>
<span className="min-w-0 flex-1">
<span className="flex items-center gap-1.5">
<span className="truncate font-medium">{rule.title}</span>
{rule.isEstimate ? <Badge variant="secondary">{t.estimate}</Badge> : null}
</span>
<span className="block truncate text-xs text-muted-foreground">
{rule.recurrence} ·{" "}
{rule.toAccount ? `${rule.account} → ${rule.toAccount}` : rule.account}
{rule.nextDate ? ` · ${t.next(dateLabel(rule.nextDate))}` : ""}
{rule.remaining !== null
? ` · ${t.remaining(rule.remaining)}`
: ` · ${t.endless}`}
</span>
</span>
<Amount type={rule.type} amountMinor={rule.amountMinor} />
{canWrite ? (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild>
<Button size="icon-sm" variant="ghost" aria-label={t.actions.more}>
<EllipsisVertical />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem onSelect={() => void editRule(rule)}>
<Pencil />
{t.actions.edit}
</DropdownMenuItem>
<DropdownMenuItem
variant="destructive"
onSelect={() => setPending({ kind: "delete", ruleId: rule.id })}
>
<Trash2 />
{t.actions.delete}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : null}
</li>
))}
</ul>
)}
</TabsContent>
</Tabs>
<ConfirmDialog
item={pending?.kind === "confirm" ? pending.item : null}
onClose={() => setPending(null)}
/>
<PostponeDialog
item={pending?.kind === "postpone" ? pending.item : null}
onClose={() => setPending(null)}
/>
<ScopeDialog
item={pending?.kind === "scope" ? pending.item : null}
onClose={() => setPending(null)}
onPick={(item, scope) => void editScope(item, scope)}
/>
<DeleteDialog
target={pending?.kind === "delete" ? pending : null}
onClose={() => setPending(null)}
/>
<RuleFormDialog mode={ruleForm} onOpenChange={(o) => !o && setRuleForm(null)} />
</div>
);
}
function ConfirmDialog({ item, onClose }: { item: PlannedItem | null; onClose: () => void }) {
return item ? <ConfirmForm key={item.id} item={item} onClose={onClose} /> : null;
}
function ConfirmForm({ item, onClose }: { item: PlannedItem; onClose: () => void }) {
const today = todayIstanbul();
const [amount, setAmount] = useState(formatMoneyInput(item.amountMinor));
// Gelecekteki kaydı erken onaylarken bugünün tarihi; geçmiştekini kendi tarihiyle.
const [date, setDate] = useState(item.date > today ? today : item.date);
const [errors, setErrors] = useState<Record<string, string | undefined>>({});
const [busy, setBusy] = useState(false);
async function submit() {
setBusy(true);
const r = await confirmOccurrenceAction(item.id, { amount, date });
setBusy(false);
if (r.ok) {
toast.success(t.toast.confirmed);
onClose();
} else setErrors({ ...r.fieldErrors, root: r.fieldErrors ? undefined : r.error });
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={`${t.confirmTitle}: ${rowTitle(item)}`}
description={t.confirmDescription}
footer={
<>
<Button variant="outline" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button onClick={submit} disabled={busy}>
{busy ? <Loader2 className="animate-spin" /> : <Check />}
{t.actions.confirm}
</Button>
</>
}
>
<FieldGroup>
<Field data-invalid={Boolean(errors.amount)}>
<FieldLabel htmlFor="confirm-amount">{tr.transactions.fields.amount}</FieldLabel>
<MoneyInput id="confirm-amount" value={amount} onChange={setAmount} autoFocus />
{errors.amount ? <FieldError>{errors.amount}</FieldError> : null}
</Field>
<Field data-invalid={Boolean(errors.date)}>
<FieldLabel htmlFor="confirm-date">{tr.transactions.fields.date}</FieldLabel>
<Input
id="confirm-date"
type="date"
value={date}
onChange={(e) => setDate(e.target.value)}
/>
{errors.date ? <FieldError>{errors.date}</FieldError> : null}
</Field>
{item.isEstimate ? (
<p className="text-xs text-muted-foreground">
{t.estimate}: {formatMoney(item.amountMinor)}
</p>
) : null}
{errors.root ? <FieldError>{errors.root}</FieldError> : null}
</FieldGroup>
</ResponsiveDialog>
);
}
function PostponeDialog({ item, onClose }: { item: PlannedItem | null; onClose: () => void }) {
return item ? <PostponeForm key={item.id} item={item} onClose={onClose} /> : null;
}
function PostponeForm({ item, onClose }: { item: PlannedItem; onClose: () => void }) {
const base = item.date > todayIstanbul() ? item.date : todayIstanbul();
const [date, setDate] = useState(addDays(base, 7));
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
async function submit() {
setBusy(true);
const r = await postponeOccurrenceAction(item.id, date);
setBusy(false);
if (r.ok) {
toast.success(t.toast.postponed);
onClose();
} else setError(r.fieldErrors?.date ?? r.error);
}
return (
<ResponsiveDialog
open
onOpenChange={(o) => !o && onClose()}
title={`${t.postponeTitle}: ${rowTitle(item)}`}
footer={
<>
<Button variant="outline" onClick={onClose}>
{tr.common.cancel}
</Button>
<Button onClick={submit} disabled={busy}>
{busy ? <Loader2 className="animate-spin" /> : <CalendarClock />}
{t.actions.postpone}
</Button>
</>
}
>
<Field data-invalid={Boolean(error)}>
<FieldLabel htmlFor="postpone-date">{t.postponeDate}</FieldLabel>
<Input
id="postpone-date"
type="date"
value={date}
min={addDays(item.date, 1)}
onChange={(e) => setDate(e.target.value)}
/>
{error ? <FieldError>{error}</FieldError> : null}
</Field>
</ResponsiveDialog>
);
}
function ScopeDialog({
item,
onClose,
onPick,
}: {
item: PlannedItem | null;
onClose: () => void;
onPick: (item: PlannedItem, scope: "one" | "following" | "all") => void;
}) {
return (
<ResponsiveDialog
open={Boolean(item)}
onOpenChange={(o) => !o && onClose()}
title={t.scopeTitle}
>
<div className="flex flex-col gap-2">
{(["one", "following", "all"] as const).map((scope) => (
<button
key={scope}
type="button"
onClick={() => item && onPick(item, scope)}
className="rounded-xl border p-3 text-left outline-none hover:bg-muted/50 focus-visible:ring-2 focus-visible:ring-ring"
>
<span className="block font-medium">{t.scopes[scope]}</span>
<span className="block text-xs text-muted-foreground">{t.scopeHints[scope]}</span>
</button>
))}
</div>
</ResponsiveDialog>
);
}
function DeleteDialog({
target,
onClose,
}: {
target: { ruleId: string; item?: PlannedItem } | null;
onClose: () => void;
}) {
const [busy, setBusy] = useState(false);
async function run(scope: "all" | "following") {
if (!target) return;
setBusy(true);
const r = await deleteRuleAction(target.ruleId, scope, target.item?.id);
setBusy(false);
if (r.ok) {
toast.success(t.toast.deleted);
onClose();
} else toast.error(r.error);
}
return (
<AlertDialog open={Boolean(target)} onOpenChange={(o) => !o && onClose()}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t.deleteTitle}</AlertDialogTitle>
<AlertDialogDescription>{t.deleteDescription}</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>{tr.common.cancel}</AlertDialogCancel>
{target?.item ? (
<Button variant="outline" disabled={busy} onClick={() => run("following")}>
{t.deleteScopes.following}
</Button>
) : null}
<Button variant="destructive" disabled={busy} onClick={() => run("all")}>
{t.deleteScopes.all}
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
);
}
@@ -0,0 +1,538 @@
"use client";
import { zodResolver } from "@hookform/resolvers/zod";
import { Loader2 } from "lucide-react";
import { useEffect, useMemo, useState } from "react";
import { Controller, useForm, useWatch, type Resolver } from "react-hook-form";
import { toast } from "sonner";
import { MoneyInput } from "@/components/money-input";
import { ResponsiveDialog } from "@/components/responsive-dialog";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Skeleton } from "@/components/ui/skeleton";
import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { getTransactionFormOptionsAction } from "@/features/transactions/actions";
import {
AccountSelect,
CategorySelect,
PayeeInput,
} from "@/features/transactions/components/transaction-form";
import type { TransactionFormOptions } from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { todayIstanbul } from "@/shared/dates";
import { formatDate } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import {
describeRecurrence,
FREQUENCIES,
listOccurrences,
MONTHLY_MODES,
type Frequency,
type MonthlyMode,
} from "@/shared/recurrence";
import {
END_KINDS,
recurringRuleFormSchema,
type RecurringRuleForm,
} from "@/shared/schemas/recurring";
import { TRANSACTION_TYPES, type TransactionType } from "@/shared/transactions";
import { createRuleAction, updateRuleAction } from "../actions";
import type { RuleFormValues } from "../service";
const t = tr.recurring;
const tf = tr.transactions.fields;
export type RuleFormMode =
| { kind: "create" }
| {
kind: "edit";
rule: RuleFormValues;
scope: "all" | "following";
/** "Bu ve sonrakiler" için başlangıç tekrarı ve onun tarihi / kalan tekrar sayısı. */
fromTransactionId?: string;
fromDate?: string;
remainingCount?: number | null;
};
type FormValues = {
type: TransactionType;
amount: string;
isEstimate: boolean;
accountId: string;
toAccountId: string;
categoryId: string;
payee: string;
description: string;
tags: string;
startDate: string;
frequency: Frequency;
interval: string;
monthlyMode: MonthlyMode;
endKind: (typeof END_KINDS)[number];
count: string;
endDate: string;
};
function toValues(mode: RuleFormMode, options: TransactionFormOptions | null): FormValues {
if (mode.kind === "create") {
return {
type: "expense",
amount: "",
isEstimate: false,
accountId: options?.accounts[0]?.id ?? "",
toAccountId: "",
categoryId: "",
payee: "",
description: "",
tags: "",
startDate: todayIstanbul(),
frequency: "monthly",
interval: "1",
monthlyMode: "day",
endKind: "never",
count: "",
endDate: "",
};
}
const r = mode.rule;
const following = mode.scope === "following" && mode.fromDate;
const count = following ? (mode.remainingCount ?? null) : r.count;
return {
type: r.type,
amount: formatMoneyInput(r.amountMinor),
isEstimate: r.isEstimate,
accountId: r.accountId,
toAccountId: r.toAccountId ?? "",
categoryId: r.categoryId ?? "",
payee: r.payee,
description: r.description,
tags: r.tags.join(", "),
startDate: following ? mode.fromDate! : r.startDate,
frequency: r.frequency,
interval: String(r.interval),
monthlyMode: r.monthlyMode,
endKind: count ? "count" : r.endDate ? "date" : "never",
count: count ? String(count) : "",
endDate: r.endDate ?? "",
};
}
/** Düzenli işlem kuralı formu (oluştur / tümünü düzenle / bu ve sonrakileri düzenle). */
export function RuleFormDialog({
mode,
onOpenChange,
}: {
mode: RuleFormMode | null;
onOpenChange: (open: boolean) => void;
}) {
const [options, setOptions] = useState<TransactionFormOptions | null>(null);
const [loadError, setLoadError] = useState<string | null>(null);
const form = useForm<FormValues, unknown, RecurringRuleForm>({
resolver: zodResolver(recurringRuleFormSchema) as unknown as Resolver<
FormValues,
unknown,
RecurringRuleForm
>,
defaultValues: toValues({ kind: "create" }, null),
});
useEffect(() => {
if (!mode) return;
let cancelled = false;
getTransactionFormOptionsAction().then((res) => {
if (cancelled) return;
if (!res.ok) return setLoadError(res.error);
setLoadError(null);
setOptions(res.data);
form.reset(toValues(mode, res.data));
});
return () => {
cancelled = true;
};
}, [mode, form]);
const w = useWatch({ control: form.control });
const type = w.type ?? "expense";
const categories = useMemo(() => {
const kind = type === "income" ? "income" : "expense";
return (options?.categories ?? []).filter((c) => c.kind === kind);
}, [options, type]);
// Önizleme: açıklama ve ilk 3 tarih (istemcide aynı saf fonksiyonla).
const preview = useMemo(() => {
const interval = Math.min(12, Math.max(1, Number(w.interval) || 1));
const r = {
frequency: w.frequency ?? "monthly",
interval,
monthlyMode: w.monthlyMode ?? "day",
startDate: w.startDate ?? todayIstanbul(),
endDate: w.endKind === "date" && w.endDate ? w.endDate : null,
count: w.endKind === "count" && Number(w.count) > 0 ? Number(w.count) : null,
} as const;
if (!/^\d{4}-\d{2}-\d{2}$/.test(r.startDate)) return null;
return {
text: describeRecurrence(r),
dates: listOccurrences(r, "9999-12-31")
.slice(0, 3)
.map((o) => o.date),
};
}, [w]);
function changeType(next: TransactionType) {
form.setValue("type", next);
form.setValue("categoryId", "");
if (next !== "transfer") form.setValue("toAccountId", "");
form.clearErrors();
}
async function onSubmit() {
if (!mode) return;
const values = form.getValues();
const payload = {
...values,
toAccountId: values.type === "transfer" ? values.toAccountId : "",
categoryId: values.type === "transfer" ? "" : values.categoryId,
count: values.endKind === "count" ? values.count : null,
endDate: values.endKind === "date" ? values.endDate : null,
};
const result =
mode.kind === "edit"
? await updateRuleAction(mode.rule.id, payload, mode.scope, mode.fromTransactionId)
: await createRuleAction(payload);
if (result.ok) {
toast.success(mode.kind === "edit" ? t.toast.updated : t.toast.created);
onOpenChange(false);
return;
}
for (const [name, message] of Object.entries(result.fieldErrors ?? {})) {
if (message) form.setError(name as keyof FormValues, { message });
}
if (!result.fieldErrors) form.setError("root", { message: result.error });
}
const loading = Boolean(mode) && !options && !loadError;
const errors = form.formState.errors;
const title = mode?.kind === "edit" ? `${t.editTitle} · ${t.scopes[mode.scope]}` : t.createTitle;
return (
<ResponsiveDialog
open={Boolean(mode)}
onOpenChange={onOpenChange}
title={title}
description={mode?.kind === "edit" ? t.scopeHints[mode.scope] : undefined}
footer={
loadError ? null : (
<>
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
{tr.common.cancel}
</Button>
<Button
type="submit"
form="rule-form"
disabled={form.formState.isSubmitting || loading}
>
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
{tr.common.save}
</Button>
</>
)
}
>
{loadError ? (
<p className="text-sm text-destructive">{loadError}</p>
) : loading || !options ? (
<div className="flex flex-col gap-4" role="status" aria-label={tr.common.loading}>
<Skeleton className="h-9 w-full" />
<Skeleton className="h-9 w-full" />
<Skeleton className="h-9 w-full" />
</div>
) : (
<form id="rule-form" onSubmit={form.handleSubmit(onSubmit)} noValidate>
<FieldGroup>
<Tabs value={type} onValueChange={(v) => changeType(v as TransactionType)}>
<TabsList className="w-full">
{TRANSACTION_TYPES.map((x) => (
<TabsTrigger key={x} value={x} className="flex-1">
{tr.transactions.types[x]}
</TabsTrigger>
))}
</TabsList>
</Tabs>
<Controller
name="amount"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-amount">{tf.amount}</FieldLabel>
<MoneyInput
id="rule-amount"
value={field.value}
onChange={field.onChange}
onBlur={field.onBlur}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="isEstimate"
control={form.control}
render={({ field }) => (
<label className="-mt-2 flex items-center gap-2 text-sm">
<Checkbox
checked={field.value}
onCheckedChange={(v) => field.onChange(v === true)}
/>
{t.fields.estimate}
</label>
)}
/>
<Controller
name="accountId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-account">
{type === "transfer" ? tf.fromAccount : tf.account}
</FieldLabel>
<AccountSelect
id="rule-account"
value={field.value}
onChange={field.onChange}
accounts={options.accounts}
invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
{type === "transfer" ? (
<Controller
name="toAccountId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-to">{tf.toAccount}</FieldLabel>
<AccountSelect
id="rule-to"
value={field.value}
onChange={field.onChange}
accounts={options.accounts}
exclude={w.accountId}
invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
) : (
<Controller
name="categoryId"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-category">{tf.category}</FieldLabel>
<CategorySelect
id="rule-category"
value={field.value}
onChange={field.onChange}
options={categories}
appearance={options.categoryAppearance}
invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
)}
<Controller
name="payee"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="tx-payee">{tf.payee}</FieldLabel>
<PayeeInput value={field.value} onChange={field.onChange} onPick={() => {}} />
</Field>
)}
/>
<Controller
name="description"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="rule-description">{tf.description}</FieldLabel>
<Input {...field} id="rule-description" />
</Field>
)}
/>
<div className="grid grid-cols-2 gap-3">
<Controller
name="startDate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-start">{t.fields.startDate}</FieldLabel>
<Input
{...field}
id="rule-start"
type="date"
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
<Controller
name="frequency"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="rule-frequency">{t.fields.frequency}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger id="rule-frequency" className="w-full">
<SelectValue>{t.frequencies[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{FREQUENCIES.map((x) => (
<SelectItem key={x} value={x}>
{t.frequencies[x]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
</div>
<div className="grid grid-cols-2 gap-3">
<Controller
name="interval"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-interval">
{t.fields.interval} ({t.units[w.frequency ?? "monthly"]})
</FieldLabel>
<Input
{...field}
id="rule-interval"
type="number"
inputMode="numeric"
min={1}
max={12}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
{w.frequency === "monthly" ? (
<Controller
name="monthlyMode"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="rule-monthly">{t.fields.monthlyMode}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger id="rule-monthly" className="w-full">
<SelectValue>{t.monthlyModes[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{MONTHLY_MODES.map((x) => (
<SelectItem key={x} value={x}>
{t.monthlyModes[x]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
) : null}
</div>
<div className="grid grid-cols-2 gap-3">
<Controller
name="endKind"
control={form.control}
render={({ field }) => (
<Field>
<FieldLabel htmlFor="rule-end">{t.fields.end}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger id="rule-end" className="w-full">
<SelectValue>{t.endKinds[field.value]}</SelectValue>
</SelectTrigger>
<SelectContent>
{END_KINDS.map((x) => (
<SelectItem key={x} value={x}>
{t.endKinds[x]}
</SelectItem>
))}
</SelectContent>
</Select>
</Field>
)}
/>
{w.endKind === "count" ? (
<Controller
name="count"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-count">{t.fields.count}</FieldLabel>
<Input
{...field}
id="rule-count"
type="number"
inputMode="numeric"
min={1}
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
) : w.endKind === "date" ? (
<Controller
name="endDate"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="rule-enddate">{t.fields.endDate}</FieldLabel>
<Input
{...field}
id="rule-enddate"
type="date"
aria-invalid={fieldState.invalid}
/>
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
) : null}
</div>
{preview ? (
<FieldDescription>
{preview.text} · {t.fields.preview}:{" "}
{preview.dates.map((d) => formatDate(`${d}T12:00:00+03:00`)).join(", ")}
</FieldDescription>
) : null}
{errors.root ? <FieldError>{errors.root.message}</FieldError> : null}
</FieldGroup>
</form>
)}
</ResponsiveDialog>
);
}
+284
View File
@@ -0,0 +1,284 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { listAccounts } from "@/features/accounts/service";
import {
listTransactions,
updateTransaction,
getTransaction,
} from "@/features/transactions/service";
import { AccountModel } from "@/models/account";
import { CategoryModel } from "@/models/category";
import { RecurringRuleModel } from "@/models/recurring-rule";
import { TransactionModel } from "@/models/transaction";
import { todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { recurringRuleFormSchema, type RecurringRuleFormInput } from "@/shared/schemas/recurring";
import { transactionFilterSchema } from "@/shared/schemas/transaction";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import {
confirmOccurrence,
createRule,
deleteRule,
ensureHorizon,
getPlannedOverview,
postponeOccurrence,
skipOccurrence,
updateRule,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let emre = "";
let zeynep = "";
let fatma = "";
const today = todayIstanbul();
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
emre = ids.user("emre");
zeynep = ids.user("zeynep");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, name })
.lean()
.then((a) => String(a!._id));
const cat = (key: string) =>
CategoryModel.findOne({ householdId: cakir, defaultKey: key })
.lean()
.then((c) => String(c!._id));
async function form(over: Partial<RecurringRuleFormInput> = {}) {
return recurringRuleFormSchema.parse({
type: "expense",
amount: "1.000,00",
accountId: await acc("Ziraat Maaş"),
categoryId: await cat("faturalar.elektrik"),
payee: "Elektrik",
startDate: addDays(today, -40),
frequency: "monthly",
...over,
});
}
const occurrences = (ruleId: string) =>
TransactionModel.find({ recurringRuleId: ruleId }).sort({ occurrenceIndex: 1 }).lean();
async function balance(accountId: string) {
const list = await listAccounts(ayse, cakir);
return list!.accounts.find((a) => a.id === accountId)!.balanceMinor!;
}
describe("kural ve planlı kayıtlar", () => {
let ruleId = "";
it("kural 12 ay ileriye planlı kayıt üretir; planlı kayıtlar bakiyeyi etkilemez", async () => {
const ziraat = await acc("Ziraat Maaş");
const before = await balance(ziraat);
const r = await createRule(ayse, cakir, await form({ isEstimate: true }));
expect(r.ok).toBe(true);
ruleId = r.ok ? r.data.id : "";
const occ = await occurrences(ruleId);
// Başlangıç 40 gün önce: 2 geçmiş + 12 ay ileri (13 ya da 14 kayıt, ay uzunluğuna göre).
expect(occ.length).toBeGreaterThanOrEqual(13);
expect(occ.every((o) => o.status === "planned" && o.isEstimate)).toBe(true);
expect(await balance(ziraat)).toBe(before);
expect(await ensureHorizon((await RecurringRuleModel.findById(ruleId))!.householdId)).toBe(0);
});
it("genel bakış: vadesi geçmiş ve yaklaşan; işlem listesi planlıları varsayılan göstermez", async () => {
const o = (await getPlannedOverview(ayse, cakir))!;
const mine = o.overdue.filter((x) => x.recurringRuleId === ruleId);
expect(mine.length).toBeGreaterThanOrEqual(1);
expect(o.upcoming.every((x) => x.date >= today)).toBe(true);
expect(o.rules.find((x) => x.id === ruleId)).toMatchObject({
recurrence: expect.stringContaining("Her ay"),
remaining: null,
});
const list = await listTransactions(ayse, cakir, transactionFilterSchema.parse({}));
expect(list!.items.some((i) => i.status === "planned")).toBe(false);
const planned = await listTransactions(
ayse,
cakir,
transactionFilterSchema.parse({ durum: "planned" }),
);
expect(planned!.total).toBeGreaterThan(0);
});
it("onayla (tutar/tarih düzeltilerek) bakiyeye yansır; atla iptal eder", async () => {
const ziraat = await acc("Ziraat Maaş");
const before = await balance(ziraat);
const [first, second] = await occurrences(ruleId);
const c = await confirmOccurrence(ayse, cakir, String(first!._id), {
amount: 1_234_56,
date: today,
});
expect(c.ok).toBe(true);
const posted = (await TransactionModel.findById(first!._id).lean())!;
expect(posted).toMatchObject({ status: "posted", amountMinor: 1_234_56, isEstimate: false });
expect(await balance(ziraat)).toBe(before - 1_234_56);
// İkinci kez onaylanamaz.
expect(
(await confirmOccurrence(ayse, cakir, String(first!._id), { amount: 1, date: today })).ok,
).toBe(false);
expect((await skipOccurrence(emre, cakir, String(second!._id))).ok).toBe(true);
expect((await TransactionModel.findById(second!._id).lean())!.status).toBe("void");
expect(await balance(ziraat)).toBe(before - 1_234_56);
});
it("ertele: tarih ileri alınır, kayıt seriden ayrılır; geçmişe ertelenemez", async () => {
const occ = await occurrences(ruleId);
const third = occ[2]!;
const current = third.date.toISOString();
expect((await postponeOccurrence(ayse, cakir, String(third._id), "2000-01-01")).ok).toBe(false);
const target = addDays(today, 200);
expect((await postponeOccurrence(ayse, cakir, String(third._id), target)).ok).toBe(true);
const after = (await TransactionModel.findById(third._id).lean())!;
expect(after.detached).toBe(true);
expect(after.date.toISOString()).not.toBe(current);
});
it("tümünü güncelle: planlılar yeni tutarla yeniden üretilir; gerçekleşen, atlanan ve ayrılan korunur", async () => {
const r = await updateRule(ayse, cakir, ruleId, await form({ amount: "1.500,00" }), "all");
expect(r.ok).toBe(true);
const occ = await occurrences(ruleId);
expect(occ[0]).toMatchObject({ status: "posted", amountMinor: 1_234_56 });
expect(occ[1]).toMatchObject({ status: "void" });
expect(occ[2]).toMatchObject({ detached: true, amountMinor: 1_000_00 });
expect(occ.slice(3).every((o) => o.status === "planned" && o.amountMinor === 1_500_00)).toBe(
true,
);
// Sıra numaraları benzersiz.
expect(new Set(occ.map((o) => o.occurrenceIndex)).size).toBe(occ.length);
});
it("bu ve sonrakiler: seri bölünür", async () => {
const occ = await occurrences(ruleId);
const k = 5;
const from = occ.find((o) => o.occurrenceIndex === k)!;
const r = await updateRule(
ayse,
cakir,
ruleId,
await form({ amount: "2.000,00", startDate: addDays(today, 100) }),
"following",
String(from._id),
);
expect(r.ok).toBe(true);
const newId = r.ok ? r.data.id : "";
expect(newId).not.toBe(ruleId);
expect((await RecurringRuleModel.findById(ruleId).lean())!.count).toBe(k);
const old = await occurrences(ruleId);
expect(old.every((o) => o.occurrenceIndex! < k)).toBe(true);
const fresh = await occurrences(newId);
expect(fresh.length).toBeGreaterThan(0);
expect(fresh.every((o) => o.amountMinor === 2_000_00)).toBe(true);
});
it("tek kaydı düzenlemek (yalnızca bu) kaydı seriden ayırır", async () => {
const r = await createRule(
ayse,
cakir,
await form({ startDate: addDays(today, 3), endKind: "count", count: 3 }),
);
const id = r.ok ? r.data.id : "";
const occ = await occurrences(id);
expect(occ).toHaveLength(3);
const d = (await getTransaction(ayse, cakir, String(occ[1]!._id)))!;
expect(d.status).toBe("planned");
const u = await updateTransaction(ayse, cakir, d.id, {
type: "expense",
amount: 777_00,
date: d.date,
accountId: d.account.id,
toAccountId: null,
categoryId: d.categoryId,
splits: [],
payee: d.payeeName,
description: "",
tags: [],
attachmentIds: [],
installments: 1,
});
expect(u.ok).toBe(true);
expect(await TransactionModel.findById(d.id).lean()).toMatchObject({
detached: true,
status: "planned",
amountMinor: 777_00,
});
// Silme: bu ve sonrakiler (index 1'den) → yalnızca ilk kalır, kural 1 tekrarla biter.
expect((await deleteRule(ayse, cakir, id, "following", d.id)).ok).toBe(true);
expect(await occurrences(id)).toHaveLength(1);
expect((await deleteRule(ayse, cakir, id, "all")).ok).toBe(true);
expect(await occurrences(id)).toHaveLength(0);
expect((await RecurringRuleModel.findById(id).lean())!.deletedAt).toBeInstanceOf(Date);
});
});
describe("yetki ve izolasyon", () => {
it("izleyici kural oluşturamaz/onaylayamaz; hane dışı göremez", async () => {
expect((await createRule(zeynep, cakir, await form())).ok).toBe(false);
const o = (await getPlannedOverview(zeynep, cakir))!;
const any = o.upcoming[0]!;
expect((await confirmOccurrence(zeynep, cakir, any.id, { amount: 1, date: today })).ok).toBe(
false,
);
expect(await getPlannedOverview(fatma, cakir)).toBeNull();
expect((await skipOccurrence(fatma, cakir, any.id)).ok).toBe(false);
});
it("gizli hesap kuralı ve kayıtları yalnızca sahibine", async () => {
const pluxee = await acc("Ayşe — Pluxee");
expect(
(
await createRule(
emre,
cakir,
await form({ accountId: pluxee, startDate: addDays(today, 1) }),
)
).ok,
).toBe(false);
const r = await createRule(
ayse,
cakir,
await form({ accountId: pluxee, startDate: addDays(today, 1), payee: "Gizli kural" }),
);
const id = r.ok ? r.data.id : "";
const mine = (await getPlannedOverview(ayse, cakir))!;
expect(mine.rules.some((x) => x.id === id)).toBe(true);
const theirs = (await getPlannedOverview(emre, cakir))!;
expect(theirs.rules.some((x) => x.id === id)).toBe(false);
expect(theirs.upcoming.some((x) => x.recurringRuleId === id)).toBe(false);
expect((await deleteRule(emre, cakir, id, "all")).ok).toBe(false);
});
it("form doğrulaması: bitiş tarihi başlangıçtan önce olamaz; transferde hedef hesap", () => {
expect(
recurringRuleFormSchema.safeParse({
type: "expense",
amount: "10",
accountId: "a".repeat(24),
categoryId: "b".repeat(24),
startDate: "2026-05-01",
frequency: "monthly",
endKind: "date",
endDate: "2026-04-01",
}).success,
).toBe(false);
expect(
recurringRuleFormSchema.safeParse({
type: "transfer",
amount: "10",
accountId: "a".repeat(24),
startDate: "2026-05-01",
frequency: "monthly",
}).success,
).toBe(false);
});
});
+608
View File
@@ -0,0 +1,608 @@
import "server-only";
import mongoose, { Types, type ClientSession } from "mongoose";
import {
baseFilter,
buildDoc,
loadContext,
loadOwnTransaction,
toItem,
touchPayee,
userNames,
type Ctx,
type LeanTx,
type TransactionListItem,
} from "@/features/transactions/service";
import { tr } from "@/i18n/tr";
import { fail, ok, type ActionResult } from "@/lib/action-result";
import { writeAudit } from "@/lib/audit";
import { toObjectId } from "@/lib/object-id";
import { RecurringRuleModel } from "@/models/recurring-rule";
import { TransactionModel } from "@/models/transaction";
import {
addDays,
describeRecurrence,
horizonDate,
listOccurrences,
type Recurrence,
} from "@/shared/recurrence";
import type { ConfirmOccurrenceForm, RecurringRuleForm } from "@/shared/schemas/recurring";
import type { TransactionForm } from "@/shared/schemas/transaction";
import { istanbulDayStart, todayIstanbul, toIstanbulYmd } from "@/shared/dates";
import { foldTr } from "@/shared/search";
import type { TransactionType } from "@/shared/transactions";
/**
* Planlı ve düzenli işlemler (Bölüm 6.7). Okuma: viewer; yazma: member.
* Planlı kayıtlar bakiyeyi etkilemez; "Onayla" ile posted olur. Gizli hesap kuralları ve
* kayıtları işlemlerle aynı kuralla yalnızca hesap sahibine görünür.
*/
const t = tr.recurring;
/** "Yaklaşan" listesinin kapsadığı gün sayısı. */
export const UPCOMING_DAYS = 60;
type RuleDoc = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
type: TransactionType;
amountMinor: number;
isEstimate: boolean;
accountId: Types.ObjectId;
toAccountId?: Types.ObjectId | null;
categoryId?: Types.ObjectId | null;
payeeName: string;
description: string;
tags: string[];
frequency: Recurrence["frequency"];
interval: number;
monthlyMode: Recurrence["monthlyMode"];
startDate: string;
endDate?: string | null;
count?: number | null;
generatedUntil?: string | null;
createdBy: Types.ObjectId;
updatedBy: Types.ObjectId;
};
const toRecurrence = (r: RuleDoc): Recurrence => ({
frequency: r.frequency,
interval: r.interval,
monthlyMode: r.monthlyMode,
startDate: r.startDate,
endDate: r.endDate ?? null,
count: r.count ?? null,
});
function asTransactionForm(input: RecurringRuleForm): TransactionForm {
return {
type: input.type,
amount: input.amount,
date: input.startDate,
accountId: input.accountId,
toAccountId: input.toAccountId,
categoryId: input.type === "transfer" ? null : input.categoryId,
splits: [],
payee: input.payee,
description: input.description,
tags: input.tags,
attachmentIds: [],
installments: 1,
};
}
/** Form → kural alanları (doğrulanmış işlem şablonu + tekrar). */
function ruleFields(ctx: Ctx, input: RecurringRuleForm, existing?: RuleDoc) {
const built = buildDoc(ctx, asTransactionForm(input), existing);
if (!built.ok) return built;
const d = built.data as {
type: TransactionType;
accountId: Types.ObjectId;
toAccountId: Types.ObjectId | null;
categoryId: Types.ObjectId | null;
amountMinor: number;
payeeName: string;
description: string;
tags: string[];
};
return ok({
type: d.type,
amountMinor: d.amountMinor,
isEstimate: input.isEstimate,
accountId: d.accountId,
toAccountId: d.toAccountId,
categoryId: d.categoryId,
payeeName: d.payeeName,
description: d.description,
tags: d.tags,
frequency: input.frequency,
interval: input.interval,
monthlyMode: input.monthlyMode,
startDate: input.startDate,
endDate: input.endDate,
count: input.count,
});
}
/** Kuralın ufka kadar eksik planlı kayıtlarını üretir (mevcut sıra numaraları atlanır). */
async function generate(rule: RuleDoc, today: string, session?: ClientSession): Promise<number> {
const until = horizonDate(today);
const occurrences = listOccurrences(toRecurrence(rule), until);
const existing = new Set(
(
await TransactionModel.find(
{ recurringRuleId: rule._id },
{ occurrenceIndex: 1 },
{ session },
).lean()
).map((x) => x.occurrenceIndex),
);
const missing = occurrences.filter((o) => !existing.has(o.index));
if (missing.length) {
const docs = missing.map((o) => ({
householdId: rule.householdId,
type: rule.type,
status: "planned",
date: istanbulDayStart(o.date)!,
accountId: rule.accountId,
toAccountId: rule.toAccountId ?? null,
amountMinor: rule.amountMinor,
categoryId: rule.categoryId ?? null,
splits: [],
effectiveCategoryIds: rule.categoryId ? [rule.categoryId] : [],
payeeName: rule.payeeName,
description: rule.description,
searchText: foldTr(`${rule.payeeName} ${rule.description}`),
tags: rule.tags,
isEstimate: rule.isEstimate,
recurringRuleId: rule._id,
occurrenceIndex: o.index,
createdBy: rule.createdBy,
updatedBy: rule.updatedBy,
}));
try {
await TransactionModel.insertMany(docs, { session, ordered: false });
} catch (error) {
// Eşzamanlı üretim: benzersiz index kopyayı reddeder (transaction dışında).
if (session || (error as { code?: number }).code !== 11000) throw error;
}
}
await RecurringRuleModel.updateOne(
{ _id: rule._id },
{ $set: { generatedUntil: until } },
{ session },
);
return missing.length;
}
/** Hanedeki kuralların ufkunu ilerletir (okuma sırasında; zamanlanmış görev gerekmez). */
export async function ensureHorizon(householdId: Types.ObjectId, today = todayIstanbul()) {
const until = horizonDate(today);
const rules = await RecurringRuleModel.find({
householdId,
deletedAt: null,
$or: [{ generatedUntil: null }, { generatedUntil: { $lt: until } }],
}).lean<RuleDoc[]>();
let created = 0;
for (const rule of rules) created += await generate(rule, today);
return created;
}
function ruleVisible(ctx: Ctx, rule: Pick<RuleDoc, "accountId" | "toAccountId">) {
return [rule.accountId, rule.toAccountId]
.filter(Boolean)
.every((id) => !ctx.accountMap.get(String(id))?.hidden);
}
async function loadRule(ctx: Ctx, ruleId: string, session?: ClientSession) {
const id = toObjectId(ruleId);
if (!id) return null;
const rule = await RecurringRuleModel.findOne(
{ _id: id, householdId: ctx.m.householdId, deletedAt: null },
null,
{ session },
).lean<RuleDoc>();
return rule && ruleVisible(ctx, rule) ? rule : null;
}
/** "Bu ve sonrakiler" için başlangıç tekrarı (kurala ait olmalı). */
async function occurrenceIndexOf(rule: RuleDoc, transactionId: string | undefined) {
const id = transactionId ? toObjectId(transactionId) : null;
if (!id) return null;
const tx = await TransactionModel.findOne(
{ _id: id, recurringRuleId: rule._id, householdId: rule.householdId },
{ occurrenceIndex: 1 },
).lean();
return tx?.occurrenceIndex ?? null;
}
// --- Kural yazma ---
export async function createRule(
actorId: string,
householdId: string,
input: RecurringRuleForm,
): Promise<ActionResult<{ id: string; generated: number }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const fields = ruleFields(ctx, input);
if (!fields.ok) return fields;
const actor = new Types.ObjectId(actorId);
let out = { id: "", generated: 0 };
await mongoose.connection.transaction(async (session) => {
const [rule] = await RecurringRuleModel.create(
[{ ...fields.data, householdId: ctx.m.householdId, createdBy: actor, updatedBy: actor }],
{ session },
);
const generated = await generate(rule!.toObject() as RuleDoc, todayIstanbul(), session);
out = { id: String(rule!._id), generated };
});
return ok(out);
}
/**
* Seri düzenleme. "all": kural güncellenir, seriden ayrılmamış planlı kayıtlar yeniden üretilir
* (gerçekleşmiş/atlanmış kayıtlar korunur). "following": seri bu tekrardan bölünür — eski kural
* önceki tekrarda biter, yeni kural bu tekrardan itibaren yeni değerlerle başlar.
*/
export async function updateRule(
actorId: string,
householdId: string,
ruleId: string,
input: RecurringRuleForm,
scope: "all" | "following",
fromTransactionId?: string,
): Promise<ActionResult<{ id: string }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const rule = await loadRule(ctx, ruleId);
if (!rule) return fail(tr.common.notFound);
const fields = ruleFields(ctx, input, rule);
if (!fields.ok) return fields;
const actor = new Types.ObjectId(actorId);
const from = scope === "following" ? await occurrenceIndexOf(rule, fromTransactionId) : 0;
if (from === null) return fail(tr.common.notFound);
const today = todayIstanbul();
let id = String(rule._id);
await mongoose.connection.transaction(async (session) => {
if (from === 0) {
await RecurringRuleModel.updateOne(
{ _id: rule._id },
{ $set: { ...fields.data, generatedUntil: null, updatedBy: actor } },
{ session },
);
await TransactionModel.deleteMany(
{
recurringRuleId: rule._id,
status: "planned",
...(scope === "all" ? { detached: false } : {}),
},
{ session },
);
const fresh = await RecurringRuleModel.findById(rule._id, null, { session }).lean<RuleDoc>();
await generate(fresh!, today, session);
return;
}
// Böl: eski kural `from` tekrarından önce biter.
await RecurringRuleModel.updateOne(
{ _id: rule._id },
{ $set: { count: from, updatedBy: actor } },
{ session },
);
await TransactionModel.deleteMany(
{ recurringRuleId: rule._id, status: "planned", occurrenceIndex: { $gte: from } },
{ session },
);
const [next] = await RecurringRuleModel.create(
[{ ...fields.data, householdId: ctx.m.householdId, createdBy: actor, updatedBy: actor }],
{ session },
);
id = String(next!._id);
await generate(next!.toObject() as RuleDoc, today, session);
});
return ok({ id });
}
export async function deleteRule(
actorId: string,
householdId: string,
ruleId: string,
scope: "all" | "following",
fromTransactionId?: string,
): Promise<ActionResult<{ removed: number }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const rule = await loadRule(ctx, ruleId);
if (!rule) return fail(tr.common.notFound);
const from = scope === "following" ? await occurrenceIndexOf(rule, fromTransactionId) : 0;
if (from === null) return fail(tr.common.notFound);
const actor = new Types.ObjectId(actorId);
let removed = 0;
await mongoose.connection.transaction(async (session) => {
const res = await TransactionModel.deleteMany(
{ recurringRuleId: rule._id, status: "planned", occurrenceIndex: { $gte: from } },
{ session },
);
removed = res.deletedCount;
await RecurringRuleModel.updateOne(
{ _id: rule._id },
from === 0
? { $set: { deletedAt: new Date(), updatedBy: actor } }
: { $set: { count: from, updatedBy: actor } },
{ session },
);
await writeAudit(
{
action: "recurring.delete",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "recurringRule",
targetId: String(rule._id),
diff: { scope, fromIndex: from, removedPlanned: removed },
},
session,
);
});
return ok({ removed });
}
// --- Planlı kayıt işlemleri ---
async function loadPlanned(ctx: Ctx, transactionId: string) {
const tx = await loadOwnTransaction(ctx, transactionId);
return tx && tx.status === "planned" ? tx : null;
}
/** Onayla: planlı → gerçekleşti; tutar ve tarih düzeltilebilir. */
export async function confirmOccurrence(
actorId: string,
householdId: string,
transactionId: string,
input: ConfirmOccurrenceForm,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const tx = await loadPlanned(ctx, transactionId);
if (!tx) return fail(tr.common.notFound);
const date = istanbulDayStart(input.date);
if (!date) return fail(tr.validation.date, { date: tr.validation.date });
if (tx.splits?.length && input.amount !== tx.amountMinor) return fail(t.errors.splitAmount);
// Arşivlenmiş/kapalı hesap veya kategoriye bağlı kayıt onaylanamaz.
for (const id of [tx.accountId, tx.toAccountId].filter(Boolean)) {
const a = ctx.accountMap.get(String(id));
if (!a || a.archived) return fail(tr.transactions.validation.accountInvalid);
}
const payeeId = await touchPayee(
ctx.m.householdId,
tx.payeeName ?? "",
tx.type,
tx.accountId,
tx.categoryId ?? null,
);
await TransactionModel.updateOne(
{ _id: tx._id, householdId: ctx.m.householdId, status: "planned" },
{
$set: {
status: "posted",
amountMinor: input.amount,
date,
isEstimate: false,
payeeId,
updatedBy: new Types.ObjectId(actorId),
},
},
);
return ok(undefined);
}
/** Atla: bu tekrar gerçekleşmeyecek (iptal); seri devam eder. */
export async function skipOccurrence(
actorId: string,
householdId: string,
transactionId: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const tx = await loadPlanned(ctx, transactionId);
if (!tx) return fail(tr.common.notFound);
await TransactionModel.updateOne(
{ _id: tx._id, householdId: ctx.m.householdId, status: "planned" },
{ $set: { status: "void", updatedBy: new Types.ObjectId(actorId) } },
);
return ok(undefined);
}
/** Ertele: tarihi ileri al (seri tarihleri değişmez; kayıt seriden ayrılır). */
export async function postponeOccurrence(
actorId: string,
householdId: string,
transactionId: string,
ymd: string,
): Promise<ActionResult> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const tx = await loadPlanned(ctx, transactionId);
if (!tx) return fail(tr.common.notFound);
const date = istanbulDayStart(ymd);
if (!date || ymd <= toIstanbulYmd(tx.date))
return fail(t.errors.postponeDate, { date: t.errors.postponeDate });
await TransactionModel.updateOne(
{ _id: tx._id, householdId: ctx.m.householdId, status: "planned" },
{ $set: { date, detached: true, updatedBy: new Types.ObjectId(actorId) } },
);
return ok(undefined);
}
// --- Okuma ---
export type PlannedItem = TransactionListItem & {
recurringRuleId: string | null;
isEstimate: boolean;
/** "3/12" (tekrar sayılı seride). */
seriesPosition: string | null;
};
export type RuleView = {
id: string;
type: TransactionType;
title: string;
amountMinor: number;
isEstimate: boolean;
recurrence: string;
account: string;
toAccount: string | null;
category: string | null;
nextDate: string | null;
/** Kalan planlı kayıt (tekrar sayılı seride kalan tekrar). */
remaining: number | null;
startDate: string;
endDate: string | null;
count: number | null;
};
export type PlannedOverview = {
overdue: PlannedItem[];
upcoming: PlannedItem[];
rules: RuleView[];
};
async function plannedItems(ctx: Ctx, filter: Record<string, unknown>, limit = 500) {
const rows = (await TransactionModel.find({ ...baseFilter(ctx), status: "planned", ...filter })
.sort({ date: 1, createdAt: 1 })
.limit(limit)
.lean()) as unknown as LeanTx[];
const ruleIds = [
...new Set(
rows
.map((r) => r.recurringRuleId)
.filter(Boolean)
.map(String),
),
];
const rules = await RecurringRuleModel.find({ _id: { $in: ruleIds } }, { count: 1 }).lean();
const counts = new Map(rules.map((r) => [String(r._id), r.count ?? null]));
const names = await userNames(rows.map((r) => r.createdBy as Types.ObjectId));
return rows.map((r): PlannedItem => {
const ruleId = r.recurringRuleId ? String(r.recurringRuleId) : null;
const count = ruleId ? counts.get(ruleId) : null;
return {
...toItem(ctx, r, names),
recurringRuleId: ruleId,
isEstimate: Boolean(r.isEstimate),
seriesPosition:
count && r.occurrenceIndex !== null && r.occurrenceIndex !== undefined
? `${r.occurrenceIndex + 1}/${count}`
: null,
};
});
}
export async function getPlannedOverview(
userId: string,
householdId: string,
): Promise<PlannedOverview | null> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
await ensureHorizon(ctx.m.householdId);
const today = todayIstanbul();
const todayStart = istanbulDayStart(today)!;
const end = istanbulDayStart(addDays(today, UPCOMING_DAYS + 1))!;
const [overdue, upcoming, rules] = await Promise.all([
plannedItems(ctx, { date: { $lt: todayStart } }),
plannedItems(ctx, { date: { $gte: todayStart, $lt: end } }),
listRules(ctx),
]);
return { overdue, upcoming, rules };
}
async function listRules(ctx: Ctx): Promise<RuleView[]> {
const rules = (
await RecurringRuleModel.find({ householdId: ctx.m.householdId, deletedAt: null })
.sort({ createdAt: 1 })
.lean<RuleDoc[]>()
).filter((r) => ruleVisible(ctx, r));
const next = await TransactionModel.aggregate<{
_id: Types.ObjectId;
date: Date | null;
planned: number;
done: number;
}>([
{ $match: { recurringRuleId: { $in: rules.map((r) => r._id) }, deletedAt: null } },
{
$group: {
_id: "$recurringRuleId",
date: { $min: { $cond: [{ $eq: ["$status", "planned"] }, "$date", null] } },
planned: { $sum: { $cond: [{ $eq: ["$status", "planned"] }, 1, 0] } },
done: { $sum: { $cond: [{ $eq: ["$status", "planned"] }, 0, 1] } },
},
},
]);
const nextMap = new Map(next.map((x) => [String(x._id), x]));
const name = (id?: Types.ObjectId | null) =>
id ? (ctx.accountMap.get(String(id))?.name ?? "—") : null;
return rules
.map((r): RuleView => {
const n = nextMap.get(String(r._id));
const category = r.categoryId ? ctx.categoryMap.get(String(r.categoryId)) : undefined;
return {
id: String(r._id),
type: r.type,
title: r.payeeName || r.description || category?.name || tr.transactions.types[r.type],
amountMinor: r.amountMinor,
isEstimate: r.isEstimate,
recurrence: describeRecurrence(r),
account: name(r.accountId)!,
toAccount: name(r.toAccountId),
category: category?.path ?? null,
nextDate: n?.date ? toIstanbulYmd(n.date) : null,
// Tekrar sayılı seride: toplam − gerçekleşen/atlanan; bitiş tarihlide: kalan planlı kayıt.
remaining: r.count
? Math.max(0, r.count - (n?.done ?? 0))
: r.endDate
? (n?.planned ?? 0)
: null,
startDate: r.startDate,
endDate: r.endDate ?? null,
count: r.count ?? null,
};
})
.filter((r) => r.nextDate !== null || r.remaining === null);
}
/** Düzenleme formu için kural değerleri. */
export async function getRuleForm(userId: string, householdId: string, ruleId: string) {
const ctx = await loadContext(userId, householdId, "member");
if (!ctx) return null;
const r = await loadRule(ctx, ruleId);
if (!r) return null;
return {
id: String(r._id),
type: r.type,
amountMinor: r.amountMinor,
isEstimate: r.isEstimate,
accountId: String(r.accountId),
toAccountId: r.toAccountId ? String(r.toAccountId) : null,
categoryId: r.categoryId ? String(r.categoryId) : null,
payee: r.payeeName,
description: r.description,
tags: r.tags,
startDate: r.startDate,
frequency: r.frequency,
interval: r.interval,
monthlyMode: r.monthlyMode,
endDate: r.endDate ?? null,
count: r.count ?? null,
};
}
export type RuleFormValues = NonNullable<Awaited<ReturnType<typeof getRuleForm>>>;
/** Dashboard uyarısı: vadesi geçmiş onaylanmamış planlı kayıt sayısı. */
export async function countOverdue(userId: string, householdId: string): Promise<number> {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return 0;
return TransactionModel.countDocuments({
...baseFilter(ctx),
status: "planned",
date: { $lt: istanbulDayStart(todayIstanbul())! },
});
}
+14
View File
@@ -8,6 +8,7 @@ import { getHouseholdActionContext } from "@/lib/dal";
import { reconcileSchema } from "@/shared/schemas/reconciliation"; import { reconcileSchema } from "@/shared/schemas/reconciliation";
import { transactionFormSchema } from "@/shared/schemas/transaction"; import { transactionFormSchema } from "@/shared/schemas/transaction";
import { import {
cancelRemainingInstallments,
createTransaction, createTransaction,
getTransaction, getTransaction,
getTransactionFormOptions, getTransactionFormOptions,
@@ -106,6 +107,19 @@ export async function searchPayeesAction(query: unknown): Promise<PayeeSuggestio
return searchPayees(ctx.user.id, ctx.household.id, q.data); return searchPayees(ctx.user.id, ctx.household.id, q.data);
} }
/** Taksitli alışverişin kalan (gerçekleşmemiş) taksitlerini iptal eder. */
export async function cancelRemainingInstallmentsAction(
transactionId: unknown,
): Promise<ActionResult<{ cancelled: number }>> {
const ctx = await getHouseholdActionContext("member");
if (!ctx) return fail(tr.common.unauthorized);
const id = idSchema.safeParse(transactionId);
if (!id.success) return fail(tr.common.notFound);
const result = await cancelRemainingInstallments(ctx.user.id, ctx.household.id, id.data);
if (result.ok) revalidate();
return result;
}
/** Mutabakat önizlemesi: ekstre bakiyesi ile uygulama bakiyesi arasındaki fark. */ /** Mutabakat önizlemesi: ekstre bakiyesi ile uygulama bakiyesi arasındaki fark. */
export async function previewReconciliationAction( export async function previewReconciliationAction(
accountId: unknown, accountId: unknown,
+297
View File
@@ -0,0 +1,297 @@
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { createAccount, listAccounts } from "@/features/accounts/service";
import { AccountModel } from "@/models/account";
import { CardStatementModel } from "@/models/card-statement";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import { cardPeriods, minimumPayment } from "@/shared/card-periods";
import { istanbulDayStart, todayIstanbul } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { transactionFormSchema, type TransactionForm } from "@/shared/schemas/transaction";
import { transactionEffects } from "@/shared/transactions";
import { setupSeededDb, teardownDb } from "@/test/seeded-db";
import { getCardSummary, getOverdraftSummary } from "./card";
import {
cancelRemainingInstallments,
createTransaction,
listTransactions,
postDueInstallments,
} from "./service";
let ids: Awaited<ReturnType<typeof setupSeededDb>>;
let cakir = "";
let ayse = "";
let fatma = "";
const today = todayIstanbul();
beforeAll(async () => {
ids = await setupSeededDb();
cakir = ids.household("Çakır Ailesi");
ayse = ids.user("ayse");
fatma = ids.user("fatma");
});
afterAll(teardownDb);
const acc = (name: string) =>
AccountModel.findOne({ householdId: cakir, 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: today,
accountId: await acc("Garanti Bonus"),
toAccountId: null,
categoryId: await cat("giyim"),
splits: [],
payee: "",
description: "",
tags: [],
installments: 1,
attachmentIds: [],
...over,
};
}
/** Bağımsız hesap: açılış + belirli andan önceki gerçekleşmiş işlemler. */
async function balanceAt(accountId: string, before?: Date) {
const account = (await AccountModel.findById(accountId).lean())!;
const txs = await TransactionModel.find({
householdId: cakir,
deletedAt: null,
...(before ? { date: { $lt: before } } : {}),
}).lean();
let b = account.openingBalanceMinor;
for (const t of txs) {
for (const e of transactionEffects({
type: t.type,
status: t.status,
amountMinor: t.amountMinor,
accountId: String(t.accountId),
toAccountId: t.toAccountId ? String(t.toAccountId) : null,
}))
if (e.accountId === accountId) b += e.deltaMinor;
}
return b;
}
describe("kart özeti", () => {
it("anlık borç, ekstre borcu (kesim günü dahil) ve asgari ödeme işlemlerle tutarlı", async () => {
const card = await acc("Garanti Bonus");
const s = (await getCardSummary(ayse, cakir, card))!;
const { statement, current } = cardPeriods(today, 29);
expect(s.statement.period).toEqual(statement);
expect(s.current.start).toBe(current.start);
expect(s.debtMinor).toBe(Math.max(0, -(await balanceAt(card))));
const endEx = new Date(istanbulDayStart(statement.end)!.getTime() + 24 * 3600 * 1000);
expect(s.statement.debtMinor).toBe(Math.max(0, -(await balanceAt(card, endEx))));
// Limit 60.000 TL ≥ 50.000 → %40.
expect(s.minimumRateBp).toBe(4000);
expect(s.statement.minimumMinor).toBe(minimumPayment(s.statement.debtMinor, 4000));
expect(s.history).toHaveLength(6);
expect(s.paymentAccount?.name).toBe("Ziraat Maaş");
expect(await CardStatementModel.countDocuments({ accountId: card })).toBe(6);
});
it("karta ödeme ekstre borcunu düşürür", async () => {
const card = await acc("Garanti Bonus");
const before = (await getCardSummary(ayse, cakir, card))!;
const r = await createTransaction(
ayse,
cakir,
await form({
type: "transfer",
amount: 1_000_00,
accountId: await acc("Ziraat Maaş"),
toAccountId: card,
categoryId: null,
}),
);
expect(r.ok).toBe(true);
const after = (await getCardSummary(ayse, cakir, card))!;
expect(after.statement.paidMinor).toBe(before.statement.paidMinor + 1_000_00);
expect(after.debtMinor).toBe(before.debtMinor - 1_000_00);
});
it("yetki: hane dışı ve kart olmayan hesap", async () => {
expect(await getCardSummary(fatma, cakir, await acc("Garanti Bonus"))).toBeNull();
expect(await getCardSummary(ayse, cakir, await acc("Cüzdan"))).toBeNull();
});
});
describe("taksitli harcama", () => {
let first = "";
it("her taksit ayrı işlem; vadesi gelenler gerçekleşir, gelecekler planlı ve limitten düşer", async () => {
const card = await acc("Garanti Bonus");
const balanceBefore = await balanceAt(card);
const summaryBefore = (await getCardSummary(ayse, cakir, card))!;
const date = addDays(today, -65);
const r = await createTransaction(
ayse,
cakir,
await form({ amount: 9_000_00, installments: 9, payee: "Hepsiburada", date }),
);
expect(r.ok).toBe(true);
first = r.ok ? r.data.id : "";
const plan = (await TransactionModel.findById(first).lean())!.installment!.planId;
const all = await TransactionModel.find({ "installment.planId": plan })
.sort({ "installment.index": 1 })
.lean();
expect(all).toHaveLength(9);
expect(all.map((t) => t.installment!.index)).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9]);
expect(all.reduce((a, t) => a + t.amountMinor, 0)).toBe(9_000_00);
const posted = all.filter((t) => t.status === "posted");
expect(posted.length).toBeGreaterThanOrEqual(3);
expect(all.filter((t) => t.status === "planned").every((t) => t.date > new Date())).toBe(true);
expect(await balanceAt(card)).toBe(
balanceBefore - posted.reduce((a, t) => a + t.amountMinor, 0),
);
const s = (await getCardSummary(ayse, cakir, card))!;
const pending = all
.filter((t) => t.status === "planned")
.reduce((a, t) => a + t.amountMinor, 0);
expect(s.pendingInstallmentsMinor).toBe(summaryBefore.pendingInstallmentsMinor + pending);
expect(s.availableMinor).toBe(s.limitMinor - s.debtMinor - s.pendingInstallmentsMinor);
expect(s.upcomingInstallments.reduce((a, x) => a + x.totalMinor, 0)).toBe(
s.pendingInstallmentsMinor,
);
const list = await listTransactions(
ayse,
cakir,
(await import("@/shared/schemas/transaction")).transactionFilterSchema.parse({
q: "Hepsiburada",
}),
);
expect(list!.items[0]!.installment).toMatchObject({ count: 9 });
});
it("vadesi gelen taksit kendi döneminde otomatik gerçekleşir", async () => {
const plan = (await TransactionModel.findById(first).lean())!.installment!.planId;
const plannedBefore = await TransactionModel.countDocuments({
"installment.planId": plan,
status: "planned",
});
await postDueInstallments(
(await AccountModel.findById(await acc("Garanti Bonus")).lean())!.householdId,
addDays(today, 40),
);
const plannedAfter = await TransactionModel.countDocuments({
"installment.planId": plan,
status: "planned",
});
expect(plannedAfter).toBe(plannedBefore - 1);
});
it("kalan taksitler iptal edilebilir; gerçekleşenler korunur", async () => {
const plan = (await TransactionModel.findById(first).lean())!.installment!.planId;
const posted = await TransactionModel.countDocuments({
"installment.planId": plan,
status: "posted",
});
const r = await cancelRemainingInstallments(ayse, cakir, first);
expect(r).toMatchObject({ ok: true });
expect(
await TransactionModel.countDocuments({
"installment.planId": plan,
status: "planned",
deletedAt: null,
}),
).toBe(0);
expect(
await TransactionModel.countDocuments({
"installment.planId": plan,
status: "posted",
deletedAt: null,
}),
).toBe(posted);
});
it("taksit yalnızca kredi kartı giderinde", async () => {
const onBank = await createTransaction(
ayse,
cakir,
await form({ installments: 3, accountId: await acc("Ziraat Maaş") }),
);
expect(onBank.ok).toBe(false);
const base = {
type: "income",
amount: "100",
date: today,
accountId: "a".repeat(24),
categoryId: "b".repeat(24),
installments: "3",
};
expect(transactionFormSchema.safeParse(base).success).toBe(false);
expect(transactionFormSchema.safeParse({ ...base, type: "expense" }).success).toBe(true);
expect(
transactionFormSchema.safeParse({ ...base, type: "expense", installments: "37" }).success,
).toBe(false);
expect(
transactionFormSchema.parse({ ...base, type: "expense", installments: "" }).installments,
).toBe(1);
});
});
describe("KMH özeti", () => {
it("dönem içi eksi bakiyeden faiz tahmini; kullanılabilir KMH", async () => {
const created = await createAccount(ayse, cakir, {
name: "KMH Test",
type: "bank",
institution: "",
mealCardProvider: null,
openingBalance: 0,
openingDate: "2020-01-01",
color: "blue",
icon: "landmark",
ownerUserId: null,
isPrivate: false,
overdraftEnabled: true,
overdraftLimit: 10_000_00,
overdraftMonthlyRate: 425,
overdraftStatementDay: 1,
cardLimit: 0,
cardStatementDay: 1,
cardDueKind: "daysAfter",
cardDueValue: 10,
cardPaymentAccountId: null,
cardMinimumRate: null,
});
expect(created.ok).toBe(true);
const id = created.ok ? created.data.id : "";
const { statement } = cardPeriods(today, 1);
await createTransaction(
ayse,
cakir,
await form({ accountId: id, amount: 3_000_00, date: statement.start }),
);
const s = (await getOverdraftSummary(ayse, cakir, id))!;
const days =
Math.round(
(istanbulDayStart(statement.end)!.getTime() -
istanbulDayStart(statement.start)!.getTime()) /
(24 * 3600 * 1000),
) + 1;
expect(s.statement.interestMinor).toBe(Math.round((days * 3_000_00 * 425) / 10_000 / 30));
expect(s.usedMinor).toBe(3_000_00);
expect(s.availableMinor).toBe(7_000_00);
// Artı bakiyeli hesapta kullanılabilir KMH limitin kendisi.
const z = (await getOverdraftSummary(ayse, cakir, await acc("Ziraat Maaş")))!;
expect(z.usedMinor).toBe(0);
expect(z.availableMinor).toBe(z.limitMinor);
expect(s.interestCategoryId).not.toBeNull();
expect(s.interestBooked).toBe(false);
expect((await listAccounts(ayse, cakir))!.accounts.find((a) => a.id === id)!.balanceMinor).toBe(
-3_000_00,
);
expect(await getOverdraftSummary(ayse, cakir, await acc("Cüzdan"))).toBeNull();
});
});
+396
View File
@@ -0,0 +1,396 @@
import "server-only";
import { Types, type PipelineStage } from "mongoose";
import { AccountModel } from "@/models/account";
import { CardStatementModel } from "@/models/card-statement";
import { CategoryModel } from "@/models/category";
import { TransactionModel } from "@/models/transaction";
import {
cardPeriods,
closingOnOrAfter,
dueDate,
estimateOverdraftInterest,
minimumPayment,
minimumRateBp,
nextPeriod,
previousPeriod,
type DueRule,
type Period,
} from "@/shared/card-periods";
import { istanbulDayStart, todayIstanbul, toIstanbulYmd } from "@/shared/dates";
import { addDays } from "@/shared/recurrence";
import { loadContext, toItem, userNames, type LeanTx, type TransactionListItem } from "./service";
import { accountMatch, balanceBefore } from "./statement";
/**
* Kredi kartı özeti ve KMH dönem özeti (Bölüm 6.8). Tüm tutarlar işlemlerden hesaplanır;
* dönem kayıtları (`statements`) okunurken güncellenir.
*/
const DAY_MS = 24 * 60 * 60 * 1000;
const HISTORY = 6;
const dayStart = (ymd: string) => istanbulDayStart(ymd)!;
const endExclusive = (ymd: string) => new Date(dayStart(ymd).getTime() + DAY_MS);
type AccountDoc = {
_id: Types.ObjectId;
householdId: Types.ObjectId;
name: string;
type: string;
openingBalanceMinor: number;
archivedAt?: Date | null;
creditCard?: {
limitMinor: number;
statementDay: number;
dueRule: DueRule;
paymentAccountId?: Types.ObjectId | null;
minimumPaymentRateBp?: number | null;
} | null;
overdraft?: {
enabled: boolean;
limitMinor: number;
monthlyRateBp?: number | null;
statementDay?: number | null;
} | null;
};
/** Hesaba giriş (gelir, gelen transfer) ve çıkış (gider, giden transfer) toplamları. */
async function flows(householdId: Types.ObjectId, accountId: Types.ObjectId, from: Date, to: Date) {
const pipeline: PipelineStage[] = [
{ $match: { ...accountMatch(householdId, accountId), date: { $gte: from, $lt: to } } },
{
$group: {
_id: null,
inflow: {
$sum: {
$cond: [
{
$or: [
{ $and: [{ $eq: ["$type", "income"] }, { $eq: ["$accountId", accountId] }] },
{ $and: [{ $eq: ["$type", "transfer"] }, { $eq: ["$toAccountId", accountId] }] },
],
},
"$amountMinor",
0,
],
},
},
outflow: {
$sum: {
$cond: [
{
$and: [
{ $in: ["$type", ["expense", "transfer"]] },
{ $eq: ["$accountId", accountId] },
],
},
"$amountMinor",
0,
],
},
},
},
},
];
const [row] = await TransactionModel.aggregate<{ inflow: number; outflow: number }>(pipeline);
return { inflow: row?.inflow ?? 0, outflow: row?.outflow ?? 0 };
}
async function loadAccount(userId: string, householdId: string, accountId: string) {
const ctx = await loadContext(userId, householdId, "viewer");
if (!ctx) return null;
const info = ctx.accountMap.get(accountId);
if (!info || info.hidden) return null;
const account = await AccountModel.findOne({
_id: info.id,
householdId: ctx.m.householdId,
}).lean<AccountDoc>();
return account ? { ctx, account } : null;
}
// --- Kredi kartı ---
export type StatementSummary = {
period: Period;
dueDate: string;
debtMinor: number;
minimumMinor: number;
paidMinor: number;
spentMinor: number;
remainingMinor: number;
minimumRemainingMinor: number;
};
export type CardSummary = {
limitMinor: number;
debtMinor: number;
availableMinor: number;
/** Henüz gerçekleşmemiş taksitlerin toplamı (limitten düşer). */
pendingInstallmentsMinor: number;
minimumRateBp: number;
current: Period & { spentMinor: number };
statement: StatementSummary;
daysToDue: number;
history: StatementSummary[];
/** Dönem dönem yaklaşan taksit toplamları. */
upcomingInstallments: { periodEnd: string; dueDate: string; totalMinor: number; count: number }[];
/** Güncel ve sonraki dönemdeki planlı (taksit dışı) harcamalar. */
planned: TransactionListItem[];
paymentAccount: { id: string; name: string } | null;
};
export async function getCardSummary(
userId: string,
householdId: string,
accountId: string,
today = todayIstanbul(),
): Promise<CardSummary | null> {
const loaded = await loadAccount(userId, householdId, accountId);
if (!loaded || loaded.account.type !== "credit_card" || !loaded.account.creditCard) return null;
const { ctx, account } = loaded;
const card = account.creditCard!;
const hh = ctx.m.householdId;
const S = card.statementDay;
const rate = minimumRateBp(card.limitMinor, card.minimumPaymentRateBp);
const { current, statement } = cardPeriods(today, S);
const balanceNow = await balanceBefore(hh, account, null);
const debtMinor = Math.max(0, -balanceNow);
// Son ekstre + geçmiş dönemler (yeniden eskiye).
const periods: Period[] = [statement];
while (periods.length < HISTORY) periods.push(previousPeriod(periods.at(-1)!, S));
const history = await Promise.all(
periods.map(async (p): Promise<StatementSummary> => {
const next = nextPeriod(p, S);
const [debtAt, paidFlows, spentFlows] = await Promise.all([
balanceBefore(hh, account, endExclusive(p.end)),
flows(hh, account._id, endExclusive(p.end), endExclusive(next.end)),
flows(hh, account._id, dayStart(p.start), endExclusive(p.end)),
]);
const debt = Math.max(0, -debtAt);
const minimum = minimumPayment(debt, rate);
return {
period: p,
dueDate: dueDate(p.end, card.dueRule),
debtMinor: debt,
minimumMinor: minimum,
paidMinor: paidFlows.inflow,
spentMinor: spentFlows.outflow,
remainingMinor: Math.max(0, debt - paidFlows.inflow),
minimumRemainingMinor: Math.max(0, minimum - paidFlows.inflow),
};
}),
);
const now = new Date();
await CardStatementModel.bulkWrite(
history.map((h) => ({
updateOne: {
filter: { accountId: account._id, periodEnd: h.period.end },
update: {
$set: {
householdId: hh,
kind: "credit_card",
periodStart: h.period.start,
dueDate: h.dueDate,
statementDebtMinor: h.debtMinor,
minimumPaymentMinor: h.minimumMinor,
paidMinor: h.paidMinor,
spentMinor: h.spentMinor,
computedAt: now,
},
},
upsert: true,
},
})),
);
const currentFlows = await flows(
hh,
account._id,
dayStart(current.start),
endExclusive(current.end),
);
// Planlı taksitler (dönemlerine göre) ve diğer planlı harcamalar.
const planned = (await TransactionModel.find({
householdId: hh,
accountId: account._id,
status: "planned",
deletedAt: null,
})
.sort({ date: 1 })
.lean()) as unknown as LeanTx[];
const byPeriod = new Map<string, { totalMinor: number; count: number }>();
let pendingInstallmentsMinor = 0;
const horizon = nextPeriod(current, S).end;
const other: LeanTx[] = [];
for (const tx of planned) {
if (tx.installment?.planId) {
const end = closingOnOrAfter(toIstanbulYmd(tx.date), S);
const x = byPeriod.get(end) ?? { totalMinor: 0, count: 0 };
x.totalMinor += tx.amountMinor;
x.count++;
byPeriod.set(end, x);
pendingInstallmentsMinor += tx.amountMinor;
} else if (toIstanbulYmd(tx.date) <= horizon && tx.type !== "income") {
other.push(tx);
}
}
const names = await userNames(other.map((t) => t.createdBy as Types.ObjectId));
const statementSummary = history[0]!;
const payer = card.paymentAccountId ? ctx.accountMap.get(String(card.paymentAccountId)) : null;
return {
limitMinor: card.limitMinor,
debtMinor,
availableMinor: card.limitMinor - debtMinor - pendingInstallmentsMinor,
pendingInstallmentsMinor,
minimumRateBp: rate,
current: { ...current, spentMinor: currentFlows.outflow },
statement: statementSummary,
daysToDue: Math.round(
(dayStart(statementSummary.dueDate).getTime() - dayStart(today).getTime()) / DAY_MS,
),
history,
upcomingInstallments: [...byPeriod.entries()]
.sort(([a], [b]) => a.localeCompare(b))
.slice(0, 12)
.map(([periodEnd, x]) => ({ periodEnd, dueDate: dueDate(periodEnd, card.dueRule), ...x })),
planned: other.slice(0, 10).map((tx) => toItem(ctx, tx, names)),
paymentAccount:
payer && !payer.hidden && !payer.archived ? { id: String(payer.id), name: payer.name } : null,
};
}
// --- KMH (esnek hesap) ---
export type OverdraftSummary = {
limitMinor: number;
balanceMinor: number;
usedMinor: number;
availableMinor: number;
monthlyRateBp: number;
current: Period & { interestSoFarMinor: number };
statement: Period & { interestMinor: number; averageUsedMinor: number };
/** Faiz kaydı önerisi için "Banka › Faiz" kategorisi (varsa). */
interestCategoryId: string | null;
/** Kesimden sonra bu hesapta faiz kategorisinde gider girilmiş mi? */
interestBooked: boolean;
};
async function dailyDeltas(
householdId: Types.ObjectId,
accountId: Types.ObjectId,
period: Period,
): Promise<Map<string, number>> {
const rows = await TransactionModel.aggregate<{ _id: string; delta: number }>([
{
$match: {
...accountMatch(householdId, accountId),
date: { $gte: dayStart(period.start), $lt: endExclusive(period.end) },
},
},
{
$group: {
_id: { $dateToString: { format: "%Y-%m-%d", date: "$date", timezone: "Europe/Istanbul" } },
delta: {
$sum: {
$cond: [
{ $eq: ["$type", "transfer"] },
{
$cond: [
{ $eq: ["$accountId", accountId] },
{ $multiply: ["$amountMinor", -1] },
"$amountMinor",
],
},
{
$cond: [
{ $eq: ["$type", "income"] },
"$amountMinor",
{ $multiply: ["$amountMinor", -1] },
],
},
],
},
},
},
},
]);
return new Map(rows.map((r) => [r._id, r.delta]));
}
export async function getOverdraftSummary(
userId: string,
householdId: string,
accountId: string,
today = todayIstanbul(),
): Promise<OverdraftSummary | null> {
const loaded = await loadAccount(userId, householdId, accountId);
const od = loaded?.account.overdraft;
if (!loaded || loaded.account.type !== "bank" || !od?.enabled) return null;
const { ctx, account } = loaded;
const hh = ctx.m.householdId;
const S = od.statementDay ?? 1;
const rate = od.monthlyRateBp ?? 0;
const { current, statement } = cardPeriods(today, S);
const [balanceMinor, stStart, curStart, stDeltas, curDeltas, faiz] = await Promise.all([
balanceBefore(hh, account, null),
balanceBefore(hh, account, dayStart(statement.start)),
balanceBefore(hh, account, dayStart(current.start)),
dailyDeltas(hh, account._id, statement),
dailyDeltas(hh, account._id, current),
CategoryModel.findOne({ householdId: hh, defaultKey: "banka.faiz", archivedAt: null })
.select({ _id: 1 })
.lean(),
]);
const st = estimateOverdraftInterest(statement, stStart, stDeltas, rate);
const cur = estimateOverdraftInterest(current, curStart, curDeltas, rate, today);
const interestBooked = faiz
? Boolean(
await TransactionModel.exists({
householdId: hh,
accountId: account._id,
type: "expense",
effectiveCategoryIds: faiz._id,
deletedAt: null,
status: { $ne: "void" },
date: { $gte: dayStart(statement.end), $lt: endExclusive(addDays(today, 0)) },
}),
)
: false;
await CardStatementModel.updateOne(
{ accountId: account._id, periodEnd: statement.end },
{
$set: {
householdId: hh,
kind: "overdraft",
periodStart: statement.start,
statementDebtMinor: Math.max(
0,
-(await balanceBefore(hh, account, endExclusive(statement.end))),
),
interestMinor: st.interestMinor,
computedAt: new Date(),
},
},
{ upsert: true },
);
return {
limitMinor: od.limitMinor,
balanceMinor,
usedMinor: Math.max(0, -balanceMinor),
// Kullanılabilir KMH: limit − kullanılan (pozitif bakiye KMH'yi artırmaz).
availableMinor: Math.max(0, od.limitMinor - Math.max(0, -balanceMinor)),
monthlyRateBp: rate,
current: { ...current, interestSoFarMinor: cur.interestMinor },
statement: {
...statement,
interestMinor: st.interestMinor,
averageUsedMinor: st.averageUsedMinor,
},
interestCategoryId: faiz ? String(faiz._id) : null,
interestBooked,
};
}
@@ -0,0 +1,314 @@
"use client";
import { ChevronDown, CreditCard, Landmark, Percent, Wallet } from "lucide-react";
import { useState } from "react";
import { useQuickAdd } from "@/components/layout/quick-add";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils";
import { formatDate, formatMoney } from "@/shared/format";
import { formatMoneyInput } from "@/shared/money";
import type { CardSummary, OverdraftSummary } from "../card";
import { Amount, rowTitle } from "./transaction-parts";
const c = tr.card;
const o = tr.overdraft;
const d = (ymd: string) => formatDate(`${ymd}T12:00:00+03:00`);
const pct = (bp: number) => formatMoneyInput(bp).replace(/,00$/, "");
function Stat({
label,
value,
tone,
sub,
}: {
label: string;
value: string;
tone?: string;
sub?: React.ReactNode;
}) {
return (
<div className="min-w-0">
<p className="text-xs text-muted-foreground">{label}</p>
<p className={cn("text-base font-semibold tabular-nums", tone)}>{value}</p>
{sub ? <p className="text-xs text-muted-foreground">{sub}</p> : null}
</div>
);
}
/** Limit kullanım çubuğu: borç + gelecek taksitler / limit. */
function UsageBar({ used, pending, limit }: { used: number; pending: number; limit: number }) {
if (limit <= 0) return null;
const u = Math.min(100, (used / limit) * 100);
const p = Math.min(100 - u, (pending / limit) * 100);
return (
<div
className="flex h-2 w-full overflow-hidden rounded-full bg-muted"
role="img"
aria-label={`${Math.round(u + p)}%`}
>
<div className="bg-expense" style={{ width: `${u}%` }} />
<div className="bg-expense/40" style={{ width: `${p}%` }} />
</div>
);
}
export function CardSummaryPanel({
summary: s,
accountId,
canWrite,
}: {
summary: CardSummary;
accountId: string;
canWrite: boolean;
}) {
const { openTransactionForm } = useQuickAdd();
const [historyOpen, setHistoryOpen] = useState(false);
const st = s.statement;
function pay() {
openTransactionForm({
kind: "create",
type: "transfer",
prefill: {
accountId: s.paymentAccount?.id,
toAccountId: accountId,
amountMinor: st.remainingMinor || undefined,
description: c.payDescription,
},
});
}
return (
<Card>
<CardHeader>
<CardTitle className="flex items-center gap-2 text-base">
<CreditCard className="size-4" aria-hidden />
{c.title}
</CardTitle>
</CardHeader>
<CardContent className="flex flex-col gap-5">
<div className="flex flex-col gap-2">
<div className="grid grid-cols-2 gap-3">
<Stat label={c.debt} value={formatMoney(s.debtMinor)} tone="text-expense" />
<Stat
label={c.available}
value={formatMoney(s.availableMinor)}
sub={c.limitOf(formatMoney(s.limitMinor))}
/>
</div>
<UsageBar used={s.debtMinor} pending={s.pendingInstallmentsMinor} limit={s.limitMinor} />
{s.pendingInstallmentsMinor ? (
<p className="text-xs text-muted-foreground">
{c.pendingInstallments(formatMoney(s.pendingInstallmentsMinor))}
</p>
) : null}
</div>
<section className="flex flex-col gap-3 rounded-xl border p-3">
<div className="flex flex-wrap items-baseline justify-between gap-2">
<h3 className="text-sm font-medium">{c.statementPeriod}</h3>
<span className="text-xs text-muted-foreground">
{c.periodRange(d(st.period.start), d(st.period.end))}
</span>
</div>
<div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
<Stat label={c.statementDebt} value={formatMoney(st.debtMinor)} />
<Stat label={c.minimum(pct(s.minimumRateBp))} value={formatMoney(st.minimumMinor)} />
<Stat label={c.paid} value={formatMoney(st.paidMinor)} tone="text-income" />
<Stat
label={c.remaining}
value={formatMoney(st.remainingMinor)}
tone={st.remainingMinor ? "text-expense" : "text-income"}
/>
</div>
<div className="flex flex-wrap items-center justify-between gap-2">
<p className="text-sm">
{c.dueDate}: <span className="font-medium">{d(st.dueDate)}</span>{" "}
<span
className={cn(
"text-xs",
st.remainingMinor && s.daysToDue < 0 ? "text-expense" : "text-muted-foreground",
)}
>
{st.remainingMinor ? `· ${c.daysLeft(s.daysToDue)}` : `· ${c.paidInFull}`}
</span>
</p>
{canWrite ? (
<Button size="sm" onClick={pay}>
<Wallet />
{c.pay}
</Button>
) : null}
</div>
</section>
<section className="flex flex-wrap items-baseline justify-between gap-2">
<div>
<h3 className="text-sm font-medium">{c.currentPeriod}</h3>
<p className="text-xs text-muted-foreground">
{c.periodRange(d(s.current.start), d(s.current.end))}
</p>
</div>
<Stat label={c.spent} value={formatMoney(s.current.spentMinor)} tone="text-expense" />
</section>
<section className="flex flex-col gap-2">
<h3 className="text-sm font-medium">{c.upcomingInstallments}</h3>
{s.upcomingInstallments.length ? (
<ul className="divide-y rounded-xl border text-sm">
{s.upcomingInstallments.map((x) => (
<li key={x.periodEnd} className="flex items-center justify-between gap-3 p-2.5">
<span className="text-muted-foreground">
{c.installmentPeriod(d(x.periodEnd), d(x.dueDate), x.count)}
</span>
<span className="font-medium tabular-nums">{formatMoney(x.totalMinor)}</span>
</li>
))}
</ul>
) : (
<p className="text-sm text-muted-foreground">{c.noInstallments}</p>
)}
</section>
{s.planned.length ? (
<section className="flex flex-col gap-2">
<h3 className="text-sm font-medium">{c.planned}</h3>
<ul className="divide-y rounded-xl border text-sm">
{s.planned.map((p) => (
<li key={p.id} className="flex items-center justify-between gap-3 p-2.5">
<span className="min-w-0 truncate">
{d(p.date)} · {rowTitle(p)}
</span>
<Amount type={p.type} amountMinor={p.amountMinor} className="font-medium" />
</li>
))}
</ul>
</section>
) : null}
<Collapsible open={historyOpen} onOpenChange={setHistoryOpen}>
<CollapsibleTrigger asChild>
<Button variant="ghost" size="sm" className="-ml-2 w-fit">
<ChevronDown className={cn("transition-transform", historyOpen && "rotate-180")} />
{c.history}
</Button>
</CollapsibleTrigger>
<CollapsibleContent className="pt-2">
<div className="overflow-x-auto rounded-xl border">
<table className="w-full text-sm">
<thead className="text-xs text-muted-foreground">
<tr className="border-b">
<th className="p-2 text-left font-normal">{c.historyHeaders.period}</th>
<th className="p-2 text-right font-normal">{c.historyHeaders.debt}</th>
<th className="p-2 text-right font-normal">{c.historyHeaders.minimum}</th>
<th className="p-2 text-right font-normal">{c.historyHeaders.paid}</th>
<th className="p-2 text-right font-normal">{c.historyHeaders.due}</th>
</tr>
</thead>
<tbody className="divide-y tabular-nums">
{s.history.map((h) => (
<tr key={h.period.end}>
<td className="p-2 whitespace-nowrap">
{c.periodRange(d(h.period.start), d(h.period.end))}
</td>
<td className="p-2 text-right">{formatMoney(h.debtMinor)}</td>
<td className="p-2 text-right">{formatMoney(h.minimumMinor)}</td>
<td className="p-2 text-right">{formatMoney(h.paidMinor)}</td>
<td className="p-2 text-right whitespace-nowrap">{d(h.dueDate)}</td>
</tr>
))}
</tbody>
</table>
</div>
</CollapsibleContent>
</Collapsible>
</CardContent>
</Card>
);
}
export function OverdraftPanel({
summary: s,
accountId,
canWrite,
}: {
summary: OverdraftSummary;
accountId: string;
canWrite: boolean;
}) {
const { openTransactionForm } = useQuickAdd();
const range = c.periodRange(d(s.statement.start), d(s.statement.end));
function bookInterest() {
openTransactionForm({
kind: "create",
type: "expense",
prefill: {
accountId,
amountMinor: s.statement.interestMinor || undefined,
categoryId: s.interestCategoryId ?? undefined,
date: s.statement.end,
description: o.interestDescription(range),
},
});
}
return (
<Card>
<CardHeader>
<CardTitle className="flex items-center gap-2 text-base">
<Landmark className="size-4" aria-hidden />
{o.title}
</CardTitle>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="grid grid-cols-3 gap-3">
<Stat
label={o.limit}
value={formatMoney(s.limitMinor)}
sub={o.rate(pct(s.monthlyRateBp))}
/>
<Stat
label={o.used}
value={formatMoney(s.usedMinor)}
tone={s.usedMinor ? "text-expense" : undefined}
/>
<Stat label={o.available} value={formatMoney(Math.max(0, s.availableMinor))} />
</div>
<UsageBar used={s.usedMinor} pending={0} limit={s.limitMinor} />
<section className="flex flex-col gap-2 rounded-xl border p-3">
<div className="flex flex-wrap items-baseline justify-between gap-2">
<h3 className="text-sm font-medium">{o.lastPeriod}</h3>
<span className="text-xs text-muted-foreground">{range}</span>
</div>
<div className="flex flex-wrap items-end justify-between gap-3">
<Stat
label={o.estimatedInterest}
value={formatMoney(s.statement.interestMinor)}
tone={s.statement.interestMinor ? "text-expense" : undefined}
sub={o.averageUsed(formatMoney(s.statement.averageUsedMinor))}
/>
{s.interestBooked ? (
<p className="text-xs text-muted-foreground">{o.booked}</p>
) : canWrite && s.statement.interestMinor > 0 ? (
<Button size="sm" variant="outline" onClick={bookInterest}>
<Percent />
{o.bookInterest}
</Button>
) : null}
</div>
<p className="text-xs text-muted-foreground">{o.taxNote}</p>
</section>
<p className="text-sm">
{o.currentSoFar}:{" "}
<span className="font-medium tabular-nums">
{formatMoney(s.current.interestSoFarMinor)}
</span>
</p>
</CardContent>
</Card>
);
}
@@ -27,6 +27,8 @@ import { todayIstanbul } from "@/shared/dates";
import { formatDate, formatMoney } from "@/shared/format"; import { formatDate, formatMoney } from "@/shared/format";
import { previewReconciliationAction, reconcileAccountAction } from "../actions"; import { previewReconciliationAction, reconcileAccountAction } from "../actions";
import type { AccountStatement, ReconcilePreview, StatementRow } from "../statement"; import type { AccountStatement, ReconcilePreview, StatementRow } from "../statement";
import type { CardSummary, OverdraftSummary } from "../card";
import { CardSummaryPanel, OverdraftPanel } from "./card-summary";
import { RowIcon, rowSubtitle, rowTitle, useTransactionDetail } from "./transaction-parts"; import { RowIcon, rowSubtitle, rowTitle, useTransactionDetail } from "./transaction-parts";
const t = tr.statement; const t = tr.statement;
@@ -57,9 +59,13 @@ function SignedMoney({ minor, className }: { minor: number; className?: string }
export function StatementView({ export function StatementView({
statement: s, statement: s,
card,
overdraft,
canWrite, canWrite,
}: { }: {
statement: AccountStatement; statement: AccountStatement;
card?: CardSummary | null;
overdraft?: OverdraftSummary | null;
canWrite: boolean; canWrite: boolean;
}) { }) {
const { openDetail, element: detailElement } = useTransactionDetail(canWrite); const { openDetail, element: detailElement } = useTransactionDetail(canWrite);
@@ -95,6 +101,13 @@ export function StatementView({
} }
/> />
{card ? (
<CardSummaryPanel summary={card} accountId={s.account.id} canWrite={canWrite} />
) : null}
{overdraft ? (
<OverdraftPanel summary={overdraft} accountId={s.account.id} canWrite={canWrite} />
) : null}
<div className="flex items-center justify-between gap-2"> <div className="flex items-center justify-between gap-2">
<Button variant="outline" size="icon-sm" asChild aria-label={t.prevMonth}> <Button variant="outline" size="icon-sm" asChild aria-label={t.prevMonth}>
<Link href={`${base}?ay=${s.prevMonth}`}> <Link href={`${base}?ay=${s.prevMonth}`}>
@@ -42,9 +42,22 @@ import type { PayeeSuggestion, TransactionDetail, TransactionFormOptions } from
const t = tr.transactions; const t = tr.transactions;
const f = t.fields; const f = t.fields;
const INSTALLMENT_OPTIONS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 15, 18, 24, 36];
export type TransactionFormMode = export type TransactionFormMode =
| { kind: "create"; type: TransactionType } | {
kind: "create";
type: TransactionType;
/** Ön doldurma (ör. kart borcu ödemesi, KMH faiz kaydı). */
prefill?: {
accountId?: string;
toAccountId?: string;
amountMinor?: number;
categoryId?: string;
date?: string;
description?: string;
};
}
| { kind: "edit"; transaction: TransactionDetail } | { kind: "edit"; transaction: TransactionDetail }
| { kind: "copy"; transaction: TransactionDetail }; | { kind: "copy"; transaction: TransactionDetail };
@@ -62,22 +75,26 @@ type FormValues = {
tags: string; tags: string;
/** Önizleme bilgisiyle ekler; sunucuya yalnızca kimlikleri gider. */ /** Önizleme bilgisiyle ekler; sunucuya yalnızca kimlikleri gider. */
attachments: AttachmentInfo[]; attachments: AttachmentInfo[];
/** Taksit sayısı (yalnızca yeni kredi kartı gideri). */
installments: string;
}; };
function toValues(mode: TransactionFormMode, options: TransactionFormOptions | null): FormValues { function toValues(mode: TransactionFormMode, options: TransactionFormOptions | null): FormValues {
if (mode.kind === "create") { if (mode.kind === "create") {
const p = mode.prefill ?? {};
return { return {
type: mode.type, type: mode.type,
amount: "", amount: p.amountMinor ? formatMoneyInput(p.amountMinor) : "",
date: todayIstanbul(), date: p.date ?? todayIstanbul(),
accountId: options?.accounts[0]?.id ?? "", accountId: p.accountId ?? options?.accounts[0]?.id ?? "",
toAccountId: "", toAccountId: p.toAccountId ?? "",
categoryId: "", categoryId: p.categoryId ?? "",
splits: [], splits: [],
payee: "", payee: "",
description: "", description: p.description ?? "",
tags: "", tags: "",
attachments: [], attachments: [],
installments: "1",
}; };
} }
const x = mode.transaction; const x = mode.transaction;
@@ -98,10 +115,11 @@ function toValues(mode: TransactionFormMode, options: TransactionFormOptions | n
tags: x.tags.join(", "), tags: x.tags.join(", "),
// Kopyada ekler taşınmaz (fiş o işleme aittir). // Kopyada ekler taşınmaz (fiş o işleme aittir).
attachments: mode.kind === "edit" ? x.attachments : [], attachments: mode.kind === "edit" ? x.attachments : [],
installments: "1",
}; };
} }
function AccountSelect({ export function AccountSelect({
id, id,
value, value,
onChange, onChange,
@@ -148,7 +166,7 @@ function AccountSelect({
); );
} }
function CategorySelect({ export function CategorySelect({
id, id,
value, value,
onChange, onChange,
@@ -199,7 +217,7 @@ function CategorySelect({
} }
/** Satıcı alanı: yazdıkça öneri; seçilince son kullanılan kategori/hesap önerilir. */ /** Satıcı alanı: yazdıkça öneri; seçilince son kullanılan kategori/hesap önerilir. */
function PayeeInput({ export function PayeeInput({
value, value,
onChange, onChange,
onPick, onPick,
@@ -374,6 +392,13 @@ export function TransactionFormDialog({
}, [options, type, mode]); }, [options, type, mode]);
const totalMinor = parseMoney(amount ?? "") ?? 0; const totalMinor = parseMoney(amount ?? "") ?? 0;
const selectedAccountType = options?.accounts.find((a) => a.id === accountId)?.type;
// Taksit: yeni (veya kopya) kredi kartı gideri, bölünmemiş.
const showInstallments =
mode?.kind !== "edit" &&
type === "expense" &&
selectedAccountType === "credit_card" &&
!splitMode;
const splitSum = (splitValues ?? []).reduce((a, s) => a + (parseMoney(s.amount ?? "") ?? 0), 0); const splitSum = (splitValues ?? []).reduce((a, s) => a + (parseMoney(s.amount ?? "") ?? 0), 0);
const remaining = totalMinor - splitSum; const remaining = totalMinor - splitSum;
@@ -448,6 +473,7 @@ export function TransactionFormDialog({
const { attachments, ...values } = form.getValues(); const { attachments, ...values } = form.getValues();
const payload = { const payload = {
...values, ...values,
installments: showInstallments ? values.installments : "1",
attachmentIds: attachments.map((a) => a.id), attachmentIds: attachments.map((a) => a.id),
toAccountId: values.type === "transfer" ? values.toAccountId : "", toAccountId: values.type === "transfer" ? values.toAccountId : "",
categoryId: values.type === "transfer" || values.splits.length ? "" : values.categoryId, categoryId: values.type === "transfer" || values.splits.length ? "" : values.categoryId,
@@ -595,6 +621,42 @@ export function TransactionFormDialog({
</Field> </Field>
)} )}
/> />
{showInstallments ? (
<Controller
name="installments"
control={form.control}
render={({ field, fieldState }) => (
<Field data-invalid={fieldState.invalid}>
<FieldLabel htmlFor="tx-installments">{f.installments}</FieldLabel>
<Select value={field.value} onValueChange={field.onChange}>
<SelectTrigger id="tx-installments" className="w-full">
<SelectValue>
{field.value === "1"
? f.singlePayment
: f.installmentCount(Number(field.value))}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-72">
{INSTALLMENT_OPTIONS.map((n) => (
<SelectItem key={n} value={String(n)}>
{n === 1 ? f.singlePayment : f.installmentCount(n)}
</SelectItem>
))}
</SelectContent>
</Select>
{Number(field.value) > 1 && totalMinor > 0 ? (
<FieldDescription>
{f.installmentHint(
Number(field.value),
formatMoney(Math.ceil(totalMinor / Number(field.value))),
)}
</FieldDescription>
) : null}
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
</Field>
)}
/>
) : null}
{type === "transfer" ? ( {type === "transfer" ? (
<Controller <Controller
name="toAccountId" name="toAccountId"
@@ -23,7 +23,11 @@ import { tr } from "@/i18n/tr";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { formatDate, formatDateTime, formatMoney } from "@/shared/format"; import { formatDate, formatDateTime, formatMoney } from "@/shared/format";
import type { TransactionType } from "@/shared/transactions"; import type { TransactionType } from "@/shared/transactions";
import { getTransactionAction, setTransactionDeletedAction } from "../actions"; import {
cancelRemainingInstallmentsAction,
getTransactionAction,
setTransactionDeletedAction,
} from "../actions";
import type { TransactionDetail, TransactionListItem } from "../service"; import type { TransactionDetail, TransactionListItem } from "../service";
/** İşlem listesi, ayrıntı ve hesap ekstresinin paylaştığı parçalar. */ /** İşlem listesi, ayrıntı ve hesap ekstresinin paylaştığı parçalar. */
@@ -101,6 +105,12 @@ export function RowIcon({ item }: { item: TransactionListItem }) {
} }
export function rowTitle(item: TransactionListItem) { export function rowTitle(item: TransactionListItem) {
const base = baseTitle(item);
// Taksit: "Hepsiburada 4/9"
return item.installment ? `${base} ${item.installment.index}/${item.installment.count}` : base;
}
function baseTitle(item: TransactionListItem) {
if (item.isAdjustment) return t.adjustment; if (item.isAdjustment) return t.adjustment;
if (item.payeeName) return item.payeeName; if (item.payeeName) return item.payeeName;
if (item.description) return item.description; if (item.description) return item.description;
@@ -127,6 +137,7 @@ function DetailDialog({
onEdit, onEdit,
onCopy, onCopy,
onDelete, onDelete,
onCancelInstallments,
}: { }: {
detail: TransactionDetail | null; detail: TransactionDetail | null;
loading: boolean; loading: boolean;
@@ -135,6 +146,7 @@ function DetailDialog({
onEdit: (d: TransactionDetail) => void; onEdit: (d: TransactionDetail) => void;
onCopy: (d: TransactionDetail) => void; onCopy: (d: TransactionDetail) => void;
onDelete: (d: TransactionDetail) => void; onDelete: (d: TransactionDetail) => void;
onCancelInstallments: (d: TransactionDetail) => void;
}) { }) {
const d = t.detail; const d = t.detail;
const row = (label: string, value: React.ReactNode) => ( const row = (label: string, value: React.ReactNode) => (
@@ -219,6 +231,27 @@ function DetailDialog({
</span>, </span>,
) )
: null} : null}
{detail.installment
? row(
t.fields.installments,
<span className="flex flex-col items-end gap-1">
<span>
{detail.installment.index}/{detail.installment.count}
</span>
{canWrite &&
(detail.status === "planned" ||
detail.installment.index < detail.installment.count) ? (
<Button
size="sm"
variant="outline"
onClick={() => onCancelInstallments(detail)}
>
{t.cancelInstallments}
</Button>
) : null}
</span>,
)
: null}
{detail.reconciledAccountIds.length {detail.reconciledAccountIds.length
? row( ? row(
tr.statement.reconcile.title, tr.statement.reconcile.title,
@@ -323,6 +356,14 @@ export function useTransactionDetail(canWrite: boolean) {
openTransactionForm({ kind: "copy", transaction: d }); openTransactionForm({ kind: "copy", transaction: d });
}} }}
onDelete={setDeleting} onDelete={setDeleting}
onCancelInstallments={(d) => {
close();
startTransition(async () => {
const r = await cancelRemainingInstallmentsAction(d.id);
if (r.ok) toast.success(t.toast.installmentsCancelled(r.data.cancelled));
else toast.error(r.error);
});
}}
/> />
<AlertDialog open={Boolean(deleting)} onOpenChange={(o) => !o && setDeleting(null)}> <AlertDialog open={Boolean(deleting)} onOpenChange={(o) => !o && setDeleting(null)}>
<AlertDialogContent> <AlertDialogContent>
@@ -52,6 +52,7 @@ function form(over: Partial<TransactionForm>): TransactionForm {
description: "", description: "",
tags: [], tags: [],
attachmentIds: [], attachmentIds: [],
installments: 1,
...over, ...over,
}; };
} }
@@ -84,6 +85,7 @@ describe("bakiye tutarlılığı", () => {
cardDueKind: "daysAfter" as const, cardDueKind: "daysAfter" as const,
cardDueValue: 10, cardDueValue: 10,
cardPaymentAccountId: null, cardPaymentAccountId: null,
cardMinimumRate: null,
}; };
const b = await createAccount(ids.user("ayse"), cakir, { const b = await createAccount(ids.user("ayse"), cakir, {
...base, ...base,
+107 -22
View File
@@ -19,7 +19,8 @@ import { TransactionModel } from "@/models/transaction";
import type { AccountType } from "@/shared/accounts"; import type { AccountType } from "@/shared/accounts";
import { allowedAttachmentKinds } from "@/shared/attachments"; import { allowedAttachmentKinds } from "@/shared/attachments";
import type { IconKey, Swatch } from "@/shared/appearance"; import type { IconKey, Swatch } from "@/shared/appearance";
import { istanbulDayStart, toIstanbulYmd } from "@/shared/dates"; import { installmentSchedule } from "@/shared/card-periods";
import { istanbulDayStart, todayIstanbul, toIstanbulYmd } from "@/shared/dates";
import type { CategoryKind } from "@/shared/schemas/category"; import type { CategoryKind } from "@/shared/schemas/category";
import type { TransactionFilters, TransactionForm } from "@/shared/schemas/transaction"; import type { TransactionFilters, TransactionForm } from "@/shared/schemas/transaction";
import { compareTr, foldTr } from "@/shared/search"; import { compareTr, foldTr } from "@/shared/search";
@@ -66,6 +67,7 @@ export async function loadContext(
) { ) {
const m = await resolveMembership(userId, householdId, minRole); const m = await resolveMembership(userId, householdId, minRole);
if (!m) return null; if (!m) return null;
await postDueInstallments(m.householdId);
const [accounts, categories] = await Promise.all([ const [accounts, categories] = await Promise.all([
AccountModel.find({ householdId: m.householdId }) AccountModel.find({ householdId: m.householdId })
.select({ name: 1, type: 1, archivedAt: 1, isPrivate: 1, ownerUserId: 1, icon: 1, color: 1 }) .select({ name: 1, type: 1, archivedAt: 1, isPrivate: 1, ownerUserId: 1, icon: 1, color: 1 })
@@ -130,7 +132,7 @@ export async function loadContext(
export type Ctx = NonNullable<Awaited<ReturnType<typeof loadContext>>>; export type Ctx = NonNullable<Awaited<ReturnType<typeof loadContext>>>;
/** Gizli hesaplara dokunan işlemleri dışlayan temel filtre. */ /** Gizli hesaplara dokunan işlemleri dışlayan temel filtre. */
function baseFilter(ctx: Ctx): Record<string, unknown> { export function baseFilter(ctx: Ctx): Record<string, unknown> {
const f: Record<string, unknown> = { householdId: ctx.m.householdId, deletedAt: null }; const f: Record<string, unknown> = { householdId: ctx.m.householdId, deletedAt: null };
if (ctx.hiddenAccountIds.length) { if (ctx.hiddenAccountIds.length) {
f.accountId = { $nin: ctx.hiddenAccountIds }; f.accountId = { $nin: ctx.hiddenAccountIds };
@@ -145,9 +147,28 @@ function baseFilter(ctx: Ctx): Record<string, unknown> {
* Hesap bazında işlem etkileri toplamı (kuruş): yalnızca posted ve silinmemiş işlemler. * Hesap bazında işlem etkileri toplamı (kuruş): yalnızca posted ve silinmemiş işlemler.
* transactionEffects ile aynı kural: gelir +, gider −, transfer kaynak − / hedef +. * transactionEffects ile aynı kural: gelir +, gider −, transfer kaynak − / hedef +.
*/ */
/**
* Vadesi gelen taksitleri gerçekleştirir (planlı → posted). Okuma yollarında çağrılır; zamanlanmış
* görev gerekmez. Taksitler onay beklemez (Faz 7 kararı: kendi döneminde otomatik).
*/
export async function postDueInstallments(householdId: Types.ObjectId, today = todayIstanbul()) {
const tomorrow = istanbulDayStart(today)!.getTime() + DAY_MS;
await TransactionModel.updateMany(
{
householdId,
status: "planned",
deletedAt: null,
"installment.planId": { $type: "objectId" },
date: { $lt: new Date(tomorrow) },
},
{ $set: { status: "posted" } },
);
}
export async function computeAccountDeltas( export async function computeAccountDeltas(
householdId: Types.ObjectId, householdId: Types.ObjectId,
): Promise<Map<string, number>> { ): Promise<Map<string, number>> {
await postDueInstallments(householdId);
const pipeline: PipelineStage[] = [ const pipeline: PipelineStage[] = [
{ $match: { householdId, status: "posted", deletedAt: null } }, { $match: { householdId, status: "posted", deletedAt: null } },
{ {
@@ -206,7 +227,7 @@ type Existing = {
splits?: { categoryId: Types.ObjectId }[]; splits?: { categoryId: Types.ObjectId }[];
}; };
function buildDoc( export function buildDoc(
ctx: Ctx, ctx: Ctx,
input: TransactionForm, input: TransactionForm,
existing?: Existing, existing?: Existing,
@@ -280,7 +301,7 @@ function buildDoc(
} }
/** Satıcı kuralını günceller (son kategori ve hesap) ve kimliğini döner. */ /** Satıcı kuralını günceller (son kategori ve hesap) ve kimliğini döner. */
async function touchPayee( export async function touchPayee(
householdId: Types.ObjectId, householdId: Types.ObjectId,
name: string, name: string,
type: TransactionType, type: TransactionType,
@@ -318,6 +339,11 @@ export async function createTransaction(
const built = buildDoc(ctx, input); const built = buildDoc(ctx, input);
if (!built.ok) return built; if (!built.ok) return built;
const d = built.data as { accountId: Types.ObjectId; categoryId: Types.ObjectId | null }; const d = built.data as { accountId: Types.ObjectId; categoryId: Types.ObjectId | null };
if (input.installments > 1 && ctx.accountMap.get(String(d.accountId))?.type !== "credit_card") {
return fail(t.validation.installmentsCardOnly, {
installments: t.validation.installmentsCardOnly,
});
}
// Bölünmüş işlemde tek bir kategori önerilemez; satıcı kuralı yalnızca hesabı hatırlar. // Bölünmüş işlemde tek bir kategori önerilemez; satıcı kuralı yalnızca hesabı hatırlar.
const payeeId = await touchPayee( const payeeId = await touchPayee(
ctx.m.householdId, ctx.m.householdId,
@@ -330,21 +356,33 @@ export async function createTransaction(
try { try {
let id = ""; let id = "";
await mongoose.connection.transaction(async (session) => { await mongoose.connection.transaction(async (session) => {
const [doc] = await TransactionModel.create( const base = {
[ ...built.data,
{ householdId: ctx.m.householdId,
...built.data, status: "posted",
householdId: ctx.m.householdId, payeeId,
status: "posted", createdBy: actor,
payeeId, updatedBy: actor,
createdBy: actor, };
updatedBy: actor, // Taksitli: her taksit ayrı işlem; vadesi gelmeyenler planlı (kendi döneminde gerçekleşir).
}, const today = todayIstanbul();
], const planId = new Types.ObjectId();
{ session }, const docs =
); input.installments > 1
id = String(doc!._id); ? installmentSchedule(input.date, input.amount, input.installments).map((x) => ({
await attach(ctx, actorId, doc!._id, input, session); ...base,
amountMinor: x.amountMinor,
date: istanbulDayStart(x.date)!,
status: x.date <= today ? "posted" : "planned",
installment: { planId, index: x.index + 1, count: input.installments },
}))
: [base];
const created = await TransactionModel.insertMany(docs as Record<string, unknown>[], {
session,
});
const first = created[0]!;
id = String(first._id);
await attach(ctx, actorId, first._id, input, session);
}); });
return ok({ id }); return ok({ id });
} catch (error) { } catch (error) {
@@ -384,7 +422,7 @@ async function attach(
); );
} }
async function loadOwnTransaction( export async function loadOwnTransaction(
ctx: Ctx, ctx: Ctx,
transactionId: string, transactionId: string,
{ includeDeleted = false } = {}, { includeDeleted = false } = {},
@@ -441,6 +479,8 @@ export async function updateTransaction(
payeeId, payeeId,
updatedBy: new Types.ObjectId(actorId), updatedBy: new Types.ObjectId(actorId),
...(balanceChanged ? { reconciledAccountIds: [] } : {}), ...(balanceChanged ? { reconciledAccountIds: [] } : {}),
// Serinin planlı tekrarı tek başına düzenlendi ("yalnızca bu").
...(current.recurringRuleId && current.status === "planned" ? { detached: true } : {}),
}, },
}, },
{ session }, { session },
@@ -484,6 +524,41 @@ export async function setTransactionDeleted(
return ok(undefined); return ok(undefined);
} }
/**
* Kalan (henüz gerçekleşmemiş) taksitleri iptal eder — ör. ürün iadesi veya erken kapama.
* Gerçekleşmiş taksitlere dokunulmaz.
*/
export async function cancelRemainingInstallments(
actorId: string,
householdId: string,
transactionId: string,
): Promise<ActionResult<{ cancelled: number }>> {
const ctx = await loadContext(actorId, householdId, "member");
if (!ctx) return fail(tr.common.unauthorized);
const tx = await loadOwnTransaction(ctx, transactionId);
const planId = tx?.installment?.planId;
if (!tx || !planId) return fail(tr.common.notFound);
const actor = new Types.ObjectId(actorId);
const res = await TransactionModel.updateMany(
{
householdId: ctx.m.householdId,
"installment.planId": planId,
status: "planned",
deletedAt: null,
},
{ $set: { deletedAt: new Date(), updatedBy: actor } },
);
await writeAudit({
action: "transaction.delete",
actorId: actor,
householdId: ctx.m.householdId,
targetType: "installmentPlan",
targetId: String(planId),
diff: { cancelled: res.modifiedCount, count: tx.installment?.count ?? null },
});
return ok({ cancelled: res.modifiedCount });
}
// --- Okuma --- // --- Okuma ---
export type TransactionListItem = { export type TransactionListItem = {
@@ -505,6 +580,8 @@ export type TransactionListItem = {
isAdjustment: boolean; isAdjustment: boolean;
/** Mutabakatı yapılmış hesaplar. */ /** Mutabakatı yapılmış hesaplar. */
reconciledAccountIds: string[]; reconciledAccountIds: string[];
/** Taksit: "4/9" */
installment: { planId: string; index: number; count: number } | null;
}; };
export type TransactionDetail = TransactionListItem & { export type TransactionDetail = TransactionListItem & {
@@ -565,6 +642,13 @@ export function toItem(ctx: Ctx, tx: LeanTx, names: Map<string, string>): Transa
attachmentCount: tx.attachmentCount ?? 0, attachmentCount: tx.attachmentCount ?? 0,
isAdjustment: Boolean(tx.isAdjustment), isAdjustment: Boolean(tx.isAdjustment),
reconciledAccountIds: (tx.reconciledAccountIds ?? []).map(String), reconciledAccountIds: (tx.reconciledAccountIds ?? []).map(String),
installment: tx.installment?.planId
? {
planId: String(tx.installment.planId),
index: tx.installment.index ?? 0,
count: tx.installment.count ?? 0,
}
: null,
}; };
} }
@@ -582,7 +666,8 @@ function filterQuery(ctx: Ctx, f: TransactionFilters): Record<string, unknown> {
}; };
} }
if (f.type) q.type = f.type; if (f.type) q.type = f.type;
if (f.durum) q.status = f.durum; // Planlı kayıtlar (12 ay ileriye kadar) yalnızca açıkça istenince listelenir (/planli sayfası).
q.status = f.durum ?? { $ne: "planned" };
if (f.hesap) { if (f.hesap) {
const id = toObjectId(f.hesap); const id = toObjectId(f.hesap);
// Gizli hesap filtresi sonuç vermez (baseFilter zaten dışlar). // Gizli hesap filtresi sonuç vermez (baseFilter zaten dışlar).
@@ -630,7 +715,7 @@ export async function listTransactions(
{ {
$match: { $match: {
...query, ...query,
status: query.status ?? "posted", status: filters.durum ?? "posted",
type: query.type ?? { $in: ["income", "expense"] }, type: query.type ?? { $in: ["income", "expense"] },
}, },
}, },
@@ -100,6 +100,7 @@ describe("hesap ekstresi", () => {
description: "", description: "",
tags: [], tags: [],
attachmentIds: [], attachmentIds: [],
installments: 1,
} satisfies TransactionForm); } satisfies TransactionForm);
expect(r.ok).toBe(true); expect(r.ok).toBe(true);
const s = (await getAccountStatement(emre, cakir, ziraat, currentMonth()))!; const s = (await getAccountStatement(emre, cakir, ziraat, currentMonth()))!;
@@ -172,6 +173,7 @@ describe("mutabakat", () => {
description: "", description: "",
tags: [], tags: [],
attachmentIds: [], attachmentIds: [],
installments: 1,
}); });
expect(edit.ok).toBe(false); expect(edit.ok).toBe(false);
expect((await setTransactionDeleted(ayse, cakir, adjustmentId, true)).ok).toBe(true); expect((await setTransactionDeleted(ayse, cakir, adjustmentId, true)).ok).toBe(true);
@@ -215,6 +217,7 @@ describe("mutabakat", () => {
description: "yeni açıklama", description: "yeni açıklama",
tags: d.tags, tags: d.tags,
attachmentIds: [], attachmentIds: [],
installments: 1,
}; };
expect((await updateTransaction(ayse, cakir, d.id, base)).ok).toBe(true); expect((await updateTransaction(ayse, cakir, d.id, base)).ok).toBe(true);
expect( expect(
+2 -2
View File
@@ -36,7 +36,7 @@ const DAY_MS = 24 * 60 * 60 * 1000;
const MAX_ROWS = 2000; const MAX_ROWS = 2000;
/** Hesap bazında bakiyeyi etkileyen işlemler (posted, silinmemiş). */ /** Hesap bazında bakiyeyi etkileyen işlemler (posted, silinmemiş). */
function accountMatch(householdId: Types.ObjectId, accountId: Types.ObjectId) { export function accountMatch(householdId: Types.ObjectId, accountId: Types.ObjectId) {
return { return {
householdId, householdId,
status: "posted" as const, status: "posted" as const,
@@ -46,7 +46,7 @@ function accountMatch(householdId: Types.ObjectId, accountId: Types.ObjectId) {
} }
/** Açılış bakiyesi + (isteğe bağlı tarihten önceki) işlem etkileri. */ /** Açılış bakiyesi + (isteğe bağlı tarihten önceki) işlem etkileri. */
async function balanceBefore( export async function balanceBefore(
householdId: Types.ObjectId, householdId: Types.ObjectId,
account: { _id: Types.ObjectId; openingBalanceMinor: number }, account: { _id: Types.ObjectId; openingBalanceMinor: number },
before: Date | null, before: Date | null,
+140
View File
@@ -199,6 +199,9 @@ export const tr = {
cardDueValueDay: "Ayın günü", cardDueValueDay: "Ayın günü",
cardPaymentAccount: "Ödeme hesabı", cardPaymentAccount: "Ödeme hesabı",
cardPaymentAccountNone: "— Seçilmedi —", cardPaymentAccountNone: "— Seçilmedi —",
cardMinimumRate: "Asgari ödeme oranı (%)",
cardMinimumRateHint:
"Boş bırakılırsa limit 50.000 TL'nin altındaysa %20, üstündeyse %40 kullanılır.",
}, },
summary: { summary: {
assets: "Varlıklar", assets: "Varlıklar",
@@ -266,6 +269,11 @@ export const tr = {
remainingOk: "Kalemler toplamı tutara eşit", remainingOk: "Kalemler toplamı tutara eşit",
fillRemaining: "Kalanı son kaleme ekle", fillRemaining: "Kalanı son kaleme ekle",
suggested: "Bu satıcı için son kullanılan kategori ve hesap önerildi.", suggested: "Bu satıcı için son kullanılan kategori ve hesap önerildi.",
installments: "Taksit",
singlePayment: "Peşin",
installmentCount: (n: number) => `${n} taksit`,
installmentHint: (n: number, each: string) =>
`${n} × yaklaşık ${each}; vadesi gelen taksit kendi döneminde otomatik gerçekleşir.`,
}, },
validation: { validation: {
amountPositive: "Tutar sıfırdan büyük olmalı", amountPositive: "Tutar sıfırdan büyük olmalı",
@@ -277,6 +285,9 @@ export const tr = {
splitSum: "Kalemlerin toplamı tutara eşit olmalı", splitSum: "Kalemlerin toplamı tutara eşit olmalı",
accountInvalid: "Hesap bu hanede yok, arşivli veya size kapalı.", accountInvalid: "Hesap bu hanede yok, arşivli veya size kapalı.",
categoryInvalid: "Kategori bu hanede yok, arşivli veya işlem türüyle uyuşmuyor.", categoryInvalid: "Kategori bu hanede yok, arşivli veya işlem türüyle uyuşmuyor.",
installmentsMax: "En fazla 36 taksit",
installmentsExpenseOnly: "Taksit yalnızca bölünmemiş kredi kartı giderinde kullanılabilir.",
installmentsCardOnly: "Taksit yalnızca kredi kartı hesabında kullanılabilir.",
}, },
list: { list: {
empty: "Bu filtrelerle işlem bulunamadı.", empty: "Bu filtrelerle işlem bulunamadı.",
@@ -321,6 +332,7 @@ export const tr = {
updated: "İşlem güncellendi.", updated: "İşlem güncellendi.",
deleted: "İşlem silindi.", deleted: "İşlem silindi.",
restored: "İşlem geri alındı.", restored: "İşlem geri alındı.",
installmentsCancelled: (n: number) => `${n} kalan taksit iptal edildi.`,
}, },
deleteTitle: "İşlem silinsin mi?", deleteTitle: "İşlem silinsin mi?",
deleteDescription: deleteDescription:
@@ -348,10 +360,89 @@ export const tr = {
adjustmentReadOnly: adjustmentReadOnly:
"Mutabakat düzeltmesi düzenlenemez; gerekirse silip mutabakatı yeniden yapın.", "Mutabakat düzeltmesi düzenlenemez; gerekirse silip mutabakatı yeniden yapın.",
reconciled: "Mutabakatı yapıldı", reconciled: "Mutabakatı yapıldı",
cancelInstallments: "Kalan taksitleri iptal et",
readOnly: "İzleyici rolündesiniz; işlem ekleyemezsiniz.", readOnly: "İzleyici rolündesiniz; işlem ekleyemezsiniz.",
noAccounts: "İşlem girmek için önce bir hesap gerekli.", noAccounts: "İşlem girmek için önce bir hesap gerekli.",
noAccountsLink: "Hesaplara git", noAccountsLink: "Hesaplara git",
}, },
recurring: {
title: "Planlı işlemler",
description:
"Düzenli ve planlı gelir/giderler. Planlı kayıtlar bakiyeyi etkilemez; onaylanınca gerçekleşir.",
newRule: "Yeni düzenli işlem",
createTitle: "Yeni düzenli işlem",
editTitle: "Düzenli işlemi düzenle",
tabs: { upcoming: "Yaklaşan", overdue: "Vadesi geçmiş", rules: "Kurallar" },
fields: {
estimate: "Tutar tahmini (ör. fatura); onaylarken düzeltilir",
startDate: "İlk tarih",
frequency: "Sıklık",
interval: "Kaç birimde bir",
monthlyMode: "Ayın hangi günü",
end: "Bitiş",
count: "Tekrar sayısı",
endDate: "Bitiş tarihi",
preview: "İlk tarihler",
},
frequencies: { daily: "Günlük", weekly: "Haftalık", monthly: "Aylık", yearly: "Yıllık" },
units: { daily: "gün", weekly: "hafta", monthly: "ay", yearly: "yıl" },
monthlyModes: { day: "İlk tarihin günü", last: "Ayın son günü" },
endKinds: { never: "Bitiş yok", count: "Tekrar sayısı", date: "Bitiş tarihi" },
actions: {
confirm: "Onayla",
skip: "Atla",
postpone: "Ertele",
edit: "Düzenle",
delete: "Sil",
more: "Diğer işlemler",
},
confirmTitle: "İşlemi onayla",
confirmDescription: "Gerçekleşen tutarı ve tarihi kontrol edin; onaylanınca bakiyeye yansır.",
postponeTitle: "Ertele",
postponeDate: "Yeni tarih",
scopeTitle: "Hangi kayıtlar değişsin?",
scopes: { one: "Yalnızca bu", following: "Bu ve sonrakiler", all: "Tümü" },
scopeHints: {
one: "Yalnızca bu planlı kayıt değişir; seri aynı kalır.",
following: "Seri bu tarihten itibaren yeni değerlerle devam eder.",
all: "Onaylanmamış tüm planlı kayıtlar yeni değerlerle yeniden oluşturulur. Gerçekleşmiş kayıtlar değişmez.",
},
deleteTitle: "Düzenli işlem silinsin mi?",
deleteDescription:
"Gerçekleşmiş kayıtlar korunur; yalnızca onaylanmamış planlı kayıtlar silinir.",
deleteScopes: { following: "Bu ve sonrakileri sil", all: "Tüm seriyi sil" },
estimate: "Tahmini",
next: (date: string) => `Sıradaki: ${date}`,
remaining: (n: number) => `${n} tekrar kaldı`,
endless: "Süresiz",
series: (pos: string) => `${pos}`,
empty: {
upcoming: "Önümüzdeki 60 günde planlı işlem yok.",
overdue: "Vadesi geçmiş planlı işlem yok.",
rules: "Henüz düzenli işlem yok. Kira, faturalar ve abonelikler için ekleyin.",
},
overdueBanner: (n: number) =>
`${n} planlı işlemin tarihi geçti; onaylayın, erteleyin veya atlayın.`,
overdueLink: "Planlı işlemlere git",
upcomingTitle: "Yaklaşan planlı işlemler",
toast: {
created: "Düzenli işlem kaydedildi.",
updated: "Düzenli işlem güncellendi.",
deleted: "Düzenli işlem silindi.",
confirmed: "İşlem onaylandı.",
skipped: "Bu tekrar atlandı.",
postponed: "İşlem ertelendi.",
},
validation: {
interval: "1 ile 12 arasında olmalı",
count: "1 ile 600 arasında bir sayı girin",
endBeforeStart: "Bitiş tarihi ilk tarihten önce olamaz",
},
errors: {
splitAmount: "Bölünmüş planlı işlemin tutarı değiştirilemez.",
postponeDate: "Yeni tarih mevcut tarihten sonra olmalı.",
},
},
attachments: { attachments: {
title: "Ekler", title: "Ekler",
add: "Ek ekle", add: "Ek ekle",
@@ -382,6 +473,55 @@ export const tr = {
upload: "Dosya yüklenemedi.", upload: "Dosya yüklenemedi.",
}, },
}, },
card: {
title: "Kart özeti",
debt: "Toplam borç",
available: "Kullanılabilir limit",
limitOf: (limit: string) => `Limit ${limit}`,
pendingInstallments: (amount: string) => `Gelecek taksitler limitten düşer: ${amount}`,
statementPeriod: "Hesap kesim dönemi",
currentPeriod: "Güncel dönem",
periodRange: (start: string, end: string) => `${start} – ${end}`,
statementDebt: "Dönem borcu",
minimum: (rate: string) => `Asgari ödeme (%${rate})`,
paid: "Ödenen",
remaining: "Kalan",
dueDate: "Son ödeme",
daysLeft: (n: number) =>
n > 0 ? `${n} gün kaldı` : n === 0 ? "Bugün son gün" : `${-n} gün geçti`,
paidInFull: "Dönem borcu ödendi.",
spent: "Harcama",
pay: "Borcu öde",
payDescription: "Kart borcu ödemesi",
upcomingInstallments: "Yaklaşan taksitler",
installmentPeriod: (end: string, due: string, n: number) =>
`${end} kesim · son ödeme ${due} · ${n} taksit`,
noInstallments: "Bekleyen taksit yok.",
planned: "Planlı harcamalar",
history: "Geçmiş ekstreler",
historyHeaders: {
period: "Dönem",
debt: "Borç",
minimum: "Asgari",
paid: "Ödenen",
due: "Son ödeme",
},
},
overdraft: {
title: "Esnek hesap (KMH)",
limit: "KMH limiti",
used: "Kullanılan",
available: "Kullanılabilir KMH",
rate: (rate: string) => `Aylık faiz %${rate}`,
lastPeriod: "Geçen dönem",
currentSoFar: "Bu dönem (şimdiye kadar)",
estimatedInterest: "Tahmini faiz",
averageUsed: (amount: string) => `Ortalama kullanım ${amount}`,
bookInterest: "Faiz kaydı ekle",
booked: "Bu dönemin faiz kaydı girilmiş.",
interestDescription: (range: string) => `KMH faizi (${range})`,
taxNote: "Tahmin vergiler (KKDF/BSMV) hariçtir; banka ekstresindeki tutarı girin.",
},
statement: { statement: {
title: "Hesap ekstresi", title: "Hesap ekstresi",
back: "Hesaplar", back: "Hesaplar",
+5
View File
@@ -26,6 +26,11 @@ const creditCardSchema = new Schema(
kind: { type: String, enum: DUE_RULE_KINDS, default: "daysAfter" }, kind: { type: String, enum: DUE_RULE_KINDS, default: "daysAfter" },
value: { type: Number, min: 1, max: 31, default: 10 }, value: { type: Number, min: 1, max: 31, default: 10 },
}, },
/**
* Asgari ödeme oranı, baz puan (2000 = %20). null → varsayılan kural: limit 50.000 TL altı %20,
* üstü %40 (Faz 7 kararı).
*/
minimumPaymentRateBp: { type: Number, min: 0, max: 10_000, default: null },
/** Kart borcunun ödeneceği varsayılan hesap. */ /** Kart borcunun ödeneceği varsayılan hesap. */
paymentAccountId: { type: Schema.Types.ObjectId, default: null }, paymentAccountId: { type: Schema.Types.ObjectId, default: null },
}, },
+1
View File
@@ -27,6 +27,7 @@ export const AUDIT_ACTIONS = [
"category.move", "category.move",
"transaction.delete", "transaction.delete",
"transaction.restore", "transaction.restore",
"recurring.delete",
] as const; ] as const;
export type AuditAction = (typeof AUDIT_ACTIONS)[number]; export type AuditAction = (typeof AUDIT_ACTIONS)[number];
+38
View File
@@ -0,0 +1,38 @@
import { model, models, Schema, type InferSchemaType, type Model } from "mongoose";
/**
* Kart/KMH dönem kaydı (Bölüm 6.8, `statements`). Tutarlar işlemlerden hesaplanır ve kart özeti
* okunurken güncellenir (geriye dönük girilen işlem dönem borcunu doğru değiştirir); bu koleksiyon
* raporlar ve mobil API için son hesaplanan değerleri tutar.
*/
const cardStatementSchema = new Schema(
{
householdId: { type: Schema.Types.ObjectId, required: true },
accountId: { type: Schema.Types.ObjectId, required: true },
kind: { type: String, enum: ["credit_card", "overdraft"], required: true },
/** "YYYY-MM-DD" (İstanbul), ikisi de dahil. */
periodStart: { type: String, required: true },
periodEnd: { type: String, required: true },
dueDate: { type: String, default: null },
/** Kesim günü sonundaki borç (pozitif). */
statementDebtMinor: { type: Number, default: 0 },
minimumPaymentMinor: { type: Number, default: 0 },
/** Kesimden sonra (bir sonraki kesime kadar) yapılan ödemeler. */
paidMinor: { type: Number, default: 0 },
/** Dönemdeki harcamalar (çıkışlar). */
spentMinor: { type: Number, default: 0 },
/** KMH: tahmini faiz. */
interestMinor: { type: Number, default: null },
computedAt: { type: Date, required: true },
},
{ timestamps: true, collection: "statements" },
);
cardStatementSchema.index({ accountId: 1, periodEnd: 1 }, { unique: true });
cardStatementSchema.index({ householdId: 1, accountId: 1, periodEnd: -1 });
export type CardStatement = InferSchemaType<typeof cardStatementSchema>;
export const CardStatementModel: Model<CardStatement> =
(models.CardStatement as Model<CardStatement> | undefined) ??
model<CardStatement>("CardStatement", cardStatementSchema);
+52
View File
@@ -0,0 +1,52 @@
import { model, models, Schema, type InferSchemaType, type Model } from "mongoose";
import { FREQUENCIES, MONTHLY_MODES } from "@/shared/recurrence";
import { TRANSACTION_TYPES } from "@/shared/transactions";
/**
* Düzenli işlem kuralı (Bölüm 6.7). Her tekrar için `planned` durumunda bir işlem üretilir
* (`transactions.recurringRuleId` + `occurrenceIndex`, benzersiz). Bitiş tarihsiz kurallarda
* ufuk 12 ay; okuma sırasında ilerletilir.
*/
const recurringRuleSchema = new Schema(
{
householdId: { type: Schema.Types.ObjectId, required: true },
// İşlem şablonu (bölme yok).
type: { type: String, enum: TRANSACTION_TYPES, required: true },
amountMinor: { type: Number, required: true, min: 1 },
/** Tutar tahmini mi (ör. fatura)? Onaylarken düzeltilir. */
isEstimate: { type: Boolean, default: false },
accountId: { type: Schema.Types.ObjectId, required: true },
toAccountId: { type: Schema.Types.ObjectId, default: null },
categoryId: { type: Schema.Types.ObjectId, default: null },
payeeName: { type: String, default: "", maxlength: 80 },
description: { type: String, default: "", maxlength: 500 },
tags: { type: [String], default: [] },
// Tekrar.
frequency: { type: String, enum: FREQUENCIES, required: true },
interval: { type: Number, default: 1, min: 1, max: 12 },
monthlyMode: { type: String, enum: MONTHLY_MODES, default: "day" },
/** "YYYY-MM-DD" (İstanbul günü). */
startDate: { type: String, required: true },
endDate: { type: String, default: null },
count: { type: Number, default: null, min: 1 },
/** Üretilen son ufuk ("YYYY-MM-DD"); null → hiç üretilmedi. */
generatedUntil: { type: String, default: null },
deletedAt: { type: Date, default: null },
seedRef: { type: String, default: null },
createdBy: { type: Schema.Types.ObjectId, required: true },
updatedBy: { type: Schema.Types.ObjectId, required: true },
},
{ timestamps: true, collection: "recurringRules" },
);
recurringRuleSchema.index({ householdId: 1, deletedAt: 1, generatedUntil: 1 });
recurringRuleSchema.index(
{ householdId: 1, seedRef: 1 },
{ unique: true, partialFilterExpression: { seedRef: { $type: "string" } } },
);
export type RecurringRule = InferSchemaType<typeof recurringRuleSchema>;
export const RecurringRuleModel: Model<RecurringRule> =
(models.RecurringRule as Model<RecurringRule> | undefined) ??
model<RecurringRule>("RecurringRule", recurringRuleSchema);
+11
View File
@@ -39,6 +39,12 @@ const transactionSchema = new Schema(
attachmentCount: { type: Number, default: 0 }, attachmentCount: { type: Number, default: 0 },
// İleri fazlar: planlı işlem kuralı (7), taksit (7), kart dönemi (7), cari (8). // İleri fazlar: planlı işlem kuralı (7), taksit (7), kart dönemi (7), cari (8).
recurringRuleId: { type: Schema.Types.ObjectId, default: null }, recurringRuleId: { type: Schema.Types.ObjectId, default: null },
/** Serideki sıra (0'dan); kuralla birlikte benzersiz (tekrar üretimi idempotent). */
occurrenceIndex: { type: Number, default: null },
/** Tek başına düzenlendi/ertelendi: "tümü" güncellemesinde korunur. */
detached: { type: Boolean, default: false },
/** Planlı tutar tahmini (ör. fatura); onaylarken kesinleşir. */
isEstimate: { type: Boolean, default: false },
installment: { installment: {
type: new Schema( type: new Schema(
{ planId: Schema.Types.ObjectId, index: Number, count: Number }, { planId: Schema.Types.ObjectId, index: Number, count: Number },
@@ -70,6 +76,11 @@ transactionSchema.index({ householdId: 1, accountId: 1, date: -1 });
transactionSchema.index({ householdId: 1, toAccountId: 1, date: -1 }); transactionSchema.index({ householdId: 1, toAccountId: 1, date: -1 });
transactionSchema.index({ householdId: 1, effectiveCategoryIds: 1, date: -1 }); transactionSchema.index({ householdId: 1, effectiveCategoryIds: 1, date: -1 });
transactionSchema.index({ householdId: 1, tags: 1 }); transactionSchema.index({ householdId: 1, tags: 1 });
transactionSchema.index({ "installment.planId": 1 }, { sparse: true });
transactionSchema.index(
{ recurringRuleId: 1, occurrenceIndex: 1 },
{ unique: true, partialFilterExpression: { recurringRuleId: { $type: "objectId" } } },
);
transactionSchema.index( transactionSchema.index(
{ householdId: 1, seedRef: 1 }, { householdId: 1, seedRef: 1 },
{ unique: true, partialFilterExpression: { seedRef: { $type: "string" } } }, { unique: true, partialFilterExpression: { seedRef: { $type: "string" } } },
+82
View File
@@ -0,0 +1,82 @@
import { describe, expect, it } from "vitest";
import {
cardPeriods,
closingOnOrAfter,
dueDate,
estimateOverdraftInterest,
installmentSchedule,
minimumPayment,
minimumRateBp,
nextPeriod,
periodContaining,
} from "./card-periods";
describe("dönem hesabı", () => {
it("kesim günü dahil hesap kesim dönemine girer; ertesi gün yeni dönem", () => {
expect(periodContaining("2026-10-29", 29)).toEqual({ start: "2026-09-30", end: "2026-10-29" });
expect(periodContaining("2026-10-30", 29)).toEqual({ start: "2026-10-30", end: "2026-11-29" });
});
it("kesim günü ayda yoksa ayın son günü (31 → Şubat 28/29)", () => {
expect(closingOnOrAfter("2026-02-10", 31)).toBe("2026-02-28");
expect(periodContaining("2028-03-05", 31)).toEqual({ start: "2028-03-01", end: "2028-03-31" });
expect(periodContaining("2026-03-01", 30)).toEqual({ start: "2026-03-01", end: "2026-03-30" });
expect(periodContaining("2026-02-28", 30)).toEqual({ start: "2026-01-31", end: "2026-02-28" });
});
it("yıl dönümü ve sonraki dönem", () => {
const p = periodContaining("2026-12-31", 15);
expect(p).toEqual({ start: "2026-12-16", end: "2027-01-15" });
expect(nextPeriod(p, 15)).toEqual({ start: "2027-01-16", end: "2027-02-15" });
});
it("güncel dönem ve son ekstre; kesim günü bugün iken dönem henüz kapanmamış", () => {
expect(cardPeriods("2026-11-05", 29)).toEqual({
current: { start: "2026-10-30", end: "2026-11-29" },
statement: { start: "2026-09-30", end: "2026-10-29" },
});
expect(cardPeriods("2026-11-29", 29).current.end).toBe("2026-11-29");
});
it("son ödeme tarihi", () => {
expect(dueDate("2026-10-29", { kind: "daysAfter", value: 10 })).toBe("2026-11-08");
expect(dueDate("2026-10-29", { kind: "fixedDay", value: 9 })).toBe("2026-11-09");
expect(dueDate("2026-10-05", { kind: "fixedDay", value: 20 })).toBe("2026-10-20");
expect(dueDate("2026-01-29", { kind: "fixedDay", value: 31 })).toBe("2026-01-31");
});
});
describe("asgari ödeme", () => {
it("limite göre %20 / %40; kart bazında oran öncelikli; yukarı yuvarlama", () => {
expect(minimumRateBp(49_999_99, null)).toBe(2000);
expect(minimumRateBp(50_000_00, null)).toBe(4000);
expect(minimumRateBp(60_000_00, 2500)).toBe(2500);
expect(minimumPayment(10_000_01, 2000)).toBe(2_000_01);
expect(minimumPayment(-5, 2000)).toBe(0);
});
});
describe("taksit planı", () => {
it("eşit bölme (kuruş farkı ilk taksitlerde), aylık tarihler, ay sonu", () => {
const s = installmentSchedule("2026-01-31", 10_000_00, 3);
expect(s.map((x) => x.amountMinor)).toEqual([3_333_34, 3_333_33, 3_333_33]);
expect(s.reduce((a, x) => a + x.amountMinor, 0)).toBe(10_000_00);
expect(s.map((x) => x.date)).toEqual(["2026-01-31", "2026-02-28", "2026-03-31"]);
});
});
describe("KMH faiz tahmini", () => {
it("gün sonu eksi bakiyeler üzerinden", () => {
const period = { start: "2026-11-01", end: "2026-11-30" };
// 10 gün boyunca -3.000 TL; sonra sıfır.
const deltas = new Map([
["2026-11-01", -3_000_00],
["2026-11-11", 3_000_00],
]);
const r = estimateOverdraftInterest(period, 0, deltas, 425);
// 10 gün × 3.000 TL × %4,25 / 30 = 42,50 TL
expect(r.interestMinor).toBe(42_50);
expect(r.days).toBe(30);
expect(estimateOverdraftInterest(period, 5_000_00, deltas, 425).interestMinor).toBe(0);
});
});
+113
View File
@@ -0,0 +1,113 @@
import { splitEvenly } from "./money";
import { addDays, addMonths, daysInMonth } from "./recurrence";
/**
* Kredi kartı ve KMH dönemleri (Bölüm 6.8). Saf fonksiyonlar; tarihler "YYYY-MM-DD" (İstanbul).
*
* - Kesim günü ayda yoksa (ör. 31) ayın son günü kullanılır.
* - Kesim günü DAHİL o gün ve öncesi "Hesap Kesim Dönemi"ne girer (Bölüm 10 varsayılanı).
* - Kesim günü bitmeden dönem kapanmış sayılmaz: bugün kesim günüyse işlemler hâlâ "Güncel Dönem"de.
*/
export type DueRule = { kind: "daysAfter" | "fixedDay"; value: number };
export type Period = { start: string; end: string };
/** Asgari ödeme varsayılanı (Faz 7 kararı): limit < 50.000 TL → %20, üstü → %40. */
export const MINIMUM_RATE_THRESHOLD_MINOR = 50_000_00;
export const MAX_INSTALLMENTS = 36;
/** O ayın kesim tarihi. */
export function closingDateIn(ym: string, statementDay: number): string {
const [y, m] = ym.split("-").map(Number) as [number, number];
const day = Math.min(statementDay, daysInMonth(y, m));
return `${ym}-${String(day).padStart(2, "0")}`;
}
/** Tarihi içeren dönemin kesim tarihi (tarih kesim gününe eşitse o gün). */
export function closingOnOrAfter(ymd: string, statementDay: number): string {
const c = closingDateIn(ymd.slice(0, 7), statementDay);
return ymd <= c
? c
: closingDateIn(addMonths(`${ymd.slice(0, 7)}-01`, 1).slice(0, 7), statementDay);
}
/** Tarihi içeren dönem: önceki kesimin ertesi günü → bu kesim (dahil). */
export function periodContaining(ymd: string, statementDay: number): Period {
const end = closingOnOrAfter(ymd, statementDay);
const prevMonth = addMonths(`${end.slice(0, 7)}-01`, -1).slice(0, 7);
return { start: addDays(closingDateIn(prevMonth, statementDay), 1), end };
}
export function previousPeriod(p: Period, statementDay: number): Period {
return periodContaining(addDays(p.start, -1), statementDay);
}
export function nextPeriod(p: Period, statementDay: number): Period {
return periodContaining(addDays(p.end, 1), statementDay);
}
/** Son ödeme tarihi: kesimden N gün sonra veya kesimden sonraki ilk "ayın N. günü". */
export function dueDate(closing: string, rule: DueRule): string {
if (rule.kind === "daysAfter") return addDays(closing, rule.value);
const same = addMonths(closing, 0, rule.value);
return same > closing ? same : addMonths(closing, 1, rule.value);
}
/** Bugüne göre güncel dönem (bugünü içerir) ve son kesilmiş dönem (ekstre). */
export function cardPeriods(today: string, statementDay: number) {
const current = periodContaining(today, statementDay);
return { current, statement: previousPeriod(current, statementDay) };
}
export function minimumRateBp(limitMinor: number, overrideBp: number | null | undefined): number {
if (overrideBp !== null && overrideBp !== undefined) return overrideBp;
return limitMinor < MINIMUM_RATE_THRESHOLD_MINOR ? 2000 : 4000;
}
/** Asgari ödeme (kuruş, yukarı yuvarlanır). */
export function minimumPayment(debtMinor: number, rateBp: number): number {
if (debtMinor <= 0) return 0;
return Math.ceil((debtMinor * rateBp) / 10_000);
}
/**
* Taksit planı: toplam eşit bölünür (kuruş farkı ilk taksitlere), her taksit alışveriş gününden
* itibaren aylık (ayda o gün yoksa son gün) — böylece her taksit ardışık bir döneme düşer.
*/
export function installmentSchedule(
purchaseYmd: string,
totalMinor: number,
count: number,
): { index: number; date: string; amountMinor: number }[] {
const day = Number(purchaseYmd.slice(8, 10));
return splitEvenly(totalMinor, count).map((amountMinor, index) => ({
index,
date: addMonths(purchaseYmd, index, day),
amountMinor,
}));
}
/**
* KMH faizi tahmini: dönemdeki her günün gün sonu eksi bakiyesi × (aylık oran / 30).
* `startBalance`: dönem başından önceki bakiye; `deltas`: gün → o günün net hareketi.
* Vergiler (KKDF/BSMV) dahil değildir; kullanıcı kesim gününde kesinleştirir.
*/
export function estimateOverdraftInterest(
period: Period,
startBalanceMinor: number,
deltas: ReadonlyMap<string, number>,
monthlyRateBp: number,
until?: string,
): { interestMinor: number; averageUsedMinor: number; days: number } {
let balance = startBalanceMinor;
let used = 0;
let days = 0;
const last = until && until < period.end ? until : period.end;
for (let d = period.start; d <= last; d = addDays(d, 1)) {
balance += deltas.get(d) ?? 0;
used += Math.max(0, -balance);
days++;
}
const interestMinor = Math.round((used * monthlyRateBp) / 10_000 / 30);
return { interestMinor, averageUsedMinor: days ? Math.round(used / days) : 0, days };
}
+95
View File
@@ -0,0 +1,95 @@
import { describe, expect, it } from "vitest";
import {
addDays,
addMonths,
describeRecurrence,
isFinished,
listOccurrences,
occurrenceDate,
type Recurrence,
} from "./recurrence";
const rule = (over: Partial<Recurrence>): Recurrence => ({
frequency: "monthly",
interval: 1,
monthlyMode: "day",
startDate: "2026-01-31",
endDate: null,
count: null,
...over,
});
describe("tarih aritmetiği", () => {
it("gün ve ay ekleme, ay sonu taşması", () => {
expect(addDays("2026-12-30", 3)).toBe("2027-01-02");
expect(addDays("2028-03-01", -1)).toBe("2028-02-29");
expect(addMonths("2026-01-31", 1)).toBe("2026-02-28");
expect(addMonths("2026-01-31", 1, 31)).toBe("2026-02-28");
expect(addMonths("2026-11-15", 3)).toBe("2027-02-15");
expect(addMonths("2026-04-10", 0, "last")).toBe("2026-04-30");
});
});
describe("occurrenceDate", () => {
it("aylık: başlangıç günü korunur, ayda yoksa son gün", () => {
const r = rule({});
expect([0, 1, 2, 3].map((i) => occurrenceDate(r, i))).toEqual([
"2026-01-31",
"2026-02-28",
"2026-03-31",
"2026-04-30",
]);
});
it("aylık son gün modu (artık yıl dahil)", () => {
const r = rule({ monthlyMode: "last", startDate: "2028-01-10" });
expect([0, 1, 2].map((i) => occurrenceDate(r, i))).toEqual([
"2028-01-31",
"2028-02-29",
"2028-03-31",
]);
});
it("günlük, haftalık (aralıkla), yıllık (29 Şubat)", () => {
expect(
occurrenceDate(rule({ frequency: "daily", interval: 3, startDate: "2026-11-30" }), 1),
).toBe("2026-12-03");
expect(
occurrenceDate(rule({ frequency: "weekly", interval: 2, startDate: "2026-11-02" }), 2),
).toBe("2026-11-30");
const y = rule({ frequency: "yearly", startDate: "2028-02-29" });
expect([1, 4].map((i) => occurrenceDate(y, i))).toEqual(["2029-02-28", "2032-02-29"]);
});
});
describe("listOccurrences", () => {
it("tekrar sayısı, bitiş tarihi ve ufuk sınırları", () => {
const r = rule({ startDate: "2026-01-05", count: 3 });
expect(listOccurrences(r, "2030-01-01").map((o) => o.date)).toEqual([
"2026-01-05",
"2026-02-05",
"2026-03-05",
]);
expect(isFinished(r, 3)).toBe(true);
const e = rule({ startDate: "2026-01-05", endDate: "2026-02-10" });
expect(listOccurrences(e, "2030-01-01")).toHaveLength(2);
const h = rule({ startDate: "2026-01-05" });
expect(listOccurrences(h, "2026-04-05").map((o) => o.index)).toEqual([0, 1, 2, 3]);
expect(listOccurrences(h, "2026-04-05", 2).map((o) => o.index)).toEqual([2, 3]);
expect(isFinished(h, 100)).toBe(false);
});
});
describe("describeRecurrence", () => {
it("Türkçe açıklama", () => {
expect(describeRecurrence(rule({ startDate: "2026-11-03" }))).toBe("Her ay 3. gün");
expect(describeRecurrence(rule({ monthlyMode: "last" }))).toBe("Her ayın son günü");
expect(
describeRecurrence(rule({ frequency: "weekly", interval: 2, startDate: "2026-11-02" })),
).toBe("2 haftada bir Pazartesi");
expect(describeRecurrence(rule({ frequency: "yearly", startDate: "2026-03-15" }))).toBe(
"Her yıl 15 Mart",
);
expect(describeRecurrence(rule({ frequency: "daily" }))).toBe("Her gün");
});
});
+136
View File
@@ -0,0 +1,136 @@
/**
* Düzenli işlem tekrarı (Bölüm 6.7). Saf fonksiyonlar: tarihler "YYYY-MM-DD" (İstanbul günü).
* Aylık/yıllık tekrarda gün, başlangıç tarihinin gününden alınır ve ayda yoksa ayın son günü
* kullanılır (31 Ocak → 28/29 Şubat → 31 Mart). "Ayın son günü" modu her zaman son günü verir.
*/
export const FREQUENCIES = ["daily", "weekly", "monthly", "yearly"] as const;
export type Frequency = (typeof FREQUENCIES)[number];
export const MONTHLY_MODES = ["day", "last"] as const;
export type MonthlyMode = (typeof MONTHLY_MODES)[number];
/** Planlı kayıtların üretileceği ufuk (ay). */
export const HORIZON_MONTHS = 12;
export const MAX_OCCURRENCES = 600;
export type Recurrence = {
frequency: Frequency;
/** Her N gün/hafta/ay/yılda bir (1–12). */
interval: number;
monthlyMode: MonthlyMode;
startDate: string;
endDate: string | null;
/** Toplam tekrar sayısı (ör. 12) — endDate ile birlikte verilirse hangisi önce gelirse. */
count: number | null;
};
const parse = (ymd: string) => {
const [y, m, d] = ymd.split("-").map(Number) as [number, number, number];
return { y, m, d };
};
const fmt = (y: number, m: number, d: number) =>
`${String(y).padStart(4, "0")}-${String(m).padStart(2, "0")}-${String(d).padStart(2, "0")}`;
export function daysInMonth(y: number, m: number): number {
return new Date(Date.UTC(y, m, 0)).getUTCDate();
}
export function addDays(ymd: string, days: number): string {
const { y, m, d } = parse(ymd);
const t = new Date(Date.UTC(y, m - 1, d + days));
return fmt(t.getUTCFullYear(), t.getUTCMonth() + 1, t.getUTCDate());
}
/** Ay ekler; gün ayda yoksa ayın son günü. `day` verilirse o gün hedeflenir. */
export function addMonths(ymd: string, months: number, day?: number | "last"): string {
const { y, m, d } = parse(ymd);
const index = y * 12 + (m - 1) + months;
const ny = Math.floor(index / 12);
const nm = (index % 12) + 1;
const last = daysInMonth(ny, nm);
const target = day === "last" ? last : Math.min(day ?? d, last);
return fmt(ny, nm, target);
}
/** index. tekrarın tarihi (0 = başlangıç; "son gün" modunda başlangıç ayının son günü). */
export function occurrenceDate(r: Recurrence, index: number): string {
const n = index * r.interval;
switch (r.frequency) {
case "daily":
return addDays(r.startDate, n);
case "weekly":
return addDays(r.startDate, n * 7);
case "monthly":
return addMonths(r.startDate, n, r.monthlyMode === "last" ? "last" : parse(r.startDate).d);
case "yearly":
return addMonths(r.startDate, n * 12, parse(r.startDate).d);
}
}
/** Ufuk tarihine (dahil) kadar, `fromIndex`ten başlayarak tekrarlar. */
export function listOccurrences(
r: Recurrence,
until: string,
fromIndex = 0,
): { index: number; date: string }[] {
const out: { index: number; date: string }[] = [];
for (let i = fromIndex; i < MAX_OCCURRENCES; i++) {
if (r.count !== null && i >= r.count) break;
const date = occurrenceDate(r, i);
if (r.endDate && date > r.endDate) break;
if (date > until) break;
out.push({ index: i, date });
}
return out;
}
/** Seri bitti mi (bir sonraki tekrar yok)? */
export function isFinished(r: Recurrence, nextIndex: number): boolean {
if (r.count !== null && nextIndex >= r.count) return true;
return Boolean(r.endDate && occurrenceDate(r, nextIndex) > r.endDate);
}
export function horizonDate(today: string): string {
return addMonths(today, HORIZON_MONTHS);
}
const MONTHS = [
"Ocak",
"Şubat",
"Mart",
"Nisan",
"Mayıs",
"Haziran",
"Temmuz",
"Ağustos",
"Eylül",
"Ekim",
"Kasım",
"Aralık",
];
const WEEKDAYS = ["Pazar", "Pazartesi", "Salı", "Çarşamba", "Perşembe", "Cuma", "Cumartesi"];
/** "Her ay 3. gün", "2 haftada bir Pazartesi", "Her ayın son günü", "Her yıl 15 Mart". */
export function describeRecurrence(
r: Pick<Recurrence, "frequency" | "interval" | "monthlyMode" | "startDate">,
): string {
const { y, m, d } = parse(r.startDate);
const every = (unit: string) =>
r.interval === 1 ? `Her ${unit}` : `${r.interval} ${unit}da bir`;
switch (r.frequency) {
case "daily":
return r.interval === 1 ? "Her gün" : `${r.interval} günde bir`;
case "weekly": {
const wd = WEEKDAYS[new Date(Date.UTC(y, m - 1, d)).getUTCDay()]!;
return r.interval === 1 ? `Her hafta ${wd}` : `${r.interval} haftada bir ${wd}`;
}
case "monthly":
if (r.monthlyMode === "last")
return r.interval === 1 ? "Her ayın son günü" : `${r.interval} ayda bir, ayın son günü`;
return r.interval === 1 ? `Her ay ${d}. gün` : `${every("ay")}, ${d}. gün`;
case "yearly":
return r.interval === 1
? `Her yıl ${d} ${MONTHS[m - 1]}`
: `${r.interval} yılda bir, ${d} ${MONTHS[m - 1]}`;
}
}
+2
View File
@@ -68,6 +68,8 @@ export const accountFormSchema = z
cardDueKind: z.enum(DUE_RULE_KINDS), cardDueKind: z.enum(DUE_RULE_KINDS),
cardDueValue: day(31), cardDueValue: day(31),
cardPaymentAccountId: objectIdOrEmpty, cardPaymentAccountId: objectIdOrEmpty,
/** Boş → varsayılan kural (limite göre %20 / %40). */
cardMinimumRate: z.string().default("").pipe(percentToBp),
}) })
.superRefine((a, ctx) => { .superRefine((a, ctx) => {
if (a.type === "meal_card" && !a.mealCardProvider) { if (a.type === "meal_card" && !a.mealCardProvider) {
+50
View File
@@ -0,0 +1,50 @@
import { describe, expect, it } from "vitest";
import { recurringRuleFormSchema } from "./recurring";
/** Formun gönderdiği biçim: tüm alanlar string, seçilmeyenler boş. */
const formValues = {
type: "expense",
amount: "1.250,00",
isEstimate: false,
accountId: "a".repeat(24),
toAccountId: "",
categoryId: "b".repeat(24),
payee: "",
description: "",
tags: "",
startDate: "2026-11-05",
frequency: "monthly",
interval: "1",
monthlyMode: "day",
endKind: "never",
count: "",
endDate: "",
};
describe("recurringRuleFormSchema", () => {
it("boş isteğe bağlı alanlarla geçerli; bitiş türüne göre count/endDate ayıklanır", () => {
const x = recurringRuleFormSchema.parse(formValues);
expect(x).toMatchObject({ amount: 125000, interval: 1, count: null, endDate: null });
const c = recurringRuleFormSchema.parse({ ...formValues, endKind: "count", count: "12" });
expect(c.count).toBe(12);
const d = recurringRuleFormSchema.parse({
...formValues,
endKind: "date",
endDate: "2027-01-01",
count: "5",
});
expect(d).toMatchObject({ endDate: "2027-01-01", count: null });
});
it("seçilen bitiş türünün değeri zorunlu", () => {
expect(recurringRuleFormSchema.safeParse({ ...formValues, endKind: "count" }).success).toBe(
false,
);
expect(recurringRuleFormSchema.safeParse({ ...formValues, endKind: "date" }).success).toBe(
false,
);
expect(recurringRuleFormSchema.safeParse({ ...formValues, interval: "13" }).success).toBe(
false,
);
});
});
+94
View File
@@ -0,0 +1,94 @@
import { z } from "zod";
import { tr } from "../../i18n/tr";
import { parseMoney } from "../money";
import { FREQUENCIES, MONTHLY_MODES } from "../recurrence";
import { normalizeTags, TRANSACTION_TYPES } from "../transactions";
const v = tr.validation;
const t = tr.transactions.validation;
const r = tr.recurring.validation;
const ymd = z.string().regex(/^\d{4}-\d{2}-\d{2}$/, v.date);
const optionalId = z
.string()
.regex(/^([a-f0-9]{24})?$/i)
.nullable()
.optional()
.transform((s) => (s ? s : null));
const positiveMoney = z
.string()
.trim()
.transform((s, ctx) => {
const minor = parseMoney(s);
if (minor === null || minor <= 0) {
ctx.addIssue({ code: "custom", message: minor === null ? v.money : t.amountPositive });
return z.NEVER;
}
return minor;
});
/** Formdan gelen boş alanlar (""), seçilmemiş isteğe bağlı değer sayılır. */
const emptyToNull = (v: unknown) => (v === "" || v === undefined ? null : v);
export const END_KINDS = ["never", "count", "date"] as const;
/** Düzenli işlem kuralı formu (web + mobil). Bölme yok; onaylarken tutar düzeltilebilir. */
export const recurringRuleFormSchema = z
.object({
type: z.enum(TRANSACTION_TYPES),
amount: positiveMoney,
isEstimate: z.boolean().default(false),
accountId: z.string().regex(/^[a-f0-9]{24}$/i, t.selectAccount),
toAccountId: optionalId,
categoryId: optionalId,
payee: z.string().trim().max(80).default(""),
description: z.string().trim().max(500).default(""),
tags: z
.union([z.string(), z.array(z.string())])
.default("")
.transform((x) => normalizeTags(x)),
startDate: ymd,
frequency: z.enum(FREQUENCIES),
interval: z.coerce.number().int().min(1, r.interval).max(12, r.interval).default(1),
monthlyMode: z.enum(MONTHLY_MODES).default("day"),
endKind: z.enum(END_KINDS).default("never"),
count: z.preprocess(
emptyToNull,
z.coerce.number().int().min(1, r.count).max(600, r.count).nullable().optional(),
),
endDate: z.preprocess(emptyToNull, ymd.nullable().optional()),
})
.superRefine((x, ctx) => {
if (x.type === "transfer") {
if (!x.toAccountId)
ctx.addIssue({ code: "custom", path: ["toAccountId"], message: t.selectToAccount });
else if (x.toAccountId === x.accountId)
ctx.addIssue({ code: "custom", path: ["toAccountId"], message: t.sameAccount });
} else if (!x.categoryId) {
ctx.addIssue({ code: "custom", path: ["categoryId"], message: t.selectCategory });
}
if (x.endKind === "count" && !x.count)
ctx.addIssue({ code: "custom", path: ["count"], message: r.count });
if (x.endKind === "date") {
if (!x.endDate) ctx.addIssue({ code: "custom", path: ["endDate"], message: v.date });
else if (x.endDate < x.startDate)
ctx.addIssue({ code: "custom", path: ["endDate"], message: r.endBeforeStart });
}
})
.transform((x) => ({
...x,
count: x.endKind === "count" ? (x.count ?? null) : null,
endDate: x.endKind === "date" ? (x.endDate ?? null) : null,
}));
export type RecurringRuleFormInput = z.input<typeof recurringRuleFormSchema>;
export type RecurringRuleForm = z.output<typeof recurringRuleFormSchema>;
/** Planlı kaydı onaylama: tutar ve tarih düzeltilebilir. */
export const confirmOccurrenceSchema = z.object({
amount: positiveMoney,
date: ymd,
});
export type ConfirmOccurrenceForm = z.output<typeof confirmOccurrenceSchema>;
export const SERIES_SCOPES = ["one", "following", "all"] as const;
export type SeriesScope = (typeof SERIES_SCOPES)[number];
+12
View File
@@ -2,6 +2,7 @@ import { z } from "zod";
import { tr } from "../../i18n/tr"; import { tr } from "../../i18n/tr";
import { parseMoney } from "../money"; import { parseMoney } from "../money";
import { MAX_ATTACHMENTS_PER_RECORD } from "../attachments"; import { MAX_ATTACHMENTS_PER_RECORD } from "../attachments";
import { MAX_INSTALLMENTS } from "../card-periods";
import { MAX_SPLITS, normalizeTags, TRANSACTION_TYPES } from "../transactions"; import { MAX_SPLITS, normalizeTags, TRANSACTION_TYPES } from "../transactions";
const v = tr.validation; const v = tr.validation;
@@ -53,6 +54,14 @@ export const transactionFormSchema = z
.union([z.string(), z.array(z.string())]) .union([z.string(), z.array(z.string())])
.default("") .default("")
.transform((x) => normalizeTags(x)), .transform((x) => normalizeTags(x)),
/**
* Taksit sayısı (yalnızca kredi kartı gideri, oluştururken). 1 = peşin. Her taksit ayrı işlem
* olur; vadesi gelmeyenler planlıdır ve kendi döneminde otomatik gerçekleşir.
*/
installments: z.preprocess(
(v) => (v === "" || v === null || v === undefined ? 1 : v),
z.coerce.number().int().min(1).max(MAX_INSTALLMENTS, t.installmentsMax),
),
/** Bağlı ek dosyalar (sıralı). Yeni ekler önce /api/files ile yüklenir. */ /** Bağlı ek dosyalar (sıralı). Yeni ekler önce /api/files ile yüklenir. */
attachmentIds: z attachmentIds: z
.array(z.string().regex(/^[a-f0-9]{24}$/i)) .array(z.string().regex(/^[a-f0-9]{24}$/i))
@@ -67,6 +76,9 @@ export const transactionFormSchema = z
ctx.addIssue({ code: "custom", path: ["toAccountId"], message: t.sameAccount }); ctx.addIssue({ code: "custom", path: ["toAccountId"], message: t.sameAccount });
return; return;
} }
if (x.installments > 1 && (x.type !== "expense" || x.splits.length > 0)) {
ctx.addIssue({ code: "custom", path: ["installments"], message: t.installmentsExpenseOnly });
}
if (x.splits.length === 1) { if (x.splits.length === 1) {
ctx.addIssue({ code: "custom", path: ["splits"], message: t.splitMin }); ctx.addIssue({ code: "custom", path: ["splits"], message: t.splitMin });
} else if (x.splits.length >= 2) { } else if (x.splits.length >= 2) {