Commit 230a303156c42df78430a64f54b920eb3894a3d3

Authored by Volodymyr Babak
1 parent 85036d05

Fixes incorrect customer user sync

... ... @@ -311,11 +311,11 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
311 311 do {
312 312 pageData = userService.findTenantAdmins(edge.getTenantId(), pageLink);
313 313 pushUsersToEdge(pageData, edge);
314   - syncCustomerUsers(edge);
315 314 if (pageData != null && pageData.hasNext()) {
316 315 pageLink = pageData.getNextPageLink();
317 316 }
318 317 } while (pageData != null && pageData.hasNext());
  318 + syncCustomerUsers(edge);
319 319 } catch (Exception e) {
320 320 log.error("Exception during loading edge user(s) on sync!", e);
321 321 }
... ... @@ -336,6 +336,15 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
336 336 }
337 337 }
338 338
  339 + private void pushUsersToEdge(TextPageData<User> pageData, Edge edge) {
  340 + if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
  341 + log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
  342 + for (User user : pageData.getData()) {
  343 + saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
  344 + }
  345 + }
  346 + }
  347 +
339 348 private void syncWidgetsBundleAndWidgetTypes(Edge edge) {
340 349 log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName());
341 350 List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
... ... @@ -423,15 +432,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
423 432 return tenantMailSettings;
424 433 }
425 434
426   - private void pushUsersToEdge(TextPageData<User> pageData, Edge edge) {
427   - if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
428   - log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
429   - for (User user : pageData.getData()) {
430   - saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
431   - }
432   - }
433   - }
434   -
435 435 @Override
436 436 public ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
437 437 log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg);
... ...