Merge "Introduce WithPermissionProperties as validation-points for RoleValidator"

[vid.git] / vid-app-common / src / main / java / org / onap / vid / model / ServiceInfo.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/ServiceInfo.java b/vid-app-common/src/main/java/org/onap/vid/model/ServiceInfo.java
index 1e1e6c2..677d67c 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/ServiceInfo.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/ServiceInfo.java
@@ -22,18 +22,29 @@ package org.onap.vid.model;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.SelectBeforeUpdate;
-import org.hibernate.annotations.Type;
-import org.onap.portalsdk.core.domain.support.DomainVo;
-import org.onap.vid.job.Job;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.SelectBeforeUpdate;
+import org.hibernate.annotations.Type;
+import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.vid.job.Job;
+import org.onap.vid.job.Job.JobStatus;
+import org.onap.vid.utils.DaoUtils.StringToLongMapAttributeConverter;
 
 /*
  The following 2 annotations let hibernate to update only fields that actually have been changed.
@@ -51,7 +62,7 @@ public class ServiceInfo extends DomainVo {
         DELETE,
         UPDATE,
         RESUME,
-        REPLACE
+        UPGRADE
     }
 
     private UUID jobId;
@@ -84,17 +95,19 @@ public class ServiceInfo extends DomainVo {
     private String serviceModelVersion;
     private Date createdBulkDate;
     private ServiceAction action;
+    private Map<String, Long> requestSummary;
 
     public ServiceInfo(){
 
     }
 
-    public ServiceInfo(String userId, Boolean aLaCarte, Job.JobStatus jobStatus, boolean pause, UUID jobId, UUID templateId,
-                       String owningEntityId, String owningEntityName, String project, String aicZoneId, String aicZoneName,
-                       String tenantId, String tenantName, String regionId, String regionName, String serviceType,
-                       String subscriberName, String subscriberId, String serviceInstanceId, String serviceInstanceName,
-                       String serviceModelId, String serviceModelName, String serviceModelVersion, Date createdBulkDate,
-                       ServiceAction action, boolean retryEnabled) {
+    public ServiceInfo(String userId, Boolean aLaCarte, JobStatus jobStatus, boolean pause, UUID jobId,
+        UUID templateId,
+        String owningEntityId, String owningEntityName, String project, String aicZoneId, String aicZoneName,
+        String tenantId, String tenantName, String regionId, String regionName, String serviceType,
+        String subscriberName, String subscriberId, String serviceInstanceId, String serviceInstanceName,
+        String serviceModelId, String serviceModelName, String serviceModelVersion, Date createdBulkDate,
+        ServiceAction action, boolean retryEnabled, Map<String, Long> requestSummary) {
         this.userId = userId;
         this.aLaCarte = aLaCarte;
         this.jobStatus = jobStatus;
@@ -121,6 +134,7 @@ public class ServiceInfo extends DomainVo {
         this.createdBulkDate = createdBulkDate;
         this.action = action;
         this.retryEnabled = retryEnabled;
+        this.requestSummary = requestSummary;
     }
 
     @Column(name = "JOB_ID", columnDefinition = "CHAR(36)")
@@ -280,6 +294,12 @@ public class ServiceInfo extends DomainVo {
         return action;
     }
 
+    @Column(name="REQUEST_SUMMARY")
+    @Convert(converter = StringToLongMapAttributeConverter.class)
+    public Map<String, Long> getRequestSummary() {
+        return requestSummary;
+    }
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Override
@@ -447,6 +467,10 @@ public class ServiceInfo extends DomainVo {
 
     public void setAction(ServiceAction action) { this.action = action; }
 
+    public void setRequestSummary(Map<String, Long> requestSummary) {
+        this.requestSummary = requestSummary;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -481,6 +505,7 @@ public class ServiceInfo extends DomainVo {
                 Objects.equals(getServiceModelName(), that.getServiceModelName()) &&
                 Objects.equals(getServiceModelVersion(), that.getServiceModelVersion()) &&
                 Objects.equals(getCreatedBulkDate(), that.getCreatedBulkDate()) &&
+                Objects.equals(getRequestSummary(), that.getRequestSummary()) &&
                 getAction() == that.getAction();
     }
 
@@ -490,6 +515,6 @@ public class ServiceInfo extends DomainVo {
                 getStatusModifiedDate(), isHidden(), isPause(), isRetryEnabled(), getDeletedAt(), getOwningEntityId(), getOwningEntityName(),
                 getProject(), getAicZoneId(), getAicZoneName(), getTenantId(), getTenantName(), getRegionId(), getRegionName(), getServiceType(),
                 getSubscriberName(), getSubscriberId(), getServiceInstanceId(), getServiceInstanceName(), getServiceModelId(), getServiceModelName(),
-                getServiceModelVersion(), getCreatedBulkDate(), getAction());
+                getServiceModelVersion(), getCreatedBulkDate(), getAction(), getRequestSummary());
     }
 }