Skip to content

Доработки 240705 #463

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 4 commits into from
Jul 5, 2024
Merged

Доработки 240705 #463

merged 4 commits into from
Jul 5, 2024

Conversation

theshadowco
Copy link
Member

@theshadowco theshadowco commented Jul 5, 2024

Описание

  • Добавлена ссылка на Задачу в бизнес процессах
  • Добавлена информация о документах последовательности
  • Добавлен состав критерия отбора
  • Исправлен регресс: возвращен порядок объектов конфигурации

Связанные задачи

Closes: #252
Closes: #259
Closes: #256
Closes: #221

Чеклист

Общие

  • Ветка PR обновлена из develop
  • Отладочные, закомментированные и прочие, не имеющие смысла участки кода удалены
  • Изменения покрыты тестами
  • Обязательные действия перед коммитом выполнены (запускал команду gradlew precommit)

Дополнительно

Добавлена ссылка на Задачу в бизнес процессах
Добавлена информация о документах последовательности
Добавлен состав критерия отбора
возвращен порядок объектов конфигурации
Copy link

coderabbitai bot commented Jul 5, 2024

Walkthrough

Недавние изменения касаются нескольких модулей проекта, включая новые поля, методы и тесты, а также упорядочивание элементов в файлах конфигурации. Эти обновления направлены на улучшение функциональности и обеспечение более точного контроля за последовательностью обработки данных и конфигурационных расширений.

Changes

Файлы Краткое описание изменений
.../src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java Добавлено поле task типа MdoReference с значением по умолчанию MdoReference.EMPTY.
.../src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java Добавлено поле content типа List<MdoReference> с аннотацией @Singular("addContent").
.../src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java Добавлены комментарии для "Измерения" и "Документы", соответствующие списки Dimension и MdoReference.
.../src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java Метод setValueChildren обновлен для использования collect(Collectors.toMap(...)) вместо toList().
.../src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java Добавлены методы testFullExtEdt и checkChildrenOrder, импортирован класс List.
.../src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/... Добавлены новые элементы контента с путями Document.Документ1.Attribute.Реквизит1 и Реквизит2 в КритерийОтбора1.
.../src/test/resources/ext/edt/mdclasses/configuration/src/Sequences/... Добавлен новый документ Document.Документ2 в список документов для Последовательность1.
.../src/test/resources/ext/edt/mdclasses_ext/configuration/src/Configuration/... Изменен порядок элементов <calculationRegisters>, перемещен CalculationRegister.РегистрРасчета1.

Assessment against linked issues

