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.

Sign up for GitHub

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

Jump to bottom

Fix VC support for notification recipients #9827

Merged
merged 3 commits into from Dec 19, 2023
Merged

Fix VC support for notification recipients #9827

merged 3 commits into from Dec 19, 2023

Conversation

ViacheslavKlimov
Copy link
Contributor

Pull Request description

Put your PR description here instead of this sentence.

General checklist

  • You have reviewed the guidelines document.
  • Labels that classify your pull request have been added.
  • The milestone is specified and corresponds to fix version.
  • Description references specific issue.
  • Description contains human-readable scope of changes.
  • Description contains brief notes about what needs to be added to the documentation.
  • No merge conflicts, commented blocks of code, code formatting issues.
  • Changes are backward compatible or upgrade script is provided.
  • Similar PR is opened for PE version to simplify merge. Crosslinks between PRs added. Required for internal contributors only.

Front-End feature checklist

  • Screenshots with affected component(s) are added. The best option is to provide 2 screens: before and after changes;
  • If you change the widget or other API, ensure it is backward-compatible or upgrade script is present.
  • Ensure new API is documented here

Back-End feature checklist

  • Added corresponding unit and/or integration test(s). Provide written explanation in the PR description if you have failed to add tests.
  • If new dependency was added: the dependency tree is checked for conflicts.
  • If new service was added: the service is marked with corresponding @TbCoreComponent, @TbRuleEngineComponent, @TbTransportComponent, etc.
  • If new REST API was added: the RestClient.java was updated, issue for Python REST client is created.
  • If new yml property was added: make sure a description is added (above or near the property).

@ViacheslavKlimov ViacheslavKlimov added bug Core Changes to Core labels Dec 12, 2023
@ViacheslavKlimov ViacheslavKlimov linked an issue Dec 12, 2023 that may be closed by this pull request
[Bug] VC: cannot load notification recipients group version #9826
Closed
@ViacheslavKlimov ViacheslavKlimov added this to the 3.6.2 milestone Dec 12, 2023
smatvienko-tb
smatvienko-tb reviewed Dec 15, 2023
View reviewed changes
...in/java/org/thingsboard/server/service/notification/DefaultNotificationSchedulerService.java Show resolved Hide resolved
...in/java/org/thingsboard/server/service/notification/DefaultNotificationSchedulerService.java Show resolved Hide resolved
...a/org/thingsboard/server/service/sync/ie/importing/impl/NotificationTargetImportService.java Show resolved Hide resolved
...a/org/thingsboard/server/service/sync/ie/exporting/impl/NotificationTargetExportService.java
@@ -43,6 +43,9 @@ protected void setRelatedEntities(EntitiesExportCtx<?> ctx, NotificationTarget n
CustomerUsersFilter customerUsersFilter = (CustomerUsersFilter) usersFilter;
customerUsersFilter.setCustomerId(getExternalIdOrElseInternal(ctx, new CustomerId(customerUsersFilter.getCustomerId())).getId());
break;
case USER_LIST:
// users list stays as is and is replaced with current user id on import (due to user entities not being supported by VC)
break;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default:
do or blow something

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you suggest to do in the default section?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViacheslavKlimov do some default action or throw an exception that actually never fires until some new code changes appear. It's up to your business logic. Just have a default section

@ashvayka ashvayka merged commit 64f61a0 into master Dec 19, 2023
2 of 3 checks passed
@ashvayka ashvayka deleted the fix/notification-target-vc branch December 19, 2023 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashvayka ashvayka ashvayka left review comments

@smatvienko-tb smatvienko-tb smatvienko-tb left review comments

Assignees
No one assigned
Labels
bug Core Changes to Core
Projects
None yet
Milestone
3.6.2
Development

Successfully merging this pull request may close these issues.

[Bug] VC: cannot load notification recipients group version
3 participants
@ViacheslavKlimov @ashvayka @smatvienko-tb