Skip to content

Sync feature/zappa-migration with main#3206

Merged
arkid15r merged 196 commits intoOWASP:feature/nest-zappa-migrationfrom
rudransh-shrivastava:feature/nest-zappa-migration-sync-main
Jan 5, 2026
Merged

Sync feature/zappa-migration with main#3206
arkid15r merged 196 commits intoOWASP:feature/nest-zappa-migrationfrom
rudransh-shrivastava:feature/nest-zappa-migration-sync-main

Conversation

@rudransh-shrivastava
Copy link
Collaborator

Proposed change

Resolves #3202

Sync feature/zappa-migration with main

Checklist

  • Required: I read and followed the contributing guidelines
  • Required: I ran make check-test locally and all tests passed
  • I used AI for code, documentation, or tests in this PR

dependabot bot and others added 30 commits November 24, 2025 19:59
Bumps [strawberry-graphql](https://github.com/strawberry-graphql/strawberry) from 0.286.1 to 0.287.0.
- [Release notes](https://github.com/strawberry-graphql/strawberry/releases)
- [Changelog](https://github.com/strawberry-graphql/strawberry/blob/main/CHANGELOG.md)
- [Commits](strawberry-graphql/strawberry@0.286.1...0.287.0)

---
updated-dependencies:
- dependency-name: strawberry-graphql
  dependency-version: 0.287.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.4 to 4.31.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@e12f017...fdbfb4d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@e797f83...83679a8)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [owasp-schema](https://github.com/OWASP/Nest) from 0.1.45 to 0.1.46.
- [Release notes](https://github.com/OWASP/Nest/releases)
- [Commits](OWASP/Nest@0.1.45...0.1.46)

---
updated-dependencies:
- dependency-name: owasp-schema
  dependency-version: 0.1.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Added minor UI\UX updates for Mentorship portal

* Address comments

* Add more files

* Update program card to use link

* update role

* Update role
…essibility (OWASP#2703)

* fix: add descriptive alt text for images to improve screen reader accessibility

* fix: replace deprecated objectFit prop with style prop in UserCard

* fix:update e2e tests for new alt text format

* style:apply prettier formatting to e2e test files
* Migrate to Python 3.14

* Update backend docker files

* Update backend/docker/Dockerfile.test
OWASP#2739)

* Add CalendarButton component and related tests for Google Calendar integration

* fix: update CalendarButton to set default icon size and add tests for size classes

* Fix Google Calendar URL for all-day events, add event URL to description, improve types with Readonly props and ReactNode
Bumps [arkid15r/check-pr-issue-action](https://github.com/arkid15r/check-pr-issue-action) from 0.1.1 to 0.1.3.
- [Release notes](https://github.com/arkid15r/check-pr-issue-action/releases)
- [Commits](arkid15r/check-pr-issue-action@f2c2ac3...695d61f)

---
updated-dependencies:
- dependency-name: arkid15r/check-pr-issue-action
  dependency-version: 0.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.5 to 4.31.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@fdbfb4d...fe4161a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add unit tests for ContributionHeatmap component

* Updating the math.random() function

* removing the usage of void operator and array index in keys

* Refactor ContributionHeatmap tests for improved readability and consistency

* Refactor ContributionHeatmap tests to enhance clarity and remove unnecessary comments and removing the use of require

* Refactor tooltip test to remove void operator and improve clarity

* Refactor tooltip mock to simplify custom tooltip handling and remove unnecessary checks

* Refactor ContributionHeatmap test to improve test description for clarity
Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@1af3b93...8e8c483)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@2028fbc...395ad32)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…SP#2793)

Bumps [strawberry-graphql-django](https://github.com/strawberry-graphql/strawberry-django) from 0.67.2 to 0.68.0.
- [Release notes](https://github.com/strawberry-graphql/strawberry-django/releases)
- [Changelog](https://github.com/strawberry-graphql/strawberry-django/blob/main/CHANGELOG.md)
- [Commits](strawberry-graphql/strawberry-django@v0.67.2...v0.68.0)

---
updated-dependencies:
- dependency-name: strawberry-graphql-django
  dependency-version: 0.68.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
arkid15r and others added 12 commits January 4, 2026 12:18
* feat: add contribution_data field to Chapter and Project models

* Create migration 0066 to add fields to database

* add management command to aggregate contributions
-commits, issues, PRs, and releases
-support --entity-type, --days(default 365), --key, --offset

* expose contribution_data in GraphQL API
- Add contribution_data field to ChapterNode
- Add contribution_data field to ProjectNode

* refactor: extract contribution date aggregation into a separate method(tackling coderabbitai suggetions)

* test: add contribution_data to the test's expected field names set.

* test: add unit tests for ChapterNode field resolutions and configurations

* test: add unit tests for owasp_aggregate_contributions management command

* feat: add contributionData to GraphQL queries

* feat: update TypeScript types for contribution data

* feat: add contributionData field to both project and chapter nodes

* fixed linting errors

* fixed failed tests in chapter_test.py

* fixed backend tests in owasp_aggregate_contributions_test.py

* feat: add contribution heatmap to chapter details page

* feat: integrate contribution heatmap into project details page

* feat: enhance contribution heatmap component with isCompact prop

* apply variant compact

* feat: add contribution stats and heatmap to chapter and project details pages

* make chapter page same as project page

* reduce the gap between the cards

* optimize queryset by select_related for owasp_repository

* feat: optimize project queryset with select_related and prefetch_related

* chapter contribution aggregation tests

* fix: update contribution_data test to assert field type

* update contribution stats calculation to provide estimated values

* fix: handle null contribution stats in project and chapter details sonarcloud suggestion

* fixing sonalcloud errors

* run pnpm lint

* adjust layout and formatting

* fixedbackend testcases

* remove redundant code in project and chapter

* make another component for github stats

* fixing sonar issues

* fixing tests

* remove unused variables

* refactor: improve heatmap series generation and chart options

* fixing sonar cloud issues

* fix make check

* fixing sonarcloud issues

* handling null/undefined values

* include test identifiers

* add tests for ContributionStats component

* sort active chapters and projects

* added trailing whitespace

* apply make check

* pnpm run lint -- --fix

* removing sonarcloud issues with contributionheatmap and contributionstats

* add contribution_stats field to Chapter and Project models for github stats

* add contribution_stats field to Chapter and Project GraphQL nodes

* add contribution statistics calculation for chapters and projects

* add contribution_stats fields to Chapter and Project migrations

* add contributionStats field to Project type

* add contributionStats field to Chapter type

* run pnpm run --graphql-codegen to update the generated types

* add contributionStats field to GET_CHAPTER_DATA and GET_PROJECT_DATA queries

* create contributionDataUtils file for handling contribution stats logic

* refactor: replace estimeted contribution stats with actual

* added tests for contributionStats field

* Run pre-commit

* add .slice().reverse() for compatibility

* resolve some issues by coderabbitai

* make check

* made the contributionheatmap responsive for both project and chapter pages

* fixed failed testcases

* fixing contributionheatmap for tests

* run pnpm run test:unit

* make check

* fixing sonarcloud issues

* adjust heatmap chart dimensions for better responsiveness

* update command in backend/Makefile to aggregate contributions

* change makefile to add owasp-aggregate-contributions target

* regenerate owasp migration 0067_chapter_contribution_stats_and_more

* refactor migration 0067 to improve code readability and formatting

* fix: update date in ProgramCard test to reflect correct end date

* style: update padding and heading size in CardDetailsPage test

* fix: update ContributionHeatmap test to reflect correct class names and attributes

* test: add variant rendering tests for ContributionHeatmap (coderabbitai)

* fixing the test for programCard

* added contribution_stats field to ProjectNode and ChapterNode

* fix: optimize chapter and project queryset with select_related and prefetch_related(coderabbitai)

* Update code

* update contributionsStats

* update frontend code

* Update code

* update scollbar suggetions

* resolve PR issues and change UI

* apply sonarcloud issues

* update coderabbitai suggestions

* Update scrollbar styling. Refactor code.

* Update code

* Fix year range showing data for 53 weeks when on Sunday

---------

Co-authored-by: Arkadii Yakovets <arkadii.yakovets@owasp.org>
Co-authored-by: Kate <kate@kgthreads.com>
Co-authored-by: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com>
* add leaders

* test: add real leader names

* use EntityMember data for leaders

* rename leaders -> leader_names

* use compact leader objects

---------

Co-authored-by: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com>
…SP#3193)

Bumps [strawberry-graphql-django](https://github.com/strawberry-graphql/strawberry-django) from 0.72.2 to 0.73.0.
- [Release notes](https://github.com/strawberry-graphql/strawberry-django/releases)
- [Changelog](https://github.com/strawberry-graphql/strawberry-django/blob/main/CHANGELOG.md)
- [Commits](strawberry-graphql/strawberry-django@0.72.2...v0.73.0)

---
updated-dependencies:
- dependency-name: strawberry-graphql-django
  dependency-version: 0.73.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 5, 2026

Important

Review skipped

Too many files!

137 files out of 287 files are above the max files limit of 150.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@rudransh-shrivastava rudransh-shrivastava linked an issue Jan 5, 2026 that may be closed by this pull request
2 tasks
@github-actions github-actions bot added docs Improvements or additions to documentation frontend docker Pull requests that update Docker code nestbot backend-tests frontend-tests deploy makefile ci labels Jan 5, 2026
@sonarqubecloud
Copy link

sonarqubecloud bot commented Jan 5, 2026

@rudransh-shrivastava rudransh-shrivastava marked this pull request as ready for review January 5, 2026 16:39
@arkid15r arkid15r enabled auto-merge January 5, 2026 17:36
@arkid15r arkid15r merged commit 9b86c80 into OWASP:feature/nest-zappa-migration Jan 5, 2026
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend-tests ci deploy docker Pull requests that update Docker code docs Improvements or additions to documentation frontend frontend-tests makefile nestbot

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Sync feature/nest-zappa-migration with main

Comments