api: fix the plugins deps problem

packages/api-server/__tests__/queries.ts

@@ -1,6 +1,6 @@
 import { buildParams, eachQuery } from './helpers/queries';
 import { QueryParser } from '../src/core/runner/query/QueryParser';
-import { CollectionService } from '../src/services/collection-service';
+import { CollectionService } from '../src/plugins/services/collection-service';
 import { testLogger } from './helpers/log';
 import CacheBuilder from '../src/core/cache/CacheBuilder';
 import {TiDBQueryExecutor} from "../src/core/executor/query-executor/TiDBQueryExecutor";

packages/api-server/__tests__/services/collection-service.ts

@@ -1,5 +1,5 @@
 import {bootstrapTestDatabase, getTestDatabase, releaseTestDatabase} from '../helpers/db';
-import { CollectionService } from '../../src/services/collection-service';
+import { CollectionService } from '../../src/plugins/services/collection-service';
 import { testLogger } from '../helpers/log';
 import CacheBuilder from '../../src/core/cache/CacheBuilder';
 import {getConnection, getConnectionOptions} from "../../src/core/db/new";

packages/api-server/__tests__/services/repo-service.ts

@@ -1,7 +1,7 @@
 import {bootstrapTestDatabase, releaseTestDatabase, TiDBDatabase} from '../helpers/db';
 import {bootstrapApp, StartedApp} from '../helpers/app';
-import '../../src/services/repo-service';
-import {RepoService, SubscribedRepo} from "../../src/services/repo-service";
+import '../../src/plugins/services/repo-service';
+import {RepoService, SubscribedRepo} from "../../src/plugins/services/repo-service";
 import {Connection} from "mysql2/promise";
 import {APIError} from "../../src/utils/error";
 

packages/api-server/__tests__/services/stats-service.ts

@@ -1,5 +1,5 @@
 import { bootstrapTestDatabase, getTestDatabase, releaseTestDatabase } from '../helpers/db';
-import { StatsService } from '../../src/services/stats-service';
+import { StatsService } from '../../src/plugins/services/stats-service';
 import { testLogger } from '../helpers/log';
 import {getPool} from "../../src/core/db/new";
 

packages/api-server/__tests__/services/user-service.ts

@@ -1,7 +1,7 @@
 import {bootstrapTestDatabase, getTestDatabase, releaseTestDatabase} from '../helpers/db';
 import {bootstrapApp, getTestApp, releaseApp} from '../helpers/app';
 import {Connection, ResultSetHeader} from "mysql2/promise";
-import {ProviderType, UserRole, UserService} from "../../src/services/user-service";
+import {ProviderType, UserRole, UserService} from "../../src/plugins/services/user-service";
 
 let userService: UserService, conn: Connection;
 

packages/api-server/src/app.ts

@@ -90,12 +90,6 @@ const app: FastifyPluginAsync<AppOptions, RawServerDefault, JsonSchemaToTsProvid
     options: opts
   })
 
