Ban revoke

Fixes #168

Author: 1-alex98

migrations/V62__ban_revoke_restructuring.sql

@@ -0,0 +1,21 @@
+ALTER TABLE ban
+  ADD COLUMN revoke_reason TEXT,
+  ADD COLUMN revoke_author_id MEDIUMINT UNSIGNED,
+  ADD COLUMN revoke_time TIMESTAMP NULL DEFAULT NULL,
+  ADD CONSTRAINT ban_revoke_author FOREIGN KEY (author_id) REFERENCES login (id);
+
+UPDATE ban
+  JOIN ban_revoke ON ban.id = ban_revoke.ban_id
+SET ban.revoke_reason  = ban_revoke.reason,
+  ban.revoke_author_id = ban_revoke.author_id,
+  ban.revoke_time      = ban_revoke.create_time;
+
+ALTER VIEW lobby_ban AS
+  select
+    `ban`.`player_id`                                                             AS `idUser`,
+    `ban`.`reason`                                                                AS `reason`,
+    coalesce(`ban`.`revoke_time`, `ban`.`expires_at`, cast('2999-12-31' as date)) AS `expires_at`
+  from `ban`
+  where (`ban`.`level` <> 'CHAT');
+
+DROP TABLE ban_revoke;

test-data.sql

@@ -26,7 +26,6 @@ DELETE FROM updates_faf;
 DELETE FROM updates_faf_files;
 DELETE FROM avatars;
 DELETE FROM avatars_list;
-DELETE FROM ban_revoke;
 DELETE FROM ban;
 DELETE FROM clan_membership;
 DELETE FROM clan;
@@ -183,8 +182,9 @@ insert into ban(id, player_id, author_id, reason, level) values
   (2, 3, 1, 'This test ban should be revoked', 'CHAT');
 insert into ban(player_id, author_id, reason, level, expires_at) values
   (4, 1, 'This test ban should be expired', 'CHAT', NOW());
-insert into ban_revoke (ban_id, reason, author_id) values
-  (2, 'I want to show that you can revoke the ban, but keep the data', 1);
+insert into ban (player_id, author_id, reason, level, expires_at, revoke_reason, revoke_author_id, revoke_time) values
+  (4, 1, 'This test ban should be revoked', 'CHAT', DATE_ADD(NOW(), INTERVAL 1 YEAR), 'this was a test ban', 1,
+   NOW());
 
 -- sample clans
 insert into clan (id, name, tag, founder_id, leader_id, description) values