kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-12-14 06:10:29 +05:30
Code Issues Projects Releases Wiki Activity

Fix imports and make database schema more strict.

Browse Source
This commit is contained in:
Kavin 2022-07-18 21:22:46 +05:30
parent 14f8c55782
commit 0e8b17698d
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View File

@ -967,7 +967,7 @@ public class ResponseHelper {
if (user != null) { if (user != null) {
Multithreading.runAsync(() -> { Multithreading.runAsync(() -> {
try (StatelessSession s = DatabaseSessionFactory.createStatelessSession()) { try (Session s = DatabaseSessionFactory.createSession()) {
if (override) { if (override) {
user.setSubscribed(Set.of(channelIds)); user.setSubscribed(Set.of(channelIds));
} else { } else {
@ -977,7 +977,7 @@ public class ResponseHelper {
if (channelIds.length > 0) { if (channelIds.length > 0) {
var tr = s.beginTransaction(); var tr = s.beginTransaction();
s.update(user); s.merge(user);
tr.commit(); tr.commit();
} }
} catch (Exception e) { } catch (Exception e) {

2
src/main/java/me/kavin/piped/utils/obj/db/Channel.java
View File

@ -7,7 +7,7 @@ import jakarta.persistence.*;
public class Channel { public class Channel {
@Id @Id
@Column(name = "uploader_id", length = 30) @Column(name = "uploader_id", unique = true, nullable = false, length = 30)
private String uploader_id; private String uploader_id;
@Column(name = "uploader", length = 80) @Column(name = "uploader", length = 80)

2
src/main/java/me/kavin/piped/utils/obj/db/Playlist.java
View File

@ -40,7 +40,7 @@ public class Playlist {
private String thumbnail; private String thumbnail;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "owner") @JoinColumn(name = "owner", nullable = false)
private User owner; private User owner;
@ManyToMany @ManyToMany

4
src/main/java/me/kavin/piped/utils/obj/db/PlaylistVideo.java
View File

@ -19,7 +19,7 @@ public class PlaylistVideo {
} }
@Id @Id
@Column(name = "id", unique = true, length = 16) @Column(name = "id", unique = true, length = 16, nullable = false)
private String id; private String id;
@Column(name = "title", length = 120) @Column(name = "title", length = 120)
@ -32,7 +32,7 @@ public class PlaylistVideo {
private String thumbnail; private String thumbnail;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "uploader_id") @JoinColumn(name = "uploader_id", nullable = false)
private Channel channel; private Channel channel;
public String getId() { public String getId() {

10
src/main/java/me/kavin/piped/utils/obj/db/User.java
View File

@ -1,6 +1,7 @@
package me.kavin.piped.utils.obj.db; package me.kavin.piped.utils.obj.db;
import jakarta.persistence.*; import jakarta.persistence.*;
import org.hibernate.annotations.Cascade;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set; import java.util.Set;
@ -29,10 +30,11 @@ public class User implements Serializable {
private String sessionId; private String sessionId;
@ElementCollection @ElementCollection
@CollectionTable(name = "users_subscribed", joinColumns = @JoinColumn(name = "subscriber"), indexes = { @CollectionTable(name = "users_subscribed", joinColumns = @JoinColumn(name = "subscriber", nullable = false),
@Index(columnList = "subscriber", name = "users_subscribed_subscriber_idx"), indexes = {@Index(columnList = "subscriber", name = "users_subscribed_subscriber_idx"),
@Index(columnList = "channel", name = "users_subscribed_channel_idx")}) @Index(columnList = "channel", name = "users_subscribed_channel_idx")})
@Column(name = "channel", length = 30) @Column(name = "channel", length = 30, nullable = false)
@Cascade(org.hibernate.annotations.CascadeType.ALL)
private Set<String> subscribed_ids; private Set<String> subscribed_ids;
@OneToMany(mappedBy = "owner", cascade = CascadeType.ALL) @OneToMany(mappedBy = "owner", cascade = CascadeType.ALL)

4
src/main/java/me/kavin/piped/utils/obj/db/Video.java
View File

@ -9,7 +9,7 @@ import jakarta.persistence.*;
public class Video { public class Video {
@Id @Id
@Column(name = "id", unique = true, length = 16) @Column(name = "id", unique = true, length = 16, nullable = false)
private String id; private String id;
@Column(name = "title", length = 120) @Column(name = "title", length = 120)
@ -28,7 +28,7 @@ public class Video {
private String thumbnail; private String thumbnail;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "uploader_id") @JoinColumn(name = "uploader_id", nullable = false)
private Channel channel; private Channel channel;
public Video() { public Video() {