fix: dataSourcePriority missing default value (#4061)

midwayjs · Sep 21, 2024 · 70c569f · 70c569f
1 parent 8d4182e
commit 70c569f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/packages/core/src/common/dataSourceManager.ts b/packages/core/src/common/dataSourceManager.ts
@@ -24,7 +24,7 @@ export abstract class DataSourceManager<
  protected options: DataSourceManagerConfigOption<ConnectionOpts> = {};
  protected modelMapping = new WeakMap();
  private innerDefaultDataSourceName: string;
- protected dataSourcePriority: Record<string, string>;
+ protected dataSourcePriority: Record<string, string> = {};
 
  @Inject()
  protected appDir: string;

diff --git a/packages/mongoose/src/configuration.ts b/packages/mongoose/src/configuration.ts
@@ -51,7 +51,7 @@ export class MongooseConfiguration implements ILifeCycle {
  let clientName: any;
  for (const name of clientNames) {
  if (
- (await this.mongooseDataSourceManager.isConnected(name)) &&
+ !(await this.mongooseDataSourceManager.isConnected(name)) &&
  !this.mongooseDataSourceManager.isLowPriority(name)
  ) {
  clientName = name;

diff --git a/packages/mongoose/test/index.test.ts b/packages/mongoose/test/index.test.ts
@@ -1,7 +1,9 @@
 import { close, createLightApp } from '@midwayjs/mock';
 import { join } from 'path';
 import { Schema } from 'mongoose';
-import { MongooseConnectionServiceFactory, MongooseConnectionService } from '../src';
+import { MongooseConnectionServiceFactory, MongooseConnectionService } from "../src";
+import * as mongoose from '../src';
+import { MidwayHealthService } from '@midwayjs/core';
 
 interface User {
  name: string;
@@ -59,4 +61,30 @@ describe('/test/index.test.ts', () => {
  await service.init();
  }).rejects.toThrowError(/instance not found/);
  });
+
+ it("should test health check", async () => {
+ const app = await createLightApp({
+ imports: [
+ mongoose
+ ],
+ globalConfig: {
+ mongoose: {
+ dataSource: {
+ default: {
+ uri: 'mongodb://a.b.c:27017/test',
+ options: {
+ serverSelectionTimeoutMS: 100,
+ },
+ }
+ }
+ }
+ },
+ });
+
+ const healthService = await app.getApplicationContext().getAsync(MidwayHealthService);
+ const re = await healthService.getStatus();
+ expect(re.status).toBe(false);
+ expect(re.reason).toMatch("is not ready");
+ await close(app);
+ });
 });