Move rarely changed data to datamappings, fix profile updating

As result of profile format change, introduced in game update yesterday we need to change profile regexp. As result of some refactoring, rarely changed data removed from database and added to sources of bot.
2018-03-31 08:34:27 +04:00
parent 8d78ef37f1
commit c9855116da
27 changed files with 460 additions and 237 deletions
--- a/lib/migrations/33_delete_datamapped_tables.go
+++ b/lib/migrations/33_delete_datamapped_tables.go
@@ -0,0 +1,220 @@
+// i2_bot – Instinct PokememBro Bot
+// Copyright (c) 2017-2018 Vladimir "fat0troll" Hodakov
+
+package migrations
+
+import (
+	"database/sql"
+)
+
+// DeleteDataMappedTablesUp drops `locations`, `elements`, `weapons` and `leagues` tables
+// These tables data is rarely changed, so I decided to hold such data in source code
+func DeleteDataMappedTablesUp(tx *sql.Tx) error {
+	request := "DROP TABLE IF EXISTS `elements`"
+	_, err := tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	request = "DROP TABLE IF EXISTS `leagues`"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	request = "DROP TABLE IF EXISTS `locations`"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	request = "DROP TABLE IF EXISTS `weapons`"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// DeleteDataMappedTablesDown returns old tables with all data
+func DeleteDataMappedTablesDown(tx *sql.Tx) error {
+	request := "CREATE TABLE `locations` ("
+	request += "`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID локации',"
+	request += "`symbol` varchar(191) COLLATE 'utf8mb4_unicode_520_ci' NOT NULL COMMENT 'Символ локации',"
+	request += "`name` varchar(191) NOT NULL COMMENT 'Имя локации',"
+	request += "`created_at` datetime NOT NULL COMMENT 'Добавлена в базу',"
+	request += "PRIMARY KEY (`id`),"
+	request += "UNIQUE KEY `id` (`id`),"
+	request += "KEY `locations_created_at` (`created_at`)"
+	request += ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='Локации';"
+	_, err := tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	// Insert locations
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🌲', 'Лес', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '⛰', 'Горы', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🚣', 'Озеро', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏙', 'Город', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏛', 'Катакомбы', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '⛪', 'Кладбище', NOW());")
+	if err != nil {
+		return err
+	}
+
+	request = "CREATE TABLE `elements` ("
+	request += "`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID элемента',"
+	request += "`symbol` varchar(191) COLLATE 'utf8mb4_unicode_520_ci' NOT NULL COMMENT 'Символ элемента',"
+	request += "`name` varchar(191) NOT NULL COMMENT 'Имя элемента',"
+	request += "`league_id` int(11) NOT NULL COMMENT 'ID родной лиги',"
+	request += "`created_at` datetime NOT NULL COMMENT 'Добавлен в базу',"
+	request += "PRIMARY KEY (`id`),"
+	request += "UNIQUE KEY `id` (`id`),"
+	request += "KEY `elements_created_at` (`created_at`)"
+	request += ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='Элементы';"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	// Insert elements
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👊', 'Боевой', 1, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🌀', 'Летающий', 1, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💀', 'Ядовитый', 1, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🗿', 'Каменный', 1, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🔥', 'Огненный', 2, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '⚡', 'Электрический', 2, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💧', 'Водяной', 2, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🍀', 'Травяной', 2, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💩', 'Шоколадный', 3, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👁', 'Психический', 3, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👿', 'Темный', 3, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '⌛', 'Времени', 3, NOW());")
+	if err != nil {
+		return err
+	}
+
+	request = "CREATE TABLE `leagues` ("
+	request += "`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID лиги',"
+	request += "`symbol` varchar(191) COLLATE 'utf8mb4_unicode_520_ci' NOT NULL COMMENT 'Символ лиги',"
+	request += "`name` varchar(191) NOT NULL COMMENT 'Имя лиги',"
+	request += "`created_at` datetime NOT NULL COMMENT 'Добавлена в базу',"
+	request += "PRIMARY KEY (`id`),"
+	request += "UNIQUE KEY `id` (`id`),"
+	request += "KEY `leagues_created_at` (`created_at`)"
+	request += ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='Лиги';"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	// Insert locations
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, '🈸', 'ИНСТИНКТ', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, '🈳', 'ОТВАГА', NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, '🈵', 'МИСТИКА', NOW());")
+	if err != nil {
+		return err
+	}
+
+	request = "CREATE TABLE `weapons` ("
+	request += "`id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID оружия',"
+	request += "`name` varchar(191) NOT NULL COMMENT 'Название оружия',"
+	request += "`power` int(11) NOT NULL COMMENT 'Атака оружия',"
+	request += "`price` int(11) NOT NULL COMMENT 'Цена в магазине',"
+	request += "`created_at` datetime NOT NULL COMMENT 'Добавлено в базу',"
+	request += "PRIMARY KEY (`id`),"
+	request += "UNIQUE KEY `id` (`id`),"
+	request += "KEY `weapons_created_at` (`created_at`)"
+	request += ") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='Оружие';"
+	_, err = tx.Exec(request)
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Бита', 2, 5, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Стальная бита', 10, 40, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Чугунная бита ', 200, 500, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Титановая бита', 2000, 10000, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Алмазная бита', 10000, 100000, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Криптонитовая бита', 100000, 500000, NOW());")
+	if err != nil {
+		return err
+	}
+	_, err = tx.Exec("INSERT INTO `weapons` VALUES(NULL, 'Буханка из пятёры', 1000000, 5000000, NOW());")
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
--- a/lib/migrations/5_create_locations.go
+++ b/lib/migrations/5_create_locations.go
@@ -24,29 +24,29 @@ func CreateLocationsUp(tx *sql.Tx) error {
 	}

 	// Insert locations
