Merge pull request #133 from Archie-Finance/patch/swagger

Patch/swagger
FurlanLuka · Oct 11, 2022 · 2b5a660 · 2b5a660
2 parents f4e51dc + 48dcb61
commit 2b5a660
Show file tree

Hide file tree

Showing 77 changed files with 1,063 additions and 1,130 deletions.
diff --git a/apps/credit-api/project.json b/apps/credit-api/project.json
@@ -34,13 +34,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build credit-api && node dist/apps/credit-api/main build-swagger"
+        "command": "npm run build credit-api && RUN_MIGRATIONS=false node dist/apps/credit-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build credit-api && node dist/apps/credit-api/main generate-migration"
       }

diff --git a/apps/credit-api/src/app.module.ts b/apps/credit-api/src/app.module.ts
@@ -49,7 +49,8 @@ import { RedisModule } from '@archie-microservices/api/utils/redis';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/apps/credit-line-api/integration/credit_line.spec.ts b/apps/credit-line-api/integration/credit_line.spec.ts
@@ -98,7 +98,7 @@ describe('Credit line creation tests', () => {
       const response = await request(app.getHttpServer())
         .post('/v2/credit_lines')
         .set('Authorization', `Bearer ${accessToken}`)
-        .expect(400);
+        .expect(409);
 
       expect(response.body.message).toStrictEqual('CREDIT_LINE_ALREADY_EXISTS');
     });

diff --git a/apps/credit-line-api/project.json b/apps/credit-line-api/project.json
@@ -56,13 +56,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build credit-line-api && node dist/apps/credit-line-api/main build-swagger"
+        "command": "npm run build credit-line-api && RUN_MIGRATIONS=false node dist/apps/credit-line-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build credit-line-api && node dist/apps/credit-line-api/main generate-migration"
       }

diff --git a/apps/credit-line-api/src/app.module.ts b/apps/credit-line-api/src/app.module.ts
@@ -43,7 +43,8 @@ import { AuthModule } from '@archie/api/utils/auth0';
         keepConnectionAlive: true,
         autoLoadEntities: true,
         migrations: migrations,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
       }),
       inject: [ConfigService],
     }),

diff --git a/apps/fireblocks-api/project.json b/apps/fireblocks-api/project.json
@@ -46,13 +46,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build fireblocks-api && node dist/apps/fireblocks-api/main build-swagger"
+        "command": "npm run build fireblocks-api && RUN_MIGRATIONS=false node dist/apps/fireblocks-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build fireblocks-api && node dist/apps/fireblocks-api/main generate-migration"
       }

diff --git a/apps/fireblocks-api/src/app.module.ts b/apps/fireblocks-api/src/app.module.ts
@@ -51,7 +51,8 @@ import { AuthModule } from '@archie/api/utils/auth0';
         keepConnectionAlive: true,
         autoLoadEntities: true,
         migrations: migrations,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
       }),
       inject: [ConfigService],
     }),

diff --git a/apps/ledger-api/project.json b/apps/ledger-api/project.json
@@ -15,9 +15,7 @@
         "assets": [
           "apps/ledger-api/src/assets"
         ],
-        "tsPlugins": [
-          "@nestjs/swagger/plugin"
-        ]
+        "tsPlugins": ["@nestjs/swagger/plugin"]
       },
       "configurations": {
         "production": {
@@ -56,13 +54,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build ledger-api && node dist/apps/ledger-api/main build-swagger"
+        "command": "npm run build ledger-api && RUN_MIGRATIONS=false node dist/apps/ledger-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build ledger-api && node dist/apps/ledger-api/main generate-migration"
       }

diff --git a/apps/ledger-api/src/app.module.ts b/apps/ledger-api/src/app.module.ts
@@ -51,7 +51,8 @@ import { SERVICE_NAME } from '@archie/api/credit-api/constants';
         keepConnectionAlive: true,
         autoLoadEntities: true,
         migrations: migrations,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
       }),
       inject: [ConfigService],
     }),

diff --git a/apps/ltv-api/project.json b/apps/ltv-api/project.json
@@ -51,13 +51,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build ltv-api && node dist/apps/ltv-api/main build-swagger"
+        "command": "npm run build ltv-api && RUN_MIGRATIONS=false node dist/apps/ltv-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build ltv-api && node dist/apps/ltv-api/main generate-migration"
       }

diff --git a/apps/ltv-api/src/app.module.ts b/apps/ltv-api/src/app.module.ts
@@ -32,7 +32,8 @@ import { RedisModule } from '@archie-microservices/api/utils/redis';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/apps/mail-api/project.json b/apps/mail-api/project.json
@@ -51,13 +51,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build mail-api && node dist/apps/mail-api/main build-swagger"
+        "command": "npm run build mail-api && RUN_MIGRATIONS=false node dist/apps/mail-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build mail-api && node dist/apps/mail-api/main generate-migration"
       }

diff --git a/apps/onboarding-api/project.json b/apps/onboarding-api/project.json
@@ -34,13 +34,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build onboarding-api && node dist/apps/onboarding-api/main build-swagger"
+        "command": "npm run build onboarding-api && RUN_MIGRATIONS=false node dist/apps/onboarding-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build onboarding-api && node dist/apps/onboarding-api/main generate-migration"
       }

