Skip to content

fix: App v1 service #207

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

Merged
merged 84 commits into from
Apr 16, 2025
Merged

fix: App v1 service #207

merged 84 commits into from
Apr 16, 2025

Conversation

lu-yg
Copy link
Collaborator

@lu-yg lu-yg commented Apr 16, 2025

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

Background and solution

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

  • Bug Fixes

    • Ensured that component schema lists no longer contain duplicate entries.
    • Restricted component queries to include only official components when searching by material history ID.
  • Chores

    • Updated internal logic to automatically mark certain components as official during bulk creation.
  • Tests

    • Improved test coverage by mocking the login user context in user controller tests.

lu-yg and others added 30 commits December 26, 2024 00:15
Copy link

coderabbitai bot commented Apr 16, 2025

Walkthrough

This update introduces deduplication in the schema components map returned by AppV1ServiceImpl, ensuring only unique schemas are included. The ComponentServiceImpl now marks all bulk-created component libraries as official. The SQL mapping for retrieving user components by material history ID is adjusted to only return official components. In testing, UserControllerTest is enhanced to mock and stub the LoginUserContext, allowing for controlled simulation of user identity during tests.

Changes

File(s) Change Summary
.../AppV1ServiceImpl.java Added deduplication to the returned list in getSchemaComponentsMap using Java Streams .distinct().
.../ComponentServiceImpl.java Set isOfficial to true for each ComponentLibrary in readFileAndBulkCreate.
.../ComponentMapper.xml Modified SQL to only join and return components where is_official is true.
.../UserControllerTest.java Added a mock for LoginUserContext and stubbed getLoginUserId() to return "1" in tests.

Sequence Diagram(s)

Loading
sequenceDiagram
    participant Test as UserControllerTest
    participant LoginCtx as LoginUserContext (Mock)
    participant Controller as UserController

    Test->>LoginCtx: Stub getLoginUserId() to return "1"
    Test->>Controller: Call me()
    Controller->>LoginCtx: getLoginUserId()
    LoginCtx-->>Controller: "1"
    Controller-->>Test: Returns user info for ID "1"

Possibly related PRs

Suggested reviewers

  • zhangjuncao

Poem

In the meadow of code where components hop,
We dedupe our schemas—no need to stop!
Official flags waving, in SQL they align,
And tests now know just whose ID is mine.
With every commit, the code grows bright—
A rabbit’s delight in the soft morning light.
🐇✨

Tip

⚡💬 Agentic Chat (Pro Plan, General Availability)
  • We're introducing multi-step agentic chat in review comments and issue comments, within and outside of PR's. This feature enhances review and issue discussions with the CodeRabbit agentic chat by enabling advanced interactions, including the ability to create pull requests directly from comments and add commits to existing pull requests.

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4726931 and 75f0be1.

📒 Files selected for processing (4)
  • base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java (1 hunks)
  • base/src/main/resources/mappers/ComponentMapper.xml (1 hunks)
  • base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java (3 hunks)
🔇 Additional comments (4)
base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java (1)

151-151: Consistent property initialization for bulk creation

Setting isOfficial to true is consistent with the other flags (isDefault and isStarted) and aligns with the filter added in ComponentMapper.xml that requires components to be official.

base/src/main/resources/mappers/ComponentMapper.xml (1)

270-270: Added filter for official components only

The SQL query now filters for official components in the join condition, which aligns with setting isOfficial=true in the ComponentServiceImpl. This ensures only officially sanctioned components are returned.

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java (1)

510-514:

❓ Verification inconclusive

Added deduplication for schema components

Good addition of the Stream API's distinct() method to remove duplicate entries from the combined components map. This prevents potential issues with duplicate schema definitions.

However, for distinct() to work correctly, ensure the Map objects in the list properly implement equals() and hashCode() methods, or consider implementing a custom comparator if needed.


🏁 Script executed:

#!/bin/bash
# Check if the maps are HashMap instances or custom implementations
rg -A 5 "new HashMap<String, Object>" --type java base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java

Length of output: 130


Action Required: Verify Map Equality Implementation

The deduplication logic using the Stream API's distinct() method is a solid improvement for removing duplicate schema components. However, since the initial search for explicit instantiation of HashMap<String, Object> produced no output, it's unclear which map implementation is used. Please manually verify that the map instances in your componentsMap are either standard implementations (such as those created by Map.of(...), new HashMap<>, or similar) that correctly implement equals() and hashCode(), or ensure that any custom map types provide appropriate equality semantics. This verification is necessary for distinct() to work as expected.

base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java (1)

19-19: Added LoginUserContext mock for proper test coverage

This change properly supports testing the user controller by mocking the LoginUserContext and setting up the expected behavior. This is a good practice for ensuring tests stay isolated and predictable.

Also applies to: 38-39, 52-52

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
  • @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.

@lu-yg lu-yg merged commit 50e94c7 into opentiny:develop Apr 16, 2025
1 check passed
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.

2 participants