Merge pull request #920 from traPtitech/chores

Chores

.tbls.yml

@@ -301,9 +301,6 @@ comments:
       token: セッショントークン
       reference_id: 参照ID
       user_id: セッションがログインしているユーザーUUID
-      last_access: 最終アクセス日時
-      last_ip: 最終アクセスIPアドレス
-      last_user_agent: 最終アクセスUserAgent
       data: セッションデータ(gobバイナリ)
       created: 生成日時
   - table: oauth2_authorizes

Makefile

@@ -45,17 +45,17 @@ db-gen-docs:
 	@if [ -d "./docs/dbschema" ]; then \
 		rm -r ./docs/dbschema; \
 	fi
-	go run main.go migrate --reset --port $(TEST_DB_PORT)
+	TRAQ_MARIADB_PORT=$(TEST_DB_PORT) go run main.go migrate --reset
 	TBLS_DSN="mysql://root:[email protected]:$(TEST_DB_PORT)/traq" tbls doc
 
 .PHONY: db-diff-docs
 db-diff-docs:
-	go run main.go migrate --reset --port $(TEST_DB_PORT)
+	TRAQ_MARIADB_PORT=$(TEST_DB_PORT) go run main.go migrate --reset
 	TBLS_DSN="mysql://root:[email protected]:$(TEST_DB_PORT)/traq" tbls diff
 
 .PHONY: db-lint
 db-lint:
-	go run main.go migrate --reset --port $(TEST_DB_PORT)
+	TRAQ_MARIADB_PORT=$(TEST_DB_PORT) go run main.go migrate --reset
 	TBLS_DSN="mysql://root:[email protected]:$(TEST_DB_PORT)/traq" tbls lint
 
 .PHONY: goreleaser-snapshot

cmd/file.go

@@ -20,18 +20,6 @@ func fileCommand() *cobra.Command {
 		filePruneCommand(),
 	)
 
-	flags := cmd.PersistentFlags()
-	flags.String("host", "", "database host")
-	bindPFlag(flags, "mariadb.host", "host")
-	flags.Int("port", 0, "database port")
-	bindPFlag(flags, "mariadb.port", "port")
-	flags.String("name", "", "database name")
-	bindPFlag(flags, "mariadb.database", "name")
-	flags.String("user", "", "database user")
-	bindPFlag(flags, "mariadb.username", "user")
-	flags.String("pass", "", "database password")
-	bindPFlag(flags, "mariadb.password", "pass")
-
 	return &cmd
 }
 

cmd/migrate.go

@@ -28,16 +28,6 @@ func migrateCommand() *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.String("host", "", "database host")
-	bindPFlag(flags, "mariadb.host", "host")
-	flags.Int("port", 0, "database port")
-	bindPFlag(flags, "mariadb.port", "port")
-	flags.String("name", "", "database name")
-	bindPFlag(flags, "mariadb.database", "name")
-	flags.String("user", "", "database user")
-	bindPFlag(flags, "mariadb.username", "user")
-	flags.String("pass", "", "database password")
-	bindPFlag(flags, "mariadb.password", "pass")
 	flags.BoolVar(&dropDB, "reset", false, "whether to truncate database (drop all tables)")
 
 	return &cmd

cmd/migrate_v2_to_v3.go

@@ -63,18 +63,6 @@ func migrateV2ToV3Command() *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.String("host", "", "database host")
-	bindPFlag(flags, "mariadb.host", "host")
-	flags.Int("port", 0, "database port")
-	bindPFlag(flags, "mariadb.port", "port")
-	flags.String("name", "", "database name")
-	bindPFlag(flags, "mariadb.database", "name")
-	flags.String("user", "", "database user")
-	bindPFlag(flags, "mariadb.username", "user")
-	flags.String("pass", "", "database password")
-	bindPFlag(flags, "mariadb.password", "pass")
-	flags.String("origin", "", "traQ origin")
-	bindPFlag(flags, "origin", "origin")
 	flags.BoolVar(&dryRun, "dry-run", false, "dry run")
 	flags.BoolVar(&skipConvertMessage, "skip-convert-message", false, "skip message converting")
 	flags.IntVar(&startMessagePage, "start-message-page", 0, "start message page (zero-origin)")

cmd/serve.go