-  // This loads all plugins defined in services.
-  void fastify.register(AutoLoad, {
-    dir: join(__dirname, 'services'),
-    options: opts
-  })
-
   // This loads all plugins defined in routes
   // define your routes in one of these.
   await fastify.register(AutoLoad, {

packages/api-server/src/core/runner/query/QueryParser.ts

@@ -1,4 +1,4 @@
-import { CollectionService } from "../../../services/collection-service";
+import { CollectionService } from "../../../plugins/services/collection-service";
 import { QuerySchema } from "../../../types/query.schema";
 
 export enum ParamType {

packages/api-server/src/plugins/auth/github.ts

@@ -12,7 +12,7 @@ import fastifyOauth2, {FastifyOAuth2Options, OAuth2Namespace} from '@fastify/oau
 import {DateTime} from 'luxon';
 import fastifyCookie from "@fastify/cookie";
 import fp from 'fastify-plugin';
-import {ProviderType, UserProfile, UserRole} from "../../services/user-service";
+import {ProviderType, UserProfile, UserRole} from "../services/user-service";
 import {APIError} from "../../utils/error";
 import {getOctokit} from "../../utils/loger";
 

packages/api-server/src/plugins/runner/query/index.ts

@@ -14,7 +14,8 @@ export default fp(async (app) => {
     dependencies: [
         '@fastify/env',
         'tidb-query-executor',
-        'cache-builder'
+        'cache-builder',
+        'collection-service'
     ],
 });
 

packages/api-server/src/services/collection-service/index.ts → packages/api-server/src/plugins/services/collection-service/index.ts

@@ -1,12 +1,12 @@
-import CacheBuilder, { CacheProviderTypes } from "../../core/cache/CacheBuilder";
+import CacheBuilder, { CacheProviderTypes } from "../../../core/cache/CacheBuilder";
 
-import { CachedData } from "../../core/cache/Cache";
+import { CachedData } from "../../../core/cache/Cache";
 import { DateTime } from "luxon";
 import { RowDataPacket } from "mysql2/promise";
-import { TiDBQueryExecutor } from "../../core/executor/query-executor/TiDBQueryExecutor";
+import { TiDBQueryExecutor } from "../../../core/executor/query-executor/TiDBQueryExecutor";
 import fp from "fastify-plugin";
 import pino from "pino";
-import {dataQueryTimer, measure, tidbQueryCounter} from "../../plugins/metrics/metrics";
+import {dataQueryTimer, measure, tidbQueryCounter} from "../../metrics/metrics";
 
 declare module 'fastify' {
   interface FastifyInstance {

packages/api-server/src/services/playground-service/index.ts → packages/api-server/src/plugins/services/playground-service/index.ts

@@ -1,6 +1,6 @@
 import fp from "fastify-plugin";
 import {MySQLPromisePool} from "@fastify/mysql";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {QuestionContext} from "../bot-service";
 
 declare module 'fastify' {

packages/api-server/src/services/repo-service/index.ts → packages/api-server/src/plugins/services/repo-service/index.ts

@@ -3,7 +3,7 @@ import {FastifyOAuth2Options} from "@fastify/oauth2";
 import {MySQLPromisePool} from "@fastify/mysql";
 import {ResultSetHeader} from "mysql2";
 import fp from "fastify-plugin";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {RowDataPacket} from "mysql2/promise";
 
 declare module 'fastify' {

packages/api-server/src/services/stats-service/index.ts → packages/api-server/src/plugins/services/stats-service/index.ts

@@ -1,7 +1,7 @@
-import { BatchLoader } from "../../core/db/batch-loader";
+import { BatchLoader } from "../../../core/db/batch-loader";
 import {Pool} from "mysql2/promise";
 import fp from "fastify-plugin";
-import {getPool} from "../../core/db/new";
+import {getPool} from "../../../core/db/new";
 import pino from "pino";
 
 declare module 'fastify' {

packages/api-server/src/services/user-service/index.ts → packages/api-server/src/plugins/services/user-service/index.ts

@@ -4,7 +4,7 @@ import { FastifyOAuth2Options } from "@fastify/oauth2";
 import { MySQLPromisePool } from "@fastify/mysql";
 import { ResultSetHeader } from "mysql2";
 import fp from "fastify-plugin";
-import {APIError} from "../../utils/error";
+import {APIError} from "../../../utils/error";
 import {Connection, RowDataPacket} from "mysql2/promise";
 
 declare module 'fastify' {

packages/api-server/src/routes/bot/questionToSQL/index.ts

@@ -1,5 +1,5 @@
 import {FastifyPluginAsyncJsonSchemaToTs} from "@fastify/type-provider-json-schema-to-ts";
-import {QuestionContext} from "../../../services/bot-service";
+import {QuestionContext} from "../../../plugins/services/bot-service";
 import {APIError} from "../../../utils/error";
 
 export interface IBody {