Objective Addressed Explanation
Реализовать чтение ссылки на задчи бизнес-процесса (#252)

Кодобелый заек стремится вперед,
В новый процесс он задачу несет.
Пусть растет и множится свет,
В коде порядок — быстрый прогресс! ✨🐇


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:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • 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 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

github-actions bot commented Jul 5, 2024

Test Results

 54 files  ±0   54 suites  ±0   46s ⏱️ -1s
212 tests +1  212 ✅ +1  0 💤 ±0  0 ❌ ±0 
214 runs  +1  214 ✅ +1  0 💤 ±0  0 ❌ ±0 

Results for commit 1109c78. ± Comparison against base commit 3f03187.

♻️ This comment has been updated with latest results.

Copy link

sonarqubecloud bot commented Jul 5, 2024

@theshadowco theshadowco merged commit f44025f into develop Jul 5, 2024
15 checks passed
@theshadowco theshadowco deleted the feature/newFeatures240705 branch July 5, 2024 09:18
Copy link

@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 3f03187 and 1109c78.

Files ignored due to path filters (42)
  • src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/КритерийОтбора1.xml is excluded by !**/*.xml
  • src/test/resources/ext/designer/mdclasses/src/cf/Sequences/Последовательность1.xml is excluded by !**/*.xml
  • src/test/resources/ext/designer/mdclasses_ext/src/cf/Configuration.xml is excluded by !**/*.xml
  • src/test/resources/fixtures/mdclasses/BusinessProcesses.БизнесПроцесс1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/BusinessProcesses.БизнесПроцесс1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Catalogs.Справочник1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Catalogs.Справочник1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.ПланВидовХарактеристик1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.ПланВидовХарактеристик1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Configuration.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Configuration_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Constants.Константа1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Constants.Константа1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Documents.Документ1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Documents.Документ1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/ExternalDataSources.ТекущаяСУБД.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/ExternalDataSources.ТекущаяСУБД_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/FilterCriteria.КритерийОтбора1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/FilterCriteria.КритерийОтбора1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Reports.Отчет1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Reports.Отчет1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Sequences.Последовательность1.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses/Sequences.Последовательность1_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses_ext/Configuration.json is excluded by !**/*.json
  • src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/BusinessProcesses.Задание.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/BusinessProcesses.Задание_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Catalogs.Заметки.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Catalogs.Заметки_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.ДополнительныеРеквизитыИСведения_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/DataProcessors.ЗагрузкаКурсовВалют.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/DataProcessors.ЗагрузкаКурсовВалют_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Documents.Анкета.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Documents.Анкета_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/ExchangePlans.ОбновлениеИнформационнойБазы.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/ExchangePlans.ОбновлениеИнформационнойБазы_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/FilterCriteria.ФайлыВТоме.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/FilterCriteria.ФайлыВТоме_edt.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Tasks.ЗадачаИсполнителя.json is excluded by !**/*.json
  • src/test/resources/fixtures/ssl_3_1/Tasks.ЗадачаИсполнителя_edt.json is excluded by !**/*.json
Files selected for processing (8)
  • src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java (1 hunks)
  • src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java (1 hunks)
  • src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java (1 hunks)
  • src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java (2 hunks)
  • src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java (5 hunks)
  • src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/КритерийОтбора1/КритерийОтбора1.mdo (1 hunks)
  • src/test/resources/ext/edt/mdclasses/configuration/src/Sequences/Последовательность1/Последовательность1.mdo (1 hunks)
  • src/test/resources/ext/edt/mdclasses_ext/configuration/src/Configuration/Configuration.mdo (1 hunks)
Files skipped from review due to trivial changes (1)
  • src/test/resources/ext/edt/mdclasses_ext/configuration/src/Configuration/Configuration.mdo
Additional comments not posted (9)
src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/КритерийОтбора1/КритерийОтбора1.mdo (2)

10-10: Добавлен элемент контента.

Элемент контента Document.Документ1.Attribute.Реквизит1 добавлен корректно.


11-11: Добавлен элемент контента.

Элемент контента Document.Документ1.Attribute.Реквизит2 добавлен корректно.

src/test/resources/ext/edt/mdclasses/configuration/src/Sequences/Последовательность1/Последовательность1.mdo (1)

10-10: Добавлен элемент документа.

Элемент документа Document.Документ2 добавлен корректно.

src/main/java/com/github/_1c_syntax/bsl/mdo/Sequence.java (2)

75-77: Добавлен комментарий документации для поля dimensions.

Комментарий документации добавлен корректно и предоставляет полезную информацию.


81-85: Добавлен комментарий документации и аннотация для поля documents.

Комментарий документации и аннотация @Singular("addDocuments") добавлены корректно и предоставляют полезную информацию.

src/main/java/com/github/_1c_syntax/bsl/mdo/FilterCriterion.java (1)

95-99: Добавлен комментарий документации и аннотация для поля content.

Комментарий документации и аннотация @Singular("addContent") добавлены корректно и предоставляют полезную информацию.

src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java (1)

102-106: Изменение одобрено.

Поле task добавлено корректно с соответствующими аннотациями и значением по умолчанию.

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java (1)

118-128: Изменение одобрено.

Использование collect(Collectors.toMap(...)) вместо toList() гарантирует сохранение порядка дочерних элементов на основе childrenNames. Это важное исправление для поддержания порядка объектов конфигурации.

src/test/java/com/github/_1c_syntax/bsl/mdclasses/ConfigurationTest.java (1)

249-262: Изменение одобрено.

Новые методы testFullExtEdt и checkChildrenOrder добавлены корректно и соответствуют существующей структуре и стилю тестового класса.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants