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: add environment e2e tests #143

Merged
merged 3 commits into from
Feb 16, 2024
Merged

test: add environment e2e tests #143

merged 3 commits into from
Feb 16, 2024

Conversation

rajdip-b
Copy link
Member

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

Type

enhancement, bug_fix


Description

  • Enhanced error handling in environment authority checks and service operations.
  • Added comprehensive e2e tests for environment management, covering creation, update, deletion, and fetching operations.
  • Improved validation and error messaging in environment service, particularly for operations involving default environments and duplicate names.
  • Introduced a unique constraint on environment names within a project to prevent duplicates.

Changes walkthrough

Relevant files
Error handling
get-environment-with-authority.ts
Improve Error Handling in Environment Authority Check       

apps/api/src/common/get-environment-with-authority.ts

  • Replaced ConflictException with UnauthorizedException for unauthorized
    access attempts.
  • +2/-2     
    Tests
    environment.e2e.spec.ts
    Add Comprehensive e2e Tests for Environment Management     

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

  • Added extensive e2e tests for environment management features
    including creation, update, deletion, and fetching of environments.
  • Ensured proper error handling and validation in various scenarios such
    as duplicate environment names, unauthorized access, and operations on
    default environments.
  • +586/-0 
    Enhancement
    environment.service.ts
    Enhance Environment Service with Better Validation and Error Handling

    apps/api/src/environment/service/environment.service.ts

  • Introduced BadRequestException for invalid operations such as deleting
    the default or the last environment.
  • Enhanced error messages for conflict exceptions during environment
    creation and update.
  • Fixed the logic for updating environments to correctly handle the
    default status and prevent duplicate names within the same project.
  • +40/-16 
    Configuration changes
    migration.sql
    Enforce Unique Environment Names within Projects                 

    apps/api/src/prisma/migrations/20240216155823_add_unique_key_to_environment/migration.sql

  • Added a unique index on projectId and name columns in the Environment
    table to enforce unique environment names within a project.
  • +8/-0     
    schema.prisma
    Update Prisma Schema to Enforce Unique Environment Names 

    apps/api/src/prisma/schema.prisma

  • Added a unique constraint on projectId and name fields in the
    Environment model.
  • +2/-0     

    ✨ 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
    Contributor

    PR Description updated to latest commit (07fd0f2)

    Copy link

    nx-cloud bot commented Feb 16, 2024

    ☁️ Nx Cloud Report

    CI is running/has finished running commands for commit 55961ad. 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 Review

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

    4, because the PR includes a wide range of changes across error handling, e2e tests, service logic, and database schema. The complexity and breadth of these changes require a thorough review to ensure correctness, security, and performance.

    🧪 Relevant tests

    Yes

    🔍 Possible issues
    • The introduction of a unique constraint on environment names within a project could lead to migration issues if there are existing duplicates. It's important to ensure that the database is in a consistent state before applying this change.
    • Changing the exception type from ConflictException to UnauthorizedException in get-environment-with-authority.ts might have implications on client error handling logic. Clients expecting a conflict error might not correctly handle unauthorized exceptions.
    • The logic to prevent deletion of the default environment or the last environment in environment.service.ts is crucial. However, it's important to ensure that these checks are comprehensive and account for all possible edge cases to avoid unintentional data loss.
    • The handling of isDefault in environment updates seems to allow for the possibility that no environment is marked as default if the update operation mistakenly sets isDefault to false without another environment taking its place. This could lead to inconsistencies in how default environments are determined.
    🔒 Security concerns

    No


    ✨ 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 16, 2024

    PR Code Suggestions

    Suggestions                                                                                                                                                     
    enhancement
    Improve exception message clarity by including the missing authority.        

    Consider using a more specific exception message that includes the missing authority for
    clarity.

    apps/api/src/common/get-environment-with-authority.ts [38-39]

     throw new UnauthorizedException(
    -  `User ${userId} does not have the required authorities`
    +  `User ${userId} does not have the required authority: ${authority}`
     )
     
    Simplify the condition for assigning isDefault using nullish coalescing.

    Refactor the condition to check dto.isDefault directly without comparing it to undefined
    or null, as it's a boolean value.

    apps/api/src/environment/service/environment.service.ts [151-154]

    -isDefault:
    -  dto.isDefault !== undefined || dto.isDefault !== null
    -    ? dto.isDefault
    -    : environment.isDefault,
    +isDefault: dto.isDefault ?? environment.isDefault,
     
    maintainability
    Use beforeEach for common setup tasks in tests.                              

    Refactor the test suite to use beforeEach for common setup tasks to reduce redundancy and
    improve test maintainability.

    apps/api/src/environment/environment.e2e.spec.ts [48-114]

    -beforeAll(async () => {
    +beforeEach(async () => {
       ...
     })
     
    Reduce code duplication by using utility functions for entity creation.      

    Use a centralized function or utility for creating test entities like users, workspaces,
    and projects to reduce code duplication.

    apps/api/src/environment/environment.e2e.spec.ts [81-88]

    -user1 = await prisma.user.create({
    -  data: {
    -    id: user1Id,
    -    email: '[email protected]',
    -    name: 'John Doe',
    -    isOnboardingFinished: true
    -  }
    +user1 = await createUser({
    +  id: user1Id,
    +  email: '[email protected]',
    +  name: 'John Doe',
    +  isOnboardingFinished: true
     })
     
    Use helper functions for repeated payload structures.                        

    Extract repeated payload structures into a helper function to reduce redundancy and
    improve test readability.

    apps/api/src/environment/environment.e2e.spec.ts [126-130]

    -payload: {
    -  name: 'Environment 1',
    -  description: 'Environment 1 description',
    -  isDefault: true
    -}
    +payload: createEnvironmentPayload('Environment 1', 'Environment 1 description', true)
     
    Improve variable naming for better readability.                              

    Consider using a more descriptive variable name than ops for the array storing operations
    to be executed. This will improve code readability and maintainability.

    apps/api/src/environment/service/environment.service.ts [120]

    -const ops = []
    +const environmentOperations = []
     
    Simplify the condition for checking if an environment with the same name exists.

    Instead of manually checking if dto.name is not empty and then comparing names, you can
    simplify the condition by directly checking if the name exists and is different.

    apps/api/src/environment/service/environment.service.ts [111-113]

     if (
    -  dto.name &&
    -  (environment.name === dto.name ||
    -    (await this.environmentExists(dto.name, environment.projectId)))
    +  dto.name && await this.environmentExists(dto.name, environment.projectId) &&
    +  environment.name !== dto.name
     )
     
    best practice
    Improve test isolation by mocking prisma.environment.findMany.  

    Consider using a mock function for prisma.environment.findMany to return controlled test
    data, ensuring test isolation and reliability.

    apps/api/src/environment/environment.e2e.spec.ts [152-156]

    -const environments = await prisma.environment.findMany({
    -  where: {
    -    projectId: project1.id
    -  }
    -})
    +jest.spyOn(prisma.environment, 'findMany').mockResolvedValue([...])
     
    Use template literals for error messages for consistency.                    

    Use template literals consistently for error messages to ensure code consistency and
    readability.

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

    -throw new BadRequestException('Cannot delete the default environment')
    +throw new BadRequestException(`Cannot delete the default environment`)
     
    Define explicit return types for methods to improve type safety.             

    For the makeAllNonDefault method, consider explicitly defining the return type to improve
    code readability and type safety.

    apps/api/src/environment/service/environment.service.ts [317]

    -private makeAllNonDefault(projectId: Project['id']) {
    +private makeAllNonDefault(projectId: Project['id']): Promise<Prisma.BatchPayload> {
     

    ✨ 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 16, 2024

    Codecov Report

    All modified and coverable lines are covered by tests ✅

    Comparison is base (7bb3d21) 62.20% compared to head (55961ad) 81.17%.
    Report is 5 commits behind head on develop.

    Additional details and impacted files
    @@             Coverage Diff              @@
    ##           develop     #143       +/-   ##
    ============================================
    + Coverage    62.20%   81.17%   +18.96%     
    ============================================
      Files           76       77        +1     
      Lines         1503     1503               
      Branches       260      255        -5     
    ============================================
    + Hits           935     1220      +285     
    + Misses         568      283      -285     
    Flag Coverage Δ
    api-e2e-tests 81.17% <100.00%> (+18.96%) ⬆️

    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

    sonarqubecloud bot commented Feb 16, 2024

    Quality Gate Passed Quality Gate passed

    Issues
    0 New issues

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

    See analysis details on SonarCloud

    @rajdip-b rajdip-b merged commit f0c2dcb into develop Feb 16, 2024
    7 of 8 checks passed
    @rajdip-b rajdip-b deleted the test/environment branch February 16, 2024 16:21
    @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