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

[AB-263] adding stricter not null checks to database, disabling updates/inserts for created and updated columns to only rely on triggers

Browse Source
This commit is contained in:
Sheldan
2021-05-23 14:17:03 +02:00
parent 04a7cfafd7
commit 13a6e1fdca
145 changed files with 1204 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-tables/mute.xml
View File

@@ -10,18 +10,18 @@
<createTable tableName="mute">
<column name="id" type="BIGINT" />
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="reason" type="VARCHAR(255)">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="trigger_key" type="VARCHAR(255)" />
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="mute_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="target_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="muted_user_in_server_id" type="BIGINT">
<constraints nullable="false"/>
@@ -32,7 +32,9 @@
<column name="server_id" type="BIGINT">
<constraints nullable="false"/>
</column>
<column name="mute_ended" type="BOOLEAN"/>
<column name="mute_ended" type="BOOLEAN">
<constraints nullable="false"/>
</column>
<column name="message_id" type="BIGINT"/>
<column name="muting_user_in_server_id" type="BIGINT">
<constraints nullable="false"/>

2
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-tables/mute_role.xml
View File

@@ -13,7 +13,7 @@
<constraints nullable="false" primaryKey="true" primaryKeyName="mute_role_pkey"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="role_id" type="BIGINT">

4
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-tables/user_note.xml
View File

@@ -9,10 +9,10 @@
<changeSet author="Sheldan" id="user_note-table">
<createTable tableName="user_note">
<column autoIncrement="true" name="id" type="BIGINT" >
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="note" type="VARCHAR(2000)"/>

12
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/resources/migrations/1.0-moderation/moderation-tables/warning.xml
View File

@@ -9,19 +9,21 @@
<changeSet author="Sheldan" id="warning-table">
<createTable tableName="warning">
<column name="id" type="BIGINT">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="decay_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="decayed" type="BOOLEAN"/>
<column name="decayed" type="BOOLEAN">
<constraints nullable="false"/>
</column>
<column name="reason" type="VARCHAR(255)">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="warn_date" type="TIMESTAMP WITHOUT TIME ZONE">
<constraints nullable="true"/>
<constraints nullable="false"/>
</column>
<column name="warned_user_in_server_id" type="BIGINT">
<constraints nullable="false"/>

15
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/Mute.java
View File

@@ -51,13 +51,13 @@ public class Mute implements Serializable {
/**
* The reason of the mute which is stored
*/
@Column(name = "reason")
@Column(name = "reason", nullable = false)
private String reason;
/**
* The date when the mute was cast, and the start date
*/
@Column(name = "mute_date")
@Column(name = "mute_date", nullable = false)
private Instant muteDate;
/**
@@ -69,8 +69,9 @@ public class Mute implements Serializable {
/**
* Whether or not the mute already ended, be it manually or when the time passed
*/
@Column(name = "mute_ended")
private Boolean muteEnded;
@Builder.Default
@Column(name = "mute_ended", nullable = false)
private Boolean muteEnded = false;
/**
* The message which contained the command which caused this mute
@@ -82,7 +83,7 @@ public class Mute implements Serializable {
* The channel in which this mute was cast
*/
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "mutingChannel", nullable = false)
@JoinColumn(name = "mutingChannel")
private AChannel mutingChannel;
/**
@@ -91,7 +92,7 @@ public class Mute implements Serializable {
@Column(name = "trigger_key")
private String triggerKey;
@Column(name = "created")
@Column(name = "created", nullable = false, insertable = false, updatable = false)
private Instant created;
@PrePersist
@@ -99,7 +100,7 @@ public class Mute implements Serializable {
this.muteDate = Instant.now();
}
@Column(name = "updated")
@Column(name = "updated", insertable = false, updatable = false)
private Instant updated;
}

6
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/MuteRole.java
View File

@@ -26,7 +26,7 @@ public class MuteRole implements Serializable {
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@Column(name = "id", nullable = false)
private Long id;
/**
@@ -45,10 +45,10 @@ public class MuteRole implements Serializable {
@JoinColumn(name = "role_id", nullable = false)
private ARole role;
@Column(name = "created")
@Column(name = "created", nullable = false, insertable = false, updatable = false)
private Instant created;
@Column(name = "updated")
@Column(name = "updated", insertable = false, updatable = false)
private Instant updated;
}

6
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/UserNote.java
View File

@@ -31,13 +31,13 @@ public class UserNote implements Serializable {
@JoinColumn(name = "user_in_server_id", nullable = false)
private AUserInAServer user;
@Column(length = 2000, name = "note")
@Column(length = 2000, name = "note", nullable = false)
private String note;
@Column(name = "created")
@Column(name = "created", nullable = false, insertable = false, updatable = false)
private Instant created;
@Column(name = "updated")
@Column(name = "updated", insertable = false, updatable = false)
private Instant updated;
}

11
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/model/database/Warning.java
View File

@@ -64,7 +64,7 @@ public class Warning implements Serializable {
*/
@Getter
@Setter
@Column(name = "warn_date")
@Column(name = "warn_date", nullable = false)
private Instant warnDate;
/**
@@ -72,8 +72,9 @@ public class Warning implements Serializable {
*/
@Getter
@Setter
@Column(name = "decayed")
private Boolean decayed;
@Builder.Default
@Column(name = "decayed", nullable = false)
private Boolean decayed = false;
/**
* The date at which the warning was decayed
@@ -83,10 +84,10 @@ public class Warning implements Serializable {
@Column(name = "decay_date")
private Instant decayDate;
@Column(name = "created")
@Column(name = "created", nullable = false, insertable = false, updatable = false)
private Instant created;
@Column(name = "updated")
@Column(name = "updated", insertable = false, updatable = false)
private Instant updated;
}