Skip to content

Commit

Permalink
chore: upgrade nest 8 + typerom 0.3 AB#23109
Browse files Browse the repository at this point in the history
  • Loading branch information
jannisvisser committed Aug 14, 2023
1 parent a8502e9 commit 2807f3b
Show file tree
Hide file tree
Showing 84 changed files with 12,881 additions and 16,425 deletions.
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ services:
- NODE_ENV=${NODE_ENV}
environment:
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
- DB_TYPE=${DB_TYPE}
- DB_HOST=${DB_HOST}
- DB_PORT=${DB_PORT}
- DB_DATABASE=${DB_DATABASE}
Expand Down
1 change: 0 additions & 1 deletion example.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ CERTBOT_EMAIL=
FQDN=

# services/API-service
DB_TYPE=
DB_HOST=
DB_PORT=
DB_DATABASE=
Expand Down
1 change: 0 additions & 1 deletion handover.example.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ COUNTRIES=
DISASTER_TYPES=

# Fill in Database credentials
DB_TYPE=postgres
DB_HOST=
DB_PORT=
DB_DATABASE=
Expand Down
9 changes: 8 additions & 1 deletion services/API-service/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
},
extends: [
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
// 'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
'plugin:jest/recommended',
],
Expand All @@ -16,5 +16,12 @@ module.exports = {
rules: {
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-unused-vars': [
'error',
{
varsIgnorePattern: '^_',
argsIgnorePattern: '^_',
},
],
},
};
3 changes: 3 additions & 0 deletions services/API-service/appdatasource.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { DataSource, DataSourceOptions } from 'typeorm';
import { ORMConfig } from './ormconfig';
export const AppDataSource = new DataSource(ORMConfig as DataSourceOptions);
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class DisasterTypeOnLayersIndicators1626091362882
implements MigrationInterface {
implements MigrationInterface
{
name = 'DisasterTypeOnLayersIndicators1626091362882';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RedCrossBranchesNumberOfVolunteersIsNumber1627399465768
implements MigrationInterface {
implements MigrationInterface
{
public name = 'RedCrossBranchesNumberOfVolunteersIsNumber1627399465768';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class VideoPdfLinksInNotificationInfo1630062419118
implements MigrationInterface {
implements MigrationInterface
{
name = 'VideoPdfLinksInNotificationInfo1630062419118';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class EapLinksDisasterSpecific1630664466068
implements MigrationInterface {
implements MigrationInterface
{
name = 'EapLinksDisasterSpecific1630664466068';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class DecoupleGlofasTriggerLevels1633686048253
implements MigrationInterface {
implements MigrationInterface
{
name = 'DecoupleGlofasTriggerLevels1633686048253';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddTimestampToTriggerPerLeadTime1635158992445
implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTimestampToTriggerPerLeadTime1635158992445';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RefactorCountryDisasterSettings1635760822211
implements MigrationInterface {
implements MigrationInterface
{
name = 'RefactorCountryDisasterSettings1635760822211';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddTimestampToDynamicData1636716079474
implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTimestampToDynamicData1636716079474';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddDroughtAreasToCountryDisasterSettings1653892419259
implements MigrationInterface {
implements MigrationInterface
{
name = 'AddDroughtAreasToCountryDisasterSettings1653892419259';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddTriggeredBooleanToEvent1654249478272
implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTriggeredBooleanToEvent1654249478272';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class TriggerStatementByDisasterType1658827145833
implements MigrationInterface {
implements MigrationInterface
{
name = 'TriggerStatementByDisasterType1658827145833';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class RenameDroughtForecastMonths1658835952815
implements MigrationInterface {
implements MigrationInterface
{
name = 'RenameDroughtForecastMonths1658835952815';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class MoreTrackpointAttributes1665129567138
implements MigrationInterface {
implements MigrationInterface
{
name = 'MoreTrackpointAttributes1665129567138';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ShowOnlyTriggeredAreasBoolean1678110416255
implements MigrationInterface {
implements MigrationInterface
{
name = 'ShowOnlyTriggeredAreasBoolean1678110416255';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class CountryLogosPerDisaster1680767945603
implements MigrationInterface {
implements MigrationInterface
{
name = 'CountryLogosPerDisaster1680767945603';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class NotificationInfoLogosPerDisaster1680769494201
implements MigrationInterface {
implements MigrationInterface
{
name = 'NotificationInfoLogosPerDisaster1680769494201';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class PointDataExposureStatus1680878390942
implements MigrationInterface {
implements MigrationInterface
{
name = 'PointDataExposureStatus1680878390942';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AssetViewsJoinByTimestamp1688740150607
implements MigrationInterface {
implements MigrationInterface
{
name = 'AssetViewsJoinByTimestamp1688740150607';

public async up(queryRunner: QueryRunner): Promise<void> {
Expand Down
27 changes: 0 additions & 27 deletions services/API-service/ormconfig.js

This file was deleted.

25 changes: 25 additions & 0 deletions services/API-service/ormconfig.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import * as fs from 'fs';
import { DataSourceOptions } from 'typeorm';

export const ORMConfig: DataSourceOptions = {
type: 'postgres',
host: process.env.DB_HOST,
port: Number(process.env.DB_PORT),
username: process.env.DB_USERNAME,
password: process.env.DB_PASSWORD,
database: process.env.DB_DATABASE,
schema: 'IBF-app',
entities: ['src/**/**.entity.ts'],
dropSchema: false,
synchronize: false,
logging: ['error'],
logger: 'advanced-console',
maxQueryExecutionTime: 1000,
migrations: ['migration/*.ts'],
// ssl:
// process.env.NODE_ENV === 'development'
// ? null
// : {
// ca: fs.readFileSync('cert/DigiCertGlobalRootCA.crt.pem').toString(),
// },
};
Loading

0 comments on commit 2807f3b

Please sign in to comment.