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

docs(api): Add swagger docs of User Controller #166

Merged
merged 3 commits into from
Mar 11, 2024

Conversation

rajdip-b
Copy link
Member

@rajdip-b rajdip-b commented Mar 11, 2024

Type

documentation, enhancement


Description

  • Enhanced Swagger documentation across various controllers and DTOs for better API documentation.
  • Refactored OTP validation endpoint parameters from ApiParam to ApiQuery.
  • Added authentication and security definitions to Swagger configuration in main.ts.
  • Documented user controller endpoints with detailed request and response schemas.

Changes walkthrough

Relevant files
Enhancement
auth.controller.ts
Refactor OTP Validation Endpoint Parameters                           

apps/api/src/auth/controller/auth.controller.ts

  • Replaced ApiParam with ApiQuery for email and otp parameters in the
    OTP validation endpoint.
  • +9/-3     
    main.ts
    Enhance Swagger Configuration with Authentication               

    apps/api/src/main.ts

  • Added bearer authentication and API key security to Swagger
    configuration.
  • +6/-0     
    Documentation
    user.controller.ts
    Add Comprehensive Swagger Documentation to User Controller

    apps/api/src/user/controller/user.controller.ts

  • Added Swagger decorators for API documentation in user controller
    endpoints.
  • Included user schema for responses and added operation summaries and
    descriptions.
  • Added ApiForbiddenResponse to endpoints for better error
    documentation.
  • +57/-0   
    create.user.ts
    Document CreateUserDto Properties with Swagger                     

    apps/api/src/user/dto/create.user/create.user.ts

  • Enhanced CreateUserDto with ApiProperty decorators for detailed API
    documentation.
  • +55/-0   

    PR-Agent usage:
    Comment /help on the PR to get a list of all available PR-Agent tools and their descriptions

    @codiumai-pr-agent-free codiumai-pr-agent-free bot added type: documentation Improvements or additions to documentation type: enhancement New feature or request labels Mar 11, 2024
    Copy link
    Contributor

    PR Description updated to latest commit (1eef0d2)

    Copy link
    Contributor

    PR Review

    ⏱️ Estimated effort to review [1-5]

    2, because the changes are mostly related to Swagger annotations for API documentation, which are straightforward to review. The modifications include adding annotations for API documentation and security, which are generally low-risk and easy to validate against the Swagger/OpenAPI specifications.

    🧪 Relevant tests

    No

    🔍 Possible issues

    Possible Inconsistency: Ensure that the @ApiProperty decorators in DTOs accurately reflect the actual request and response structures. Any mismatch might lead to incorrect documentation.

    Security Definitions Clarity: While adding security definitions to Swagger is a good practice, ensure that these definitions are clear and accurately represent the security mechanisms in place. Ambiguities in security documentation can lead to misunderstandings about the API's security posture.

    🔒 Security concerns

    No


    ✨ Review tool usage guide:

    Overview:
    The review tool scans the PR code changes, and generates a PR review. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on any PR.
    When commenting, to edit configurations related to the review tool (pr_reviewer section), use the following template:

    /review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=...
    

    With a configuration file, use the following template:

    [pr_reviewer]
    some_config1=...
    some_config2=...
    
    Utilizing extra instructions

    The review tool can be configured with extra instructions, which can be used to guide the model to a feedback tailored to the needs of your project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize.

    Examples for extra instructions:

    [pr_reviewer] # /review #
    extra_instructions="""
    In the 'possible issues' section, emphasize the following:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    How to enable\disable automation
    • When you first install PR-Agent app, the default mode for the review tool is:
    pr_commands = ["/review", ...]
    

    meaning the review tool will run automatically on every PR, with the default configuration.
    Edit this field to enable/disable the tool, or to change the used configurations

    Auto-labels

    The review tool can auto-generate two specific types of labels for a PR:

    • a possible security issue label, that detects possible security issues (enable_review_labels_security flag)
    • a Review effort [1-5]: x label, where x is the estimated effort to review the PR (enable_review_labels_effort flag)
    Extra sub-tools

    The review tool provides a collection of possible feedbacks about a PR.
    It is recommended to review the possible options, and choose the ones relevant for your use case.
    Some of the feature that are disabled by default are quite useful, and should be considered for enabling. For example:
    require_score_review, require_soc2_ticket, and more.

    Auto-approve PRs

    By invoking:

    /review auto_approve
    

    The tool will automatically approve the PR, and add a comment with the approval.

    To ensure safety, the auto-approval feature is disabled by default. To enable auto-approval, you need to actively set in a pre-defined configuration file the following:

    [pr_reviewer]
    enable_auto_approval = true
    

    (this specific flag cannot be set with a command line argument, only in the configuration file, committed to the repository)

    You can also enable auto-approval only if the PR meets certain requirements, such as that the estimated_review_effort is equal or below a certain threshold, by adjusting the flag:

    [pr_reviewer]
    maximal_review_effort = 5
    
    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the review usage page for a comprehensive guide on using this tool.

    Copy link
    Contributor

    codiumai-pr-agent-free bot commented Mar 11, 2024

    PR Code Suggestions

    CategorySuggestions                                                                                                                                                       
    Enhancement
    Replace @ApiQuery with @ApiBody for endpoints consuming request body data.

    Consider using @ApiBody instead of @ApiQuery for endpoints that consume data in the body
    of the request. This provides a more accurate description of the API in the Swagger
    documentation.

    apps/api/src/auth/controller/auth.controller.ts [71-79]

    -@ApiQuery({
    -  name: 'email',
    -  description: 'Email to send OTP',
    -  required: true
    -})
    -@ApiQuery({
    -  name: 'otp',
    -  description: 'OTP to validate',
    -  required: true
    +@ApiBody({
    +  schema: {
    +    type: 'object',
    +    properties: {
    +      email: { type: 'string', description: 'Email to send OTP' },
    +      otp: { type: 'string', description: 'OTP to validate' }
    +    },
    +    required: ['email', 'otp']
    +  }
     })
     
    Specify bearer token format in Swagger configuration.

    For enhanced security, consider specifying the bearerFormat in the addBearerAuth method to
    indicate whether the token is a JWT or another format. This helps users of your API
    understand the expected token format.

    apps/api/src/main.ts [100]

    -.addBearerAuth()
    +.addBearerAuth({ type: 'http', scheme: 'bearer', bearerFormat: 'JWT' })
     
    Add @IsEmail() validation for email fields.

    For the email field, consider adding a validation decorator @IsEmail() from
    class-validator to ensure the input is a valid email address. This enhances data integrity
    and validation on the server side.

    apps/api/src/user/dto/create.user/create.user.ts [17-27]

    -@IsString()
    +@IsEmail()
     @ApiProperty({
       name: 'email',
       description: 'Email of the user',
       required: true,
       type: String,
       example: 'johndoe@keyshade.xyz',
       format: 'email',
       uniqueItems: true
     })
     email: string
     
    Maintainability
    Extract common API response descriptions to shared variables.

    To avoid repetition and improve maintainability, consider extracting common response
    descriptions into a shared variable or function. This is particularly useful for standard
    responses like 'Invalid authentication token or API key'.

    apps/api/src/user/controller/user.controller.ts [67]

    -@ApiForbiddenResponse({
    +const invalidAuthResponse = {
       description: 'Invalid authentication token or API key'
    -})
    +};
     
    +@ApiForbiddenResponse(invalidAuthResponse)
    +
    Best practice
    Use @ApiNoContentResponse for endpoints with possible no content responses.

    To ensure the API documentation is clear and useful, consider adding @ApiNoContentResponse
    for endpoints that might not return content, specifying the possible status codes and
    their meanings.

    apps/api/src/user/controller/user.controller.ts [101-106]

     @ApiForbiddenResponse({
       description: 'Invalid authentication token'
     })
    -@ApiResponse({
    -  status: 204,
    +@ApiNoContentResponse({
       description: 'User deleted successfully'
     })
     

    ✨ Improve tool usage guide:

    Overview:
    The improve tool scans the PR code changes, and automatically generates suggestions for improving the PR code. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.
    When commenting, to edit configurations related to the improve tool (pr_code_suggestions section), use the following template:

    /improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...
    

    With a configuration file, use the following template:

    [pr_code_suggestions]
    some_config1=...
    some_config2=...
    
    Enabling\disabling automation

    When you first install the app, the default mode for the improve tool is:

    pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...]
    

    meaning the improve tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically.

    Utilizing extra instructions

    Extra instructions are very important for the improve tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.

    Examples for extra instructions:

    [pr_code_suggestions] # /improve #
    extra_instructions="""
    Emphasize the following aspects:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    A note on code suggestions quality
    • While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically.
    • Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base.
    • Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project, or use the custom suggestions 💎 tool
    • With large PRs, best quality will be obtained by using 'improve --extended' mode.
    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the improve usage page for a more comprehensive guide on using this tool.

    Copy link

    codecov bot commented Mar 11, 2024

    Codecov Report

    All modified and coverable lines are covered by tests ✅

    Project coverage is 94.78%. Comparing base (7bb3d21) to head (1eef0d2).
    Report is 27 commits behind head on develop.

    ❗ Current head 1eef0d2 differs from pull request most recent head 0e346e8. Consider uploading reports for the commit 0e346e8 to get more accurate results

    Additional details and impacted files
    @@             Coverage Diff              @@
    ##           develop     #166       +/-   ##
    ============================================
    + Coverage    62.20%   94.78%   +32.57%     
    ============================================
      Files           76       90       +14     
      Lines         1503     1993      +490     
      Branches       260      394      +134     
    ============================================
    + Hits           935     1889      +954     
    + Misses         568      104      -464     
    Flag Coverage Δ
    api-e2e-tests 94.78% <100.00%> (+32.57%) ⬆️

    Flags with carried forward coverage won't be shown. Click here to find out more.

    ☔ View full report in Codecov by Sentry.
    📢 Have feedback on the report? Share it here.

    Copy link

    sonarcloud bot commented Mar 11, 2024

    Quality Gate Passed Quality Gate passed

    Issues
    0 New issues
    0 Accepted issues

    Measures
    0 Security Hotspots
    No data about Coverage
    0.0% Duplication on New Code

    See analysis details on SonarCloud

    @rajdip-b rajdip-b merged commit fd59522 into develop Mar 11, 2024
    5 checks passed
    @rajdip-b rajdip-b deleted the docs/user-controller branch March 11, 2024 06:20
    rajdip-b pushed a commit that referenced this pull request May 12, 2024
    ## [1.3.0](v1.2.0...v1.3.0) (2024-05-12)
    
    ### 🚀 Features
    
    * Add approval support ([#158](#158)) ([e09ae60](e09ae60))
    * **api:** Add configuration live update support ([#181](#181)) ([f7d6684](f7d6684))
    * **api:** Add feature to export data of a workspace ([#152](#152)) ([46833aa](46833aa))
    * **api:** Add Integration support ([#203](#203)) ([f1ae87e](f1ae87e))
    * **api:** Add note to [secure] and variable ([#151](#151)) ([2e62351](2e62351))
    * **api:** Add OAuth redirection and polished authentication ([#212](#212)) ([d2968bc](d2968bc))
    * **api:** Add support for storing and managing variables ([#149](#149)) ([963a8ae](963a8ae))
    * **api:** Added GitLab OAuth ([#188](#188)) ([4d3bbe4](4d3bbe4))
    * **api:** Added validation for reason field ([#190](#190)) ([90b8ff2](90b8ff2))
    * **api:** Create default workspace on user's creation ([#182](#182)) ([3dc0c4c](3dc0c4c))
    * **api:** Reading `port` Dynamically ([#170](#170)) ([fd46e3e](fd46e3e))
    * **auth:** Add Google OAuth ([#156](#156)) ([cf387ea](cf387ea))
    * **web:** Added waitlist ([#168](#168)) ([1084c77](1084c77))
    * **web:** Landing revamp ([#165](#165)) ([0bc723b](0bc723b))
    
    ### 🐛 Bug Fixes
    
    * **web:** alignment issue in “Collaboration made easy” section ([#178](#178)) ([df5ca75](df5ca75))
    * **workspace:** delete duplicate tailwind config ([99d922a](99d922a))
    
    ### 📚 Documentation
    
    * add contributor list ([f37569a](f37569a))
    * Add integration docs ([#204](#204)) ([406ddb7](406ddb7))
    * Added integration docs to gitbook summary ([ab37530](ab37530))
    * **api:** Add swagger docs of API key controller ([#167](#167)) ([2910476](2910476))
    * **api:** Add swagger docs of User Controller ([#166](#166)) ([fd59522](fd59522))
    * fix typo in environment-variables.md ([#163](#163)) ([48294c9](48294c9))
    * Remove supabase from docs ([#169](#169)) ([eddbce8](eddbce8))
    * **setup:** replace NX with Turbo in setup instructions ([#175](#175)) ([af8a460](af8a460))
    * Update README.md ([b59f16b](b59f16b))
    * Update running-the-api.md ([177dbbf](177dbbf))
    * Update running-the-api.md ([#193](#193)) ([3d5bcac](3d5bcac))
    
    ### 🔧 Miscellaneous Chores
    
    * Added lockfile ([60a3b9b](60a3b9b))
    * Added lockfile ([6bb512c](6bb512c))
    * **api:** Added type inference and runtime validation to `process.env` ([#200](#200)) ([249e07d](249e07d))
    * **api:** Fixed prisma script env errors ([#209](#209)) ([8762354](8762354))
    * **API:** Refactor authority check functions in API ([#189](#189)) ([e9d710d](e9d710d))
    * **api:** Refactor user e2e tests ([b38d45a](b38d45a))
    * **ci:** Disabled api stage release ([97877c4](97877c4))
    * **ci:** Update stage deployment config ([868a6a1](868a6a1))
    * **codecov:** update api-e2e project coverage ([1e90d7e](1e90d7e))
    * **dockerfile:** Fixed web dockerfile ([6134bb2](6134bb2))
    * **docker:** Optimized web Dockerfile to reduct image size ([#173](#173)) ([444286a](444286a))
    * **release:** Downgraded package version ([c173fee](c173fee))
    * **release:** Fix failing release ([#213](#213)) ([40f64f3](40f64f3))
    * **release:** Install pnpm ([1081bea](1081bea))
    * **release:** Updated release commit ([b8958e7](b8958e7))
    * **release:** Updated release commit ([e270eb8](e270eb8))
    * Update deprecated husky Install command ([#202](#202)) ([e61102c](e61102c))
    * Upgrade @million/lint from 0.0.66 to 0.0.73 ([#172](#172)) ([dd43ed9](dd43ed9))
    * **web:** Updated fly memory config ([4debc66](4debc66))
    
    ### 🔨 Code Refactoring
    
    * **api:** Made events central to workspace ([#159](#159)) ([9bc00ae](9bc00ae))
    * **api:** Migrated to cookie based authentication ([#206](#206)) ([ad6911f](ad6911f))
    * **monorepo:** Migrate from nx to turbo ([#153](#153)) ([88b4b00](88b4b00))
    @rajdip-b
    Copy link
    Member Author

    🎉 This PR is included in version 1.3.0 🎉

    The release is available on GitHub release

    Your semantic-release bot 📦🚀

    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    type: documentation Improvements or additions to documentation type: enhancement New feature or request
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    1 participant