-	_, err2 := tx.Exec("INSERT INTO `locations` VALUES(NULL, ':evergreen_tree:', 'Лес', NOW());")
-	if err2 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, ':evergreen_tree:', 'Лес', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err3 := tx.Exec("INSERT INTO `locations` VALUES(NULL, '⛰', 'Горы', NOW());")
-	if err3 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '⛰', 'Горы', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err4 := tx.Exec("INSERT INTO `locations` VALUES(NULL, ':rowboat:', 'Озеро', NOW());")
-	if err4 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, ':rowboat:', 'Озеро', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err5 := tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏙', 'Город', NOW());")
-	if err5 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏙', 'Город', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err6 := tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏛', 'Катакомбы', NOW());")
-	if err6 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, '🏛', 'Катакомбы', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err7 := tx.Exec("INSERT INTO `locations` VALUES(NULL, ':church:', 'Кладбище', NOW());")
-	if err7 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `locations` VALUES(NULL, ':church:', 'Кладбище', NOW());")
+	if err != nil {
+		return err
 	}

 	return nil
--- a/lib/migrations/6_create_elements.go
+++ b/lib/migrations/6_create_elements.go
@@ -25,53 +25,53 @@ func CreateElementsUp(tx *sql.Tx) error {
 	}

 	// Insert elements
-	_, err2 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '👊', 'Боевой', 1, NOW());")
-	if err2 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👊', 'Боевой', 1, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err3 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '🌀', 'Летающий', 1, NOW());")
-	if err3 != nil {
-		return err3
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🌀', 'Летающий', 1, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err4 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '💀', 'Ядовитый', 1, NOW());")
-	if err4 != nil {
-		return err4
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💀', 'Ядовитый', 1, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err5 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '🗿', 'Каменный', 1, NOW());")
-	if err5 != nil {
-		return err5
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🗿', 'Каменный', 1, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err6 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '🔥', 'Огненный', 2, NOW());")
-	if err6 != nil {
-		return err6
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🔥', 'Огненный', 2, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err7 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '⚡', 'Электрический', 2, NOW());")
-	if err7 != nil {
-		return err7
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '⚡', 'Электрический', 2, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err8 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '💧', 'Водяной', 2, NOW());")
-	if err8 != nil {
-		return err8
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💧', 'Водяной', 2, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err9 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '🍀', 'Травяной', 2, NOW());")
-	if err9 != nil {
-		return err9
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '🍀', 'Травяной', 2, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err10 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '💩', 'Шоколадный', 3, NOW());")
-	if err10 != nil {
-		return err10
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '💩', 'Шоколадный', 3, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err11 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '👁', 'Психический', 3, NOW());")
-	if err11 != nil {
-		return err11
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👁', 'Психический', 3, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err12 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '👿', 'Темный', 3, NOW());")
-	if err12 != nil {
-		return err12
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '👿', 'Темный', 3, NOW());")
+	if err != nil {
+		return err
 	}
-	_, err13 := tx.Exec("INSERT INTO `elements` VALUES(NULL, '⌛', 'Времени', 1, NOW());")
-	if err13 != nil {
-		return err13
+	_, err = tx.Exec("INSERT INTO `elements` VALUES(NULL, '⌛', 'Времени', 1, NOW());")
+	if err != nil {
+		return err
 	}

 	return nil
--- a/lib/migrations/7_create_leagues.go
+++ b/lib/migrations/7_create_leagues.go
@@ -24,17 +24,17 @@ func CreateLeaguesUp(tx *sql.Tx) error {
 	}

 	// Insert locations
-	_, err2 := tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u7533:', 'ИНСТИНКТ', NOW());")
-	if err2 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u7533:', 'ИНСТИНКТ', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err3 := tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u6e80', 'ОТВАГА', NOW());")
-	if err3 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u6e80', 'ОТВАГА', NOW());")
+	if err != nil {
+		return err
 	}
-	_, err4 := tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u7a7a:', 'МИСТИКА', NOW());")
-	if err4 != nil {
-		return err2
+	_, err = tx.Exec("INSERT INTO `leagues` VALUES(NULL, ':u7a7a:', 'МИСТИКА', NOW());")
+	if err != nil {
+		return err
 	}

 	return nil
--- a/lib/migrations/migrations.go
+++ b/lib/migrations/migrations.go
@@ -43,6 +43,7 @@ func (m *Migrations) Init() {
 	goose.AddNamedMigration("30_create_alarms.go", CreateAlarmsUp, CreateAlarmsUp)
 	goose.AddNamedMigration("31_change_squads_table.go", ChangeSquadsTableUp, ChangeSquadsTableDown)
 	goose.AddNamedMigration("32_add_is_active_to_pokememes.go", AddIsActiveToPokememesUp, AddIsActiveToPokememesDown)
+	goose.AddNamedMigration("33_delete_datamapped_tables.go", DeleteDataMappedTablesUp, DeleteDataMappedTablesDown)
 }

 // Migrate migrates database to current version