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
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:
@@ -1,4 +1,20 @@
|
||||
import { type PropertyType, type TransactionType, type Direction } from '@prisma/client';
|
||||
import { type PropertyType, type TransactionType, type Direction, type Furnishing, type PropertyCondition } from '@prisma/client';
|
||||
|
||||
/**
|
||||
* Optional "rich" property fields. Bundled so the command constructor does
|
||||
* not grow unbounded each time we add a field.
|
||||
*/
|
||||
export interface PropertyExtras {
|
||||
furnishing?: Furnishing;
|
||||
propertyCondition?: PropertyCondition;
|
||||
balconyDirection?: Direction;
|
||||
maintenanceFeeVND?: bigint;
|
||||
parkingSlots?: number;
|
||||
viewType?: string[];
|
||||
petFriendly?: boolean;
|
||||
suitableFor?: string[];
|
||||
whyThisLocation?: string;
|
||||
}
|
||||
|
||||
export class CreateListingCommand {
|
||||
constructor(
|
||||
@@ -34,5 +50,7 @@ export class CreateListingCommand {
|
||||
public readonly agentId?: string,
|
||||
public readonly rentPriceMonthly?: bigint,
|
||||
public readonly commissionPct?: number,
|
||||
// Rich property fields bundled as options object (keeps ctor scalable)
|
||||
public readonly extras?: PropertyExtras,
|
||||
) {}
|
||||
}
|
||||
|
||||
@@ -68,6 +68,7 @@ export class CreateListingHandler implements ICommandHandler<CreateListingComman
|
||||
|
||||
// Create property
|
||||
const propertyId = createId();
|
||||
const extras = command.extras ?? {};
|
||||
const property = PropertyEntity.createNew(propertyId, {
|
||||
propertyType: command.propertyType,
|
||||
title: command.title,
|
||||
@@ -88,6 +89,15 @@ export class CreateListingHandler implements ICommandHandler<CreateListingComman
|
||||
nearbyPOIs: command.nearbyPOIs ?? null,
|
||||
metroDistanceM: command.metroDistanceM ?? null,
|
||||
projectName: command.projectName ?? null,
|
||||
furnishing: extras.furnishing ?? null,
|
||||
propertyCondition: extras.propertyCondition ?? null,
|
||||
balconyDirection: extras.balconyDirection ?? null,
|
||||
maintenanceFeeVND: extras.maintenanceFeeVND ?? null,
|
||||
parkingSlots: extras.parkingSlots ?? null,
|
||||
viewType: extras.viewType ?? [],
|
||||
petFriendly: extras.petFriendly ?? null,
|
||||
suitableFor: extras.suitableFor ?? [],
|
||||
whyThisLocation: extras.whyThisLocation ?? null,
|
||||
});
|
||||
|
||||
await this.propertyRepo.save(property);
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { type PropertyExtras } from '../create-listing/create-listing.command';
|
||||
|
||||
export class UpdateListingCommand {
|
||||
constructor(
|
||||
public readonly listingId: string,
|
||||
@@ -9,5 +11,7 @@ export class UpdateListingCommand {
|
||||
public readonly amenities?: string[],
|
||||
public readonly mediaOrder?: { mediaId: string; order: number }[],
|
||||
public readonly userRole?: string,
|
||||
// Rich property fields bundled so ctor stays compact (all optional).
|
||||
public readonly extras?: PropertyExtras,
|
||||
) {}
|
||||
}
|
||||
|
||||
@@ -51,10 +51,25 @@ export class UpdateListingHandler implements ICommandHandler<UpdateListingComman
|
||||
// 3. Validate no fields are being sent (empty update)
|
||||
const hasListingUpdates =
|
||||
command.priceVND !== undefined || command.rentPriceMonthly !== undefined;
|
||||
const extras = command.extras;
|
||||
const hasExtrasUpdates =
|
||||
extras !== undefined &&
|
||||
(
|
||||
extras.furnishing !== undefined ||
|
||||
extras.propertyCondition !== undefined ||
|
||||
extras.balconyDirection !== undefined ||
|
||||
extras.maintenanceFeeVND !== undefined ||
|
||||
extras.parkingSlots !== undefined ||
|
||||
extras.viewType !== undefined ||
|
||||
extras.petFriendly !== undefined ||
|
||||
extras.suitableFor !== undefined ||
|
||||
extras.whyThisLocation !== undefined
|
||||
);
|
||||
const hasPropertyUpdates =
|
||||
command.title !== undefined ||
|
||||
command.description !== undefined ||
|
||||
command.amenities !== undefined;
|
||||
command.amenities !== undefined ||
|
||||
hasExtrasUpdates;
|
||||
const hasMediaOrderUpdate =
|
||||
command.mediaOrder !== undefined && command.mediaOrder.length > 0;
|
||||
|
||||
@@ -81,12 +96,21 @@ export class UpdateListingHandler implements ICommandHandler<UpdateListingComman
|
||||
allUpdatedFields.push(...listingUpdated);
|
||||
}
|
||||
|
||||
// Update property fields (title, description, amenities)
|
||||
// Update property fields (title, description, amenities, rich fields)
|
||||
if (hasPropertyUpdates) {
|
||||
const propertyUpdated = property.updateContent({
|
||||
title: command.title,
|
||||
description: command.description,
|
||||
amenities: command.amenities,
|
||||
...(extras?.furnishing !== undefined && { furnishing: extras.furnishing }),
|
||||
...(extras?.propertyCondition !== undefined && { propertyCondition: extras.propertyCondition }),
|
||||
...(extras?.balconyDirection !== undefined && { balconyDirection: extras.balconyDirection }),
|
||||
...(extras?.maintenanceFeeVND !== undefined && { maintenanceFeeVND: extras.maintenanceFeeVND }),
|
||||
...(extras?.parkingSlots !== undefined && { parkingSlots: extras.parkingSlots }),
|
||||
...(extras?.viewType !== undefined && { viewType: extras.viewType }),
|
||||
...(extras?.petFriendly !== undefined && { petFriendly: extras.petFriendly }),
|
||||
...(extras?.suitableFor !== undefined && { suitableFor: extras.suitableFor }),
|
||||
...(extras?.whyThisLocation !== undefined && { whyThisLocation: extras.whyThisLocation }),
|
||||
});
|
||||
allUpdatedFields.push(...propertyUpdated);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { type PropertyType, type Direction } from '@prisma/client';
|
||||
import { type PropertyType, type Direction, type Furnishing, type PropertyCondition } from '@prisma/client';
|
||||
import { AggregateRoot } from '@modules/shared';
|
||||
import { type Address } from '../value-objects/address.vo';
|
||||
import { type GeoPoint } from '../value-objects/geo-point.vo';
|
||||
@@ -23,6 +23,16 @@ export interface PropertyProps {
|
||||
nearbyPOIs: unknown;
|
||||
metroDistanceM: number | null;
|
||||
projectName: string | null;
|
||||
// --- Rich fields (Phase B) -----------------------------
|
||||
furnishing?: Furnishing | null;
|
||||
propertyCondition?: PropertyCondition | null;
|
||||
balconyDirection?: Direction | null;
|
||||
maintenanceFeeVND?: bigint | null;
|
||||
parkingSlots?: number | null;
|
||||
viewType?: string[];
|
||||
petFriendly?: boolean | null;
|
||||
suitableFor?: string[];
|
||||
whyThisLocation?: string | null;
|
||||
}
|
||||
|
||||
export class PropertyEntity extends AggregateRoot<string> {
|
||||
@@ -45,6 +55,15 @@ export class PropertyEntity extends AggregateRoot<string> {
|
||||
private _nearbyPOIs: unknown;
|
||||
private _metroDistanceM: number | null;
|
||||
private _projectName: string | null;
|
||||
private _furnishing: Furnishing | null;
|
||||
private _propertyCondition: PropertyCondition | null;
|
||||
private _balconyDirection: Direction | null;
|
||||
private _maintenanceFeeVND: bigint | null;
|
||||
private _parkingSlots: number | null;
|
||||
private _viewType: string[];
|
||||
private _petFriendly: boolean | null;
|
||||
private _suitableFor: string[];
|
||||
private _whyThisLocation: string | null;
|
||||
|
||||
constructor(id: string, props: PropertyProps, createdAt?: Date, updatedAt?: Date) {
|
||||
super(id, createdAt, updatedAt);
|
||||
@@ -67,6 +86,15 @@ export class PropertyEntity extends AggregateRoot<string> {
|
||||
this._nearbyPOIs = props.nearbyPOIs;
|
||||
this._metroDistanceM = props.metroDistanceM;
|
||||
this._projectName = props.projectName;
|
||||
this._furnishing = props.furnishing ?? null;
|
||||
this._propertyCondition = props.propertyCondition ?? null;
|
||||
this._balconyDirection = props.balconyDirection ?? null;
|
||||
this._maintenanceFeeVND = props.maintenanceFeeVND ?? null;
|
||||
this._parkingSlots = props.parkingSlots ?? null;
|
||||
this._viewType = props.viewType ?? [];
|
||||
this._petFriendly = props.petFriendly ?? null;
|
||||
this._suitableFor = props.suitableFor ?? [];
|
||||
this._whyThisLocation = props.whyThisLocation ?? null;
|
||||
}
|
||||
|
||||
get propertyType(): PropertyType { return this._propertyType; }
|
||||
@@ -88,6 +116,15 @@ export class PropertyEntity extends AggregateRoot<string> {
|
||||
get nearbyPOIs(): unknown { return this._nearbyPOIs; }
|
||||
get metroDistanceM(): number | null { return this._metroDistanceM; }
|
||||
get projectName(): string | null { return this._projectName; }
|
||||
get furnishing(): Furnishing | null { return this._furnishing; }
|
||||
get propertyCondition(): PropertyCondition | null { return this._propertyCondition; }
|
||||
get balconyDirection(): Direction | null { return this._balconyDirection; }
|
||||
get maintenanceFeeVND(): bigint | null { return this._maintenanceFeeVND; }
|
||||
get parkingSlots(): number | null { return this._parkingSlots; }
|
||||
get viewType(): string[] { return this._viewType; }
|
||||
get petFriendly(): boolean | null { return this._petFriendly; }
|
||||
get suitableFor(): string[] { return this._suitableFor; }
|
||||
get whyThisLocation(): string | null { return this._whyThisLocation; }
|
||||
|
||||
static createNew(id: string, props: PropertyProps): PropertyEntity {
|
||||
return new PropertyEntity(id, props);
|
||||
@@ -101,6 +138,15 @@ export class PropertyEntity extends AggregateRoot<string> {
|
||||
title?: string;
|
||||
description?: string;
|
||||
amenities?: unknown;
|
||||
furnishing?: Furnishing | null;
|
||||
propertyCondition?: PropertyCondition | null;
|
||||
balconyDirection?: Direction | null;
|
||||
maintenanceFeeVND?: bigint | null;
|
||||
parkingSlots?: number | null;
|
||||
viewType?: string[];
|
||||
petFriendly?: boolean | null;
|
||||
suitableFor?: string[];
|
||||
whyThisLocation?: string | null;
|
||||
}): string[] {
|
||||
const updatedFields: string[] = [];
|
||||
|
||||
@@ -119,6 +165,43 @@ export class PropertyEntity extends AggregateRoot<string> {
|
||||
updatedFields.push('amenities');
|
||||
}
|
||||
|
||||
if (fields.furnishing !== undefined) {
|
||||
this._furnishing = fields.furnishing;
|
||||
updatedFields.push('furnishing');
|
||||
}
|
||||
if (fields.propertyCondition !== undefined) {
|
||||
this._propertyCondition = fields.propertyCondition;
|
||||
updatedFields.push('propertyCondition');
|
||||
}
|
||||
if (fields.balconyDirection !== undefined) {
|
||||
this._balconyDirection = fields.balconyDirection;
|
||||
updatedFields.push('balconyDirection');
|
||||
}
|
||||
if (fields.maintenanceFeeVND !== undefined) {
|
||||
this._maintenanceFeeVND = fields.maintenanceFeeVND;
|
||||
updatedFields.push('maintenanceFeeVND');
|
||||
}
|
||||
if (fields.parkingSlots !== undefined) {
|
||||
this._parkingSlots = fields.parkingSlots;
|
||||
updatedFields.push('parkingSlots');
|
||||
}
|
||||
if (fields.viewType !== undefined) {
|
||||
this._viewType = fields.viewType;
|
||||
updatedFields.push('viewType');
|
||||
}
|
||||
if (fields.petFriendly !== undefined) {
|
||||
this._petFriendly = fields.petFriendly;
|
||||
updatedFields.push('petFriendly');
|
||||
}
|
||||
if (fields.suitableFor !== undefined) {
|
||||
this._suitableFor = fields.suitableFor;
|
||||
updatedFields.push('suitableFor');
|
||||
}
|
||||
if (fields.whyThisLocation !== undefined) {
|
||||
this._whyThisLocation = fields.whyThisLocation;
|
||||
updatedFields.push('whyThisLocation');
|
||||
}
|
||||
|
||||
if (updatedFields.length > 0) {
|
||||
this.updatedAt = new Date();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { type ListingStatus, type TransactionType, type PropertyType, type Direction } from '@prisma/client';
|
||||
import { type ListingStatus, type TransactionType, type PropertyType, type Direction, type Furnishing, type PropertyCondition } from '@prisma/client';
|
||||
|
||||
/** Returned by findByIdWithProperty — full listing detail with property, seller, agent */
|
||||
export interface ListingDetailData {
|
||||
@@ -41,6 +41,15 @@ export interface ListingDetailData {
|
||||
nearbyPOIs: unknown;
|
||||
metroDistanceM: number | null;
|
||||
projectName: string | 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: ListingMediaData[];
|
||||
};
|
||||
seller: {
|
||||
|
||||
@@ -75,6 +75,15 @@ export async function findByIdWithProperty(
|
||||
nearbyPOIs: listing.property.nearbyPOIs,
|
||||
metroDistanceM: listing.property.metroDistanceM,
|
||||
projectName: listing.property.projectName,
|
||||
furnishing: listing.property.furnishing,
|
||||
propertyCondition: listing.property.propertyCondition,
|
||||
balconyDirection: listing.property.balconyDirection,
|
||||
maintenanceFeeVND: listing.property.maintenanceFeeVND?.toString() ?? null,
|
||||
parkingSlots: listing.property.parkingSlots,
|
||||
viewType: listing.property.viewType ?? [],
|
||||
petFriendly: listing.property.petFriendly,
|
||||
suitableFor: listing.property.suitableFor ?? [],
|
||||
whyThisLocation: listing.property.whyThisLocation,
|
||||
media: listing.property.media.map((m) => ({
|
||||
id: m.id,
|
||||
url: m.url,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { type Prisma, type PropertyMedia as PrismaMedia, type PropertyType, type Direction } from '@prisma/client';
|
||||
import { type Prisma, type PropertyMedia as PrismaMedia, type PropertyType, type Direction, type Furnishing, type PropertyCondition } from '@prisma/client';
|
||||
import { PrismaService } from '@modules/shared';
|
||||
import { PropertyMediaEntity, type PropertyMediaProps } from '../../domain/entities/property-media.entity';
|
||||
import { PropertyEntity, type PropertyProps } from '../../domain/entities/property.entity';
|
||||
@@ -33,6 +33,15 @@ interface PropertyWithGeo {
|
||||
nearbyPOIs: unknown;
|
||||
metroDistanceM: number | null;
|
||||
projectName: string | null;
|
||||
furnishing: Furnishing | null;
|
||||
propertyCondition: PropertyCondition | null;
|
||||
balconyDirection: Direction | null;
|
||||
maintenanceFeeVND: bigint | null;
|
||||
parkingSlots: number | null;
|
||||
viewType: string[] | null;
|
||||
petFriendly: boolean | null;
|
||||
suitableFor: string[] | null;
|
||||
whyThisLocation: string | null;
|
||||
createdAt: Date;
|
||||
updatedAt: Date;
|
||||
}
|
||||
@@ -52,7 +61,11 @@ export class PrismaPropertyRepository implements IPropertyRepository {
|
||||
"areaM2", "usableAreaM2", "bedrooms", "bathrooms",
|
||||
"floors", "floor", "totalFloors", "direction",
|
||||
"yearBuilt", "legalStatus", "amenities", "nearbyPOIs",
|
||||
"metroDistanceM", "projectName", "createdAt", "updatedAt"
|
||||
"metroDistanceM", "projectName",
|
||||
"furnishing", "propertyCondition", "balconyDirection",
|
||||
"maintenanceFeeVND", "parkingSlots", "viewType",
|
||||
"petFriendly", "suitableFor", "whyThisLocation",
|
||||
"createdAt", "updatedAt"
|
||||
FROM "Property"
|
||||
WHERE "id" = ${id}
|
||||
LIMIT 1
|
||||
@@ -67,7 +80,11 @@ export class PrismaPropertyRepository implements IPropertyRepository {
|
||||
"id", "propertyType", "title", "description", "address", "ward", "district", "city",
|
||||
"location", "areaM2", "usableAreaM2", "bedrooms", "bathrooms", "floors", "floor",
|
||||
"totalFloors", "direction", "yearBuilt", "legalStatus", "amenities", "nearbyPOIs",
|
||||
"metroDistanceM", "projectName", "createdAt", "updatedAt"
|
||||
"metroDistanceM", "projectName",
|
||||
"furnishing", "propertyCondition", "balconyDirection",
|
||||
"maintenanceFeeVND", "parkingSlots", "viewType",
|
||||
"petFriendly", "suitableFor", "whyThisLocation",
|
||||
"createdAt", "updatedAt"
|
||||
) VALUES (
|
||||
${entity.id}, ${entity.propertyType}::"PropertyType", ${entity.title}, ${entity.description},
|
||||
${entity.address.address}, ${entity.address.ward}, ${entity.address.district}, ${entity.address.city},
|
||||
@@ -78,6 +95,15 @@ export class PrismaPropertyRepository implements IPropertyRepository {
|
||||
${entity.amenities ? JSON.stringify(entity.amenities) : null}::jsonb,
|
||||
${entity.nearbyPOIs ? JSON.stringify(entity.nearbyPOIs) : null}::jsonb,
|
||||
${entity.metroDistanceM}, ${entity.projectName},
|
||||
${entity.furnishing}::"Furnishing",
|
||||
${entity.propertyCondition}::"PropertyCondition",
|
||||
${entity.balconyDirection}::"Direction",
|
||||
${entity.maintenanceFeeVND},
|
||||
${entity.parkingSlots},
|
||||
${entity.viewType}::text[],
|
||||
${entity.petFriendly},
|
||||
${entity.suitableFor}::text[],
|
||||
${entity.whyThisLocation},
|
||||
${entity.createdAt}, ${entity.updatedAt}
|
||||
)`;
|
||||
}
|
||||
@@ -107,6 +133,15 @@ export class PrismaPropertyRepository implements IPropertyRepository {
|
||||
"nearbyPOIs" = ${entity.nearbyPOIs ? JSON.stringify(entity.nearbyPOIs) : null}::jsonb,
|
||||
"metroDistanceM" = ${entity.metroDistanceM},
|
||||
"projectName" = ${entity.projectName},
|
||||
"furnishing" = ${entity.furnishing}::"Furnishing",
|
||||
"propertyCondition" = ${entity.propertyCondition}::"PropertyCondition",
|
||||
"balconyDirection" = ${entity.balconyDirection}::"Direction",
|
||||
"maintenanceFeeVND" = ${entity.maintenanceFeeVND},
|
||||
"parkingSlots" = ${entity.parkingSlots},
|
||||
"viewType" = ${entity.viewType}::text[],
|
||||
"petFriendly" = ${entity.petFriendly},
|
||||
"suitableFor" = ${entity.suitableFor}::text[],
|
||||
"whyThisLocation" = ${entity.whyThisLocation},
|
||||
"updatedAt" = NOW()
|
||||
WHERE "id" = ${entity.id}`;
|
||||
}
|
||||
@@ -177,6 +212,15 @@ export class PrismaPropertyRepository implements IPropertyRepository {
|
||||
nearbyPOIs: raw.nearbyPOIs,
|
||||
metroDistanceM: raw.metroDistanceM,
|
||||
projectName: raw.projectName,
|
||||
furnishing: raw.furnishing,
|
||||
propertyCondition: raw.propertyCondition,
|
||||
balconyDirection: raw.balconyDirection,
|
||||
maintenanceFeeVND: raw.maintenanceFeeVND,
|
||||
parkingSlots: raw.parkingSlots,
|
||||
viewType: raw.viewType ?? [],
|
||||
petFriendly: raw.petFriendly,
|
||||
suitableFor: raw.suitableFor ?? [],
|
||||
whyThisLocation: raw.whyThisLocation,
|
||||
};
|
||||
|
||||
return new PropertyEntity(raw.id, props, raw.createdAt, raw.updatedAt);
|
||||
|
||||
@@ -110,6 +110,17 @@ export class ListingsController {
|
||||
dto.agentId,
|
||||
dto.rentPriceMonthly,
|
||||
dto.commissionPct,
|
||||
{
|
||||
furnishing: dto.furnishing,
|
||||
propertyCondition: dto.propertyCondition,
|
||||
balconyDirection: dto.balconyDirection,
|
||||
maintenanceFeeVND: dto.maintenanceFeeVND,
|
||||
parkingSlots: dto.parkingSlots,
|
||||
viewType: dto.viewType,
|
||||
petFriendly: dto.petFriendly,
|
||||
suitableFor: dto.suitableFor,
|
||||
whyThisLocation: dto.whyThisLocation,
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -238,6 +249,17 @@ export class ListingsController {
|
||||
dto.amenities,
|
||||
dto.mediaOrder,
|
||||
user.role,
|
||||
{
|
||||
furnishing: dto.furnishing,
|
||||
propertyCondition: dto.propertyCondition,
|
||||
balconyDirection: dto.balconyDirection,
|
||||
maintenanceFeeVND: dto.maintenanceFeeVND,
|
||||
parkingSlots: dto.parkingSlots,
|
||||
viewType: dto.viewType,
|
||||
petFriendly: dto.petFriendly,
|
||||
suitableFor: dto.suitableFor,
|
||||
whyThisLocation: dto.whyThisLocation,
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { PropertyType, TransactionType, Direction } from '@prisma/client';
|
||||
import { PropertyType, TransactionType, Direction, Furnishing, PropertyCondition } from '@prisma/client';
|
||||
import { Type, Transform } from 'class-transformer';
|
||||
import {
|
||||
IsString,
|
||||
@@ -8,9 +8,11 @@ import {
|
||||
IsOptional,
|
||||
IsNotEmpty,
|
||||
MinLength,
|
||||
MaxLength,
|
||||
Min,
|
||||
Max,
|
||||
IsArray,
|
||||
IsBoolean,
|
||||
} from 'class-validator';
|
||||
|
||||
export class CreateListingDto {
|
||||
@@ -160,4 +162,54 @@ export class CreateListingDto {
|
||||
@IsNumber()
|
||||
@Type(() => Number)
|
||||
commissionPct?: number;
|
||||
|
||||
@ApiPropertyOptional({ enum: Furnishing, example: 'FULLY_FURNISHED', description: 'Furnishing level' })
|
||||
@IsOptional()
|
||||
@IsEnum(Furnishing)
|
||||
furnishing?: Furnishing;
|
||||
|
||||
@ApiPropertyOptional({ enum: PropertyCondition, example: 'NEW', description: 'Property condition' })
|
||||
@IsOptional()
|
||||
@IsEnum(PropertyCondition)
|
||||
propertyCondition?: PropertyCondition;
|
||||
|
||||
@ApiPropertyOptional({ enum: Direction, example: 'SOUTH', description: 'Balcony / terrace facing direction' })
|
||||
@IsOptional()
|
||||
@IsEnum(Direction)
|
||||
balconyDirection?: Direction;
|
||||
|
||||
@ApiPropertyOptional({ type: String, example: '2500000', description: 'Monthly maintenance fee in VND (as string to support bigint)' })
|
||||
@IsOptional()
|
||||
@Transform(({ value }) => (value != null && value !== '' ? BigInt(value) : undefined))
|
||||
maintenanceFeeVND?: bigint;
|
||||
|
||||
@ApiPropertyOptional({ example: 2, description: 'Number of parking slots' })
|
||||
@IsOptional()
|
||||
@IsNumber()
|
||||
@Type(() => Number)
|
||||
@Min(0)
|
||||
parkingSlots?: number;
|
||||
|
||||
@ApiPropertyOptional({ example: ['Sông', 'Thành phố'], description: 'View types (multi-select)' })
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
viewType?: string[];
|
||||
|
||||
@ApiPropertyOptional({ example: true, description: 'Whether pets are allowed (null = unknown)' })
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
petFriendly?: boolean;
|
||||
|
||||
@ApiPropertyOptional({ example: ['Gia đình có con nhỏ'], description: 'Personas selected by admin' })
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
suitableFor?: string[];
|
||||
|
||||
@ApiPropertyOptional({ example: 'Khu vực gần trường học, dễ di chuyển...', description: 'Admin narrative for why this location suits buyers' })
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(2000)
|
||||
whyThisLocation?: string;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
import { ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { Direction, Furnishing, PropertyCondition } from '@prisma/client';
|
||||
import { Transform, Type } from 'class-transformer';
|
||||
import {
|
||||
IsString,
|
||||
IsOptional,
|
||||
MinLength,
|
||||
MaxLength,
|
||||
IsArray,
|
||||
ValidateNested,
|
||||
IsInt,
|
||||
Min,
|
||||
IsEnum,
|
||||
IsBoolean,
|
||||
IsNumber,
|
||||
} from 'class-validator';
|
||||
|
||||
export class MediaOrderItemDto {
|
||||
@@ -57,5 +62,56 @@ export class UpdateListingDto {
|
||||
@Type(() => MediaOrderItemDto)
|
||||
mediaOrder?: MediaOrderItemDto[];
|
||||
|
||||
// ─── Rich property fields ──────────────────────────────
|
||||
@ApiPropertyOptional({ enum: Furnishing })
|
||||
@IsOptional()
|
||||
@IsEnum(Furnishing)
|
||||
furnishing?: Furnishing;
|
||||
|
||||
@ApiPropertyOptional({ enum: PropertyCondition })
|
||||
@IsOptional()
|
||||
@IsEnum(PropertyCondition)
|
||||
propertyCondition?: PropertyCondition;
|
||||
|
||||
@ApiPropertyOptional({ enum: Direction })
|
||||
@IsOptional()
|
||||
@IsEnum(Direction)
|
||||
balconyDirection?: Direction;
|
||||
|
||||
@ApiPropertyOptional({ type: String, example: '2500000' })
|
||||
@IsOptional()
|
||||
@Transform(({ value }) => (value != null && value !== '' ? BigInt(value) : undefined))
|
||||
maintenanceFeeVND?: bigint;
|
||||
|
||||
@ApiPropertyOptional({ example: 2 })
|
||||
@IsOptional()
|
||||
@IsNumber()
|
||||
@Type(() => Number)
|
||||
@Min(0)
|
||||
parkingSlots?: number;
|
||||
|
||||
@ApiPropertyOptional({ example: ['Sông'] })
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
viewType?: string[];
|
||||
|
||||
@ApiPropertyOptional({ example: true })
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
petFriendly?: boolean;
|
||||
|
||||
@ApiPropertyOptional({ example: ['Gia đình có con nhỏ'] })
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
suitableFor?: string[];
|
||||
|
||||
@ApiPropertyOptional({ example: 'Vì sao khu vực này phù hợp...' })
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(2000)
|
||||
whyThisLocation?: string;
|
||||
|
||||
// propertyType, address, location CANNOT be changed after ACTIVE status.
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user