X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fdomain%2Fdb%2Fep%2FEpWidgetCatalogParameter.java;h=ec6bb563acbafeff4c2c065b39ce6d8323bc494a;hb=1a7472103bde3d850f1f410a7d2ae5b249aef92e;hp=3e6e1c6c5fa77b20928774870118076deff7e366;hpb=0dd6f1189815079526c3f5211f01650bbe5e665b;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
index 3e6e1c6c..ec6bb563 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpWidgetCatalogParameter.java
@@ -51,17 +51,21 @@ import javax.persistence.Id;
 import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.validation.Valid;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.validator.constraints.SafeHtml;
 import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.dto.DomainVo;
 
 /*
 CREATE TABLE `ep_widget_catalog_parameter` (
@@ -80,22 +84,39 @@ CREATE TABLE `ep_widget_catalog_parameter` (
         )
 */
 
+
+@NamedQueries({
+        @NamedQuery(
+                name = "EpWidgetCatalogParameter.retrieveByParamId",
+                query = "FROM EpWidgetCatalogParameter WHERE paramId.id = :PARAMID"),
+        @NamedQuery(
+                name = "EpWidgetCatalogParameter.deleteWidgetCatalogParameter",
+                query = "DELETE FROM EpWidgetCatalogParameter WHERE paramId.id = :PARAMID"),
+        @NamedQuery(
+                name = "EpWidgetCatalogParameter.getUserParamById",
+                query = "FROM EpWidgetCatalogParameter WHERE paramId.id = :PARAMID and userId.userId = :USERID and widgetId.widgetId = :WIDGETID"
+        )
+})
+
 @Table(name = "ep_widget_catalog_parameter", indexes = {
         @Index(name = "EP_FN_USER_WIDGET_PARAMETER_FK", columnList = "user_id"),
         @Index(name = "EP_WIDGET_CATALOG_WIDGET_PARAMETER_FK", columnList = "widget_id"),
         @Index(name = "EP_PARAMETER_ID_WIDGET_PARAMETER_FK", columnList = "param_id")
 })
-@NoArgsConstructor
-@AllArgsConstructor
+
 @Getter
 @Setter
 @Entity
-public class EpWidgetCatalogParameter implements Serializable {
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EpWidgetCatalogParameter extends DomainVo implements Serializable {
+
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
        @Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
        @Digits(integer = 11, fraction = 0)
-       private Integer id;
+       private Long id;
        @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
        @JoinColumn(name = "widget_id", nullable = false)
        @NotNull
@@ -106,7 +127,7 @@ public class EpWidgetCatalogParameter implements Serializable {
        @NotNull
        @Valid
        private FnUser userId;
-       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+       @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
        @JoinColumn(name = "param_id", nullable = false)
        @NotNull
        @Valid