s.hajizadeh/yara724api
1
0
Fork 0
forked from Yara724/api
Code Pull Requests Activity

Merge pull request 'YARA-837, YARA-836' (#38) from s.yahyaee/yara724-api:main into main

Browse Source 
Reviewed-on: Yara724/api#38
This commit is contained in:
Sepehr Yahyaee
2026-04-25 17:12:59 +03:30
parent eef305c42e 05c5b70b4d
commit d45975b6a7
8 changed files with 195 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/claim-request-management/claim-request-management.service.ts
View File

@@ -5009,8 +5009,30 @@ export class ClaimRequestManagementService {
};
}
const getPartLabelFa = (key: string): string => {
const labels: Record<string, string> = {
hood: 'کاپوت',
trunk: 'صندوق عقب',
roof: 'سقف',
front_right_door: 'درب جلو راست',
front_left_door: 'درب جلو چپ',
rear_right_door: 'درب عقب راست',
rear_left_door: 'درب عقب چپ',
front_bumper: 'سپر جلو',
rear_bumper: 'سپر عقب',
front_right_fender: 'گلگیر جلو راست',
front_left_fender: 'گلگیر جلو چپ',
rear_right_fender: 'گلگیر عقب راست',
rear_left_fender: 'گلگیر عقب چپ',
};
return labels[key] || key;
};
const damagedPartsData = claim.media?.damagedParts as any;
const damagedParts: Record<string, { captured: boolean; url?: string }> = {};
const damagedParts: Record<
string,
{ label_fa: string; captured: boolean; url?: string }
> = {};
const resendPartKeys = normalizeResendPartKeys(
claim.evaluation?.damageExpertResend?.resendCarParts,
);
@@ -5021,6 +5043,7 @@ export class ClaimRequestManagementService {
for (const p of partKeysForDetails) {
const cap = hasCapture(damagedPartsData, p);
damagedParts[p] = {
label_fa: getPartLabelFa(p),
captured: !!cap,
url: cap?.url || (cap?.path ? buildFileLink(cap.path) : undefined),
};
@@ -5080,6 +5103,12 @@ export class ClaimRequestManagementService {
carAngles,
damagedParts,
expertResend,
evaluation: claim.evaluation
? {
damageExpertReply: claim.evaluation.damageExpertReply,
damageExpertReplyFinal: claim.evaluation.damageExpertReplyFinal,
}
: undefined,
...(isExpertViewer
? {
userRating: claim.userRating

11
src/claim-request-management/dto/claim-details-v2.dto.ts
View File

@@ -76,7 +76,7 @@ export class ClaimDetailsV2ResponseDto {
carAngles?: Record<string, { captured: boolean; url?: string }>;
@ApiPropertyOptional({ description: 'Damaged parts captured' })
damagedParts?: Record<string, { captured: boolean; url?: string }>;
damagedParts?: Record<string, { label_fa: string; captured: boolean; url?: string }>;
@ApiPropertyOptional({
description:
@@ -84,6 +84,15 @@ export class ClaimDetailsV2ResponseDto {
})
expertResend?: ExpertResendDetailsV2Dto;
@ApiPropertyOptional({
description: "Damage expert opinion(s): initial and final (after objection).",
type: Object,
})
evaluation?: {
damageExpertReply?: unknown;
damageExpertReplyFinal?: unknown;
};
@ApiPropertyOptional({ description: 'User satisfaction rating (if submitted)' })
userRating?: {
progressSpeed: number;

47
src/expert-blame/expert-blame.service.ts
View File

@@ -1122,7 +1122,31 @@ export class ExpertBlameService {
requestId,
);
// TODO: Send notifications to parties (SMS/Push) about required documents
const requestIdToken = String(request._id);
const partyPhoneByUserId = new Map<string, string>();
for (const p of request.parties || []) {
const uid = p?.person?.userId ? String(p.person.userId) : "";
const phone = p?.person?.phoneNumber;
if (uid && typeof phone === "string" && phone.length > 0) {
partyPhoneByUserId.set(uid, phone);
}
}
for (const p of partyResendRequests) {
const uid = String((p as any).partyId);
const phone = partyPhoneByUserId.get(uid);
if (!phone) continue;
const role =
String(request.parties?.find((x: any) => String(x?.person?.userId) === uid)?.role) ===
"SECOND"
? "SECOND"
: "FIRST";
await this.smsOrchestrationService.sendResendDocumentsNotice({
receptor: phone,
fileKind: "blame",
publicId: request.publicId,
link: this.smsOrchestrationService.buildBlamePartyLink(requestIdToken, role),
});
}
return {
requestId: String(request._id),
@@ -1277,6 +1301,27 @@ export class ExpertBlameService {
);
}
if (request.type === BlameRequestType.THIRD_PARTY) {
const requestIdToken = String(request._id);
const expertLastName =
actor?.fullName?.trim()?.split(/\s+/).pop() || "کارشناس";
for (const p of request.parties || []) {
const phone = p?.person?.phoneNumber;
if (!phone || typeof phone !== "string") continue;
const role = String(p?.role) === "SECOND" ? "SECOND" : "FIRST";
await this.smsOrchestrationService.sendSignatureReviewNotice({
receptor: phone,
fileKind: "blame",
publicId: request.publicId,
expertLastName,
link: this.smsOrchestrationService.buildBlamePartyLink(
requestIdToken,
role,
),
});
}
}
return {
requestId: String(request._id),
status: CaseStatus.WAITING_FOR_SIGNATURES,

2
src/expert-claim/expert-claim.module.ts
View File

@@ -13,6 +13,7 @@ import { ClientModule } from "src/client/client.module";
import { ExpertBlameModule } from "src/expert-blame/expert-blame.module";
import { RequestManagementModule } from "src/request-management/request-management.module";
import { SandHubModule } from "src/sand-hub/sand-hub.module";
import { SmsOrchestrationModule } from "src/sms-orchestration/sms-orchestration.module";
import { UsersModule } from "src/users/users.module";
import { ExpertClaimController } from "./expert-claim.controller";
import { ExpertClaimV2Controller } from "./expert-claim.v2.controller";
@@ -31,6 +32,7 @@ import { ExpertClaimService } from "./expert-claim.service";
ExpertBlameModule,
AiModule,
RequestManagementModule,
SmsOrchestrationModule,
UsersModule,
ClientModule,
],

59
src/expert-claim/expert-claim.service.ts
View File

@@ -65,6 +65,7 @@ import {
import { resendRequestHasPayload } from "src/helpers/claim-expert-resend";
import { snapshotFromDamageExpert } from "src/helpers/expert-profile-snapshot";
import { DamageExpertModel } from "src/users/entities/schema/damage-expert.schema";
import { SmsOrchestrationService } from "src/sms-orchestration/sms-orchestration.service";
@Injectable()
export class ExpertClaimService {
@@ -187,6 +188,7 @@ export class ExpertClaimService {
private readonly claimFactorsImageDbService: ClaimFactorsImageDbService,
private readonly claimRequiredDocumentDbService: ClaimRequiredDocumentDbService,
private readonly branchDbService: BranchDbService,
private readonly smsOrchestrationService: SmsOrchestrationService,
) { }
/** Load immutable profile fields from `damage-expert` for the acting expert. */
@@ -282,13 +284,16 @@ export class ExpertClaimService {
private blameFileContextForExpert(blame: any): {
blameRequestType?: BlameRequestType;
carBodyFirstForm?: { car?: boolean; object?: boolean };
blameStatus?: string
} {
if (!blame?.type) return {};
const blameRequestType = blame.type as BlameRequestType;
const out: {
blameRequestType?: BlameRequestType;
carBodyFirstForm?: { car?: boolean; object?: boolean };
blameStatus?: string;
} = { blameRequestType };
out.blameStatus = blame.blameStatus;
if (blameRequestType !== BlameRequestType.CAR_BODY) return out;
const parties = blame.parties;
@@ -297,6 +302,7 @@ export class ExpertClaimService {
const first =
parties.find((p: any) => p?.role === PartyRole.FIRST) ?? parties[0];
const cbf = first?.carBodyFirstForm;
delete out.blameStatus
if (cbf && typeof cbf === "object") {
out.carBodyFirstForm = {
...(typeof cbf.car === "boolean" ? { car: cbf.car } : {}),
@@ -2219,6 +2225,30 @@ export class ExpertClaimService {
},
});
if (claim.blameRequestId) {
const blame = await this.blameRequestDbService.findById(
claim.blameRequestId.toString(),
);
if (blame?.type === BlameRequestType.THIRD_PARTY) {
const ownerUserId = claim.owner?.userId ? String(claim.owner.userId) : "";
const ownerParty = (blame.parties || []).find(
(p: any) =>
p?.person?.userId && String(p.person.userId) === ownerUserId,
);
const ownerPhone = ownerParty?.person?.phoneNumber;
if (ownerPhone && typeof ownerPhone === "string") {
await this.smsOrchestrationService.sendResendDocumentsNotice({
receptor: ownerPhone,
fileKind: "claim",
publicId: claim.publicId,
link: this.smsOrchestrationService.buildClaimLink(
String(claim._id),
),
});
}
}
}
return {
claimRequestId,
status: ClaimCaseStatus.WAITING_FOR_USER_RESEND,
@@ -2371,6 +2401,33 @@ export class ExpertClaimService {
await this.claimCaseDbService.findByIdAndUpdate(claimRequestId, updatePayload);
if (!needsFactorUpload && claim.blameRequestId) {
const blame = await this.blameRequestDbService.findById(
claim.blameRequestId.toString(),
);
if (blame?.type === BlameRequestType.THIRD_PARTY) {
const ownerUserId = claim.owner?.userId ? String(claim.owner.userId) : "";
const ownerParty = (blame.parties || []).find(
(p: any) =>
p?.person?.userId && String(p.person.userId) === ownerUserId,
);
const ownerPhone = ownerParty?.person?.phoneNumber;
if (ownerPhone && typeof ownerPhone === "string") {
const expertLastName =
actor?.fullName?.trim()?.split(/\s+/).pop() || "کارشناس";
await this.smsOrchestrationService.sendSignatureReviewNotice({
receptor: ownerPhone,
fileKind: "claim",
publicId: claim.publicId,
expertLastName,
link: this.smsOrchestrationService.buildClaimLink(
String(claim._id),
),
});
}
}
}
return {
claimRequestId,
status: nextCaseStatus,
@@ -2519,7 +2576,7 @@ export class ExpertClaimService {
blameIds.length > 0
? ((await this.blameRequestDbService.find(
{ _id: { $in: blameIds.map((id) => new Types.ObjectId(id)) } },
{ lean: true, select: "type parties expert.decision" },
{ lean: true, select: "type parties expert.decision blameStatus" },
)) as any[])
: [];
const blameById = new Map<string, any>(

7
src/main.ts
View File

@@ -38,7 +38,12 @@ async function bootstrap() {
.addBearerAuth()
.build();
const docs = SwaggerModule.createDocument(app, config);
SwaggerModule.setup("/docs", app, docs);
SwaggerModule.setup("/docs", app, docs, {
swaggerOptions: {
persistAuthorization: true,
docExpansion: "none",
},
});
await app.listen(process.env.PORT);
}

1
src/sms-orchestration/provider/sms-gateway.service.ts
View File

@@ -22,6 +22,7 @@ export interface VerifyLookUpMessage {
token: string;
token2?: string;
token3?: string;
token10?: string;
receptor: string;
}

42
src/sms-orchestration/sms-orchestration.service.ts
View File

@@ -10,6 +10,7 @@ type TemplateArgs = {
token: string;
token2?: string;
token3?: string;
token10?: string;
};
@Injectable()
@@ -40,6 +41,15 @@ export class SmsOrchestrationService implements OnModuleInit {
return `${process.env.URL}/${frontendRoute}?token=${requestId}`;
}
buildBlamePartyLink(requestId: string, partyRole: "FIRST" | "SECOND"): string {
const route = partyRole === "SECOND" ? "user2" : "user";
return `${process.env.URL}/${route}?token=${requestId}`;
}
buildClaimLink(claimRequestId: string): string {
return `${process.env.URL}/claim?token=${claimRequestId}`;
}
async sendInviteLink(phoneNumber: string, link: string): Promise<boolean> {
return this.sendTemplate({
template: "yara724-invite-link",
@@ -124,6 +134,38 @@ export class SmsOrchestrationService implements OnModuleInit {
});
}
async sendResendDocumentsNotice(params: {
receptor: string;
fileKind: "blame" | "claim";
publicId: string;
link: string;
}): Promise<boolean> {
return this.sendTemplate({
template: "yara-resend-documents",
receptor: params.receptor,
token: params.fileKind === "blame" ? "تصادف" : "خسارت",
token2: params.publicId,
token3: params.link,
});
}
async sendSignatureReviewNotice(params: {
receptor: string;
fileKind: "blame" | "claim";
publicId: string;
expertLastName: string;
link: string;
}): Promise<boolean> {
return this.sendTemplate({
template: "yara-signature",
receptor: params.receptor,
token: params.fileKind === "blame" ? "تصادف" : "خسارت",
token2: params.publicId,
token3: params.expertLastName || "کارشناس",
token10: params.link,
});
}
private async sendTemplate(args: TemplateArgs): Promise<boolean> {
try {
await this.smsGatewayService.verifyLookUp(args);