Skip to content

fix: modify block group#160

Merged
lu-yg merged 11 commits intoopentiny:developfrom
lu-yg:develop
Jan 22, 2025
Merged

fix: modify block group#160
lu-yg merged 11 commits intoopentiny:developfrom
lu-yg:develop

Conversation

@lu-yg
Copy link
Collaborator

@lu-yg lu-yg commented Jan 22, 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

Based on the comprehensive changes, here are the release notes:

  • New Features

    • Introduced block group and block relationship management
    • Enhanced block filtering capabilities with more detailed search parameters
    • Added support for tracking block versions and histories
  • Database Changes

    • Restructured database schema for block and group relationships
    • Updated internationalization and block tracking mechanisms
  • Improvements

    • Refined block querying and retrieval methods
    • Improved data transfer object (DTO) structures for more flexible data handling
    • Enhanced block group and block management services
  • Removed Components

    • Deprecated BlockCurrentHistory related classes and mappers
    • Removed legacy block history tracking mechanisms

These changes represent a significant refactoring of the block and group management system, focusing on more flexible and robust data relationships.

@coderabbitai
Copy link

coderabbitai bot commented Jan 22, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

This pull request introduces a comprehensive refactoring of the block and block group management system. The changes involve restructuring database relationships, modifying data transfer objects, and updating service and mapper implementations. Key modifications include replacing the BlockCurrentHistory with a new BlockCarriersRelation entity, introducing a new r_block_group_block mapping table, and enhancing block filtering capabilities through a new NotGroupDto. The changes aim to improve the flexibility and precision of block and group management by introducing more granular relationship tracking and querying mechanisms.

Changes

File Path Change Summary
app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql - Updated unique index for t_i18n_entry
- Dropped t_block_current_history table
- Added t_block_carriers_relation table
- Added r_block_group_block table
base/src/main/java/com/tinyengine/it/common/enums/Enums.java - Added new BlockGroup enum with constants BLOCK_GROUP, BLOCK, MATERIAL_HISTORY
base/src/main/java/com/tinyengine/it/model/dto/ - Updated BlockDto with new currentVersion field
- Updated BlockGroupDto to use List<BlockDto>
- Added new NotGroupDto for advanced block filtering
base/src/main/java/com/tinyengine/it/model/entity/ - Replaced BlockCurrentHistory with BlockCarriersRelation
- Added BlockGroupBlock entity
- Updated Block with currentVersion field
base/src/main/java/com/tinyengine/it/mapper/ - Added BlockCarriersRelationMapper
- Added BlockGroupBlockMapper
- Updated BlockGroupMapper and BlockMapper
base/src/main/java/com/tinyengine/it/service/material/ - Updated BlockService and BlockServiceImpl
- Removed BlockCurrentHistoryService
base/src/main/resources/mappers/ - Added BlockCarriersRelationMapper.xml
- Added BlockGroupBlock.xml
- Updated BlockGroupMapper.xml

Sequence Diagram

sequenceDiagram
    participant Client
    participant BlockController
    participant BlockService
    participant BlockMapper
    participant BlockCarriersRelationMapper
    participant BlockGroupBlockMapper

    Client->>BlockController: Request blocks not in group
    BlockController->>BlockService: getNotInGroupBlocks(NotGroupDto)
    BlockService->>BlockMapper: findBlocksReturn(NotGroupDto)
    BlockMapper-->>BlockService: List<BlockDto>
    BlockService->>BlockGroupBlockMapper: Query block group relationships
    BlockGroupBlockMapper-->>BlockService: Block group details
    BlockService->>Client: Return filtered blocks
Loading

Poem

🐰 Blocks dancing free, no longer confined
In groups they roam, with versions refined
Carriers of history, relations anew
A mapper's delight, a coder's breakthrough
Hop, hop, refactoring's sweet design! 🌟


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between b8300f3 and 7d52937.

📒 Files selected for processing (25)
  • app/src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql (3 hunks)
  • base/src/main/java/com/tinyengine/it/common/enums/Enums.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/controller/BlockController.java (3 hunks)
  • base/src/main/java/com/tinyengine/it/controller/BlockCurrentHistoryController.java (0 hunks)
  • base/src/main/java/com/tinyengine/it/mapper/BlockCarriersRelationMapper.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/mapper/BlockCurrentHistoryMapper.java (0 hunks)
  • base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/mapper/BlockGroupMapper.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java (3 hunks)
  • base/src/main/java/com/tinyengine/it/model/dto/BlockDto.java (2 hunks)
  • base/src/main/java/com/tinyengine/it/model/dto/BlockGroupDto.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/model/entity/Block.java (3 hunks)
  • base/src/main/java/com/tinyengine/it/model/entity/BlockCarriersRelation.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/model/entity/BlockGroupBlock.java (1 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/BlockCurrentHistoryService.java (0 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/BlockService.java (3 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/impl/BlockCurrentHistoryServiceImpl.java (0 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java (5 hunks)
  • base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java (10 hunks)
  • base/src/main/resources/mappers/BlockCarriersRelationMapper.xml (1 hunks)
  • base/src/main/resources/mappers/BlockCurrentHistoryMapper.xml (0 hunks)
  • base/src/main/resources/mappers/BlockGroupBlock.xml (1 hunks)
  • base/src/main/resources/mappers/BlockGroupMapper.xml (3 hunks)
  • base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java (2 hunks)

Note

🎁 Summarized by CodeRabbit Free

Your organization is on the Free plan. CodeRabbit will generate a high-level summary and a walkthrough for each pull request. For a comprehensive line-by-line review, please upgrade your subscription to CodeRabbit Pro by visiting https://app.coderabbit.ai/login.

🪧 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. (Beta)
  • @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 0b94204 into opentiny:develop Jan 22, 2025
lu-yg added a commit to lu-yg/tiny-engine-backend-java that referenced this pull request Oct 23, 2025
* fix: update page history bug

* fix: format code and fix style issue

* fix: modify page histiry entity

* feat: add code submission rules

* fix: modify app schema for test
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