refactor(query-mongoose): Update type definitions and test cases for …

…string ID compatibility
souagrosolucoes · Aug 21, 2024 · 5fc1238 · 5fc1238
1 parent 43e5891
commit 5fc1238
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/packages/query-mongoose/__tests__/__fixtures__/seeds.ts b/packages/query-mongoose/__tests__/__fixtures__/seeds.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-underscore-dangle,@typescript-eslint/no-unsafe-return */
-import { Connection } from 'mongoose'
+import { Connection, Types } from 'mongoose'
 
 import { TestEntity } from './test.entity'
 import { TestReference } from './test-reference.entity'

diff --git a/packages/query-mongoose/__tests__/__fixtures__/test-reference.entity.ts b/packages/query-mongoose/__tests__/__fixtures__/test-reference.entity.ts
@@ -2,12 +2,12 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { Document, SchemaTypes, Types } from 'mongoose'
 
 @Schema()
-export class TestReference extends Document {
+export class TestReference extends Document<string> {
   @Prop({ required: true })
   referenceName!: string
 
   @Prop({ type: SchemaTypes.ObjectId, ref: 'TestEntity' })
-  testEntity?: Types.ObjectId
+  testEntity?: Types.ObjectId | string
 }
 
 export const TestReferenceSchema = SchemaFactory.createForClass(TestReference)

diff --git a/packages/query-mongoose/__tests__/__fixtures__/test.entity.ts b/packages/query-mongoose/__tests__/__fixtures__/test.entity.ts
@@ -2,7 +2,7 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { Document, SchemaTypes, Types } from 'mongoose'
 
 @Schema()
-export class TestEntity extends Document {
+export class TestEntity extends Document<string> {
   @Prop({ required: true })
   stringType!: string
 
@@ -19,7 +19,7 @@ export class TestEntity extends Document {
   testReference?: Types.ObjectId | string
 
   @Prop([{ type: SchemaTypes.ObjectId, ref: 'TestReference' }])
-  testReferences?: Types.ObjectId[]
+  testReferences?: Types.ObjectId[] | string[]
 }
 
 export const TestEntitySchema = SchemaFactory.createForClass(TestEntity)

diff --git a/packages/query-mongoose/__tests__/services/mongoose-query.service.spec.ts b/packages/query-mongoose/__tests__/services/mongoose-query.service.spec.ts
@@ -751,7 +751,7 @@ describe('MongooseQueryService', () => {
       })
 
       it('should return undefined select if no results are found.', async () => {
-        const entities: TestEntity[] = [TEST_ENTITIES[0], { _id: new Types.ObjectId() } as TestEntity]
+        const entities: TestEntity[] = [TEST_ENTITIES[0], { _id: new Types.ObjectId() as never as string } as TestEntity]
         const queryService = moduleRef.get(TestEntityService)
         const queryResult = await queryService.findRelation(TestReference, 'testReference', entities)
 
@@ -1139,7 +1139,7 @@ describe('MongooseQueryService', () => {
       })
 
       it('should return an empty array if no results are found.', async () => {
-        const entities: TestEntity[] = [TEST_ENTITIES[0], { _id: new Types.ObjectId() } as TestEntity]
+        const entities: TestEntity[] = [TEST_ENTITIES[0], { _id: new Types.ObjectId() as never as string } as TestEntity]
         const queryService = moduleRef.get(TestEntityService)
         const queryResult = await queryService.aggregateRelations(
           TestReference,

diff --git a/packages/query-mongoose/src/services/reference-query.service.ts b/packages/query-mongoose/src/services/reference-query.service.ts
@@ -17,8 +17,7 @@ import {
   isEmbeddedSchemaTypeOptions,
   isSchemaTypeWithReferenceOptions,
   isVirtualTypeWithReferenceOptions,
-  VirtualReferenceOptions,
-  VirtualTypeWithOptions
+  VirtualReferenceOptions
 } from '../mongoose-types.helper'
 import { AggregateBuilder, FilterQueryBuilder } from '../query'