Skip to content
This repository has been archived by the owner on Mar 14, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into notification-endpoints
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/app.module.ts
#	src/couchdb/dtos.ts
#	src/domain/report-data-change-event.ts
#	src/domain/report.ts
#	src/notification/core/notification.service.ts
#	src/notification/notification.module.ts
#	src/report-changes/core/report-change-detector.spec.ts
#	src/report-changes/core/report-changes.service.ts
#	src/report-changes/report-changes.module.ts
#	src/report/report.module.ts
#	src/report/storage/report-storage.service.ts
  • Loading branch information
sleidig committed Feb 16, 2024
2 parents 287f15b + a07b3e3 commit ded8c3e
Show file tree
Hide file tree
Showing 40 changed files with 976 additions and 576 deletions.
6 changes: 5 additions & 1 deletion nest-cli.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"collection": "@nestjs/schematics",
"sourceRoot": "src",
"compilerOptions": {}
"compilerOptions": {
"assets": [
{ "include": "./config/*.yaml", "outDir": "./dist", "watchAssets": true }
]
}
}
24 changes: 21 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@nestjs/schedule": "4.0.0",
"@ntegral/nestjs-sentry": "^4.0.0",
"@sentry/node": "^7.38.0",
"js-yaml": "4.1.0",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.8.0",
Expand All @@ -40,6 +41,7 @@
"@nestjs/testing": "^9.3.9",
"@types/express": "^4.17.17",
"@types/jest": "^29.4.0",
"@types/js-yaml": "4.0.9",
"@types/node": "^18.13.0",
"@types/supertest": "^2.0.12",
"@types/uuid": "9.0.8",
Expand Down
184 changes: 0 additions & 184 deletions src/app.controller.spec.ts

This file was deleted.

94 changes: 0 additions & 94 deletions src/app.controller.ts

This file was deleted.

7 changes: 6 additions & 1 deletion src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
import { HttpModule } from '@nestjs/axios';
import { ReportModule } from './report/report.module';
import { ScheduleModule } from '@nestjs/schedule';
import { AppConfiguration } from './config/configuration';
import { ReportChangesModule } from './report-changes/report-changes.module';
import { NotificationModule } from './notification/notification.module';

Expand All @@ -29,7 +30,11 @@ const lowSeverityLevels: SeverityLevel[] = ['log', 'info'];
imports: [
HttpModule,
ScheduleModule.forRoot(),
ConfigModule.forRoot({ isGlobal: true }),
ConfigModule.forRoot({
isGlobal: true,
ignoreEnvFile: false,
load: [AppConfiguration],
}),
SentryModule.forRootAsync({
imports: [ConfigModule],
inject: [ConfigService],
Expand Down
2 changes: 2 additions & 0 deletions src/config/app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
COUCH_SQS_CLIENT_CONFIG:
BASE_URL: http://localhost:4984
Loading

0 comments on commit ded8c3e

Please sign in to comment.