Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Upgrade express-validator to v7+ #4384

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Conversation

Baalmart
Copy link
Contributor

@Baalmart Baalmart commented Feb 7, 2025

Description

This PR refactors the validation middleware to use express-validator v7+ and removes the deprecated oneOf method which was causing compatibility issues. The upgrade simplifies the validation code and makes it more maintainable.

Changes Made

  • Removed oneOf and handleValidationErrors from tips.validators.js: The oneOf construct and the separate handleValidationErrors function have been removed. Validation logic is now incorporated directly into the validation chains, improving readability.
  • Removed oneOf and handleValidationErrors from kya.validators.js: Similar to the tips.validators.js changes, oneOf and its separate error handling have been removed, integrating validation directly into the chains.
  • Refactored cohorts.validators.js: Removed oneOf and integrated validationResult into individual validation chains. This ensures consistency across validators and removes deprecated code. Updated deviceIdentifiers to use optional checks and a consolidated error message if no identifiers are provided. Simplified filterNonPrivateDevices and listCohorts logic.
  • Upgraded express-validator in package.json: The express-validator dependency has been updated to the latest version, ensuring compatibility. (Or, if this was already done in a previous commit, indicate that it's not part of this PR but mention the upgrade as context.)

Testing

  • Tested locally
  • Tested against staging environment
  • Relevant tests passed: [List test names]

Affected Services

  • Which services were modified:
    • Device Registry

Endpoints Ready for Testing

  • New endpoints ready for testing:
    • create KYA
    • List KYA lessons

API Documentation Updated?

  • Yes, API documentation was updated
  • No, API documentation does not need updating

Additional Notes

These changes ensure consistency across our validation logic, improve readability, and resolve the "chain.run is not a function" error caused by the use of oneOf in express-validator v6 syntax with the newer version 7+.

Summary by CodeRabbit

  • Refactor

    • Streamlined the health tip submission process by removing redundant data transformation steps.
    • Simplified input validation, providing clearer error feedback for tip operations.
  • Chore

    • Upgraded the input validation library to the latest version for improved performance and reliability.

Copy link
Contributor

coderabbitai bot commented Feb 7, 2025

📝 Walkthrough

Walkthrough

This pull request streamlines existing functionality in the device registry. The HealthTips model’s register method has been refactored to directly use the provided arguments instead of processing the aqi_category with a switch statement. The express-validator dependency has been upgraded in package.json. In the validators, unused imports have been removed from the kya module while the tips module now leverages validationResult and a simplified structure to handle validations. Error handling and overall control flows remain intact.

Changes

File(s) Change Summary
src/.../models/HealthTips.js Refactored the register method in tipsSchema by removing the switch-case logic for aqi_category; now directly using the args object.
src/.../package.json Upgraded the express-validator dependency version from ^6.12.0 to ^7.2.1.
src/.../validators/(kya, tips).js Removed unused imports (isValidObjectId and common validators) in kya.validators.js; in tips.validators.js, replaced oneOf wrappers with direct validations and added validationResult for error handling.

Sequence Diagram(s)

sequenceDiagram
    participant R as Request
    participant V as Tips Validation Middleware
    participant VR as validationResult
    participant N as Next Handler
    R->>V: Submit tip-related request
    V->>VR: Validate payload using validationResult
    alt Validation errors exist
        VR-->>V: Return error details
        V->>N: Pass HttpError with BAD_REQUEST status
    else No errors
        VR-->>V: Return clean validation result
        V->>N: Call next middleware in chain
    end
Loading

Possibly related PRs

Suggested reviewers

  • BenjaminSsempala
  • Codebmk

Poem

In streamlined code the logic gleams,
With fewer branches and simpler themes.
Validators dance with errors caught,
A cleaner path in each new thought.
Our code now sings a clearer tune – cheers to progress soon!
🚀✨

Warning

Review ran into problems

🔥 Problems

Errors were encountered while retrieving linked issues.

Errors (1)
  • JIRA integration encountered authorization issues. Please disconnect and reconnect the integration in the CodeRabbit UI.
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

codecov bot commented Feb 7, 2025

Codecov Report

Attention: Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 11.21%. Comparing base (4d9fba9) to head (6251197).
Report is 21 commits behind head on staging.

Files with missing lines Patch % Lines
src/device-registry/models/HealthTips.js 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           staging    #4384      +/-   ##
===========================================
- Coverage    11.21%   11.21%   -0.01%     
===========================================
  Files          156      156              
  Lines        17985    17968      -17     
  Branches       388      388              
===========================================
- Hits          2017     2015       -2     
+ Misses       15966    15951      -15     
  Partials         2        2              
Files with missing lines Coverage Δ
src/device-registry/validators/kya.validators.js 4.14% <ø> (-0.79%) ⬇️
src/device-registry/validators/tips.validators.js 32.43% <100.00%> (ø)
src/device-registry/models/HealthTips.js 15.70% <0.00%> (+1.73%) ⬆️

Copy link
Contributor

github-actions bot commented Feb 7, 2025

Device registry changes in this PR available for preview here

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
src/device-registry/models/HealthTips.js (1)

70-70: LGTM! Simplified tip registration logic.

The direct use of args is cleaner and relies on express-validator's upstream validation.

However, consider adding debug logging for the created tip to aid in troubleshooting:

-      const createdTip = await this.create({ ...args });
+      const createdTip = await this.create({ ...args });
+      logObject("created tip", createdTip);
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e9e41df and 6251197.

⛔ Files ignored due to path filters (1)
  • src/device-registry/package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (4)
  • src/device-registry/models/HealthTips.js (1 hunks)
  • src/device-registry/package.json (1 hunks)
  • src/device-registry/validators/kya.validators.js (0 hunks)
  • src/device-registry/validators/tips.validators.js (2 hunks)
💤 Files with no reviewable changes (1)
  • src/device-registry/validators/kya.validators.js
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: build-push-deploy-device-registry
  • GitHub Check: Analyze (python)
  • GitHub Check: Analyze (javascript)
🔇 Additional comments (2)
src/device-registry/package.json (1)

60-60: Verify express-validator v7 compatibility.

The upgrade from v6 to v7 is a major version change that may introduce breaking changes.

src/device-registry/validators/tips.validators.js (1)

207-210: LGTM! Simplified validation chain references.

The removal of oneOf wrapper simplifies the validation logic while maintaining the same functionality.

@Baalmart Baalmart merged commit c6ca7f2 into staging Feb 7, 2025
52 checks passed
@Baalmart Baalmart deleted the hf-validators branch February 7, 2025 05:32
@Baalmart Baalmart mentioned this pull request Feb 7, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant