Skip to content

Commit 64c1107

Browse files
Get rid of operations
1 parent 14397a5 commit 64c1107

40 files changed

+91
-552
lines changed

packages/apollo-collaboration-server/src/app.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { FilesModule } from './files/files.module.js'
2121
import { HealthModule } from './health/health.module.js'
2222
import { JBrowseModule } from './jbrowse/jbrowse.module.js'
2323
import { MessagesModule } from './messages/messages.module.js'
24-
import { OperationsModule } from './operations/operations.module.js'
2524
import { PluginsModule } from './plugins/plugins.module.js'
2625
import { RefSeqChunksModule } from './refSeqChunks/refSeqChunks.module.js'
2726
import { RefSeqsModule } from './refSeqs/refSeqs.module.js'
@@ -165,7 +164,6 @@ async function mongoDBURIFactory(
165164
useFactory: mongoDBURIFactory,
166165
inject: [ConfigService],
167166
}),
168-
OperationsModule,
169167
PluginsModule.registerAsync(),
170168
RefSeqChunksModule,
171169
RefSeqsModule,

packages/apollo-collaboration-server/src/assemblies/assemblies.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { MongooseModule } from '@nestjs/mongoose'
44

55
import { ChecksModule } from '../checks/checks.module.js'
66
import { FeaturesModule } from '../features/features.module.js'
7-
import { OperationsModule } from '../operations/operations.module.js'
87
import { RefSeqsModule } from '../refSeqs/refSeqs.module.js'
98

109
import { AssembliesController } from './assemblies.controller.js'
@@ -19,7 +18,6 @@ import { AssembliesService } from './assemblies.service.js'
1918
]),
2019
ChecksModule,
2120
FeaturesModule,
22-
OperationsModule,
2321
RefSeqsModule,
2422
],
2523
exports: [MongooseModule, AssembliesService],

packages/apollo-collaboration-server/src/assemblies/assemblies.service.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import {
22
Assembly,
33
type AssemblyDocument,
44
Check,
5-
type CheckDocument,
65
} from '@apollo-annotation/schemas'
7-
import { GetAssembliesOperation } from '@apollo-annotation/shared'
86
import {
97
Injectable,
108
Logger,
@@ -16,7 +14,6 @@ import { Model } from 'mongoose'
1614

1715
import { ChecksService } from '../checks/checks.service.js'
1816
import { FeaturesService } from '../features/features.service.js'
19-
import { OperationsService } from '../operations/operations.service.js'
2017
import { RefSeqsService } from '../refSeqs/refSeqs.service.js'
2118

2219
import { CreateAssemblyDto } from './dto/create-assembly.dto.js'
@@ -28,8 +25,6 @@ export class AssembliesService {
2825
@InjectModel(Assembly.name)
2926
private readonly assemblyModel: Model<AssemblyDocument>,
3027
@InjectModel(Check.name)
31-
private readonly checkModel: Model<CheckDocument>,
32-
private readonly operationsService: OperationsService,
3328
private readonly checksService: ChecksService,
3429
private readonly featuresService: FeaturesService,
3530
private readonly refSeqsService: RefSeqsService,
@@ -78,9 +73,7 @@ export class AssembliesService {
7873
}
7974

8075
findAll() {
81-
return this.operationsService.executeOperation<GetAssembliesOperation>({
82-
typeName: 'GetAssembliesOperation',
83-
})
76+
return this.assemblyModel.find({ status: 0 }).exec()
8477
}
8578

8679
async findOne(id: string) {

packages/apollo-collaboration-server/src/features/features.module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import {
33
type FeatureDocument,
44
FeatureSchema,
55
} from '@apollo-annotation/schemas'
6-
import { Module, forwardRef } from '@nestjs/common'
6+
import { Module } from '@nestjs/common'
77
import { MongooseModule, getConnectionToken } from '@nestjs/mongoose'
88
import type { Connection } from 'mongoose'
99
import idValidator from 'mongoose-id-validator'
1010

1111
import { ChecksModule } from '../checks/checks.module.js'
1212
import { ChecksService } from '../checks/checks.service.js'
13-
import { OperationsModule } from '../operations/operations.module.js'
1413
import { RefSeqsModule } from '../refSeqs/refSeqs.module.js'
1514
import { SequenceModule } from '../sequence/sequence.module.js'
1615

@@ -22,7 +21,6 @@ import { FeaturesService } from './features.service.js'
2221
providers: [FeaturesService],
2322
imports: [
2423
ChecksModule,
25-
forwardRef(() => OperationsModule),
2624
RefSeqsModule,
2725
SequenceModule,
2826
MongooseModule.forFeatureAsync([

packages/apollo-collaboration-server/src/features/features.service.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import {
66
RefSeq,
77
type RefSeqDocument,
88
} from '@apollo-annotation/schemas'
9-
import { GetFeaturesOperation } from '@apollo-annotation/shared'
109
import { Injectable, Logger, NotFoundException } from '@nestjs/common'
1110
import { InjectModel } from '@nestjs/mongoose'
1211
import { Model } from 'mongoose'
1312

1413
import { ChecksService } from '../checks/checks.service.js'
1514
import type { FeatureRangeSearchDto } from '../entity/gff3Object.dto.js'
16-
import { OperationsService } from '../operations/operations.service.js'
1715

1816
import type {
1917
FeatureCountRequest,
@@ -23,7 +21,6 @@ import type {
2321
@Injectable()
2422
export class FeaturesService {
2523
constructor(
26-
private readonly operationsService: OperationsService,
2724
private readonly checksService: ChecksService,
2825
@InjectModel(Feature.name)
2926
private readonly featureModel: Model<FeatureDocument>,
@@ -226,13 +223,14 @@ export class FeaturesService {
226223
}
227224

228225
async findByRange(searchDto: FeatureRangeSearchDto) {
229-
const featureDocs =
230-
await this.operationsService.executeOperation<GetFeaturesOperation>({
231-
typeName: 'GetFeaturesOperation',
226+
const featureDocs = await this.featureModel
227+
.find({
232228
refSeq: searchDto.refSeq,
233-
start: searchDto.start,
234-
end: searchDto.end,
229+
min: { $lte: searchDto.end },
230+
max: { $gte: searchDto.start },
231+
status: 0,
235232
})
233+
.exec()
236234
for (const featureDoc of featureDocs) {
237235
await this.checksService.checkFeature(featureDoc)
238236
}

packages/apollo-collaboration-server/src/main.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
type Check,
88
changeRegistry,
99
checkRegistry,
10-
operationRegistry,
1110
} from '@apollo-annotation/common'
1211
import { CheckSchema } from '@apollo-annotation/schemas'
1312
import {
@@ -16,7 +15,6 @@ import {
1615
ParentChildValidation,
1716
TranscriptCheck,
1817
changes,
19-
operations,
2018
validationRegistry,
2119
} from '@apollo-annotation/shared'
2220
import type { LogLevel } from '@nestjs/common'
@@ -75,10 +73,6 @@ async function bootstrap() {
7573
changeRegistry.registerChange(changeName, change)
7674
}
7775

78-
for (const [operationName, operation] of Object.entries(operations)) {
79-
operationRegistry.registerOperation(operationName, operation)
80-
}
81-
8276
const cdsCheck = new CDSCheck()
8377
checkRegistry.registerCheck(cdsCheck.name, cdsCheck)
8478

packages/apollo-collaboration-server/src/operations/operations.module.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

packages/apollo-collaboration-server/src/operations/operations.service.spec.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/apollo-collaboration-server/src/operations/operations.service.ts

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)