new db scheme

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     restart: always
     volumes:
       - netneutrality-db:/var/lib/mysql
-      - ./sql/netneutrality.sql:/docker-entrypoint-initdb.d/dump.sql
+      - ./sql/netneutrality_jpa.sql:/docker-entrypoint-initdb.d/dump.sql
     environment:
       MYSQL_DATABASE: 'netneutrality'
       MYSQL_USER: 'java'

sql/add_debug_field_to_guilds_table.sql

@@ -1 +0,0 @@
-ALTER TABLE `guilds` ADD `debug` BOOLEAN NOT NULL DEFAULT '1' AFTER `logging`;

sql/add_volume_field_to_settings_table.sql

@@ -1 +0,0 @@
-ALTER TABLE `guild_settings` ADD `music_volume` INT NOT NULL DEFAULT '30' AFTER `music_channel`;

sql/netneutrality.sql

@@ -1,142 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 5.1.0
--- https://www.phpmyadmin.net/
---
--- Host: 127.0.0.1:3306
--- Generation Time: Nov 07, 2021 at 04:31 AM
--- Server version: 10.4.10-MariaDB
--- PHP Version: 7.4.19
-
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
---
--- Database: `netneutrality`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `blacklist`
---
-
-DROP TABLE IF EXISTS `blacklist`;
-CREATE TABLE IF NOT EXISTS `blacklist` (
-  `word` varchar(255) NOT NULL,
-  `serverId` varchar(255) NOT NULL,
-  `isEnabled` tinyint(1) NOT NULL,
-  `creatorId` varchar(255) NOT NULL,
-  PRIMARY KEY (`word`,`serverId`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `guilds`
---
-
-DROP TABLE IF EXISTS `guilds`;
-CREATE TABLE IF NOT EXISTS `guilds` (
-  `guild_id` varchar(255) NOT NULL,
-  `logging` int(11) DEFAULT 0,
-  `logchannel` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`guild_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `guilds`
---
-
-INSERT INTO `guilds` (`guild_id`, `logging`, `logchannel`) VALUES
-('195386426400047105', 0, NULL);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `guild_settings`
---
-
-DROP TABLE IF EXISTS `guild_settings`;
-CREATE TABLE IF NOT EXISTS `guild_settings` (
-  `guild_id` varchar(255) NOT NULL,
-  `music_role` varchar(255) DEFAULT NULL,
-  `music_channel` varchar(255) DEFAULT NULL,
-  `blacklist_exclude_channels` text DEFAULT NULL,
-  PRIMARY KEY (`guild_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `guild_settings`
---
-
-INSERT INTO `guild_settings` (`guild_id`, `music_role`, `music_channel`, `blacklist_exclude_channels`) VALUES
-('195386426400047105', NULL, NULL, NULL);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `logging`
---
-
-DROP TABLE IF EXISTS `logging`;
-CREATE TABLE IF NOT EXISTS `logging` (
-  `serverId` varchar(255) NOT NULL,
-  `channelId` varchar(255) NOT NULL,
-  `enabled` tinyint(4) NOT NULL,
-  PRIMARY KEY (`serverId`,`channelId`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `log_message`
---
-
-DROP TABLE IF EXISTS `log_message`;
-CREATE TABLE IF NOT EXISTS `log_message` (
-  `serverId` varchar(255) NOT NULL,
-  `channelId` varchar(255) NOT NULL,
-  `userId` varchar(255) NOT NULL,
-  `dateSent` varchar(255) NOT NULL,
-  `messageId` varchar(255) NOT NULL,
-  `message` varchar(2000) DEFAULT NULL,
-  `editedMessage` varchar(2000) DEFAULT NULL,
-  PRIMARY KEY (`messageId`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `permissions`
---
-
-DROP TABLE IF EXISTS `permissions`;
-CREATE TABLE IF NOT EXISTS `permissions` (
-  `guild_id` varchar(255) NOT NULL,
-  `role_id` varchar(255) NOT NULL,
-  `type` int(11) DEFAULT NULL,
-  `command` int(11) DEFAULT NULL,
-  PRIMARY KEY (`guild_id`,`role_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---
--- Constraints for dumped tables
---
-
---
--- Constraints for table `guild_settings`
---
-ALTER TABLE `guild_settings`
-  ADD CONSTRAINT `fk_guildid_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`);
-COMMIT;
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

sql/netneutrality_jpa.sql

@@ -3,7 +3,7 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: 127.0.0.1:3306
--- Generation Time: Jan 04, 2022 at 09:55 PM
+-- Generation Time: Mar 14, 2022 at 08:59 AM
 -- Server version: 10.4.10-MariaDB
 -- PHP Version: 7.4.19
 
@@ -29,11 +29,13 @@ SET time_zone = "+00:00";
 
 DROP TABLE IF EXISTS `blacklist`;
 CREATE TABLE IF NOT EXISTS `blacklist` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `guild_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `word` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `enabled` tinyint(1) NOT NULL,
   `creator_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`guild_id`,`word`)
+  PRIMARY KEY (`id`),
+  KEY `fk_blacklist_guilds` (`guild_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- --------------------------------------------------------
@@ -45,28 +47,12 @@ CREATE TABLE IF NOT EXISTS `blacklist` (
 DROP TABLE IF EXISTS `guilds`;
 CREATE TABLE IF NOT EXISTS `guilds` (
   `guild_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `logging` int(11) DEFAULT 0,
+  `logging` tinyint(1) NOT NULL DEFAULT 0,
+  `debug` tinyint(1) NOT NULL DEFAULT 1,
   `log_channel` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`guild_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
---
--- Dumping data for table `guilds`
---
-
-INSERT INTO `guilds` (`guild_id`, `logging`, `log_channel`) VALUES
-('195386426400047105', 0, NULL),
-('250767028397408256', 0, NULL);
-
---
--- Triggers `guilds`
---
-DROP TRIGGER IF EXISTS `insert_settings`;
-DELIMITER $$
-CREATE TRIGGER `insert_settings` AFTER INSERT ON `guilds` FOR EACH ROW INSERT INTO guild_settings(guild_id) VALUES (new.guild_id)
-$$
-DELIMITER ;
-
 -- --------------------------------------------------------
 
 --
@@ -75,21 +61,14 @@ DELIMITER ;
 
 DROP TABLE IF EXISTS `guild_settings`;
 CREATE TABLE IF NOT EXISTS `guild_settings` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `guild_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `music_role` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `music_channel` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `value` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `blacklist_exclude_channels` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
-  PRIMARY KEY (`guild_id`)
+  KEY `fk_guildsetting_guilds` (`guild_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
---
--- Dumping data for table `guild_settings`
---
-
-INSERT INTO `guild_settings` (`guild_id`, `music_role`, `music_channel`, `blacklist_exclude_channels`) VALUES
-('195386426400047105', NULL, NULL, NULL),
-('250767028397408256', NULL, NULL, NULL);
-
 -- --------------------------------------------------------
 
 --
@@ -100,7 +79,7 @@ DROP TABLE IF EXISTS `logging`;
 CREATE TABLE IF NOT EXISTS `logging` (
   `guild_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `channel_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `enabled` tinyint(4) NOT NULL,
+  `enabled` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`guild_id`,`channel_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
@@ -112,14 +91,16 @@ CREATE TABLE IF NOT EXISTS `logging` (
 
 DROP TABLE IF EXISTS `log_message`;
 CREATE TABLE IF NOT EXISTS `log_message` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `guild_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `channel_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `message_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `user_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `date_sent` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `message_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
   `message` varchar(2000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `edited_message` varchar(2000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`message_id`),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `message_id` (`message_id`),
   KEY `fk_log_guilds` (`guild_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
@@ -163,19 +144,25 @@ CREATE TABLE IF NOT EXISTS `web_users` (
 -- Constraints for table `blacklist`
 --
 ALTER TABLE `blacklist`
-  ADD CONSTRAINT `fk_blacklist_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`);
+  ADD CONSTRAINT `fk_blacklist_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 --
 -- Constraints for table `guild_settings`
 --
 ALTER TABLE `guild_settings`
-  ADD CONSTRAINT `fk_guildid_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`);
+  ADD CONSTRAINT `fk_guildsetting_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `logging`
+--
+ALTER TABLE `logging`
+  ADD CONSTRAINT `fk_logging_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 
 --
 -- Constraints for table `log_message`
 --
 ALTER TABLE `log_message`
-  ADD CONSTRAINT `fk_log_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`);
+  ADD CONSTRAINT `fk_log_guilds` FOREIGN KEY (`guild_id`) REFERENCES `guilds` (`guild_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;