Add collaboration feature

Issue-ID: SDC-767
Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795
Signed-off-by: talig <talig@amdocs.com>

6 files changed, 168 insertions, 160 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java
index 9804bfc3c5..6ca1010a2d 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDao.java
@@ -18,10 +18,6 @@ package org.openecomp.sdc.activitylog.dao;
 
 import org.openecomp.core.dao.BaseDao;
 import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
-import java.util.Collection;
 
 public interface ActivityLogDao extends BaseDao<ActivityLogEntity> {
-    Collection<ActivityLogEntity> getActivityLogListForItem(String itemId, String versionId);
 }
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java
index d3ac277d58..1fc7de7cbc 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/ActivityLogDaoFactory.java
@@ -15,8 +15,8 @@
  */
 package org.openecomp.sdc.activitylog.dao;
 
-import org.openecomp.core.factory.api.AbstractFactory;
 import org.openecomp.core.factory.api.AbstractComponentFactory;
+import org.openecomp.core.factory.api.AbstractFactory;
 
 
 public abstract class ActivityLogDaoFactory extends AbstractComponentFactory<ActivityLogDao> {
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java
index e84a2be40a..36a4bbcbfd 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityLogEntity.java
@@ -16,107 +16,130 @@
 
 package org.openecomp.sdc.activitylog.dao.type;
 
-import com.datastax.driver.mapping.annotations.*;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.Enumerated;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.Calendar;
 import java.util.Date;
 
 @Table(keyspace = "dox", name = "activity_log")
 public class ActivityLogEntity {
-    @PartitionKey
-    @Column(name = "item_id")
-    private String itemId;
-    @ClusteringColumn(value = 1)
-    @Column(name = "version_id")
-    private String versionId;
-    @ClusteringColumn
-    @Column(name = "activity_id")
-    private String id;
-    private String type;
-    private String user;
-    private Date timestamp;
-    private boolean success;
-    private String message;
-    private String comment;
-
-    public ActivityLogEntity() {}
-
-    public ActivityLogEntity(String itemId, String versionId, String type, String user, boolean success, String message, String comment) {
-        this.itemId = itemId;
-        this.versionId = versionId;
-        this.type = type;
-        this.user = user;
-        this.success = success;
-        this.message = message;
-        this.comment = comment;
-        Calendar now = Calendar.getInstance();
-        this.timestamp = now.getTime();
-    }
-
-    public String getItemId() { return itemId; }
-
-    public void setItemId(String itemId) {
-        this.itemId = itemId;
-    }
-
-    public String getVersionId() {
-        return versionId;
-    }
-
-    public void setVersionId(String versionId) {
-        this.versionId = versionId;
-    }
-
-    public String getId() { return id; }
-
-    public void setId(String id) { this.id = id; }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
+  @PartitionKey
+  @Column(name = "item_id")
+  private String itemId;
+  @ClusteringColumn(value = 1)
+  @Column(name = "version_id")
+  private String versionId;
+  @ClusteringColumn
+  @Column(name = "activity_id")
+  private String id;
+  @Enumerated
+  private ActivityType type;
+  private String user;
+  private Date timestamp;
+  private boolean success;
+  private String message;
+  private String comment;
+
+  public ActivityLogEntity() {
+  }
+
+  public ActivityLogEntity(String itemId, Version version) {
+    this.itemId = itemId;
+    setVersion(version);
+  }
+
+  public ActivityLogEntity(String itemId, Version version, ActivityType type, String user,
+                           boolean success, String message, String comment) {
+    this(itemId, version);
+    this.type = type;
+    this.user = user;
+    this.success = success;
+    this.message = message;
+    this.comment = comment;
+    this.timestamp = new Date();
+  }
+
+  public String getItemId() {
+    return itemId;
+  }
+
+  public void setItemId(String itemId) {
+    this.itemId = itemId;
+  }
+
+  public Version getVersion() {
+    return versionId == null ? null : new Version(versionId);
+  }
+
+  public void setVersion(Version version) {
+    this.versionId = version == null ? null : version.getId();
+  }
+
+  public String getVersionId() {
+    return versionId;
+  }
+
+  public void setVersionId(String versionId) {
+    this.versionId = versionId;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public ActivityType getType() {
+    return type;
+  }
+
+  public void setType(ActivityType type) {
+    this.type = type;
+  }
+
+  public String getUser() {
+    return user;
+  }
+
+  public void setUser(String user) {
+    this.user = user;
+  }
+
+  public Date getTimestamp() {
+    return timestamp;
+  }
+
+  public void setTimestamp(Date timestamp) {
+    this.timestamp = timestamp;
+  }
+
+  public boolean isSuccess() {
+    return success;
+  }
+
+  public void setSuccess(boolean success) {
+    this.success = success;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public String getComment() {
+    return comment;
+  }
+
+  public void setComment(String comment) {
+    this.comment = comment;
+  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityType.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityType.java
new file mode 100644
index 0000000000..620113e2b5
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-api/src/main/java/org/openecomp/sdc/activitylog/dao/type/ActivityType.java
@@ -0,0 +1,13 @@
+package org.openecomp.sdc.activitylog.dao.type;
+
+public enum ActivityType {
+  Create,
+  Create_Version,
+  Commit,
+  Submit,
+  Upload_Artifact,
+  Upload_Network_Package,
+  Revert,
+  Reset
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java
index 5772cc16b7..85e0afa90f 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoCassandraImpl.java
@@ -26,58 +26,34 @@ import org.openecomp.sdc.activitylog.dao.ActivityLogDao;
 import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity;
 
 import java.util.Collection;
-import java.util.Date;
 
-public class ActivityLogDaoCassandraImpl extends CassandraBaseDao<ActivityLogEntity> implements ActivityLogDao{
-    private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
-    private static final Mapper<ActivityLogEntity> mapper =
-            noSqlDb.getMappingManager().mapper(ActivityLogEntity.class);
-    private static final ActivityLogAccessor accessor =
-            noSqlDb.getMappingManager().createAccessor(ActivityLogAccessor.class);
-
-    @Override
-    protected Mapper<ActivityLogEntity> getMapper() {
-        return mapper;
-    }
-
-    @Override
-    protected Object[] getKeys(ActivityLogEntity entity) {
-        return new Object[0];
-    }
-
-    @Override
-    public Collection<ActivityLogEntity> list(ActivityLogEntity entity) {
-        return accessor.list().all();
-    }
-
-    @Override
-    public void create(ActivityLogEntity activityLogEntity) {
-        accessor.create(activityLogEntity.getItemId(), activityLogEntity.getVersionId(),activityLogEntity.getId(),
-                activityLogEntity.getType(),activityLogEntity.getUser(), activityLogEntity.getTimestamp(), activityLogEntity.isSuccess(),
-                activityLogEntity.getMessage(), activityLogEntity.getComment());
-    }
-
-    @Override
-    public Collection<ActivityLogEntity> getActivityLogListForItem(String itemId, String versionId) {
-        return accessor.getForItem(itemId, versionId).all();
-    }
-
-
-    @Accessor
-    interface ActivityLogAccessor {
-        @Query("select item_id, version_id, activity_id, type, user, timestamp, success, message, comment"
-                        + " from activity_log")
-        Result<ActivityLogEntity> list();
-
-        @Query("select item_id, version_id, activity_id, type, user, timestamp, success, message, comment"
-                        + " from activity_log where item_id=? and version_id=?")
-        Result<ActivityLogEntity> getForItem(String itemId, String versionId);
-
-        @Query("insert into activity_log " +
-                " (item_id, version_id, activity_id, type, user, timestamp, success, message, comment)" +
-                " values (?,?,?,?,?,?,?,?,?)")
-        Result<ActivityLogEntity> create(String itemId, String versionId, String id, String type,
-                                         String user, Date timestamp, boolean success,
-                                         String message, String comment);
-    }
+public class ActivityLogDaoCassandraImpl extends CassandraBaseDao<ActivityLogEntity>
+    implements ActivityLogDao {
+  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+  private static final Mapper<ActivityLogEntity> mapper =
+      noSqlDb.getMappingManager().mapper(ActivityLogEntity.class);
+  private static final ActivityLogAccessor accessor =
+      noSqlDb.getMappingManager().createAccessor(ActivityLogAccessor.class);
+
+  @Override
+  protected Mapper<ActivityLogEntity> getMapper() {
+    return mapper;
+  }
+
+  @Override
+  protected Object[] getKeys(ActivityLogEntity entity) {
+    return new Object[]{entity.getItemId(), entity.getVersionId(), entity.getId()};
+  }
+
+  @Override
+  public Collection<ActivityLogEntity> list(ActivityLogEntity entity) {
+    return accessor.listByItemVersion(entity.getItemId(), entity.getVersionId()).all();
+  }
+
+  @Accessor
+  interface ActivityLogAccessor {
+
+    @Query("select * from activity_log where item_id=? and version_id=?")
+    Result<ActivityLogEntity> listByItemVersion(String itemId, String versionId);
+  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java
index 98e4cc2ed2..02c8a71b0e 100644
--- a/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-activity-log-lib/openecomp-sdc-activity-log-core/src/main/java/org/openecomp/sdc/activitylog/dao/impl/ActivityLogDaoFactoryImpl.java
@@ -19,10 +19,10 @@ import org.openecomp.sdc.activitylog.dao.ActivityLogDao;
 import org.openecomp.sdc.activitylog.dao.ActivityLogDaoFactory;
 
 public class ActivityLogDaoFactoryImpl extends ActivityLogDaoFactory {
-    private static final ActivityLogDao INSTANCE = new ActivityLogDaoCassandraImpl();
+  private static final ActivityLogDao INSTANCE = new ActivityLogDaoCassandraImpl();
 
-    @Override
-    public ActivityLogDao createInterface() {
-        return INSTANCE;
-    }
+  @Override
+  public ActivityLogDao createInterface() {
+    return INSTANCE;
+  }
 }