Skip to content

fix(delegate): entity create fails when inheriting from a delegate model that extends an abstract model#1561

Merged
ymc9 merged 1 commit intodevfrom
fix/issue-1560
Jul 7, 2024
Merged

fix(delegate): entity create fails when inheriting from a delegate model that extends an abstract model#1561
ymc9 merged 1 commit intodevfrom
fix/issue-1560

Conversation

@ymc9
Copy link
Member

@ymc9 ymc9 commented Jul 7, 2024

Fixes #1560

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jul 7, 2024

Walkthrough

Walkthrough

The recent changes introduce a function named getInheritedFromDelegate to handle inherited fields from delegate models in the schema generation logic. This is applied in the schema generator, model meta-generator, and utility functions, ensuring accurate handling of inherited fields, especially those involving delegate models and abstract models.

Changes

Files Change Summary
packages/schema/src/plugins/prisma/schema-generator.ts Added getInheritedFromDelegate function to process inherited fields from delegate models in the schema generation logic.
packages/sdk/src/model-meta-generator.ts Incorporated getInheritedFromDelegate function to handle inherited delegate fields in metadata.
packages/sdk/src/utils.ts Added getInheritedFromDelegate function to locate the original delegate base model for a field by recursively searching through base models.
tests/regression/tests/issue-1560.test.ts Introduced a test case for issue 1560, which checks if schema loading and data creation work correctly when using delegate models extending abstract ones.

Sequence Diagram(s)

No applicable sequence diagrams are needed for these documentation-only changes.

Assessment against linked issues

Objective Addressed Explanation
Fix issue where model entity creation fails when inheriting from a delegate model (1560)

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:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

  • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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 resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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
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

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between df32680 and 09d14e7.

Files selected for processing (4)
  • packages/schema/src/plugins/prisma/schema-generator.ts (2 hunks)
  • packages/sdk/src/model-meta-generator.ts (2 hunks)
  • packages/sdk/src/utils.ts (1 hunks)
  • tests/regression/tests/issue-1560.test.ts (1 hunks)
Additional comments not posted (6)
tests/regression/tests/issue-1560.test.ts (1)

1-41: LGTM! The test case is thorough and well-structured.

The test case correctly addresses the issue by loading the schema, enhancing it, and performing data creation steps to verify the fix.

packages/sdk/src/model-meta-generator.ts (2)

270-273: LGTM! The integration of getInheritedFromDelegate is logical and correctly placed.

The condition to exclude inherited fields from delegates, except for ID fields, is appropriate.


Line range hint 561-571:
LGTM! The getInheritedFromDelegate function is well-defined and correctly identifies the original delegate base model.

The use of findLast to start from the uppermost base is appropriate.

packages/sdk/src/utils.ts (1)

561-571: LGTM! The getInheritedFromDelegate function is well-defined and correctly identifies the original delegate base model.

The use of findLast to start from the uppermost base is appropriate.

packages/schema/src/plugins/prisma/schema-generator.ts (2)

265-268: LGTM! The integration of getInheritedFromDelegate is logical and correctly placed.

The condition to exclude inherited fields from delegates, except for ID fields, is appropriate.


42-42: LGTM! The getInheritedFromDelegate function is well-defined and correctly identifies the original delegate base model.

The use of findLast to start from the uppermost base is appropriate.

@ymc9 ymc9 merged commit ac2b291 into dev Jul 7, 2024
@ymc9 ymc9 deleted the fix/issue-1560 branch July 7, 2024 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant