refactor

Author: arvinxx

src/database/server/models/__tests__/_test_template.ts src/database/models/__tests__/_test_template.ts

@@ -4,8 +4,8 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { sessionGroups, users } from '../../../schemas';
-import { SessionGroupModel } from '../sessionGroup';
+import { sessionGroups, users } from '../../schemas';
+import { SessionGroupModel } from '../../server/models/sessionGroup';
 
 let serverDB = await getTestDBInstance();
 

src/database/server/models/__tests__/_util.ts src/database/models/__tests__/_util.ts

@@ -13,8 +13,8 @@ import {
   knowledgeBases,
   sessions,
   users,
-} from '../../../schemas';
-import { AgentModel } from '../agent';
+} from '../../schemas';
+import { AgentModel } from '../../server/models/agent';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/agent.test.ts src/database/models/__tests__/agent.test.ts

@@ -5,8 +5,8 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 import { AiProviderModelListItem } from '@/types/aiModel';
 
-import { AiModelSelectItem, NewAiModelItem, aiModels, users } from '../../../schemas';
-import { AiModelModel } from '../aiModel';
+import { AiModelSelectItem, NewAiModelItem, aiModels, users } from '../../schemas';
+import { AiModelModel } from '../../server/models/aiModel';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/aiModel.test.ts src/database/models/__tests__/aiModel.test.ts

@@ -5,8 +5,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 import { ModelProvider } from '@/libs/agent-runtime';
 
-import { aiProviders, users } from '../../../schemas';
-import { AiProviderModel } from '../aiProvider';
+import { aiProviders, users } from '../../schemas';
+import { AiProviderModel } from '../../server/models/aiProvider';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/aiProvider.test.ts src/database/models/__tests__/aiProvider.test.ts

@@ -5,8 +5,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
 
-import { asyncTasks, users } from '../../../schemas';
-import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../asyncTask';
+import { asyncTasks, users } from '../../schemas';
+import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../../server/models/asyncTask';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/asyncTask.test.ts src/database/models/__tests__/asyncTask.test.ts

@@ -5,8 +5,8 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 import { uuid } from '@/utils/uuid';
 
-import { chunks, embeddings, fileChunks, files, unstructuredChunks, users } from '../../../schemas';
-import { ChunkModel } from '../chunk';
+import { chunks, embeddings, fileChunks, files, unstructuredChunks, users } from '../../schemas';
+import { ChunkModel } from '../../server/models/chunk';
 import { getTestDB } from './_util';
 import { codeEmbedding, designThinkingQuery, designThinkingQuery2 } from './fixtures/embedding';
 

src/database/server/models/__tests__/chunk.test.ts src/database/models/__tests__/chunk.test.ts

@@ -5,8 +5,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { LobeChatDatabase } from '@/database/type';
 import { FilesTabs, SortType } from '@/types/files';
 
-import { files, globalFiles, knowledgeBaseFiles, knowledgeBases, users } from '../../../schemas';
-import { FileModel } from '../file';
+import { files, globalFiles, knowledgeBaseFiles, knowledgeBases, users } from '../../schemas';
+import { FileModel } from '../../server/models/file';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/file.test.ts src/database/models/__tests__/file.test.ts

@@ -11,8 +11,8 @@ import {
   knowledgeBaseFiles,
   knowledgeBases,
   users,
-} from '../../../schemas';
-import { KnowledgeBaseModel } from '../knowledgeBase';
+} from '../../schemas';
+import { KnowledgeBaseModel } from '../../server/models/knowledgeBase';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/fixtures/embedding.ts src/database/models/__tests__/fixtures/embedding.ts

@@ -2,6 +2,7 @@ import dayjs from 'dayjs';
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { getTestDB } from '@/database/models/__tests__/_util';
 import { LobeChatDatabase } from '@/database/type';
 import { MessageItem } from '@/types/message';
 import { uuid } from '@/utils/uuid';
@@ -21,9 +22,8 @@ import {
   sessions,
   topics,
   users,
-} from '../../../schemas';
-import { MessageModel } from '../message';
-import { getTestDB } from './_util';
+} from '../../schemas';
+import { MessageModel } from '../../server/models/message';
 import { codeEmbedding } from './fixtures/embedding';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/knowledgeBase.test.ts src/database/models/__tests__/knowledgeBase.test.ts

@@ -3,8 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';
 
-import { NewInstalledPlugin, userInstalledPlugins, users } from '../../../schemas';
-import { PluginModel } from '../plugin';
+import { NewInstalledPlugin, userInstalledPlugins, users } from '../../schemas';
+import { PluginModel } from '../../server/models/plugin';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/message.test.ts src/database/models/__tests__/message.test.ts

@@ -16,8 +16,8 @@ import {
   sessions,
   topics,
   users,
-} from '../../../schemas';
-import { SessionModel } from '../session';
+} from '../../schemas';
+import { SessionModel } from '../../server/models/session';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/plugin.test.ts src/database/models/__tests__/plugin.test.ts

@@ -4,8 +4,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';
 
-import { sessionGroups, users } from '../../../schemas';
-import { SessionGroupModel } from '../sessionGroup';
+import { sessionGroups, users } from '../../schemas';
+import { SessionGroupModel } from '../../server/models/sessionGroup';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/session.test.ts src/database/models/__tests__/session.test.ts

@@ -3,8 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';
 
-import { messages, sessions, topics, users } from '../../../schemas';
-import { CreateTopicParams, TopicModel } from '../topic';
+import { messages, sessions, topics, users } from '../../schemas';
+import { CreateTopicParams, TopicModel } from '../../server/models/topic';
 import { getTestDB } from './_util';
 
 const serverDB: LobeChatDatabase = await getTestDB();

src/database/server/models/__tests__/sessionGroup.test.ts src/database/models/__tests__/sessionGroup.test.ts

@@ -15,12 +15,11 @@ import {
   nextauthVerificationTokens,
   users,
 } from '@/database/schemas';
+import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 
-import { getTestDB } from './_util';
-
-const serverDB: LobeChatDatabase = await getTestDB();
+let serverDB = await getTestDBInstance();
 
 let nextAuthAdapter = LobeNextAuthDbAdapter(serverDB);
 

src/database/server/models/__tests__/topic.test.ts src/database/models/__tests__/topic.test.ts

@@ -4,16 +4,16 @@ import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';
+import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { LobeChatDatabase } from '@/database/type';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
 import { UserGuide, UserPreference } from '@/types/user';
 
 import { UserSettingsItem, userSettings, users } from '../../../schemas';
 import { SessionModel } from '../session';
 import { UserModel, UserNotFoundError } from '../user';
-import { getTestDB } from './_util';
 
-const serverDB: LobeChatDatabase = await getTestDB();
+let serverDB = await getTestDBInstance();
 
 const userId = 'user-db';
 const userEmail = '[email protected]';

src/database/server/models/__tests__/nextauth.test.ts

@@ -30,6 +30,7 @@ export default defineConfig({
       '**/node_modules/**',
       '**/dist/**',
       '**/build/**',
+      'src/database/server/**/**',
       'src/database/repositories/dataImporter/**/**',
     ],
     globals: true,