feat(households): hane seçici, ayarlar, admin hane yönetimi ve hane-yok sayfası
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,74 @@
|
||||
"use server";
|
||||
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { z } from "zod";
|
||||
import {
|
||||
adminAddMember,
|
||||
adminCreateHousehold,
|
||||
adminRemoveMember,
|
||||
adminSetMemberRole,
|
||||
} from "@/features/households/service";
|
||||
import { tr } from "@/i18n/tr";
|
||||
import { fail, type ActionResult } from "@/lib/action-result";
|
||||
import { getActionUser } from "@/lib/dal";
|
||||
import {
|
||||
addMemberSchema,
|
||||
householdCreateSchema,
|
||||
householdRoleSchema,
|
||||
} from "@/shared/schemas/household";
|
||||
|
||||
/** Sistem admini: hane ve üyelik yönetimi. Hanenin finansal verisine dokunmaz. */
|
||||
|
||||
const PATH = "/admin/haneler";
|
||||
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
|
||||
|
||||
export async function createHouseholdAction(input: unknown): Promise<ActionResult<{ id: string }>> {
|
||||
const admin = await getActionUser("admin");
|
||||
if (!admin) return fail(tr.common.unauthorized);
|
||||
const parsed = householdCreateSchema.safeParse(input);
|
||||
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields);
|
||||
const result = await adminCreateHousehold(admin.id, parsed.data);
|
||||
if (result.ok) revalidatePath("/", "layout");
|
||||
return result;
|
||||
}
|
||||
|
||||
export async function addMemberAction(householdId: unknown, input: unknown): Promise<ActionResult> {
|
||||
const admin = await getActionUser("admin");
|
||||
if (!admin) return fail(tr.common.unauthorized);
|
||||
const hid = idSchema.safeParse(householdId);
|
||||
const parsed = addMemberSchema.safeParse(input);
|
||||
if (!hid.success || !parsed.success) return fail(tr.adminUsers.errors.checkFields);
|
||||
const result = await adminAddMember(admin.id, hid.data, parsed.data);
|
||||
if (result.ok) revalidatePath("/", "layout");
|
||||
return result;
|
||||
}
|
||||
|
||||
export async function adminSetMemberRoleAction(
|
||||
householdId: unknown,
|
||||
userId: unknown,
|
||||
role: unknown,
|
||||
): Promise<ActionResult> {
|
||||
const admin = await getActionUser("admin");
|
||||
if (!admin) return fail(tr.common.unauthorized);
|
||||
const hid = idSchema.safeParse(householdId);
|
||||
const uid = idSchema.safeParse(userId);
|
||||
const r = householdRoleSchema.safeParse(role);
|
||||
if (!hid.success || !uid.success || !r.success) return fail(tr.common.genericError);
|
||||
const result = await adminSetMemberRole(admin.id, hid.data, uid.data, r.data);
|
||||
if (result.ok) revalidatePath(PATH);
|
||||
return result;
|
||||
}
|
||||
|
||||
export async function adminRemoveMemberAction(
|
||||
householdId: unknown,
|
||||
userId: unknown,
|
||||
): Promise<ActionResult> {
|
||||
const admin = await getActionUser("admin");
|
||||
if (!admin) return fail(tr.common.unauthorized);
|
||||
const hid = idSchema.safeParse(householdId);
|
||||
const uid = idSchema.safeParse(userId);
|
||||
if (!hid.success || !uid.success) return fail(tr.common.genericError);
|
||||
const result = await adminRemoveMember(admin.id, hid.data, uid.data);
|
||||
if (result.ok) revalidatePath("/", "layout");
|
||||
return result;
|
||||
}
|
||||
@@ -0,0 +1,306 @@
|
||||
"use client";
|
||||
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { Loader2, Plus, UserPlus } from "lucide-react";
|
||||
import { useEffect, useState } from "react";
|
||||
import { Controller, useForm } from "react-hook-form";
|
||||
import { toast } from "sonner";
|
||||
import { ResponsiveDialog } from "@/components/responsive-dialog";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Card,
|
||||
CardAction,
|
||||
CardContent,
|
||||
CardDescription,
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/components/ui/card";
|
||||
import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import { MembersList } from "@/features/households/components/members-list";
|
||||
import type { AdminHouseholdRow, UserOption } from "@/features/households/service";
|
||||
import { HOUSEHOLD_ROLES } from "@/features/households/types";
|
||||
import { tr } from "@/i18n/tr";
|
||||
import {
|
||||
addMemberSchema,
|
||||
householdCreateSchema,
|
||||
type AddMemberInput,
|
||||
type HouseholdCreateInput,
|
||||
} from "@/shared/schemas/household";
|
||||
import {
|
||||
addMemberAction,
|
||||
adminRemoveMemberAction,
|
||||
adminSetMemberRoleAction,
|
||||
createHouseholdAction,
|
||||
} from "../actions";
|
||||
import { UserSelect } from "./user-select";
|
||||
|
||||
const t = tr.adminHouseholds;
|
||||
|
||||
function CreateHouseholdDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
users,
|
||||
}: {
|
||||
open: boolean;
|
||||
onOpenChange: (o: boolean) => void;
|
||||
users: UserOption[];
|
||||
}) {
|
||||
const form = useForm<HouseholdCreateInput>({
|
||||
resolver: zodResolver(householdCreateSchema),
|
||||
defaultValues: { name: "", ownerUserId: "" },
|
||||
});
|
||||
useEffect(() => {
|
||||
if (open) form.reset({ name: "", ownerUserId: "" });
|
||||
}, [open, form]);
|
||||
|
||||
async function onSubmit(values: HouseholdCreateInput) {
|
||||
const result = await createHouseholdAction(values);
|
||||
if (result.ok) {
|
||||
toast.success(t.created(values.name));
|
||||
onOpenChange(false);
|
||||
} else {
|
||||
form.setError("root", { message: result.error });
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<ResponsiveDialog
|
||||
open={open}
|
||||
onOpenChange={onOpenChange}
|
||||
title={t.createTitle}
|
||||
description={t.createDescription}
|
||||
footer={
|
||||
<>
|
||||
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
|
||||
{tr.common.cancel}
|
||||
</Button>
|
||||
<Button type="submit" form="household-create" disabled={form.formState.isSubmitting}>
|
||||
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
|
||||
{tr.common.create}
|
||||
</Button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<form id="household-create" onSubmit={form.handleSubmit(onSubmit)} noValidate>
|
||||
<FieldGroup>
|
||||
<Controller
|
||||
name="name"
|
||||
control={form.control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel htmlFor="hh-create-name">{t.name}</FieldLabel>
|
||||
<Input {...field} id="hh-create-name" aria-invalid={fieldState.invalid} />
|
||||
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="ownerUserId"
|
||||
control={form.control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel htmlFor="hh-create-owner">{t.owner}</FieldLabel>
|
||||
<UserSelect
|
||||
id="hh-create-owner"
|
||||
users={users}
|
||||
value={field.value}
|
||||
onChange={field.onChange}
|
||||
invalid={fieldState.invalid}
|
||||
/>
|
||||
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
{form.formState.errors.root ? (
|
||||
<FieldError>{form.formState.errors.root.message}</FieldError>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
</ResponsiveDialog>
|
||||
);
|
||||
}
|
||||
|
||||
function AddMemberDialog({
|
||||
household,
|
||||
users,
|
||||
onOpenChange,
|
||||
}: {
|
||||
household: AdminHouseholdRow | null;
|
||||
users: UserOption[];
|
||||
onOpenChange: (o: boolean) => void;
|
||||
}) {
|
||||
const form = useForm<AddMemberInput>({
|
||||
resolver: zodResolver(addMemberSchema),
|
||||
defaultValues: { userId: "", role: "member" },
|
||||
});
|
||||
useEffect(() => {
|
||||
if (household) form.reset({ userId: "", role: "member" });
|
||||
}, [household, form]);
|
||||
|
||||
async function onSubmit(values: AddMemberInput) {
|
||||
if (!household) return;
|
||||
const result = await addMemberAction(household.id, values);
|
||||
if (result.ok) {
|
||||
toast.success(t.memberAdded(users.find((u) => u.id === values.userId)?.name ?? ""));
|
||||
onOpenChange(false);
|
||||
} else {
|
||||
form.setError("root", { message: result.error });
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<ResponsiveDialog
|
||||
open={Boolean(household)}
|
||||
onOpenChange={onOpenChange}
|
||||
title={household ? t.addMemberTitle(household.name) : t.addMember}
|
||||
description={t.addMemberDescription}
|
||||
footer={
|
||||
<>
|
||||
<Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
|
||||
{tr.common.cancel}
|
||||
</Button>
|
||||
<Button type="submit" form="household-add-member" disabled={form.formState.isSubmitting}>
|
||||
{form.formState.isSubmitting ? <Loader2 className="animate-spin" /> : null}
|
||||
{t.addMember}
|
||||
</Button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
<form id="household-add-member" onSubmit={form.handleSubmit(onSubmit)} noValidate>
|
||||
<FieldGroup>
|
||||
<Controller
|
||||
name="userId"
|
||||
control={form.control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel htmlFor="hh-member-user">{t.user}</FieldLabel>
|
||||
<UserSelect
|
||||
id="hh-member-user"
|
||||
users={users}
|
||||
value={field.value}
|
||||
onChange={field.onChange}
|
||||
invalid={fieldState.invalid}
|
||||
/>
|
||||
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="role"
|
||||
control={form.control}
|
||||
render={({ field }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="hh-member-role">{t.role}</FieldLabel>
|
||||
<Select value={field.value} onValueChange={field.onChange}>
|
||||
<SelectTrigger
|
||||
id="hh-member-role"
|
||||
className="w-full"
|
||||
aria-describedby="hh-member-role-hint"
|
||||
>
|
||||
<SelectValue>{tr.household.roles[field.value]}</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{HOUSEHOLD_ROLES.map((r) => (
|
||||
<SelectItem key={r} value={r}>
|
||||
{tr.household.roles[r]}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<FieldDescription id="hh-member-role-hint">
|
||||
{tr.household.roleHints[field.value]}
|
||||
</FieldDescription>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
{form.formState.errors.root ? (
|
||||
<FieldError>{form.formState.errors.root.message}</FieldError>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
</ResponsiveDialog>
|
||||
);
|
||||
}
|
||||
|
||||
export function HouseholdsAdmin({
|
||||
households,
|
||||
users,
|
||||
currentUserId,
|
||||
}: {
|
||||
households: AdminHouseholdRow[];
|
||||
users: UserOption[];
|
||||
currentUserId: string;
|
||||
}) {
|
||||
const [creating, setCreating] = useState(false);
|
||||
const [addingTo, setAddingTo] = useState<AdminHouseholdRow | null>(null);
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="flex flex-wrap items-center gap-3">
|
||||
<p className="max-w-2xl text-sm text-muted-foreground">{t.privacyNote}</p>
|
||||
<Button className="ml-auto" onClick={() => setCreating(true)}>
|
||||
<Plus />
|
||||
{t.newHousehold}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{households.length === 0 ? (
|
||||
<p className="rounded-xl border border-dashed p-8 text-center text-muted-foreground">
|
||||
{t.empty}
|
||||
</p>
|
||||
) : (
|
||||
<div className="grid gap-4 xl:grid-cols-2">
|
||||
{households.map((h) => (
|
||||
<Card key={h.id}>
|
||||
<CardHeader>
|
||||
<CardTitle>{h.name}</CardTitle>
|
||||
<CardDescription className="flex flex-wrap items-center gap-2">
|
||||
<span>{t.members(h.memberCount)}</span>
|
||||
{h.owners.length ? (
|
||||
<span>
|
||||
· {t.owners}: {h.owners.join(", ")}
|
||||
</span>
|
||||
) : (
|
||||
<Badge variant="destructive">{t.noOwner}</Badge>
|
||||
)}
|
||||
</CardDescription>
|
||||
<CardAction>
|
||||
<Button variant="outline" size="sm" onClick={() => setAddingTo(h)}>
|
||||
<UserPlus />
|
||||
{t.addMember}
|
||||
</Button>
|
||||
</CardAction>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<MembersList
|
||||
members={h.members}
|
||||
householdName={h.name}
|
||||
currentUserId={currentUserId}
|
||||
canManage
|
||||
onSetRole={(userId, role) => adminSetMemberRoleAction(h.id, userId, role)}
|
||||
onRemove={(userId) => adminRemoveMemberAction(h.id, userId)}
|
||||
/>
|
||||
</CardContent>
|
||||
</Card>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<CreateHouseholdDialog open={creating} onOpenChange={setCreating} users={users} />
|
||||
<AddMemberDialog
|
||||
household={addingTo}
|
||||
users={users}
|
||||
onOpenChange={(o) => !o && setAddingTo(null)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
"use client";
|
||||
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import type { UserOption } from "@/features/households/service";
|
||||
import { tr } from "@/i18n/tr";
|
||||
|
||||
/** Kullanıcı seçici (askıdakiler işaretli). */
|
||||
export function UserSelect({
|
||||
id,
|
||||
users,
|
||||
value,
|
||||
onChange,
|
||||
invalid,
|
||||
}: {
|
||||
id: string;
|
||||
users: UserOption[];
|
||||
value: string;
|
||||
onChange: (id: string) => void;
|
||||
invalid?: boolean;
|
||||
}) {
|
||||
const selected = users.find((u) => u.id === value);
|
||||
return (
|
||||
<Select value={value || undefined} onValueChange={onChange}>
|
||||
<SelectTrigger id={id} className="w-full" aria-invalid={invalid}>
|
||||
<SelectValue placeholder={tr.adminHouseholds.selectUser}>
|
||||
{selected ? `${selected.name} (@${selected.username})` : null}
|
||||
</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent className="max-h-72">
|
||||
{users.map((u) => (
|
||||
<SelectItem key={u.id} value={u.id}>
|
||||
{u.name}
|
||||
<span className="text-xs text-muted-foreground">
|
||||
@{u.username}
|
||||
{u.banned ? ` · ${tr.settings.banned}` : ""}
|
||||
</span>
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
import "server-only";
|
||||
import { adminListHouseholds, adminListUserOptions } from "@/features/households/service";
|
||||
import { requireRole } from "@/lib/dal";
|
||||
|
||||
/** Admin: haneler (üyeleriyle) ve hane atamaları için kullanıcı listesi. */
|
||||
export async function getAdminHouseholdsData() {
|
||||
await requireRole("admin");
|
||||
const [households, users] = await Promise.all([adminListHouseholds(), adminListUserOptions()]);
|
||||
return { households, users };
|
||||
}
|
||||
@@ -7,7 +7,9 @@ import { tr } from "@/i18n/tr";
|
||||
import { fail, ok, type ActionResult } from "@/lib/action-result";
|
||||
import { getAuth } from "@/lib/auth";
|
||||
import { authErrorCode } from "@/lib/auth-errors";
|
||||
import { writeAudit } from "@/lib/audit";
|
||||
import { getActionUser } from "@/lib/dal";
|
||||
import { removeAllMembershipsOfUser } from "@/features/households/service";
|
||||
import { storedEmail } from "@/shared/account-email";
|
||||
import { systemRoleSchema, type SystemRole } from "@/shared/schemas/common";
|
||||
import {
|
||||
@@ -102,8 +104,9 @@ export async function createUserAction(input: unknown): Promise<ActionResult> {
|
||||
const parsed = userCreateSchema.safeParse(input);
|
||||
if (!parsed.success) return fail(t.errors.checkFields);
|
||||
const v = parsed.data;
|
||||
let createdId = "";
|
||||
try {
|
||||
await ctx.api.createUser({
|
||||
const created = await ctx.api.createUser({
|
||||
headers: ctx.headers,
|
||||
body: {
|
||||
name: v.name,
|
||||
@@ -113,9 +116,17 @@ export async function createUserAction(input: unknown): Promise<ActionResult> {
|
||||
data: { username: v.username },
|
||||
},
|
||||
});
|
||||
createdId = created.user.id;
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.create",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: createdId,
|
||||
diff: { username: v.username, role: v.role },
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
@@ -148,6 +159,13 @@ export async function updateUserAction(userId: unknown, input: unknown): Promise
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.update",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: target.id,
|
||||
diff: { name: v.name, username: v.username, role: v.role },
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
@@ -167,6 +185,13 @@ export async function setRoleAction(userId: unknown, role: unknown): Promise<Act
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.role",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: target.id,
|
||||
diff: { role: { from: target.role, to: r.data } },
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
@@ -191,6 +216,12 @@ export async function setPasswordAction(userId: unknown, input: unknown): Promis
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.password.reset",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: target.id,
|
||||
});
|
||||
return ok(undefined);
|
||||
}
|
||||
|
||||
@@ -213,6 +244,13 @@ export async function banUserAction(userId: unknown, input: unknown): Promise<Ac
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.ban",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: target.id,
|
||||
diff: { reason: parsed.data.reason ?? null },
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
@@ -227,6 +265,12 @@ export async function unbanUserAction(userId: unknown): Promise<ActionResult> {
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
await writeAudit({
|
||||
action: "user.unban",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: id.data,
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
@@ -245,6 +289,14 @@ export async function removeUserAction(userId: unknown): Promise<ActionResult> {
|
||||
} catch (error) {
|
||||
return mapAuthError(error);
|
||||
}
|
||||
const removedMemberships = await removeAllMembershipsOfUser(target.id);
|
||||
await writeAudit({
|
||||
action: "user.remove",
|
||||
actorId: ctx.actor.id,
|
||||
targetType: "user",
|
||||
targetId: target.id,
|
||||
diff: { name: target.name, removedMemberships },
|
||||
});
|
||||
revalidatePath(PATH);
|
||||
return ok(undefined);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
"use server";
|
||||
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { z } from "zod";
|
||||
import { tr } from "@/i18n/tr";
|
||||
import { fail, ok, type ActionResult } from "@/lib/action-result";
|
||||
import { writeActiveHouseholdId } from "@/lib/active-household";
|
||||
import { getCurrentUser, getHouseholdActionContext } from "@/lib/dal";
|
||||
import { householdRoleSchema, householdSettingsSchema } from "@/shared/schemas/household";
|
||||
import { removeMember, resolveMembership, setMemberRole, updateHouseholdSettings } from "./service";
|
||||
|
||||
const idSchema = z.string().regex(/^[a-f0-9]{24}$/i);
|
||||
|
||||
/** Aktif haneyi değiştirir: önce üyelik doğrulanır, sonra cookie yazılır. */
|
||||
export async function switchHouseholdAction(
|
||||
householdId: unknown,
|
||||
): Promise<ActionResult<{ name: string }>> {
|
||||
const user = await getCurrentUser();
|
||||
const id = idSchema.safeParse(householdId);
|
||||
if (!user || !id.success) return fail(tr.common.unauthorized);
|
||||
const membership = await resolveMembership(user.id, id.data, "viewer");
|
||||
if (!membership) return fail(tr.common.unauthorized);
|
||||
await writeActiveHouseholdId(id.data);
|
||||
revalidatePath("/", "layout");
|
||||
return ok({ name: membership.name });
|
||||
}
|
||||
|
||||
/** Owner: hane adı ve ayarları (aktif hane). */
|
||||
export async function updateHouseholdSettingsAction(input: unknown): Promise<ActionResult> {
|
||||
const ctx = await getHouseholdActionContext("owner");
|
||||
if (!ctx) return fail(tr.common.unauthorized);
|
||||
const parsed = householdSettingsSchema.safeParse(input);
|
||||
if (!parsed.success) return fail(tr.adminUsers.errors.checkFields);
|
||||
const result = await updateHouseholdSettings(ctx.user.id, ctx.household.id, parsed.data);
|
||||
if (result.ok) revalidatePath("/", "layout");
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Owner: aktif hanedeki üyenin rolü. */
|
||||
export async function setMemberRoleAction(userId: unknown, role: unknown): Promise<ActionResult> {
|
||||
const ctx = await getHouseholdActionContext("owner");
|
||||
if (!ctx) return fail(tr.common.unauthorized);
|
||||
const uid = idSchema.safeParse(userId);
|
||||
const r = householdRoleSchema.safeParse(role);
|
||||
if (!uid.success || !r.success) return fail(tr.common.genericError);
|
||||
const result = await setMemberRole(ctx.user.id, ctx.household.id, uid.data, r.data);
|
||||
if (result.ok) revalidatePath("/ayarlar");
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Owner: üyeyi aktif haneden çıkarır. */
|
||||
export async function removeMemberAction(userId: unknown): Promise<ActionResult> {
|
||||
const ctx = await getHouseholdActionContext("owner");
|
||||
if (!ctx) return fail(tr.common.unauthorized);
|
||||
const uid = idSchema.safeParse(userId);
|
||||
if (!uid.success) return fail(tr.common.genericError);
|
||||
const result = await removeMember(ctx.user.id, ctx.household.id, uid.data);
|
||||
if (result.ok) revalidatePath("/", "layout");
|
||||
return result;
|
||||
}
|
||||
@@ -0,0 +1,228 @@
|
||||
"use client";
|
||||
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { Loader2 } from "lucide-react";
|
||||
import { Controller, useForm } from "react-hook-form";
|
||||
import { toast } from "sonner";
|
||||
import { z } from "zod";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Checkbox } from "@/components/ui/checkbox";
|
||||
import {
|
||||
Field,
|
||||
FieldDescription,
|
||||
FieldError,
|
||||
FieldGroup,
|
||||
FieldLabel,
|
||||
FieldSet,
|
||||
} from "@/components/ui/field";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import { tr } from "@/i18n/tr";
|
||||
import { householdSettingsSchema, type HouseholdSettings } from "@/shared/schemas/household";
|
||||
import { updateHouseholdSettingsAction } from "../actions";
|
||||
|
||||
const t = tr.settings.fields;
|
||||
|
||||
/** Form şeması: eşik TL (tam sayı) olarak girilir, kuruşa sunucuya giderken çevrilir. */
|
||||
const formSchema = householdSettingsSchema
|
||||
.omit({ extraStoreSavingThresholdMinor: true, budgetMonthStartDay: true })
|
||||
.extend({
|
||||
budgetMonthStartDay: z.number().int().min(1).max(28),
|
||||
extraStoreSavingThresholdTl: z
|
||||
.number({ error: tr.validation.wholeNumber })
|
||||
.int(tr.validation.wholeNumber)
|
||||
.min(0)
|
||||
.max(100_000),
|
||||
});
|
||||
type FormValues = z.infer<typeof formSchema>;
|
||||
|
||||
const DAYS = Array.from({ length: 28 }, (_, i) => i + 1);
|
||||
|
||||
export function HouseholdSettingsForm({
|
||||
settings,
|
||||
canEdit,
|
||||
}: {
|
||||
settings: HouseholdSettings;
|
||||
canEdit: boolean;
|
||||
}) {
|
||||
const form = useForm<FormValues>({
|
||||
resolver: zodResolver(formSchema),
|
||||
defaultValues: {
|
||||
name: settings.name,
|
||||
budgetMonthStartDay: settings.budgetMonthStartDay,
|
||||
installmentBudgetMode: settings.installmentBudgetMode,
|
||||
dailyPlanMode: settings.dailyPlanMode,
|
||||
includePrivateAccountsInTotals: settings.includePrivateAccountsInTotals,
|
||||
extraStoreSavingThresholdTl: Math.round(settings.extraStoreSavingThresholdMinor / 100),
|
||||
},
|
||||
});
|
||||
|
||||
async function onSubmit({ extraStoreSavingThresholdTl, ...rest }: FormValues) {
|
||||
const result = await updateHouseholdSettingsAction({
|
||||
...rest,
|
||||
extraStoreSavingThresholdMinor: extraStoreSavingThresholdTl * 100,
|
||||
});
|
||||
if (result.ok) {
|
||||
toast.success(tr.settings.saved);
|
||||
form.reset({ ...rest, extraStoreSavingThresholdTl });
|
||||
} else {
|
||||
toast.error(result.error);
|
||||
}
|
||||
}
|
||||
|
||||
const submitting = form.formState.isSubmitting;
|
||||
|
||||
return (
|
||||
<form onSubmit={form.handleSubmit(onSubmit)} noValidate>
|
||||
{/* Sahip olmayanlar için tüm alanlar salt okunur. */}
|
||||
<FieldSet disabled={!canEdit || submitting}>
|
||||
<FieldGroup>
|
||||
<Controller
|
||||
name="name"
|
||||
control={form.control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel htmlFor="hh-name">{t.name}</FieldLabel>
|
||||
<Input {...field} id="hh-name" aria-invalid={fieldState.invalid} />
|
||||
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="budgetMonthStartDay"
|
||||
control={form.control}
|
||||
render={({ field }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="hh-start-day">{t.budgetMonthStartDay}</FieldLabel>
|
||||
<Select
|
||||
value={String(field.value)}
|
||||
onValueChange={(v) => field.onChange(Number(v))}
|
||||
disabled={!canEdit}
|
||||
>
|
||||
<SelectTrigger
|
||||
id="hh-start-day"
|
||||
className="w-28"
|
||||
aria-describedby="hh-start-day-hint"
|
||||
>
|
||||
<SelectValue>{field.value}</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent className="max-h-64">
|
||||
{DAYS.map((d) => (
|
||||
<SelectItem key={d} value={String(d)}>
|
||||
{d}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<FieldDescription id="hh-start-day-hint">
|
||||
{t.budgetMonthStartDayHint}
|
||||
</FieldDescription>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="installmentBudgetMode"
|
||||
control={form.control}
|
||||
render={({ field }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="hh-installment">{t.installmentBudgetMode}</FieldLabel>
|
||||
<Select value={field.value} onValueChange={field.onChange} disabled={!canEdit}>
|
||||
<SelectTrigger id="hh-installment" className="w-full sm:w-80">
|
||||
<SelectValue>{t.installmentModes[field.value]}</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{(["per_installment", "purchase_month"] as const).map((m) => (
|
||||
<SelectItem key={m} value={m}>
|
||||
{t.installmentModes[m]}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="dailyPlanMode"
|
||||
control={form.control}
|
||||
render={({ field }) => (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="hh-daily">{t.dailyPlanMode}</FieldLabel>
|
||||
<Select value={field.value} onValueChange={field.onChange} disabled={!canEdit}>
|
||||
<SelectTrigger id="hh-daily" className="w-full sm:w-80">
|
||||
<SelectValue>{t.dailyPlanModes[field.value]}</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{(["even", "previous_month_pattern"] as const).map((m) => (
|
||||
<SelectItem key={m} value={m}>
|
||||
{t.dailyPlanModes[m]}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="extraStoreSavingThresholdTl"
|
||||
control={form.control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field data-invalid={fieldState.invalid}>
|
||||
<FieldLabel htmlFor="hh-threshold">{t.extraStoreSavingThreshold}</FieldLabel>
|
||||
<Input
|
||||
id="hh-threshold"
|
||||
type="number"
|
||||
inputMode="numeric"
|
||||
min={0}
|
||||
step={1}
|
||||
className="w-36 tabular-nums"
|
||||
name={field.name}
|
||||
ref={field.ref}
|
||||
onBlur={field.onBlur}
|
||||
value={Number.isNaN(field.value) ? "" : field.value}
|
||||
onChange={(e) => field.onChange(e.target.valueAsNumber)}
|
||||
aria-invalid={fieldState.invalid}
|
||||
aria-describedby="hh-threshold-hint"
|
||||
/>
|
||||
<FieldDescription id="hh-threshold-hint">
|
||||
{t.extraStoreSavingThresholdHint}
|
||||
</FieldDescription>
|
||||
{fieldState.invalid ? <FieldError errors={[fieldState.error]} /> : null}
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
<Controller
|
||||
name="includePrivateAccountsInTotals"
|
||||
control={form.control}
|
||||
render={({ field }) => (
|
||||
<Field orientation="horizontal">
|
||||
<Checkbox
|
||||
id="hh-private"
|
||||
checked={field.value}
|
||||
onCheckedChange={(v) => field.onChange(v === true)}
|
||||
disabled={!canEdit}
|
||||
/>
|
||||
<FieldLabel htmlFor="hh-private" className="font-normal">
|
||||
{t.includePrivateAccountsInTotals}
|
||||
</FieldLabel>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
{canEdit ? (
|
||||
<div>
|
||||
<Button type="submit" disabled={submitting || !form.formState.isDirty}>
|
||||
{submitting ? <Loader2 className="animate-spin" /> : null}
|
||||
{tr.common.save}
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</FieldSet>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,169 @@
|
||||
"use client";
|
||||
|
||||
import { UserMinus } from "lucide-react";
|
||||
import { useState, useTransition } from "react";
|
||||
import { toast } from "sonner";
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogCancel,
|
||||
AlertDialogContent,
|
||||
AlertDialogDescription,
|
||||
AlertDialogFooter,
|
||||
AlertDialogHeader,
|
||||
AlertDialogTitle,
|
||||
} from "@/components/ui/alert-dialog";
|
||||
import { Avatar, AvatarFallback } from "@/components/ui/avatar";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import { initials } from "@/components/layout/user-menu";
|
||||
import { tr } from "@/i18n/tr";
|
||||
import type { ActionResult } from "@/lib/action-result";
|
||||
import { HOUSEHOLD_ROLES, type HouseholdRole } from "../types";
|
||||
|
||||
export type MemberRow = {
|
||||
userId: string;
|
||||
name: string;
|
||||
username: string;
|
||||
role: HouseholdRole;
|
||||
banned: boolean;
|
||||
};
|
||||
|
||||
type Props = {
|
||||
members: MemberRow[];
|
||||
householdName: string;
|
||||
currentUserId: string;
|
||||
canManage: boolean;
|
||||
onSetRole: (userId: string, role: HouseholdRole) => Promise<ActionResult>;
|
||||
onRemove: (userId: string) => Promise<ActionResult>;
|
||||
};
|
||||
|
||||
/** Hane üyeleri: owner (veya admin) rol değiştirir / haneden çıkarır. Kurallar sunucuda. */
|
||||
export function MembersList({
|
||||
members,
|
||||
householdName,
|
||||
currentUserId,
|
||||
canManage,
|
||||
onSetRole,
|
||||
onRemove,
|
||||
}: Props) {
|
||||
const [pending, startTransition] = useTransition();
|
||||
const [removing, setRemoving] = useState<MemberRow | null>(null);
|
||||
const t = tr.settings;
|
||||
|
||||
function changeRole(member: MemberRow, role: HouseholdRole) {
|
||||
startTransition(async () => {
|
||||
const result = await onSetRole(member.userId, role);
|
||||
if (result.ok) toast.success(t.roleChanged(member.name));
|
||||
else toast.error(result.error);
|
||||
});
|
||||
}
|
||||
|
||||
function confirmRemove() {
|
||||
const member = removing;
|
||||
if (!member) return;
|
||||
startTransition(async () => {
|
||||
const result = await onRemove(member.userId);
|
||||
if (result.ok) {
|
||||
toast.success(t.memberRemoved(member.name));
|
||||
setRemoving(null);
|
||||
} else {
|
||||
toast.error(result.error);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<ul className="divide-y rounded-xl border" aria-busy={pending}>
|
||||
{members.map((m) => (
|
||||
<li key={m.userId} className="flex flex-wrap items-center gap-3 p-3">
|
||||
<Avatar>
|
||||
<AvatarFallback className="bg-primary/10 text-xs font-medium text-primary">
|
||||
{initials(m.name)}
|
||||
</AvatarFallback>
|
||||
</Avatar>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="truncate font-medium">
|
||||
{m.name}
|
||||
{m.userId === currentUserId ? (
|
||||
<span className="ml-1.5 text-xs font-normal text-muted-foreground">
|
||||
({tr.adminUsers.you})
|
||||
</span>
|
||||
) : null}
|
||||
</p>
|
||||
<p className="truncate text-xs text-muted-foreground">@{m.username}</p>
|
||||
</div>
|
||||
{m.banned ? <Badge variant="destructive">{t.banned}</Badge> : null}
|
||||
{canManage ? (
|
||||
<div className="flex items-center gap-1">
|
||||
<Select
|
||||
value={m.role}
|
||||
onValueChange={(v) => changeRole(m, v as HouseholdRole)}
|
||||
disabled={pending}
|
||||
>
|
||||
<SelectTrigger
|
||||
size="sm"
|
||||
className="w-32"
|
||||
aria-label={`${m.name} — ${t.changeRole}`}
|
||||
>
|
||||
<SelectValue>{tr.household.roles[m.role]}</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent align="end">
|
||||
{HOUSEHOLD_ROLES.map((r) => (
|
||||
<SelectItem key={r} value={r}>
|
||||
<span className="flex flex-col">
|
||||
<span>{tr.household.roles[r]}</span>
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{tr.household.roleHints[r]}
|
||||
</span>
|
||||
</span>
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
onClick={() => setRemoving(m)}
|
||||
disabled={pending}
|
||||
aria-label={`${m.name} — ${t.removeMember}`}
|
||||
title={t.removeMember}
|
||||
>
|
||||
<UserMinus />
|
||||
</Button>
|
||||
</div>
|
||||
) : (
|
||||
<Badge variant={m.role === "owner" ? "default" : "secondary"}>
|
||||
{tr.household.roles[m.role]}
|
||||
</Badge>
|
||||
)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
<AlertDialog open={Boolean(removing)} onOpenChange={(open) => !open && setRemoving(null)}>
|
||||
<AlertDialogContent>
|
||||
<AlertDialogHeader>
|
||||
<AlertDialogTitle>{t.removeTitle}</AlertDialogTitle>
|
||||
<AlertDialogDescription>
|
||||
{removing ? t.removeDescription(removing.name, householdName) : null}
|
||||
</AlertDialogDescription>
|
||||
</AlertDialogHeader>
|
||||
<AlertDialogFooter>
|
||||
<AlertDialogCancel disabled={pending}>{tr.common.cancel}</AlertDialogCancel>
|
||||
<Button variant="destructive" onClick={confirmRemove} disabled={pending}>
|
||||
{t.removeConfirm}
|
||||
</Button>
|
||||
</AlertDialogFooter>
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
"use client";
|
||||
|
||||
import { removeMemberAction, setMemberRoleAction } from "../actions";
|
||||
import type { HouseholdRole } from "../types";
|
||||
import { MembersList, type MemberRow } from "./members-list";
|
||||
|
||||
/** /ayarlar: aktif hanenin üyeleri (owner action'larına bağlı). */
|
||||
export function SettingsMembers(props: {
|
||||
members: MemberRow[];
|
||||
householdName: string;
|
||||
currentUserId: string;
|
||||
canManage: boolean;
|
||||
}) {
|
||||
return (
|
||||
<MembersList
|
||||
{...props}
|
||||
onSetRole={(userId, role: HouseholdRole) => setMemberRoleAction(userId, role)}
|
||||
onRemove={(userId) => removeMemberAction(userId)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import type { HouseholdSummary } from "./types";
|
||||
|
||||
/** FAZ 2 GEÇİCİ: Faz 5'te kullanıcının üye olduğu hanelerle değiştirilecek. */
|
||||
export const MOCK_HOUSEHOLDS: HouseholdSummary[] = [
|
||||
{ id: "h_cakir", name: "Çakır Ailesi", role: "owner" },
|
||||
{ id: "h_anne", name: "Annemler", role: "viewer" },
|
||||
];
|
||||
@@ -0,0 +1,207 @@
|
||||
import mongoose, { Types } from "mongoose";
|
||||
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
||||
import { getDb, getMongoClient } from "@/lib/db/mongo";
|
||||
import { AuditLogModel } from "@/models/audit-log";
|
||||
import { HouseholdModel } from "@/models/household";
|
||||
import { HouseholdMemberModel } from "@/models/household-member";
|
||||
import { runSeed } from "../../../scripts/seed/run";
|
||||
import {
|
||||
adminCreateHousehold,
|
||||
adminSetMemberRole,
|
||||
getHouseholdDetail,
|
||||
listMemberships,
|
||||
removeAllMembershipsOfUser,
|
||||
removeMember,
|
||||
resolveMembership,
|
||||
setMemberRole,
|
||||
updateHouseholdSettings,
|
||||
} from "./service";
|
||||
|
||||
/**
|
||||
* VERİ İZOLASYONU (Bölüm 5): başka hanenin verisine erişim imkânsız olmalı.
|
||||
* Seed verisi: Çakır Ailesi (admin+ayse owner, emre member, zeynep viewer, ozan member),
|
||||
* Annemler (fatma owner, mehmet member, ayse viewer), burak = hanesi olmayan admin.
|
||||
*/
|
||||
|
||||
const ids = new Map<string, string>();
|
||||
let cakir = "";
|
||||
let annemler = "";
|
||||
|
||||
const settings = {
|
||||
name: "Çakır Ailesi",
|
||||
budgetMonthStartDay: 15,
|
||||
installmentBudgetMode: "purchase_month" as const,
|
||||
dailyPlanMode: "even" as const,
|
||||
includePrivateAccountsInTotals: false,
|
||||
extraStoreSavingThresholdMinor: 25_000,
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
expect(getDb().databaseName).toBe("butcem_test");
|
||||
await getDb().dropDatabase();
|
||||
await runSeed({ log: () => {} });
|
||||
for (const u of await getDb().collection("user").find().toArray())
|
||||
ids.set(String(u.username), String(u._id));
|
||||
cakir = String((await HouseholdModel.findOne({ name: "Çakır Ailesi" }))!._id);
|
||||
annemler = String((await HouseholdModel.findOne({ name: "Annemler" }))!._id);
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await getDb().dropDatabase();
|
||||
await mongoose.disconnect();
|
||||
await getMongoClient().close();
|
||||
});
|
||||
|
||||
const id = (username: string) => ids.get(username)!;
|
||||
|
||||
describe("üyelik çözümleme (izolasyon çekirdeği)", () => {
|
||||
it("üye olmayan kullanıcı başka hanenin üyeliğini çözemez", async () => {
|
||||
expect(await resolveMembership(id("fatma"), cakir)).toBeNull();
|
||||
expect(await resolveMembership(id("emre"), annemler)).toBeNull();
|
||||
});
|
||||
|
||||
it("rol yetmezse null döner", async () => {
|
||||
expect((await resolveMembership(id("ayse"), annemler, "viewer"))?.role).toBe("viewer");
|
||||
expect(await resolveMembership(id("ayse"), annemler, "member")).toBeNull();
|
||||
expect(await resolveMembership(id("zeynep"), cakir, "member")).toBeNull();
|
||||
expect((await resolveMembership(id("emre"), cakir, "member"))?.role).toBe("member");
|
||||
});
|
||||
|
||||
it("hanesi olmayan admin hiçbir haneyi göremez (admin ayrıcalığı yok)", async () => {
|
||||
expect(await listMemberships(id("burak"))).toEqual([]);
|
||||
expect(await resolveMembership(id("burak"), cakir)).toBeNull();
|
||||
expect(await getHouseholdDetail(id("burak"), cakir)).toBeNull();
|
||||
});
|
||||
|
||||
it("geçersiz ve uydurma kimlikler reddedilir", async () => {
|
||||
const forged = new Types.ObjectId().toHexString();
|
||||
expect(await resolveMembership(id("ayse"), forged)).toBeNull();
|
||||
expect(await resolveMembership(id("ayse"), "not-an-id")).toBeNull();
|
||||
expect(await resolveMembership(id("ayse"), { $ne: null } as unknown as string)).toBeNull();
|
||||
expect(await resolveMembership("", cakir)).toBeNull();
|
||||
});
|
||||
|
||||
it("kullanıcı yalnızca kendi hanelerini listeler", async () => {
|
||||
expect((await listMemberships(id("ayse"))).map((m) => [m.name, m.role])).toEqual([
|
||||
["Annemler", "viewer"],
|
||||
["Çakır Ailesi", "owner"],
|
||||
]);
|
||||
expect((await listMemberships(id("fatma"))).map((m) => m.name)).toEqual(["Annemler"]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("hane ayrıntısı ve ayarlar", () => {
|
||||
it("başka hanenin ayrıntısı okunamaz", async () => {
|
||||
expect(await getHouseholdDetail(id("fatma"), cakir)).toBeNull();
|
||||
const own = await getHouseholdDetail(id("emre"), cakir);
|
||||
expect(own?.members.map((m) => m.username).sort()).toEqual([
|
||||
"admin",
|
||||
"ayse",
|
||||
"emre",
|
||||
"ozan",
|
||||
"zeynep",
|
||||
]);
|
||||
});
|
||||
|
||||
it("başka hanenin sahibi, üye ve izleyici ayarları değiştiremez", async () => {
|
||||
for (const u of ["fatma", "emre", "zeynep", "burak"]) {
|
||||
const res = await updateHouseholdSettings(id(u), cakir, settings);
|
||||
expect(res.ok, u).toBe(false);
|
||||
}
|
||||
const h = await HouseholdModel.findById(cakir).lean();
|
||||
expect(h?.settings?.budgetMonthStartDay).toBe(1);
|
||||
});
|
||||
|
||||
it("sahip ayarları değiştirir ve denetim kaydı yazılır", async () => {
|
||||
const res = await updateHouseholdSettings(id("ayse"), cakir, settings);
|
||||
expect(res.ok).toBe(true);
|
||||
const h = await HouseholdModel.findById(cakir).lean();
|
||||
expect(h?.settings?.budgetMonthStartDay).toBe(15);
|
||||
const audit = await AuditLogModel.findOne({
|
||||
action: "household.settings.update",
|
||||
householdId: cakir,
|
||||
}).lean();
|
||||
expect(audit?.actorId.toString()).toBe(id("ayse"));
|
||||
expect((audit?.diff as Record<string, unknown>).budgetMonthStartDay).toEqual({
|
||||
from: 1,
|
||||
to: 15,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("üyelik değişiklikleri", () => {
|
||||
it("üye ve izleyici rol değiştiremez, üye çıkaramaz", async () => {
|
||||
expect((await setMemberRole(id("emre"), cakir, id("zeynep"), "owner")).ok).toBe(false);
|
||||
expect((await removeMember(id("zeynep"), cakir, id("emre"))).ok).toBe(false);
|
||||
});
|
||||
|
||||
it("bir hanenin sahibi başka hanedeki üyeliği etkileyemez", async () => {
|
||||
// ayse Çakır'ın sahibi; fatma Çakır üyesi değil → işlem bulunamaz, Annemler'deki rolü değişmez.
|
||||
expect((await setMemberRole(id("ayse"), cakir, id("fatma"), "viewer")).ok).toBe(false);
|
||||
expect((await removeMember(id("ayse"), cakir, id("mehmet"))).ok).toBe(false);
|
||||
// fatma Annemler'in sahibi; Çakır üzerinde yetkisi yok.
|
||||
expect((await setMemberRole(id("fatma"), cakir, id("emre"), "viewer")).ok).toBe(false);
|
||||
const fatma = await HouseholdMemberModel.findOne({
|
||||
householdId: annemler,
|
||||
userId: id("fatma"),
|
||||
}).lean();
|
||||
const mehmet = await HouseholdMemberModel.findOne({
|
||||
householdId: annemler,
|
||||
userId: id("mehmet"),
|
||||
}).lean();
|
||||
const emre = await HouseholdMemberModel.findOne({
|
||||
householdId: cakir,
|
||||
userId: id("emre"),
|
||||
}).lean();
|
||||
expect([fatma?.role, mehmet?.role, emre?.role]).toEqual(["owner", "member", "member"]);
|
||||
});
|
||||
|
||||
it("son sahip düşürülemez; birden çok sahip varken düşürülebilir", async () => {
|
||||
expect((await adminSetMemberRole(id("admin"), annemler, id("fatma"), "member")).ok).toBe(false);
|
||||
expect((await setMemberRole(id("fatma"), annemler, id("fatma"), "member")).ok).toBe(false);
|
||||
// Çakır'da iki sahip var (admin + ayse).
|
||||
expect((await setMemberRole(id("ayse"), cakir, id("admin"), "member")).ok).toBe(true);
|
||||
// Artık ayse son sahip.
|
||||
expect((await setMemberRole(id("ayse"), cakir, id("ayse"), "member")).ok).toBe(false);
|
||||
expect((await setMemberRole(id("ayse"), cakir, id("admin"), "owner")).ok).toBe(true);
|
||||
expect(
|
||||
await AuditLogModel.countDocuments({ action: "household.member.role", householdId: cakir }),
|
||||
).toBe(2);
|
||||
});
|
||||
|
||||
it("sahip üyeyi haneden çıkarır; kullanıcı artık haneyi göremez", async () => {
|
||||
expect((await removeMember(id("ayse"), cakir, id("ozan"))).ok).toBe(true);
|
||||
expect(await resolveMembership(id("ozan"), cakir)).toBeNull();
|
||||
expect(await listMemberships(id("ozan"))).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("admin işlemleri", () => {
|
||||
it("hane + ilk sahip + denetim kaydı tek transaction'da oluşur", async () => {
|
||||
const res = await adminCreateHousehold(id("admin"), {
|
||||
name: "Yazlık",
|
||||
ownerUserId: id("burak"),
|
||||
});
|
||||
expect(res.ok).toBe(true);
|
||||
const hid = res.ok ? res.data.id : "";
|
||||
expect((await resolveMembership(id("burak"), hid, "owner"))?.name).toBe("Yazlık");
|
||||
expect(
|
||||
await AuditLogModel.countDocuments({ action: "household.create", householdId: hid }),
|
||||
).toBe(1);
|
||||
});
|
||||
|
||||
it("var olmayan kullanıcıyla hane oluşturulmaz", async () => {
|
||||
const before = await HouseholdModel.countDocuments();
|
||||
const res = await adminCreateHousehold(id("admin"), {
|
||||
name: "Hayalet",
|
||||
ownerUserId: new Types.ObjectId().toHexString(),
|
||||
});
|
||||
expect(res.ok).toBe(false);
|
||||
expect(await HouseholdModel.countDocuments()).toBe(before);
|
||||
});
|
||||
|
||||
it("kullanıcı silinince tüm üyelikleri temizlenir", async () => {
|
||||
expect(await removeAllMembershipsOfUser(id("mehmet"))).toBe(1);
|
||||
expect(await listMemberships(id("mehmet"))).toEqual([]);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user