From 5423faba3fbe7a80f91e12b68da47283f3ba3cf2 Mon Sep 17 00:00:00 2001
From: Paul Dudenkov <nocs00@gmail.com>
Date: Mon, 11 Jul 2016 14:46:35 +0300
Subject: [PATCH] event service fix

---
 .../server/common/dao/model/sql/EventClassFamily.java |  1 -
 .../common/dao/service/EventClassServiceImpl.java     | 11 ++++++-----
 .../kaa/server/control/service/ControlService.java    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java
index 4ddfc1b9ec..09d112d91b 100644
--- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java
+++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java
@@ -94,7 +94,6 @@ public EventClassFamily(EventClassFamilyDto dto) {
         this.description = dto.getDescription();
         this.createdUsername = dto.getCreatedUsername();
         this.createdTime = dto.getCreatedTime();
-
     }
 
     public Tenant getTenant() {
diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java
index 98db0246e5..8aded22bc3 100644
--- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java
+++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/service/EventClassServiceImpl.java
@@ -97,10 +97,7 @@ public EventClassFamilyDto findEventClassFamilyById(String id) {
     public List<EventClassFamilyVersionDto> findEventClassFamilyVersionsById(String id) {
         validateSqlId(id, "Event class family id is incorrect. Can't find event class family by id " + id);
         EventClassFamily ecf = eventClassFamilyDao.findById(id);
-        List<EventClassFamilyVersion> schemas = ecf.getSchemas();
-        List<EventClassFamilyVersionDto> schemasDto = new ArrayList<>();
-        schemas.forEach(s -> schemasDto.add(s.toDto()));
-        return schemasDto;
+        return convertDtoList(ecf.getSchemas());
     }
 
     @Override
@@ -127,7 +124,11 @@ public EventClassFamilyDto saveEventClassFamily(
                         throw new IncorrectParameterException("Incorrect event class family. Namespace is not valid. '" + eventClassFamilyDto.getNamespace() + "' is not a valid identifier.");
                     }
                 }
-                savedEventClassFamilyDto = getDto(eventClassFamilyDao.save(new EventClassFamily(eventClassFamilyDto)));
+                EventClassFamily ecf = new EventClassFamily(eventClassFamilyDto);
+                List<EventClassFamilyVersion> schemas = new ArrayList<>();
+                findEventClassFamilyVersionsById(eventClassFamilyDto.getId()).forEach(s -> schemas.add(new EventClassFamilyVersion(s)));
+                ecf.setSchemas(schemas);
+                savedEventClassFamilyDto = getDto(eventClassFamilyDao.save(ecf));
             } else {
                 LOG.debug("Can't save event class family. Name should be unique within the tenant.");
                 throw new IncorrectParameterException("Incorrect event class family. Name should be unique within the tenant.");
diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
index 7f33ed8994..81a4558051 100644
--- a/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
+++ b/server/node/src/main/java/org/kaaproject/kaa/server/control/service/ControlService.java
@@ -1046,7 +1046,7 @@ List<NotificationSchemaDto> findNotificationSchemasByAppIdAndType(String applica
     void addEventClassFamilySchema(String eventClassFamilyId, String eventClassFamilySchema, String createdUsername)
             throws ControlServiceException;
 
-     /**
+    /**
      * Gets the event classes by family id version and type.
      *
      * @param ecfId