feat(listings): phase B — rich property fields + admin-authored personas
Some checks failed
CI / Lint → Typecheck → Test → Build (22) (push) Failing after 6s
CI / E2E Tests (push) Has been skipped
CodeQL Analysis / CodeQL (javascript-typescript) (push) Failing after 1m8s
Deploy / Build API Image (push) Failing after 29s
E2E Tests / Playwright E2E (push) Failing after 13s
Security Scanning / Dependency Audit (pnpm) (push) Failing after 2s
Security Scanning / Trivy Scan — API Image (push) Failing after 1m9s
Security Scanning / Trivy Scan — Web Image (push) Failing after 37s
Security Scanning / Trivy Scan — AI Services Image (push) Failing after 1m2s
Security Scanning / Trivy Filesystem Scan (push) Failing after 51s
Deploy / Smoke Test Staging (push) Has been skipped
Deploy / Smoke Test Production (push) Has been skipped
Security Scanning / Security Gate (push) Failing after 1s
Deploy / Rollback Staging (push) Has been skipped
Deploy / Rollback Production (push) Has been skipped
Deploy / Build Web Image (push) Failing after 14s
Deploy / Build AI Services Image (push) Failing after 12s
Deploy / Deploy to Staging (push) Has been skipped
Deploy / Deploy to Production (push) Has been skipped

Schema (prisma/migrations/20260419000000_property_rich_fields)
--------------------------------------------------------------
New Prisma enums:
- Furnishing: FULLY_FURNISHED / BASIC_FURNISHED / UNFURNISHED
- PropertyCondition: NEW / LIKE_NEW / RENOVATED / USED

New Property columns (all optional / default empty, no data loss):
- furnishing, propertyCondition — enums above
- balconyDirection — reuses existing Direction enum
- maintenanceFeeVND BigInt (phí quản lý/tháng)
- parkingSlots Int
- viewType String[] (e.g. ["Sông","Thành phố"])
- petFriendly Boolean (null = unknown)
- suitableFor String[] — admin-chosen persona labels
- whyThisLocation Text — admin narrative

Backend wiring end-to-end
-------------------------
- Create/Update DTOs: @IsEnum/@IsString/@IsNumber/@IsBoolean/@IsArray
  validators; maintenanceFeeVND accepted as a numeric string, cast to
  BigInt on the way to Prisma. whyThisLocation capped at 2000 chars.
- Introduced a small `PropertyExtras` interface on the create/update
  commands so the constructor signature stays readable instead of
  ballooning to 30+ positional args. Handlers forward it to the repo.
- Prisma property repository writes all new columns via raw SQL
  INSERT/UPDATE and reads them on findById.
- ListingDetailData + findByIdWithProperty expose the 9 new fields
  (maintenanceFeeVND serialised as decimal string to avoid BigInt JSON).

Frontend
--------
- listings-api.ts: ListingDetail.property + CreateListingPayload carry
  the 9 new fields; Furnishing + PropertyCondition exported as string
  unions.
- validations/listings.ts: zod schema extended; FURNISHING_OPTIONS,
  PROPERTY_CONDITION_OPTIONS, VIEW_TYPE_OPTIONS label arrays added in
  the existing DIRECTIONS style (Vietnamese labels).
- listing-form-steps.tsx StepDetails: new "Nội thất & điều kiện"
  fieldset with selects/inputs for each field. viewType + suitableFor
  are comma-separated text (same convention as amenities).
  petFriendly is a 3-way select (không chọn / Có / Không).
- new/page.tsx + [id]/edit/page.tsx: submit handlers split CSV inputs
  into arrays, coerce petFriendly, prune empty selects.
- listing-detail-client.tsx Details card: new rows for furnishing,
  propertyCondition, balconyDirection, maintenanceFeeVND (VND
  formatted), parkingSlots, viewType (joined · ), petFriendly
  (Cho phép / Không cho phép / hide when null).
- PersonaFitCard now takes the listing directly and MERGES admin
  suitableFor (rendered first with a "Người đăng chọn" badge in primary
  accent) with the derived personas (deduped by label). When
  whyThisLocation is non-empty it overrides the derived narrative.