@@ -8,7 +8,6 @@ import (
 	"github.com/leandro-lugaresi/hub"
 	"github.com/spf13/cobra"
 	"github.com/traPtitech/traQ/repository"
-	"github.com/traPtitech/traQ/router/sessions"
 	"github.com/traPtitech/traQ/service"
 	"github.com/traPtitech/traQ/utils/gormzap"
 	"github.com/traPtitech/traQ/utils/jwt"
@@ -98,13 +97,6 @@ func serveCommand() *cobra.Command {
 				logger.Info("data initialization finished")
 			}
 
-			// SessionStore
-			sessionStore, err := sessions.NewGORMStore(engine)
-			if err != nil {
-				logger.Fatal("failed to setup session store", zap.Error(err))
-			}
-			sessions.SetStore(sessionStore)
-
 			// JWT for QRCode
 			if priv := c.JWT.Keys.Private; priv != "" {
 				privRaw, err := ioutil.ReadFile(priv)
@@ -141,7 +133,6 @@ func serveCommand() *cobra.Command {
 			if err := server.Shutdown(ctx); err != nil {
 				logger.Warn("abnormal shutdown", zap.Error(err))
 			}
-			sessions.PurgeCache()
 			logger.Info("traQ shutdown")
 		},
 	}

docs/dbschema/README.md

@@ -26,7 +26,7 @@
 | [oauth2_clients](oauth2_clients.md) | 11 | OAuth2クライアントテーブル | BASE TABLE |
 | [oauth2_tokens](oauth2_tokens.md) | 11 | OAuth2トークンテーブル | BASE TABLE |
 | [pins](pins.md) | 4 | ピンテーブル | BASE TABLE |
-| [r_sessions](r_sessions.md) | 8 | traQ API HTTPセッションテーブル | BASE TABLE |
+| [r_sessions](r_sessions.md) | 5 | traQ API HTTPセッションテーブル | BASE TABLE |
 | [stamp_palettes](stamp_palettes.md) | 7 | スタンプパレットテーブル | BASE TABLE |
 | [stamps](stamps.md) | 8 | スタンプテーブル | BASE TABLE |
 | [stars](stars.md) | 2 | お気に入りチャンネルテーブル | BASE TABLE |

docs/dbschema/channels.md

@@ -22,7 +22,8 @@ CREATE TABLE `channels` (
   `updated_at` datetime(6) DEFAULT NULL,
   `deleted_at` datetime(6) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `name_parent` (`name`,`parent_id`)
+  UNIQUE KEY `name_parent` (`name`,`parent_id`),
+  KEY `idx_channel_channels_id_is_public_is_forced` (`id`,`is_public`,`is_forced`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
 ```
 
@@ -56,6 +57,7 @@ CREATE TABLE `channels` (
 
 | Name | Definition |
 | ---- | ---------- |
+| idx_channel_channels_id_is_public_is_forced | KEY idx_channel_channels_id_is_public_is_forced (id, is_public, is_forced) USING BTREE |
 | PRIMARY | PRIMARY KEY (id) USING BTREE |
 | name_parent | UNIQUE KEY name_parent (name, parent_id) USING BTREE |
 

docs/dbschema/messages.md

@@ -21,6 +21,7 @@ CREATE TABLE `messages` (
   KEY `idx_messages_created_at` (`created_at`),
   KEY `messages_user_id_users_id_foreign` (`user_id`),
   KEY `idx_messages_channel_id_deleted_at_created_at` (`channel_id`,`deleted_at`,`created_at`),
+  KEY `idx_messages_deleted_at_created_at` (`deleted_at`,`created_at`),
   CONSTRAINT `messages_channel_id_channels_id_foreign` FOREIGN KEY (`channel_id`) REFERENCES `channels` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `messages_user_id_users_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
@@ -55,6 +56,7 @@ CREATE TABLE `messages` (
 | idx_messages_channel_id | KEY idx_messages_channel_id (channel_id) USING BTREE |
 | idx_messages_channel_id_deleted_at_created_at | KEY idx_messages_channel_id_deleted_at_created_at (channel_id, deleted_at, created_at) USING BTREE |
 | idx_messages_created_at | KEY idx_messages_created_at (created_at) USING BTREE |
+| idx_messages_deleted_at_created_at | KEY idx_messages_deleted_at_created_at (deleted_at, created_at) USING BTREE |
 | messages_user_id_users_id_foreign | KEY messages_user_id_users_id_foreign (user_id) USING BTREE |
 | PRIMARY | PRIMARY KEY (id) USING BTREE |
 

docs/dbschema/r_sessions.md

@@ -12,9 +12,6 @@ CREATE TABLE `r_sessions` (
   `token` varchar(50) NOT NULL DEFAULT '',
   `reference_id` char(36) DEFAULT NULL,
   `user_id` varchar(36) DEFAULT NULL,
-  `last_access` datetime(6) DEFAULT NULL,
-  `last_ip` text,
-  `last_user_agent` text,
   `data` longblob,
   `created` datetime(6) DEFAULT NULL,
   PRIMARY KEY (`token`),
@@ -32,9 +29,6 @@ CREATE TABLE `r_sessions` (
 | token | varchar(50) |  | false |  |  | セッショントークン |
 | reference_id | char(36) |  | true |  |  | 参照ID |
 | user_id | varchar(36) |  | true |  |  | セッションがログインしているユーザーUUID |
-| last_access | datetime(6) |  | true |  |  | 最終アクセス日時 |
-| last_ip | text |  | true |  |  | 最終アクセスIPアドレス |
-| last_user_agent | text |  | true |  |  | 最終アクセスUserAgent |
 | data | longblob |  | true |  |  | セッションデータ(gobバイナリ) |
 | created | datetime(6) |  | true |  |  | 生成日時 |