diff --git a/apps/onboarding-api/src/app.module.ts b/apps/onboarding-api/src/app.module.ts
@@ -38,7 +38,8 @@ import { QueueModule } from '@archie/api/utils/queue';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/apps/paypal-api/project.json b/apps/paypal-api/project.json
@@ -51,13 +51,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build paypal-api && node dist/apps/paypal-api/main build-swagger"
+        "command": "npm run build paypal-api && RUN_MIGRATIONS=false node dist/apps/paypal-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build paypal-api && node dist/apps/paypal-api/main generate-migration"
       }

diff --git a/apps/paypal-api/src/app.module.ts b/apps/paypal-api/src/app.module.ts
@@ -7,7 +7,7 @@ import {
 } from '@archie/api/paypal-api/constants';
 import { QueueModule } from '@archie/api/utils/queue';
 import { HealthModule } from '@archie/api/utils/health';
-import { PaypalModule } from '@archie/api/paypal-api/paypal'
+import { PaypalModule } from '@archie/api/paypal-api/paypal';
 import { migrations } from './migrations';
 import { AuthModule } from '@archie/api/utils/auth0';
 
@@ -23,7 +23,7 @@ import { AuthModule } from '@archie/api/utils/auth0';
         ConfigVariables.PAYPAL_CLIENT_ID,
         ConfigVariables.PAYPAL_CLIENT_SECRET,
         ConfigVariables.PAYPAL_API_URL,
-        ConfigVariables.PAYPAL_RETURN_URL
+        ConfigVariables.PAYPAL_RETURN_URL,
       ],
     }),
     TypeOrmModule.forRootAsync({
@@ -38,9 +38,10 @@ import { AuthModule } from '@archie/api/utils/auth0';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
-        migrations: migrations
+        migrations: migrations,
       }),
       inject: [ConfigService],
     }),

diff --git a/apps/peach-api/project.json b/apps/peach-api/project.json
@@ -51,13 +51,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build peach-api && node dist/apps/peach-api/main build-swagger"
+        "command": "npm run build peach-api && RUN_MIGRATIONS=false node dist/apps/peach-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build peach-api && node dist/apps/peach-api/main generate-migration"
       }

diff --git a/apps/peach-api/src/app.module.ts b/apps/peach-api/src/app.module.ts
@@ -45,7 +45,8 @@ import { seeds } from './seeds';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: [...migrations, ...seeds],
       }),

diff --git a/apps/referral-system-api/project.json b/apps/referral-system-api/project.json
@@ -34,13 +34,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build referral-system-api && node dist/apps/referral-system-api/main build-swagger"
+        "command": "npm run build referral-system-api && RUN_MIGRATIONS=false node dist/apps/referral-system-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build referral-system-api && node dist/apps/referral-system-api/main generate-migration"
       }

diff --git a/apps/referral-system-api/src/app.module.ts b/apps/referral-system-api/src/app.module.ts
@@ -37,7 +37,8 @@ import { SalesConnectModule } from '@archie/api/referral-system-api/sales-connec
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/apps/user-api/project.json b/apps/user-api/project.json
@@ -34,13 +34,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build user-api && node dist/apps/user-api/main build-swagger"
+        "command": "npm run build user-api && RUN_MIGRATIONS=false node dist/apps/user-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build user-api && node dist/apps/user-api/main generate-migration"
       }

diff --git a/apps/user-api/src/app.module.ts b/apps/user-api/src/app.module.ts
@@ -40,7 +40,8 @@ import { QueueModule } from '@archie/api/utils/queue';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/apps/webhook-api/project.json b/apps/webhook-api/project.json
@@ -51,13 +51,13 @@
       }
     },
     "build-openapi": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
-        "command": "npm run build webhook-api && node dist/apps/webhook-api/main build-swagger"
+        "command": "npm run build webhook-api && RUN_MIGRATIONS=false node dist/apps/webhook-api/main build-swagger"
       }
     },
     "generate-migration": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "npm run build webhook-api && node dist/apps/webhook-api/main generate-migration"
       }

diff --git a/apps/webhook-api/src/app.module.ts b/apps/webhook-api/src/app.module.ts
@@ -37,7 +37,8 @@ import { FireblocksWebhookModule } from '@archie/api/webhook-api/fireblocks';
         synchronize: false,
         autoLoadEntities: true,
         keepConnectionAlive: true,
-        migrationsRun: true,
+        migrationsRun:
+          configService.get(ConfigVariables.RUN_MIGRATIONS) !== 'false',
         migrationsTableName: `${SERVICE_NAME}-migrations`,
         migrations: migrations,
       }),

diff --git a/libs/api/credit-api/constants/src/index.ts b/libs/api/credit-api/constants/src/index.ts
@@ -23,6 +23,7 @@ export enum ConfigVariables {
   QUEUE_URL = 'QUEUE_URL',
   ENCRYPTION_KEY = 'ENCRYPTION_KEY',
   REDIS_URL = 'REDIS_URL',
+  RUN_MIGRATIONS = 'RUN_MIGRATIONS',
 }
 
 export const COLLATERAL_RECEIVED_TOPIC = 'credit.collateral.received';

diff --git a/libs/api/credit-api/rize/src/lib/factory/rize_factory.service.ts b/libs/api/credit-api/rize/src/lib/factory/rize_factory.service.ts
@@ -3,7 +3,7 @@ import {
   ComplianceDocumentAcknowledgementRequest,
   CustomerDetails,
 } from '../api/rize_api.interfaces';
-import { GetKycResponse } from '@archie/api/user-api/kyc';
+import { GetKycResponse } from '@archie/api/user-api/data-transfer-objects';
 
 @Injectable()
 export class RizeFactoryService {