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

Fixed inquiry of birthdate

Browse Source
This commit is contained in:
SepehrYahyaee
2026-06-01 14:11:23 +03:30
parent 6261af8a29
commit 5fab0a00b6
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/helpers/date-jalali.ts
View File

@@ -96,14 +96,13 @@ function jalaliPartsToGregorian(
jMonth: number, jMonth: number,
jDay: number, jDay: number,
): string | null { ): string | null {
// Jalali to Julian Day Number, then to Gregorian
// Algorithm: https://www.fourmilab.ch/documents/calendar/
const jy = jYear - 979; const jy = jYear - 979;
const jm = jMonth - 1; const jm = jMonth - 1;
const jd = jDay - 1; const jd = jDay - 1;
// Jalali day number — correct leap cycle is every 33 years with 8 leaps
let jDayNo = let jDayNo =
365 * jy + Math.floor(jy / 4) - Math.floor(jy / 100) + Math.floor(jy / 400); 365 * jy + Math.floor(jy / 33) * 8 + Math.floor(((jy % 33) + 3) / 4);
const jalaliMonthDays = [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29]; const jalaliMonthDays = [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29];
for (let i = 0; i < jm; i++) { for (let i = 0; i < jm; i++) {
@@ -111,29 +110,29 @@ function jalaliPartsToGregorian(
} }
jDayNo += jd; jDayNo += jd;
// Convert to Gregorian day number (offset from 1970-01-01 in Julian days) // Offset to Gregorian day number anchored at 1600
const gDayNo = jDayNo + 79; let gDayNo = jDayNo + 79;
let gy = 1979 + 400 * Math.floor(gDayNo / 146097); let gy = 1600 + 400 * Math.floor(gDayNo / 146097);
let days = gDayNo % 146097; gDayNo %= 146097;
let leap = true; let leap = true;
if (days >= 36525) { if (gDayNo >= 36525) {
days--; gDayNo--;
gy += 100 * Math.floor(days / 36524); gy += 100 * Math.floor(gDayNo / 36524);
days %= 36524; gDayNo %= 36524;
if (days >= 365) days++; if (gDayNo >= 365) gDayNo++;
else leap = false; else leap = false;
} }
gy += 4 * Math.floor(days / 1461); gy += 4 * Math.floor(gDayNo / 1461);
days %= 1461; gDayNo %= 1461;
if (days >= 366) { if (gDayNo >= 366) {
leap = false; leap = false;
days--; gDayNo--;
gy += Math.floor(days / 365); gy += Math.floor(gDayNo / 365);
days %= 365; gDayNo %= 365;
} }
const gregorianMonthDays = [ const gregorianMonthDays = [
@@ -153,19 +152,18 @@ function jalaliPartsToGregorian(
let gm = 0; let gm = 0;
for (let i = 0; i < 12; i++) { for (let i = 0; i < 12; i++) {
if (days < gregorianMonthDays[i]) { if (gDayNo < gregorianMonthDays[i]) {
gm = i + 1; gm = i + 1;
break; break;
} }
days -= gregorianMonthDays[i]; gDayNo -= gregorianMonthDays[i];
} }
const gd = days + 1; const gd = gDayNo + 1;
const mm = String(gm).padStart(2, "0"); const mm = String(gm).padStart(2, "0");
const dd = String(gd).padStart(2, "0"); const dd = String(gd).padStart(2, "0");
const result = `${gy}-${mm}-${dd}`; const result = `${gy}-${mm}-${dd}`;
// Sanity check
const check = new Date(result); const check = new Date(result);
if (isNaN(check.getTime())) return null; if (isNaN(check.getTime())) return null;

1
src/sand-hub/sand-hub.service.ts
View File

@@ -564,6 +564,7 @@ export class SandHubService {
const requestUrl = `${process.env.SANHUB_BASE_URL}/personal-inquiry/tejarat-no`; const requestUrl = `${process.env.SANHUB_BASE_URL}/personal-inquiry/tejarat-no`;
const gregorianBirthdate = jalaliToGregorianDate(birthDate); const gregorianBirthdate = jalaliToGregorianDate(birthDate);
console.log(gregorianBirthdate);
if (!gregorianBirthdate) { if (!gregorianBirthdate) {
throw new BadRequestException( throw new BadRequestException(
`Invalid birth date for personal inquiry: ${birthDate}. Expected a Jalali date (e.g. 13770624 or "1377-06-24").`, `Invalid birth date for personal inquiry: ${birthDate}. Expected a Jalali date (e.g. 13770624 or "1377-06-24").`,