summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Mizyn <d.mizyn@samsung.com>2019-08-16 11:30:48 +0200
committerDominik Mizyn <d.mizyn@samsung.com>2019-08-16 13:57:59 +0200
commita53d557e00fd9d8c339835b0588b60ebef37b7b9 (patch)
tree38791066e5107eb319298d8a563f09865df0c4b1
parent7cccd66d94bdf00fd2dac7c51ef1af466ff3e5c8 (diff)
Portal Spring Boot version Hibernate implementation
Create classes that represent tables in the original database. Issue-ID: PORTAL-705 Change-Id: I7894ff3fee0ac7ed13ce8ecc267bcbc02e6107d1 Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
-rw-r--r--portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java (renamed from portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppManSort.java)45
1 files changed, 19 insertions, 26 deletions
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppManSort.java b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java
index 088f91b8..2abf6aed 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppManSort.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/ep/EpPersUserAppSort.java
@@ -49,68 +49,61 @@ import javax.persistence.GenerationType;
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.OneToOne;
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.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import org.onap.portalapp.portal.domain.db.fn.FnApp;
+import org.hibernate.validator.constraints.SafeHtml;
import org.onap.portalapp.portal.domain.db.fn.FnUser;
/*
-CREATE TABLE `ep_pers_user_app_man_sort` (
+CREATE TABLE `ep_pers_user_app_sort` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`user_id` int(11) NOT NULL,
- `app_id` int(11) NOT NULL,
- `sort_order` int(11) NOT NULL,
+ `sort_pref` char(1) NOT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `uk_1_ep_pers_user_app_man_sort` (`user_id`,`app_id`),
- KEY `fk_ep_pers_app_man_sort_fn_app` (`app_id`),
- CONSTRAINT `fk_ep_pers_app_man_sort_fn_app` FOREIGN KEY (`app_id`) REFERENCES `fn_app` (`app_id`),
- CONSTRAINT `fk_ep_pers_app_man_sort_fn_user` FOREIGN KEY (`user_id`) REFERENCES `fn_user` (`user_id`)
+ UNIQUE KEY `uk_1_ep_pers_user_app_sort` (`user_id`),
+ CONSTRAINT `fk_ep_pers_user_app_sort_fn_user` FOREIGN KEY (`user_id`) REFERENCES `fn_user` (`user_id`)
)
*/
@NamedQueries({
@NamedQuery(
- name = "EpPersUserAppManSort.retrieveByUserId",
- query = "from EpPersUserAppManSort where user_id =:userId"
+ name = "EpPersUserAppSort.retrieveByUserId",
+ query = "from EpPersUserAppSort where user_id = :userId"
)
})
-@Table(name = "ep_pers_user_app_man_sort", indexes ={
- @Index(name = "uk_1_ep_pers_user_app_man_sort", columnList = "user_id, app_id", unique = true),
- @Index(name = "fk_ep_pers_app_man_sort_fn_app", columnList = "app_id")
+@Table(name = "ep_pers_user_app_sort", indexes = {
+ @Index(name = "uk_1_ep_pers_user_app_sort", columnList = "user_id", unique = true)
})
@NoArgsConstructor
@AllArgsConstructor
@Getter
@Setter
@Entity
-public class EpPersUserAppManSort {
+public class EpPersUserAppSort {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id", length = 11, nullable = false, columnDefinition = "int(11) AUTO_INCREMENT")
@Digits(integer = 11, fraction = 0)
private Long id;
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinColumn(name = "user_id", nullable = false)
+ @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ @JoinColumn(name = "user_id", unique = true, nullable = false)
@NotNull
@Valid
- private FnUser userId;
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @JoinColumn(name = "app_id", nullable = false)
+ private FnUser userID;
+ @Column(name = "sort_pref", length = 1, nullable = false)
+ @Size(max = 1)
@NotNull
- @Valid
- private FnApp appId;
- @Column(name = "sort_order", length = 11, nullable = false)
- @Digits(integer = 11, fraction = 0)
- @NotNull
- private Long sortOrder;
+ @SafeHtml
+ private String sortPref;
}