Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-08 18:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-103] adding triggers to update created and updating attributes on tables

Browse Source 
fixing error handling in installer
merging change sets to larger operations
adding check constraints
fixing suggestion id handling
applying naming conventions to various columns
adding indices to tables
adding user in server and user locking
This commit is contained in:
Sheldan
2021-02-07 03:06:48 +01:00
parent dac3b0887f
commit 038d5c3832
126 changed files with 1416 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/TableLocks.java
View File

@@ -1,5 +1,5 @@
package dev.sheldan.abstracto.core.command.models;
public enum TableLocks {
CHANNELS
CHANNELS, USER_IN_SERVER, USER
}

10
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommand.java
View File

@@ -40,17 +40,7 @@ public class ACommand implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

15
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/ACommandInAServer.java
View File

@@ -7,6 +7,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
import java.util.List;
@Entity(name = "command_in_server")
@@ -22,14 +23,15 @@ public class ACommandInAServer implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "command_in_server_id")
private Long commandInServerId;
@OneToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@JoinColumn(name = "commandReference", nullable = false)
@JoinColumn(name = "command_id", nullable = false)
private ACommand commandReference;
@OneToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@JoinColumn(name = "serverReference", nullable = false)
@JoinColumn(name = "server_id", nullable = false)
private AServer serverReference;
@ManyToMany(fetch = FetchType.LAZY)
@@ -46,9 +48,16 @@ public class ACommandInAServer implements Serializable {
@Getter
@Setter
@Column
@Column(name = "restricted")
private Boolean restricted;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

10
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java
View File

@@ -38,17 +38,7 @@ public class AModule implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

6
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannel.java
View File

@@ -42,10 +42,8 @@ public class AChannel implements SnowFlake, Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@Getter
@Setter

8
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroup.java
View File

@@ -23,7 +23,7 @@ public class AChannelGroup implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column
@Column(name = "group_name")
@Setter
private String groupName;
@@ -40,10 +40,8 @@ public class AChannelGroup implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@ManyToMany
@JoinTable(

9
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelGroupCommand.java
View File

@@ -6,6 +6,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.*;
import java.io.Serializable;
import java.time.Instant;
@Entity
@Table(name = "channel_group_command")
@@ -20,6 +21,7 @@ public class AChannelGroupCommand implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "command_in_group_id")
private Long commandInGroupId;
@OneToOne(fetch = FetchType.LAZY)
@@ -33,6 +35,13 @@ public class AChannelGroupCommand implements Serializable {
private AChannelGroup group;
@Setter
@Column(name = "enabled")
private Boolean enabled;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

4
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AChannelType.java
View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.models.database;
import net.dv8tion.jda.api.entities.ChannelType;
public enum AChannelType {
TEXT, DM, VOICE, NEWS, CATEGORY, UNKOWN;
TEXT, DM, VOICE, NEWS, CATEGORY, UNKNOWN;
public static AChannelType getAChannelType(ChannelType type) {
switch (type) {
@@ -11,7 +11,7 @@ public enum AChannelType {
case PRIVATE: return AChannelType.DM;
case VOICE: return AChannelType.VOICE;
case CATEGORY: return AChannelType.CATEGORY;
default: return AChannelType.UNKOWN;
default: return AChannelType.UNKNOWN;
}
}
}

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AConfig.java
View File

@@ -8,7 +8,7 @@ import java.io.Serializable;
import java.time.Instant;
@Entity
@Table(name="systemConfig")
@Table(name="system_config")
@Builder
@AllArgsConstructor
@NoArgsConstructor
@@ -46,19 +46,9 @@ public class AConfig implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
public String getValueAsString() {
if(getLongValue() != null) {
return getLongValue().toString();

16
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/ADefaultConfig.java
View File

@@ -24,34 +24,24 @@ public class ADefaultConfig implements Serializable {
@Column
private String name;
@Column
@Column(name = "string_value")
@Setter
private String stringValue;
@Column
@Column(name = "double_value")
@Setter
private Double doubleValue;
@Column
@Column(name = "long_value")
@Setter
private Long longValue;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
public String getValueAsString() {
if(getLongValue() != null) {
return getLongValue().toString();

23
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AEmote.java
View File

@@ -21,48 +21,39 @@ public class AEmote implements Serializable, Fakeable {
@javax.persistence.Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Integer id;
@Column
@Column(name = "name")
private String name;
// the way discord calls them and the unicode char for default Tweemoji emotes
@Column
@Column(name = "emote_key")
@Setter
private String emoteKey;
@Column
@Column(name = "emote_id")
@Setter
private Long emoteId;
@Column
@Column(name = "animated")
@Setter
private Boolean animated;
@Column
@Column(name = "custom")
@Setter
private Boolean custom;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "emote_server_id", nullable = false)
@JoinColumn(name = "server_id", nullable = false)
private AServer serverRef;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
@Column(name = "changeable")
@Getter
@Setter

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeature.java
View File

@@ -28,6 +28,7 @@ public class AFeature implements SnowFlake, Serializable {
@Getter
@Setter
@Column(name = "key")
private String key;
@Getter
@@ -39,18 +40,7 @@ public class AFeature implements SnowFlake, Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeatureFlag.java
View File

@@ -44,23 +44,13 @@ public class AFeatureFlag implements Serializable {
@Getter
@Setter
@Column(name = "enabled")
private boolean enabled;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updateTimestamp;
@PreUpdate
private void onUpdate() {
this.updateTimestamp = Instant.now();
}
}

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeatureMode.java
View File

@@ -40,7 +40,7 @@ public class AFeatureMode implements Serializable {
@JoinColumn(name = "server_id", nullable = false)
private AServer server;
@Column
@Column(name = "enabled")
@Getter
@Setter
private Boolean enabled;
@@ -48,17 +48,7 @@ public class AFeatureMode implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updateTimestamp;
@PreUpdate
private void onUpdate() {
this.updateTimestamp = Instant.now();
}
}

13
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/ARole.java
View File

@@ -26,32 +26,23 @@ public class ARole implements SnowFlake, Serializable {
@ManyToOne(fetch = FetchType.LAZY)
@Getter
@Setter
@JoinColumn(name = "role_server_id", nullable = false)
@JoinColumn(name = "server_id", nullable = false)
private AServer server;
@Getter
@Setter
@Column(name = "deleted")
private Boolean deleted;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@Transient
private boolean fake;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
public String getAsMention() {
return "<@&" + getId() + '>';
}

10
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java
View File

@@ -28,22 +28,12 @@ public class AServer implements SnowFlake, Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@Transient
private boolean fake;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
@OneToOne(mappedBy = "server", cascade = CascadeType.ALL)
@PrimaryKeyJoinColumn
private AllowedMention allowedMention;

11
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUser.java
View File

@@ -20,6 +20,7 @@ import java.util.List;
public class AUser implements Serializable {
@Id
@Column(name = "id")
private Long id;
@OneToMany(
@@ -32,17 +33,7 @@ public class AUser implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

14
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUserInAServer.java
View File

@@ -25,27 +25,17 @@ public class AUserInAServer implements Serializable {
private Long userInServerId;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@JoinColumn(name = "userReference", nullable = false)
@JoinColumn(name = "user_id", nullable = false)
private AUser userReference;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@JoinColumn(name = "serverReference", nullable = false)
@JoinColumn(name = "server_id", nullable = false)
private AServer serverReference;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

12
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AllowedMention.java
View File

@@ -44,18 +44,8 @@ public class AllowedMention implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updateTimestamp;
@PreUpdate
private void onUpdate() {
this.updateTimestamp = Instant.now();
}
private Instant updated;
public boolean allAllowed() {
return everyone && user && role;

7
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/ChannelGroupType.java
View File

@@ -4,6 +4,7 @@ import lombok.*;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import javax.persistence.*;
import java.time.Instant;
@Entity
@Table(name = "channel_group_type")
@@ -24,4 +25,10 @@ public class ChannelGroupType {
@Column(name = "group_type_key")
private String groupTypeKey;
@Column(name = "created")
private Instant created;
@Column(name = "updated")
private Instant updated;
}

16
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/DefaultEmote.java
View File

@@ -19,31 +19,21 @@ import java.time.Instant;
public class DefaultEmote implements Serializable {
@javax.persistence.Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Column
@Column(name = "name")
private String name;
@Column
@Column(name = "emote_key")
@Setter
private String emoteKey;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

13
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/DefaultFeatureFlag.java
View File

@@ -31,23 +31,14 @@ public class DefaultFeatureFlag implements Serializable {
@Getter
@Setter
@Column(name = "enabled")
private boolean enabled;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updateTimestamp;
@PreUpdate
private void onUpdate() {
this.updateTimestamp = Instant.now();
}
private Instant updated;
}

13
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/DefaultFeatureMode.java
View File

@@ -38,25 +38,18 @@ public class DefaultFeatureMode implements Serializable {
@Getter
@Setter
@Column(name = "enabled")
private boolean enabled;
@Getter
@Setter
@Column(name = "mode")
private String mode;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updateTimestamp;
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updateTimestamp = Instant.now();
}
}

13
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/DefaultPostTarget.java
View File

@@ -20,26 +20,17 @@ public class DefaultPostTarget implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter
@Column(name = "id")
private Long id;
@Getter
@Column(name = "name")
private String name;
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}

13
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/PostTarget.java
View File

@@ -20,9 +20,11 @@ public class PostTarget implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Getter
@Column(name = "id")
private Long id;
@Getter
@Column(name = "name")
private String name;
@OneToOne(fetch = FetchType.LAZY)
@@ -38,18 +40,7 @@ public class PostTarget implements Serializable {
@Column(name = "created")
private Instant created;
@PrePersist
private void onInsert() {
this.created = Instant.now();
}
@Column(name = "updated")
private Instant updated;
@PreUpdate
private void onUpdate() {
this.updated = Instant.now();
}
}