feat: remove BatchDelete interface and use BatchDeleteModel

gql/player.gql

@@ -81,3 +81,13 @@ mutation DeletePlayer {
     deletedCount
   }
 }
+
+mutation SwitchIsPubilc {
+  switchIsPubilc(
+    ids: ["60e5c5a2-f69f-41df-bc04-53f9c699e498", "00c602bd-e364-491d-abb1-45cf930ac443"]
+  ) {
+    n
+    ok
+    deletedCount
+  }
+}

schema.gql

@@ -16,6 +16,12 @@ type BatchDeleteModel {
   deletedCount: Float
 }
 
+type BatchUpdateModel {
+  ok: Float
+  n: Float
+  nModified: Float
+}
+
 type BestAlbumModel {
   _id: ID!
   title: String!
@@ -104,7 +110,7 @@ type Mutation {
   updatePlayerById(input: UpdatePlayerInput!): PlayerModel!
   deletePlayerById(id: ID!): PlayerModel!
   deletePlayer(ids: [ID!]!): BatchDeleteModel!
-  switchIsPubilc(ids: [ID!]!): PlayerModel!
+  switchIsPubilc(ids: [ID!]!): BatchUpdateModel!
 }
 
 type OpenSourceModel {

src/announcements/announcements.resolver.ts

@@ -6,7 +6,7 @@ import { AnnouncementsService } from './announcements.service'
 import { AnnouncementsModel } from './models/announcements.model'
 import { CreateAnnouncementInput } from './dtos/create-announcement.input'
 import { UpdateAnnouncementInput } from './dtos/update-announcement.input'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 // const pubSub = new PubSub();
 

src/best-albums/best-albums.resolver.ts

@@ -2,7 +2,7 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql'
 import { ID } from 'type-graphql'
 import { BestAlbumsService } from './best-albums.service'
 import { BestAlbumModel } from './models/best-albums.model'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 import { CreateBestAlbumInput } from './dtos/create-best-album.input'
 import { UpdateBestAlbumInput } from './dtos/update-best-album.input'
 

src/best-albums/best-albums.service.ts

@@ -5,7 +5,7 @@ import { CreateBestAlbumInput } from './dtos/create-best-album.input'
 import { UpdateBestAlbumInput } from './dtos/update-best-album.input'
 import { BestAlbumModel } from './models/best-albums.model'
 import { BestAlbum } from './interfaces/best-albums.interface'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 @Injectable()
 export class BestAlbumsService {

src/database/models/batch-update.model.ts

@@ -0,0 +1,13 @@
+import { Field, ObjectType } from 'type-graphql'
+
+@ObjectType()
+export class BatchUpdateModel {
+  @Field({ nullable: true })
+  public readonly ok?: number
+
+  @Field({ nullable: true })
+  public readonly n?: number
+
+  @Field({ nullable: true })
+  public readonly nModified?: number
+}

src/live-tours/live-tours.resolver.ts

@@ -2,7 +2,7 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql'
 import { ID } from 'type-graphql'
 import { LiveToursService } from './live-tours.service'
 import { LiveTourModel } from './models/live-tours.model'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 import { CreateLiveTourInput } from './dtos/create-live-tour.input'
 import { UpdateLiveTourInput } from './dtos/update-live-tour.input'
 

src/live-tours/live-tours.service.ts

@@ -5,7 +5,7 @@ import { CreateLiveTourInput } from './dtos/create-live-tour.input'
 import { UpdateLiveTourInput } from './dtos/update-live-tour.input'
 import { LiveTourModel } from './models/live-tours.model'
 import { LiveTour } from './interfaces/live-tours.interface'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 @Injectable()
 export class LiveToursService {

src/mottos/mottos.resolver.ts

@@ -13,7 +13,6 @@ import { AuthGuard } from '@nestjs/passport'
 import { MottosService } from './mottos.service'
 import { CreateMottoDto } from './dtos/createMotto.dto'
 import { Motto } from './interfaces/motto.interface'
-import { BatchDelete } from '../database/interfaces/batchDelete.interface'
 
 @Controller('mottos')
 export class MottosResolver {
@@ -54,7 +53,7 @@ export class MottosResolver {
 
   @UseGuards(AuthGuard())
   @Delete()
-  public deleteMottos(@Body('ids') ids: string[]): Promise<BatchDelete> {
+  public deleteMottos(@Body('ids') ids: string[]) {
     return this.mottosService.batchDelete(ids)
   }
 }

src/mottos/mottos.service.ts

@@ -3,7 +3,6 @@ import { InjectModel } from '@nestjs/mongoose'
 import { Injectable } from '@nestjs/common'
 import { Motto } from './interfaces/motto.interface'
 import { CreateMottoDto } from './dtos/createMotto.dto'
-import { BatchDelete } from '../database/interfaces/batchDelete.interface'
 
 @Injectable()
 export class MottosService {
@@ -39,7 +38,7 @@ export class MottosService {
     return res
   }
 
-  public async batchDelete(ids: string[]): Promise<BatchDelete> {
+  public async batchDelete(ids: string[]) {
     const res = await this.MottoModel.deleteMany({
       _id: { $in: ids },
     })

src/open-sources/open-sources.resolver.ts

@@ -2,7 +2,7 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql'
 import { ID } from 'type-graphql'
 import { OpenSourcesService } from './open-sources.service'
 import { OpenSourceModel } from './models/open-sources.model'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 import { CreateOpenSourceInput } from './dtos/create-open-source.input'
 import { UpdateOpenSourceInput } from './dtos/update-open-source.input'
 

src/open-sources/open-sources.service.ts

@@ -5,7 +5,7 @@ import { CreateOpenSourceInput } from './dtos/create-open-source.input'
 import { UpdateOpenSourceInput } from './dtos/update-open-source.input'
 import { OpenSourceModel } from './models/open-sources.model'
 import { OpenSource } from './interfaces/open-sources.interface'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 @Injectable()
 export class OpenSourcesService {

src/player/player.resolver.ts

@@ -2,7 +2,8 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql'
 import { ID } from 'type-graphql'
 import { PlayerService } from './player.service'
 import { PlayerModel } from './models/player.model'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
+import { BatchUpdateModel } from '../database/models/batch-update.model'
 import { CreatePlayerInput } from './dtos/create-player.input'
 import { UpdatePlayerInput } from './dtos/update-player.input'
 
@@ -42,7 +43,7 @@ export class PlayerResolver {
     return this.playerService.batchDelete(ids)
   }
 
-  @Mutation(() => null)
+  @Mutation(() => BatchUpdateModel)
   public async switchIsPubilc(@Args({ name: 'ids', type: () => [ID] }) ids: string[]) {
     return this.playerService.switchIsPubilc(ids)
   }

src/player/player.service.ts

@@ -5,7 +5,7 @@ import { CreatePlayerInput } from './dtos/create-player.input'
 import { UpdatePlayerInput } from './dtos/update-player.input'
 import { PlayerModel } from './models/player.model'
 import { Player } from './interfaces/player.interface'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 @Injectable()
 export class PlayerService {

src/yancey-music/yancey-music.resolver.ts

@@ -2,7 +2,7 @@ import { Args, Query, Resolver, Mutation } from '@nestjs/graphql'
 import { ID } from 'type-graphql'
 import { YanceyMusicService } from './yancey-music.service'
 import { YanceyMusicModel } from './models/yancey-music.model'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 import { CreateYanceyMusicInput } from './dtos/create-yancey-music.input'
 import { UpdateYanceyMusicInput } from './dtos/update-yancey-music.input'
 

src/yancey-music/yancey-music.service.ts

@@ -5,7 +5,7 @@ import { CreateYanceyMusicInput } from './dtos/create-yancey-music.input'
 import { UpdateYanceyMusicInput } from './dtos/update-yancey-music.input'
 import { YanceyMusicModel } from './models/yancey-music.model'
 import { YanceyMusic } from './interfaces/yancey-music.interface'
-import { BatchDeleteModel } from '../database/models/database.model'
+import { BatchDeleteModel } from '../database/models/batch-delete.model'
 
 @Injectable()
 export class YanceyMusicService {

test/announcements.e2e-spec.ts

@@ -10,7 +10,7 @@ import { AnnouncementsModule } from '../src/announcements/announcements.module'
 import { AnnouncementsModel } from '../src/announcements/models/announcements.model'
 import { CreateAnnouncementInput } from '../src/announcements/dtos/create-announcement.input'
 import { UpdateAnnouncementInput } from '../src/announcements/dtos/update-announcement.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('AnnouncementsController (e2e)', () => {
   let app: NestApplication
@@ -199,7 +199,7 @@ describe('AnnouncementsController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deleteAnnouncements
+        const testData: BatchDeleteModel = body.data.deleteAnnouncements
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)

test/best-albums.e2e-spec.ts

@@ -10,7 +10,7 @@ import { BestAlbumsModule } from '../src/best-albums/best-albums.module'
 import { BestAlbumModel } from '../src/best-albums/models/best-albums.model'
 import { CreateBestAlbumInput } from '../src/best-albums/dtos/create-best-album.input'
 import { UpdateBestAlbumInput } from '../src/best-albums/dtos/update-best-album.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('BestAlbumsController (e2e)', () => {
   let app: NestApplication
@@ -255,7 +255,7 @@ describe('BestAlbumsController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deleteBestAlbums
+        const testData: BatchDeleteModel = body.data.deleteBestAlbums
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)

test/live-tours.e2e-spec.ts

@@ -10,7 +10,7 @@ import { LiveToursModule } from '../src/live-tours/live-tours.module'
 import { LiveTourModel } from '../src/live-tours/models/live-tours.model'
 import { CreateLiveTourInput } from '../src/live-tours/dtos/create-live-tour.input'
 import { UpdateLiveTourInput } from '../src/live-tours/dtos/update-live-tour.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('LiveToursController (e2e)', () => {
   let app: NestApplication
@@ -230,7 +230,7 @@ describe('LiveToursController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deleteLiveTours
+        const testData: BatchDeleteModel = body.data.deleteLiveTours
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)

test/open-sources.e2e-spec.ts

@@ -10,7 +10,7 @@ import { OpenSourcesModule } from '../src/open-sources/open-sources.module'
 import { OpenSourceModel } from '../src/open-sources/models/open-sources.model'
 import { CreateOpenSourceInput } from '../src/open-sources/dtos/create-open-source.input'
 import { UpdateOpenSourceInput } from '../src/open-sources/dtos/update-open-source.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('OpenSourcesController (e2e)', () => {
   let app: NestApplication
@@ -247,7 +247,7 @@ describe('OpenSourcesController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deleteOpenSources
+        const testData: BatchDeleteModel = body.data.deleteOpenSources
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)

test/player.e2e-spec.ts

@@ -10,7 +10,7 @@ import { PlayerModule } from '../src/player/player.module'
 import { PlayerModel } from '../src/player/models/player.model'
 import { CreatePlayerInput } from '../src/player/dtos/create-player.input'
 import { UpdatePlayerInput } from '../src/player/dtos/update-player.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('PlayerController (e2e)', () => {
   let app: NestApplication
@@ -262,7 +262,7 @@ describe('PlayerController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deletePlayer
+        const testData: BatchDeleteModel = body.data.deletePlayer
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)

test/yancey-music.e2e-spec.ts

@@ -10,7 +10,7 @@ import { YanceyMusicModule } from '../src/yancey-music/yancey-music.module'
 import { YanceyMusicModel } from '../src/yancey-music/models/yancey-music.model'
 import { CreateYanceyMusicInput } from '../src/yancey-music/dtos/create-yancey-music.input'
 import { UpdateYanceyMusicInput } from '../src/yancey-music/dtos/update-yancey-music.input'
-import { BatchDelete } from '../src/database/interfaces/batchDelete.interface'
+import { BatchDeleteModel } from '../src/database/models/batch-delete.model'
 
 describe('YanceyMusicController (e2e)', () => {
   let app: NestApplication
@@ -242,7 +242,7 @@ describe('YanceyMusicController (e2e)', () => {
         query: batchDeleteTypeDefs,
       })
       .expect(({ body }) => {
-        const testData: BatchDelete = body.data.deleteYanceyMusic
+        const testData: BatchDeleteModel = body.data.deleteYanceyMusic
         expect(testData.ok).toBe(1)
         expect(testData.n).toBe(0)
         expect(testData.deletedCount).toBe(0)