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

test(api): add test for workspace #141

Merged
merged 4 commits into from
Feb 15, 2024
Merged

test(api): add test for workspace #141

merged 4 commits into from
Feb 15, 2024

Conversation

rajdip-b
Copy link
Member

@rajdip-b rajdip-b commented Feb 15, 2024

User description

Description

  • Added tests for workspace module
  • Fixed logical errors in the workspace code

Type

enhancement, bug_fix


Description

  • Added and updated tests in api-key.e2e.spec.ts, event.e2e.spec.ts, and workspace-role.e2e.spec.ts for better coverage and sanity checks.
  • Enhanced workspace.controller.ts and workspace.service.ts to improve authority checks, role management during ownership transfer, and error handling.
  • Introduced comprehensive E2E tests for Workspace functionality in workspace.e2e.spec.ts.
  • Updated database schema and migration to remove TRANSFER_OWNERSHIP from the Authority enum, reflecting changes in the application's authority management.

Changes walkthrough

Relevant files
Tests
api-key.e2e.spec.ts
Add Sanity Check Test for API Key Role Controller               

apps/api/src/api-key/api-key.e2e.spec.ts

  • Added a test to check if app and prisma are defined in API Key Role
    Controller Tests.
  • +5/-0     
    event.e2e.spec.ts
    Add Sanity Check Test for Event Controller                             

    apps/api/src/event/event.e2e.spec.ts

  • Added a test to ensure app and prisma are defined in Event Controller
    Tests.
  • +5/-0     
    workspace-role.e2e.spec.ts
    Update Workspace Role Controller Test for `prisma` Definition

    apps/api/src/workspace-role/workspace-role.e2e.spec.ts

  • Modified a test to be async and check if prisma is defined in
    Workspace Role Controller Tests.
  • +2/-1     
    workspace.e2e.spec.ts
    Comprehensive E2E Tests for Workspace Functionality           

    apps/api/src/workspace/workspace.e2e.spec.ts

  • Introduced comprehensive end-to-end tests for Workspace functionality,
    covering creation, update, invitation management, role updates, and
    deletion.
  • +1131/-0
    Enhancement
    workspace.controller.ts
    Update Authority Check and Fix Member Roles Update in Workspace
    Controller

    apps/api/src/workspace/controller/workspace.controller.ts

  • Changed authority required for transferring ownership from
    TRANSFER_OWNERSHIP to WORKSPACE_ADMIN.
  • Fixed the parameter for updating member roles from @Query('roles') to
    @Body() roleIds.
  • +2/-2     
    workspace.service.ts
    Enhance Workspace Service with Role Management and Error Handling

    apps/api/src/workspace/service/workspace.service.ts

  • Updated authority check for transferring ownership to WORKSPACE_ADMIN.
  • Implemented removal of admin role from current owner and reassignment
    to new owner during ownership transfer.
  • Fixed pagination issue by correcting the skip calculation in several
    methods.
  • Added error handling for adding users to workspace when they are
    already members.
  • Changed exception types for better clarity in error scenarios.
  • +104/-86
    migration.sql
    Database Migration to Update Authority Enum                           

    apps/api/src/prisma/migrations/20240215135023_update_authority/migration.sql

    • Removed TRANSFER_OWNERSHIP from the Authority enum.
    +15/-0   
    schema.prisma
    Update Prisma Schema to Reflect Authority Enum Changes     

    apps/api/src/prisma/schema.prisma

  • Removed TRANSFER_OWNERSHIP from the Authority enum in Prisma schema.
  • +0/-1     

    ✨ Usage guide:

    Overview:
    The describe tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels. 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 describe tool (pr_description section), use the following template:

    /describe --pr_description.some_config1=... --pr_description.some_config2=...
    

    With a configuration file, use the following template:

    [pr_description]
    some_config1=...
    some_config2=...
    
    Enabling\disabling automation
    • When you first install the app, the default mode for the describe tool is:
    pr_commands = ["/describe --pr_description.add_original_user_description=true" 
                             "--pr_description.keep_original_user_title=true", ...]
    

    meaning the describe tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description.

    • Markers are an alternative way to control the generated description, to give maximal control to the user. If you set:
    pr_commands = ["/describe --pr_description.use_description_markers=true", ...]
    

    the tool will replace every marker of the form pr_agent:marker_name in the PR description with the relevant content, where marker_name is one of the following:

    • type: the PR type.
    • summary: the PR summary.
    • walkthrough: the PR walkthrough.

    Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.

    Custom labels

    The default labels of the describe tool are quite generic: [Bug fix, Tests, Enhancement, Documentation, Other].

    If you specify custom labels in the repo's labels page or via configuration file, you can get tailored labels for your use cases.
    Examples for custom labels:

    • Main topic:performance - pr_agent:The main topic of this PR is performance
    • New endpoint - pr_agent:A new endpoint was added in this PR
    • SQL query - pr_agent:A new SQL query was added in this PR
    • Dockerfile changes - pr_agent:The PR contains changes in the Dockerfile
    • ...

    The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases.
    Note that Labels are not mutually exclusive, so you can add multiple label categories.
    Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.

    Inline File Walkthrough 💎

    For enhanced user experience, the describe tool can add file summaries directly to the "Files changed" tab in the PR page.
    This will enable you to quickly understand the changes in each file, while reviewing the code changes (diffs).

    To enable inline file summary, set pr_description.inline_file_summary in the configuration file, possible values are:

    • 'table': File changes walkthrough table will be displayed on the top of the "Files changed" tab, in addition to the "Conversation" tab.
    • true: A collapsable file comment with changes title and a changes summary for each file in the PR.
    • false (default): File changes walkthrough will be added only to the "Conversation" tab.
    Utilizing extra instructions

    The describe tool can be configured with extra instructions, 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. Notice that the general structure of the description is fixed, and cannot be changed. Extra instructions can change the content or style of each sub-section of the PR description.

    Examples for extra instructions:

    [pr_description] 
    extra_instructions="""
    - The PR title should be in the format: '<PR type>: <title>'
    - The title should be short and concise (up to 10 words)
    - ...
    """
    

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

    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 describe usage page for a comprehensive guide on using this tool.

    Copy link

    nx-cloud bot commented Feb 15, 2024

    ☁️ Nx Cloud Report

    CI is running/has finished running commands for commit 52e7bab. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

    📂 See all runs for this CI Pipeline Execution


    ✅ Successfully ran 3 targets

    Sent with 💌 from NxCloud.

    Copy link
    Contributor

    PR Description updated to latest commit (f1d1f00)

    Copy link
    Contributor

    PR Review

         PR feedback                    
    ⏱️ Estimated effort to review [1-5]

    4, because the PR involves multiple significant changes across various files including tests, service logic, controller logic, and database schema migrations. The complexity of the changes, especially those related to authority checks and ownership transfer logic, requires careful review to ensure correctness and security.

    🧪 Relevant tests

    Yes

    🔍 Possible issues
    • The migration removing TRANSFER_OWNERSHIP from the Authority enum might cause issues if the database contains records that still use this value. It's important to ensure that all references to TRANSFER_OWNERSHIP are properly updated or removed before applying this migration.
    • The changes in workspace.service.ts for transferring workspace ownership involve deleting and creating role associations. This operation should be carefully reviewed to ensure it correctly handles all edge cases, especially around error handling and transactional integrity.
    • The method leaveWorkspace in workspace.service.ts has been updated to include fetching the workspace with authority check at the beginning but doesn't seem to use this workspace object for any further checks before proceeding with the leave operation. This might be an oversight or unnecessary code.
    • The update in pagination logic (e.g., changing skip: (page - 1) * limit to skip: page * limit) in various service methods might introduce off-by-one errors in pagination, depending on how the page parameter is expected to be used (0-indexed vs. 1-indexed).
    🔒 Security concerns
    • The PR does not introduce direct security vulnerabilities in the changes reviewed. However, the logic around workspace ownership transfer and role management should be scrutinized for potential indirect security implications, such as unauthorized access or privilege escalation due to incorrect role assignments or checks.

    ✨ 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 Feb 15, 2024

    PR Code Suggestions

    Suggestions                                                                                                                                                     
    performance
    Improve performance by executing asynchronous calls concurrently.            

    Consider using Promise.all() for executing getWorkspaceWithAuthority and
    this.prisma.workspaceMember.findMany concurrently to improve performance.

    apps/api/src/workspace/service/workspace.service.ts [699-708]

    -const workspace = await getWorkspaceWithAuthority(
    -...
    -const memberships = await this.prisma.workspaceMember.findMany({
    +const [workspace, memberships] = await Promise.all([
    +  getWorkspaceWithAuthority(user.id, workspaceId, Authority.READ_WORKSPACE, this.prisma),
    +  this.prisma.workspaceMember.findMany({
    +    where: { workspaceId },
    +  }),
    +]);
     
    enhancement
    Use a more specific exception for clarity and better error handling.         

    Replace the throw new BadRequestException with a more specific exception class that better
    describes the scenario, such as UserSelfRemovalException.

    apps/api/src/workspace/service/workspace.service.ts [386-388]

    -throw new BadRequestException(
    -  `You cannot remove yourself from the workspace. Please transfer the ownership to another member before leaving the workspace.`
    -)
    +throw new UserSelfRemovalException()
     
    maintainability
    Enhance log messages for better clarity and debugging.                       

    Use a more descriptive log message when no users are added to the workspace, including the
    reason why no users were added.

    apps/api/src/workspace/service/workspace.service.ts [366-368]

     this.log.warn(
    -  `No users to add to workspace ${workspace.name} (${workspace.id})`
    +  `Attempted to add users to workspace ${workspace.name} (${workspace.id}), but no valid user IDs were provided.`
     )
     
    Refactor repetitive validation checks into a utility function for cleaner code.

    Instead of manually throwing an exception for each check, create a utility function that
    validates the user's ability to perform an action and throws the appropriate exception.

    apps/api/src/workspace/service/workspace.service.ts [662-665]

    -if (!(await this.invitationPending(workspaceId, user.id)))
    -  throw new BadRequestException(
    -    `User ${user.name} (${user.id}) is not invited to workspace ${workspaceId}`
    -  )
    +await validateInvitationPending(workspaceId, user)
     
    reliability
    Add error handling for database transactions to improve reliability.         

    Implement error handling for the this.prisma.$transaction call to catch and handle any
    potential errors that may occur during the transaction.

    apps/api/src/workspace/service/workspace.service.ts [269]

    -await this.prisma.$transaction([removeRole, assignRole, updateWorkspace])
    +try {
    +  await this.prisma.$transaction([removeRole, assignRole, updateWorkspace])
    +} catch (error) {
    +  this.log.error(`Error updating workspace roles: ${error.message}`)
    +  throw new InternalServerErrorException('Failed to update workspace roles.')
    +}
     

    ✨ 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 Feb 15, 2024

    Codecov Report

    All modified and coverable lines are covered by tests ✅

    Comparison is base (7bb3d21) 62.20% compared to head (ec5e483) 73.35%.
    Report is 3 commits behind head on develop.

    Additional details and impacted files
    @@             Coverage Diff              @@
    ##           develop     #141       +/-   ##
    ============================================
    + Coverage    62.20%   73.35%   +11.14%     
    ============================================
      Files           76       76               
      Lines         1503     1505        +2     
      Branches       260      257        -3     
    ============================================
    + Hits           935     1104      +169     
    + Misses         568      401      -167     
    Flag Coverage Δ
    api-e2e-tests 73.35% <100.00%> (+11.14%) ⬆️

    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.

    @rajdip-b rajdip-b merged commit 05caad9 into develop Feb 15, 2024
    4 checks passed
    @rajdip-b rajdip-b deleted the test/workspace branch February 15, 2024 15:32
    Copy link

    Quality Gate Passed Quality Gate passed

    Issues
    0 New issues

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

    See analysis details on SonarCloud

    @rajdip-b
    Copy link
    Member Author

    🎉 This PR is included in version 1.2.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: enhancement New feature or request
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    1 participant