Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-01-27 23:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-62] adding server id to more tables for easier joins and fixing structure at more places

Browse Source
This commit is contained in:
Sheldan
2021-02-08 01:58:35 +01:00
parent 1352fac40f
commit ea12d67e5f
46 changed files with 188 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/EmbeddedMessage.java
View File

@@ -23,22 +23,22 @@ import java.time.Instant;
public class EmbeddedMessage implements Serializable {
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedded_user_in_server_id", nullable = false)
private AUserInAServer embeddedUser;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedding_user_in_server_id", nullable = false)
private AUserInAServer embeddingUser;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedded_server_id", nullable = false)
private AServer embeddedServer;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedded_channel_id", nullable = false)
private AChannel embeddedChannel;
@@ -46,13 +46,13 @@ public class EmbeddedMessage implements Serializable {
private Long embeddedMessageId;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedding_server_id", nullable = false)
private AServer embeddingServer;
@Getter
@ManyToOne
@JoinColumn(name = "embeddingChannel", nullable = false)
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "embedding_channel_id", nullable = false)
private AChannel embeddingChannel;
@Column(name = "embedding_message_id")

6
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/PostedImage.java
View File

@@ -24,17 +24,17 @@ import java.util.List;
public class PostedImage {
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "author_user_in_server_id", nullable = false)
private AUserInAServer poster;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "posted_channel_id", nullable = false)
private AChannel postedChannel;

6
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Reminder.java
View File

@@ -29,7 +29,7 @@ public class Reminder implements Serializable {
private Long id;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_in_server_id", nullable = false)
private AUserInAServer remindedUser;
@@ -38,12 +38,12 @@ public class Reminder implements Serializable {
private Long messageId;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "channel_id", nullable = false)
private AChannel channel;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;

4
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Repost.java
View File

@@ -27,13 +27,13 @@ public class Repost {
private RepostIdentifier repostId;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@MapsId("userInServerId")
@JoinColumn(name = "user_in_server_id", referencedColumnName = "user_in_server_id", nullable = false)
private AUserInAServer poster;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;

6
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPost.java
View File

@@ -38,16 +38,16 @@ public class StarboardPost implements Serializable {
@Column(name = "post_message_id")
private Long postMessageId;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "channel_id", nullable = false)
private AChannel starboardChannel;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "source_channel_id", nullable = false)
private AChannel sourceChanel;

8
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/StarboardPostReaction.java
View File

@@ -1,5 +1,6 @@
package dev.sheldan.abstracto.utility.models.database;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import lombok.*;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -25,15 +26,18 @@ public class StarboardPostReaction implements Serializable {
@Column(name = "id")
private Long id;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "reactor_user_in_server_id", nullable = false)
private AUserInAServer reactor;
@OneToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "post_id")
private StarboardPost starboardPost;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;
@Column(name = "created")
private Instant created;

4
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/models/database/Suggestion.java
View File

@@ -30,7 +30,7 @@ public class Suggestion implements Serializable {
private ServerSpecificId suggestionId;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "suggester_user_in_server_id")
private AUserInAServer suggester;
@@ -39,7 +39,7 @@ public class Suggestion implements Serializable {
private Long messageId;
@Getter
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "channel_id")
private AChannel channel;