cleanup

Author: extreme4all

_mysql/docker-entrypoint-initdb.d/01_tables.sql

@@ -13,7 +13,7 @@ CREATE TABLE Players (
   hardcore_ironman BOOLEAN,
   ultimate_ironman BOOLEAN,
   normalized_name VARCHAR(50),
-  UNIQUE KEY `Unique_name` (`name`)
+  UNIQUE KEY Unique_name (name)
 );
 -- these tables are for future use
 -- CREATE TABLE player (
@@ -46,7 +46,6 @@ CREATE TABLE Players (
 --   PRIMARY KEY (player_id, updated_at) 
 -- ) PARTITION BY HASH (player_id) PARTITIONS 10;
 -- Foreign keys are not yet supported in conjunction with partitioning
-
 CREATE TABLE highscore_data_latest (
   player_id INT UNSIGNED NOT NULL,
   scrape_date DATE NOT NULL,
@@ -57,7 +56,6 @@ CREATE TABLE highscore_data_latest (
   activities JSON DEFAULT NULL,
   PRIMARY KEY (player_id)
 ) PARTITION BY HASH (player_id) PARTITIONS 10;
-
 CREATE TABLE highscore_data_daily (
   player_id INT UNSIGNED NOT NULL,
   scrape_date DATE NOT NULL,
@@ -69,7 +67,6 @@ CREATE TABLE highscore_data_daily (
   activities JSON DEFAULT NULL,
   PRIMARY KEY (player_id, scrape_date)
 ) PARTITION BY HASH (player_id) PARTITIONS 10;
-
 CREATE TABLE highscore_data_weekly (
   player_id INT UNSIGNED NOT NULL,
   scrape_date DATE NOT NULL,
@@ -81,7 +78,6 @@ CREATE TABLE highscore_data_weekly (
   activities JSON DEFAULT NULL,
   PRIMARY KEY (player_id, scrape_year, scrape_week)
 ) PARTITION BY HASH (player_id) PARTITIONS 10;
-
 CREATE TABLE highscore_data_monthly (
   player_id INT UNSIGNED NOT NULL,
   scrape_date DATE NOT NULL,
@@ -93,7 +89,6 @@ CREATE TABLE highscore_data_monthly (
   activities JSON DEFAULT NULL,
   PRIMARY KEY (player_id, scrape_year, scrape_month)
 ) PARTITION BY HASH (player_id) PARTITIONS 10;
-
 CREATE TABLE Predictions (
   id INT PRIMARY KEY AUTO_INCREMENT,
   name VARCHAR(12),
@@ -129,7 +124,6 @@ CREATE TABLE Predictions (
   nex_bot DECIMAL(5, 2) DEFAULT 0,
   unknown_bot DECIMAL(5, 2) DEFAULT 0
 );
-
 CREATE TABLE PredictionsFeedback (
   id INT PRIMARY KEY AUTO_INCREMENT,
   ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -148,16 +142,64 @@ CREATE TABLE PredictionsFeedback (
     subject_id,
     voter_id
   ) USING BTREE,
-  CONSTRAINT `FK_Subject_ID` FOREIGN KEY (`subject_id`) REFERENCES `Players` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `FK_Voter_ID` FOREIGN KEY (`voter_id`) REFERENCES `Players` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+  CONSTRAINT FK_Subject_ID FOREIGN KEY (subject_id) REFERENCES Players (id) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT FK_Voter_ID FOREIGN KEY (voter_id) REFERENCES Players (id) ON DELETE RESTRICT ON UPDATE RESTRICT
 );
-
-CREATE TABLE `report_sighting` (
-    `report_sighting_id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-    `reporting_id` INT UNSIGNED NOT NULL,
-    `reported_id` INT UNSIGNED NOT NULL,
-    `manual_detect` TINYINT(1) DEFAULT 0,
-    PRIMARY key (`report_sighting_id`),
-    UNIQUE KEY unique_sighting (`reporting_id`, `reported_id`, `manual_detect`),
-    KEY idx_reported_id (`reported_id`)
+CREATE TABLE report_sighting (
+  report_sighting_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  reporting_id INT UNSIGNED NOT NULL,
+  reported_id INT UNSIGNED NOT NULL,
+  manual_detect TINYINT(1) DEFAULT 0,
+  PRIMARY key (report_sighting_id),
+  UNIQUE KEY unique_sighting (reporting_id, reported_id, manual_detect),
+  KEY idx_reported_id (reported_id)
+);
+CREATE TABLE report_gear (
+  report_gear_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  equip_head_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_amulet_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_torso_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_legs_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_boots_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_cape_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_hands_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_weapon_id SMALLINT UNSIGNED DEFAULT NULL,
+  equip_shield_id SMALLINT UNSIGNED DEFAULT NULL,
+  PRIMARY key (report_gear_id),
+  UNIQUE KEY unique_gear (
+    equip_head_id,
+    equip_amulet_id,
+    equip_torso_id,
+    equip_legs_id,
+    equip_boots_id,
+    equip_cape_id,
+    equip_hands_id,
+    equip_weapon_id,
+    equip_shield_id
+  )
+);
+CREATE TABLE report_location (
+  report_location_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  region_id MEDIUMINT UNSIGNED NOT NULL,
+  x_coord MEDIUMINT UNSIGNED NOT NULL,
+  y_coord MEDIUMINT UNSIGNED NOT NULL,
+  z_coord MEDIUMINT UNSIGNED NOT NULL,
+  PRIMARY key (report_location_id),
+  UNIQUE KEY unique_location (region_id, x_coord, y_coord, z_coord)
+);
+CREATE TABLE report (
+  report_sighting_id INT UNSIGNED NOT NULL,
+  report_location_id INT UNSIGNED NOT NULL,
+  report_gear_id INT UNSIGNED NOT NULL,
+  created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  reported_at timestamp NOT NULL,
+  on_members_world TINYINT(1) DEFAULT NULL,
+  on_pvp_world TINYINT(1) DEFAULT NULL,
+  world_number SMALLINT UNSIGNED DEFAULT NULL,
+  region_id MEDIUMINT UNSIGNED NOT NULL,
+  PRIMARY key (
+    report_sighting_id,
+    report_location_id,
+    region_id
+  )
 );

_mysql/docker-entrypoint-initdb.d/02_grants.sql

@@ -0,0 +1,16 @@
+/*report-worker*/
+GRANT CREATE TEMPORARY TABLES ON *.* TO `report-worker`@`%`;
+GRANT SELECT, INSERT, UPDATE ON playerdata.Players TO `report-worker`@`%`;
+-- GRANT SELECT ON playerdata.Reports TO `report-worker`@`%`;
+-- GRANT INSERT ON playerdata.stgReports TO `report-worker`@`%`;
+
+GRANT SELECT, INSERT ON playerdata.report_sighting TO `report-worker`@`%`;
+GRANT SELECT, INSERT ON playerdata.report_gear TO `report-worker`@`%`;
+GRANT SELECT, INSERT ON playerdata.report_location TO `report-worker`@`%`;
+GRANT SELECT, INSERT ON playerdata.report TO `report-worker`@`%`;
+
+GRANT SELECT, INSERT, CREATE, DROP ON playerdata.temp_sighting TO `report-worker`@`%`;
+GRANT SELECT, INSERT, CREATE, DROP ON playerdata.temp_gear TO `report-worker`@`%`;
+GRANT SELECT, INSERT, CREATE, DROP ON playerdata.temp_location TO `report-worker`@`%`;
+GRANT SELECT, INSERT, CREATE, DROP ON playerdata.temp_report TO `report-worker`@`%`;
+FLUSH PRIVILEGES;

bases/bot_detector/worker_report/__init__.py

@@ -1,3 +1,3 @@
-from bot_detector.worker_report import core
+from bot_detector import logfmt
 
-__all__ = ["core"]
+__all__ = ["logfmt"]