Tests
-----
- listing-detail-client.spec.tsx fixture gains all 9 nullable/empty
  defaults.
- listing-form-steps.spec.tsx direction-options duplication fixed.
- pnpm --filter @goodgo/api test --run: 1975/1975 pass.
- pnpm --filter @goodgo/web test --run: 624/624 pass.

Phase B of 4. Next: Phase E AI advisor via Anthropic Opus (URL+key to
be provided by the user).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ho Ngoc Hai
2026-04-19 15:08:04 +07:00
parent a008e623c5
commit 88429a1e51
21 changed files with 638 additions and 21 deletions

View File

@@ -62,6 +62,20 @@ export default function EditListingPage() {
priceVND: data.priceVND,
rentPriceMonthly: data.rentPriceMonthly ?? '',
commissionPct: data.commissionPct != null ? String(data.commissionPct) : '',
furnishing: property.furnishing ?? '',
propertyCondition: property.propertyCondition ?? '',
balconyDirection: property.balconyDirection ?? '',
maintenanceFeeVND: property.maintenanceFeeVND ?? '',
parkingSlots: property.parkingSlots != null ? String(property.parkingSlots) : '',
viewType: property.viewType?.join(', ') ?? '',
petFriendly:
property.petFriendly === true
? 'true'
: property.petFriendly === false
? 'false'
: '',
suitableFor: property.suitableFor?.join(', ') ?? '',
whyThisLocation: property.whyThisLocation ?? '',
});
})
.catch(() => setListing(null))

View File

