Skip to content

Develop#89

Open
iposho wants to merge 3 commits intomainfrom
develop
Open

Develop#89
iposho wants to merge 3 commits intomainfrom
develop

Conversation

@iposho
Copy link
Copy Markdown
Owner

@iposho iposho commented Apr 11, 2026

No description provided.

iposho and others added 3 commits April 11, 2026 05:29
- Added `src/data/transferredHolidays.json` to store transferred holidays, keeping them distinct from regular holidays.
- Moved January 9, 2026 from `holidays.json` to `transferredHolidays.json` with the appropriate name.
- Updated `scripts/generate-static-api.js` to process transferred holidays, returning them in the `/api/calendar/{year}/holidays` API and outputting them correctly in the day info, and adding support for the `.ics` calendar file with a unique UID format (`T`).
- Updated `src/helpers/countWorkingDays.ts` and `src/helpers/isWorkingDay.ts` to ensure transferred holidays are properly treated as non-working days in all calculations.
- Updated the Swagger specification in `public/swagger.json` to reflect the new `transferredHolidays` array.
- Updated the `holidaysLoader.ts` util to process and expose the newly added data.

Co-authored-by: iposho <40692570+iposho@users.noreply.github.com>
@vercel
Copy link
Copy Markdown

vercel bot commented Apr 11, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
holidays-calendar-ru Ready Ready Preview, Comment Apr 11, 2026 1:34am

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 90514d7c00

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

});

// Добавляем перенесенные выходные
transferredHolidays.forEach((transferredHoliday) => {
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge De-duplicate transferred days before writing ICS events

The new transferred-holiday block appends an extra VEVENT for each transferred date, but generateIcs is still called with getHolidays(y), which already contains transferred days marked with isHoliday: false (for example, 2026-01-09 in src/data/holidays.json). This produces two all-day events for the same date in the generated .ics file, so calendar clients will show duplicates; filter out isHoliday === false from the base holidays list or dedupe by date before allEvents.push(...).

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant