Merge pull request 'main' (#178) from s.hajizadeh/yara724api:main into main

Reviewed-on: Yara724/api#178

src/claim-request-management/claim-request-management.service.ts

@@ -3699,11 +3699,16 @@ export class ClaimRequestManagementService {
       BeginDate: insurance.startDate ?? null,
       BuiltYear:
         Number(inquiryMapped.ModelField ?? inquiryMapped.ModelCii) || null,
-      ChassisNo: inquiryMapped.ChassisNo ?? inquiryRaw.ChassisNo ?? null,
+      ChassisNo:
+        inquiryMapped.ChassisNumberField ??
+        inquiryMapped.ShsNum ??
+        inquiryRaw.ChassisNumberField ??
+        inquiryRaw.ShsNum ??
+        null,
       DmgHistoryStatus: input.defaults.DmgHistoryStatus,
       Desc: this.formatFanavaranSelectedPartsDesc(input.selectedParts),
       DmgCaseTypeId: input.defaults.DmgCaseTypeId,
-      DriverId: null,
+      DriverId: person.nationalCodeOfDriver ?? null,
       EndDate: insurance.endDate ?? null,
       EstimateAmount: FANAVARAN_PROVISIONAL_ESTIMATE_AMOUNT,
       FaultPercent: input.defaults.FaultPercent,
@@ -3715,7 +3720,12 @@ export class ClaimRequestManagementService {
       LicenceIssuDate: person.driverBirthday ?? "1394/10/13",
       LicenceNo: person.driverLicense ?? "1124242",
       LicenceTypeId: input.defaults.CulpritLicenceTypeId,
-      MotorNo: inquiryMapped.MotorNo ?? inquiryRaw.MotorNo ?? null,
+      MotorNo:
+        inquiryMapped.MtrNum ??
+        inquiryMapped.EngineNumberField ??
+        inquiryRaw.MtrNum ??
+        inquiryRaw.EngineNumberField ??
+        null,
       OwnerId: null,
       PlaqueCityId: null,
       PlaqueKindId: plate ? input.defaults.PlaqueKindId : null,