@@ -13,7 +13,13 @@ import {
} from '@/components/listings/listing-form-steps';
import { Button } from '@/components/ui/button';
import { Card, CardContent } from '@/components/ui/card';
import { listingsApi, type CreateListingPayload, type Direction } from '@/lib/listings-api';
import {
listingsApi,
type CreateListingPayload,
type Direction,
type Furnishing,
type PropertyCondition,
} from '@/lib/listings-api';
import { cn } from '@/lib/utils';
import {
createListingSchema,
@@ -110,6 +116,25 @@ export default function CreateListingPage() {
const commissionPct = toNum(data.commissionPct);
if (commissionPct != null) payload.commissionPct = commissionPct;
// Rich property fields ----------------------------------
if (data.furnishing) payload.furnishing = data.furnishing as Furnishing;
if (data.propertyCondition) payload.propertyCondition = data.propertyCondition as PropertyCondition;
if (data.balconyDirection) payload.balconyDirection = data.balconyDirection as Direction;
if (data.maintenanceFeeVND) payload.maintenanceFeeVND = data.maintenanceFeeVND;
const parkingSlots = toNum(data.parkingSlots);
if (parkingSlots != null) payload.parkingSlots = parkingSlots;
if (data.viewType) {
const arr = data.viewType.split(',').map((s) => s.trim()).filter(Boolean);
if (arr.length > 0) payload.viewType = arr;
}
if (data.petFriendly === 'true') payload.petFriendly = true;
else if (data.petFriendly === 'false') payload.petFriendly = false;
if (data.suitableFor) {
const arr = data.suitableFor.split(',').map((s) => s.trim()).filter(Boolean);
if (arr.length > 0) payload.suitableFor = arr;
}
if (data.whyThisLocation) payload.whyThisLocation = data.whyThisLocation;
const result = await listingsApi.create(payload);
for (const img of images) {

View File

@@ -116,6 +116,15 @@ function makeListing(overrides: Partial<ListingDetail> = {}): ListingDetail {
projectName: 'Vinhomes Central Park',
latitude: 10.7975,
longitude: 106.721,
furnishing: null,
propertyCondition: null,
balconyDirection: null,
maintenanceFeeVND: null,
parkingSlots: null,
viewType: [],
petFriendly: null,
suitableFor: [],
whyThisLocation: null,
media: [
{ id: 'media-1', type: 'image', url: 'https://example.com/img1.jpg', order: 0, caption: null },
],

View File

@@ -148,9 +148,11 @@ describe('StepDetails', () => {
it('renders direction options', () => {
render(<StepDetails register={mockRegister()} errors={noErrors} />);
expect(screen.getByText('Bắc')).toBeInTheDocument();
expect(screen.getByText('Nam')).toBeInTheDocument();
expect(screen.getByText('Đông')).toBeInTheDocument();
// "Direction" options appear in both `direction` and `balconyDirection`
// selects, so they occur multiple times.
expect(screen.getAllByText('Bắc').length).toBeGreaterThanOrEqual(1);
expect(screen.getAllByText('Nam').length).toBeGreaterThanOrEqual(1);
expect(screen.getAllByText('Đông').length).toBeGreaterThanOrEqual(1);
});
it('renders year built input', () => {

View File

@@ -18,7 +18,13 @@ import { formatPrice, formatPricePerM2 } from '@/lib/currency';
import { composeWhyThisLocation, derivePersonas } from '@/lib/listing-personas';
import type { ListingDetail, NeighborhoodScoreResult, PriceHistoryItem } from '@/lib/listings-api';
import { listingsApi } from '@/lib/listings-api';
import { PROPERTY_TYPES, DIRECTIONS, TRANSACTION_TYPES } from '@/lib/validations/listings';
import {
PROPERTY_TYPES,
DIRECTIONS,
TRANSACTION_TYPES,
FURNISHING_OPTIONS,
PROPERTY_CONDITION_OPTIONS,
} from '@/lib/validations/listings';
import type { POIItem } from '@/components/neighborhood';
const NeighborhoodRadarChart = dynamic(
@@ -244,6 +250,27 @@ export function ListingDetailClient({ listing }: ListingDetailClientProps) {
: '---'
}
/>
<InfoItem label="Nội thất" value={getLabel(FURNISHING_OPTIONS, property.furnishing) || '---'} />
<InfoItem label="Tình trạng" value={getLabel(PROPERTY_CONDITION_OPTIONS, property.propertyCondition) || '---'} />
<InfoItem label="Hướng ban công" value={getLabel(DIRECTIONS, property.balconyDirection) || '---'} />
<InfoItem
label="Phí quản lý/tháng"
value={property.maintenanceFeeVND ? `${formatPrice(property.maintenanceFeeVND)} VND` : '---'}
/>
<InfoItem
label="Chỗ để xe"
value={property.parkingSlots != null ? `${property.parkingSlots}` : '---'}
/>
<InfoItem
label="View"
value={property.viewType && property.viewType.length > 0 ? property.viewType.join(' • ') : '---'}
/>
{property.petFriendly !== null && (
<InfoItem
label="Thú cưng"
value={property.petFriendly ? 'Cho phép' : 'Không cho phép'}
/>
)}
</div>
</CardContent>
</Card>
@@ -451,17 +478,29 @@ function PersonaFitCard({
score: NeighborhoodScoreResult | null;
pois: POIItem[];
}) {
const personas = React.useMemo(
const adminPicks = listing.property.suitableFor ?? [];
const adminNarrative = listing.property.whyThisLocation?.trim() || null;
// Derive personas purely from signals — then prepend admin picks, de-duping
// against derived labels so we never double up.
const derived = React.useMemo(
() => derivePersonas(listing, score, pois),
[listing, score, pois],
);
const narrative = React.useMemo(
const derivedNarrative = React.useMemo(
() => composeWhyThisLocation(listing, score, pois),
[listing, score, pois],
);
// Admin narrative wins when present — that's the authoritative version.
const narrative = adminNarrative ?? derivedNarrative;
// Merge: admin picks first (each shown as "admin-chosen"), then derived
// personas whose labels aren't already in the admin picks.
const derivedFiltered = derived.filter((d) => !adminPicks.includes(d.label));
// Only render when we have something meaningful to say.
if (personas.length === 0 && !narrative) return null;
if (adminPicks.length === 0 && derivedFiltered.length === 0 && !narrative) return null;
return (
<Card className="my-6 border-primary/30 bg-primary/5">
@@ -469,9 +508,20 @@ function PersonaFitCard({
<CardTitle className="text-lg">Phù hợp với ai?</CardTitle>
</CardHeader>
<CardContent className="space-y-4">
{personas.length > 0 && (
{(adminPicks.length > 0 || derivedFiltered.length > 0) && (
<div className="flex flex-wrap gap-2">
{personas.map((p) => (
{adminPicks.map((label) => (
<div
key={`admin-${label}`}
className="group relative inline-flex items-center gap-1.5 rounded-full border border-primary/50 bg-primary/10 px-3 py-1.5 text-sm shadow-sm"
>
<span className="font-medium">{label}</span>
<span className="rounded bg-primary/20 px-1.5 py-0.5 text-[10px] uppercase tracking-wide text-primary">
Người đăng chọn
</span>
</div>
))}
{derivedFiltered.map((p) => (
<div
key={p.key}
className="group relative inline-flex items-center gap-1.5 rounded-full border bg-card px-3 py-1.5 text-sm shadow-sm"
@@ -483,9 +533,9 @@ function PersonaFitCard({
))}
</div>
)}
{personas.length > 0 && (
{derivedFiltered.length > 0 && (
<ul className="space-y-1.5 text-sm text-muted-foreground">
{personas.map((p) => (
{derivedFiltered.map((p) => (
<li key={`reason-${p.key}`} className="flex gap-2">
<span className="shrink-0 text-primary" aria-hidden="true"></span>
<span>

View File

@@ -9,6 +9,8 @@ import {
TRANSACTION_TYPES,
PROPERTY_TYPES,
DIRECTIONS,
FURNISHING_OPTIONS,
PROPERTY_CONDITION_OPTIONS,
type CreateListingFormData,
} from '@/lib/validations/listings';
@@ -208,6 +210,96 @@ export function StepDetails({ register, errors }: StepProps) {
<Label htmlFor="amenities">Tiện ích (cách nhau bởi dấu phẩy)</Label>
<Input id="amenities" placeholder="VD: Hồ bơi, Gym, Công viên" {...register('amenities')} />
</div>
<fieldset className="space-y-4 rounded-lg border p-4">
<legend className="px-2 text-sm font-semibold">Nội thất & điều kiện</legend>
<div className="grid gap-4 sm:grid-cols-2 md:grid-cols-3">
<div>
<Label htmlFor="furnishing">Nội thất</Label>
<Select id="furnishing" {...register('furnishing')}>
<option value="">-- Không chọn --</option>
{FURNISHING_OPTIONS.map((o) => (
<option key={o.value} value={o.value}>
{o.label}
</option>
))}
</Select>
</div>
<div>
<Label htmlFor="propertyCondition">Tình trạng</Label>
<Select id="propertyCondition" {...register('propertyCondition')}>
<option value="">-- Không chọn --</option>
{PROPERTY_CONDITION_OPTIONS.map((o) => (
<option key={o.value} value={o.value}>
{o.label}
</option>
))}
</Select>
</div>
<div>
<Label htmlFor="balconyDirection">Hướng ban công</Label>
<Select id="balconyDirection" {...register('balconyDirection')}>
<option value="">-- Không chọn --</option>
{DIRECTIONS.map((d) => (
<option key={d.value} value={d.value}>
{d.label}
</option>
))}
</Select>
</div>
<div>
<Label htmlFor="maintenanceFeeVND">Phí quản / tháng (VNĐ)</Label>
<Input
id="maintenanceFeeVND"
type="text"
inputMode="numeric"
placeholder="VD: 2500000"
{...register('maintenanceFeeVND')}
/>
</div>
<div>
<Label htmlFor="parkingSlots">Chỗ đ xe</Label>
<Input id="parkingSlots" type="number" min="0" {...register('parkingSlots')} />
</div>
<div>
<Label htmlFor="petFriendly">Cho phép thú cưng</Label>
<Select id="petFriendly" {...register('petFriendly')}>
<option value="">-- Không chọn --</option>
<option value="true"></option>
<option value="false">Không</option>
</Select>
</div>
</div>
<div>
<Label htmlFor="viewType">View (cách nhau bởi dấu phẩy)</Label>
<Input
id="viewType"
placeholder="VD: Sông, Thành phố, Công viên"
{...register('viewType')}
/>
</div>
<div>
<Label htmlFor="suitableFor">Phù hợp với (cách nhau bởi dấu phẩy)</Label>
<Input
id="suitableFor"
placeholder="VD: Gia đình có con nhỏ, Người đi làm xa"
{...register('suitableFor')}
/>
</div>
<div>
<Label htmlFor="whyThisLocation"> sao khu vực này phù hợp</Label>
<Textarea
id="whyThisLocation"
rows={3}
placeholder="Mô tả ngắn lý do khu vực này phù hợp với người mua..."
{...register('whyThisLocation')}
/>
</div>
</fieldset>
</div>
);
}

View File

@@ -23,6 +23,9 @@ export type Direction =
| 'SOUTHEAST'
| 'SOUTHWEST';
export type Furnishing = 'FULLY_FURNISHED' | 'BASIC_FURNISHED' | 'UNFURNISHED';
export type PropertyCondition = 'NEW' | 'LIKE_NEW' | 'RENOVATED' | 'USED';
// ─── Interfaces ──────────────────────────────────────────
export interface PropertyMedia {
@@ -71,6 +74,15 @@ export interface ListingDetail {
projectName: string | null;
latitude: number | null;
longitude: number | null;
furnishing: Furnishing | null;
propertyCondition: PropertyCondition | null;
balconyDirection: Direction | null;
maintenanceFeeVND: string | null;
parkingSlots: number | null;
viewType: string[];
petFriendly: boolean | null;
suitableFor: string[];
whyThisLocation: string | null;
media: PropertyMedia[];
thumbnail?: string | null;
};
@@ -120,6 +132,16 @@ export interface CreateListingPayload {
projectName?: string;
rentPriceMonthly?: string;
commissionPct?: number;
// Rich property fields (Phase B)
furnishing?: Furnishing;
propertyCondition?: PropertyCondition;
balconyDirection?: Direction;
maintenanceFeeVND?: string;
parkingSlots?: number;
viewType?: string[];
petFriendly?: boolean;
suitableFor?: string[];
whyThisLocation?: string;
}
export interface SearchListingsParams {

View File

@@ -25,6 +25,29 @@ export const DIRECTIONS = [
{ value: 'SOUTHWEST', label: 'Tây Nam' },
] as const;
export const FURNISHING_OPTIONS = [
{ value: 'FULLY_FURNISHED', label: 'Đầy đủ nội thất' },
{ value: 'BASIC_FURNISHED', label: 'Nội thất cơ bản' },
{ value: 'UNFURNISHED', label: 'Bàn giao thô' },
] as const;
export const PROPERTY_CONDITION_OPTIONS = [
{ value: 'NEW', label: 'Mới' },
{ value: 'LIKE_NEW', label: 'Như mới' },
{ value: 'RENOVATED', label: 'Đã cải tạo' },
{ value: 'USED', label: 'Đã qua sử dụng' },
] as const;
export const VIEW_TYPE_OPTIONS = [
{ value: 'Sông', label: 'Sông' },
{ value: 'Thành phố', label: 'Thành phố' },
{ value: 'Công viên', label: 'Công viên' },
{ value: 'Hồ bơi', label: 'Hồ bơi' },
{ value: 'Sân vườn', label: 'Sân vườn' },
{ value: 'Biển', label: 'Biển' },
{ value: 'Nội khu', label: 'Nội khu' },
] as const;
export const LISTING_STATUSES = {
DRAFT: { label: 'Nháp', variant: 'secondary' as const },
PENDING_REVIEW: { label: 'Chờ duyệt', variant: 'warning' as const },
@@ -75,6 +98,16 @@ export const listingDetailsSchema = z.object({
legalStatus: z.string().optional(),
amenities: z.string().optional(),
projectName: z.string().optional(),
// Rich property fields (Phase B)
furnishing: z.string().optional(),
propertyCondition: z.string().optional(),
balconyDirection: z.string().optional(),
maintenanceFeeVND: z.string().optional(),
parkingSlots: z.string().optional(),
viewType: z.string().optional(), // comma-separated
petFriendly: z.string().optional(), // '' | 'true' | 'false'
suitableFor: z.string().optional(), // comma-separated
whyThisLocation: z.string().max(2000, 'Tối đa 2000 ký tự').optional(),
});
// ─── Step 4: Pricing ─────────────────────────────────────