Merge branch 'release/v2.12.0'

ReseauEntourage · Jul 18, 2023 · 05dee1a · 05dee1a
2 parents feda5ed + c759de3
commit 05dee1a
Show file tree

Hide file tree

Showing 69 changed files with 1,444 additions and 594 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkedout-backend",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "license": "ISC",
   "engines": {
     "node": "16.x"

diff --git a/src/app.module.ts b/src/app.module.ts
@@ -10,7 +10,7 @@ import type { ClientOpts } from 'redis';
 import { AuthModule } from 'src/auth/auth.module';
 import { JwtAuthGuard } from 'src/auth/guards';
 import { AmbitionsModule } from 'src/common/ambitions/ambitions.module';
-import { BusinessLinesModule } from 'src/common/businessLines/businessLines.module';
+import { BusinessLinesModule } from 'src/common/business-lines/business-lines.module';
 import { ContractsModule } from 'src/common/contracts/contracts.module';
 import { ExperiencesModule } from 'src/common/experiences/experiences.module';
 import { LanguagesModule } from 'src/common/languages/languages.module';
@@ -25,6 +25,7 @@ import { UsersDeletionModule } from 'src/users-deletion/users-deletion.module';
 import { UsersModule } from 'src/users/users.module';
 import { ContactsModule } from './contacts/contacts.module';
 import { ExternalDatabasesModule } from './external-databases/external-databases.module';
+import { ExternalMessagesModule } from './external-messages/external-messages.module';
 import { BitlyModule } from './external-services/bitly/bitly.module';
 import { MailjetModule } from './external-services/mailjet/mailjet.module';
 import { PleziModule } from './external-services/plezi/plezi.module';
@@ -119,6 +120,7 @@ export function getSequelizeOptions(): SequelizeModuleOptions {
     ContactsModule,
     PleziModule,
     OrganizationsModule,
+    ExternalMessagesModule,
   ],
   providers: [
     {
@@ -150,6 +152,7 @@ export function getSequelizeOptions(): SequelizeModuleOptions {
     ExperiencesModule,
     ReviewsModule,
     OrganizationsModule,
+    ExternalMessagesModule,
   ],
 })
 export class AppModule {}
diff --git a/...mon/businessLines/businessLines.module.ts → ...n/business-lines/business-lines.module.ts b/...mon/businessLines/businessLines.module.ts → ...n/business-lines/business-lines.module.ts
diff --git a/...mmon/businessLines/businessLines.types.ts → ...on/business-lines/business-lines.types.ts b/...mmon/businessLines/businessLines.types.ts → ...on/business-lines/business-lines.types.ts
diff --git a/...mmon/businessLines/businessLines.utils.ts → ...on/business-lines/business-lines.utils.ts b/...mmon/businessLines/businessLines.utils.ts → ...on/business-lines/business-lines.utils.ts
diff --git a/...usinessLines/models/businessLine.model.ts → ...iness-lines/models/business-line.model.ts b/...usinessLines/models/businessLine.model.ts → ...iness-lines/models/business-line.model.ts
@@ -10,7 +10,7 @@ import {
   Table,
   UpdatedAt,
 } from 'sequelize-typescript';
-import { BusinessLineValue } from '../businessLines.types';
+import { BusinessLineValue } from '../business-lines.types';
 import { CV, CVBusinessLine } from 'src/cvs/models';
 import { Opportunity, OpportunityBusinessLine } from 'src/opportunities/models';
 import { WrapperModel } from 'src/utils/types';

diff --git a/src/common/business-lines/models/index.ts b/src/common/business-lines/models/index.ts
@@ -0,0 +1 @@
+export { BusinessLine } from './business-line.model';
diff --git a/src/common/businessLines/models/index.ts b/src/common/businessLines/models/index.ts
diff --git a/src/common/locations/models/location.model.ts b/src/common/locations/models/location.model.ts
@@ -26,6 +26,11 @@ export class Location extends WrapperModel {
   @Column
   name: Department;
 
+  @AllowNull(false)
+  @Default(-1)
+  @Column
+  order: number;
+
   @BelongsToMany(() => CV, () => CVLocation, 'LocationId', 'CVId')
   CVs: CV[];
 

diff --git a/src/contacts/dto/contact-candidate-form.dto.ts b/src/contacts/dto/contact-candidate-form.dto.ts
@@ -6,7 +6,7 @@ import {
   IsPostalCode,
   IsString,
 } from 'class-validator';
-import { BusinessLineValue } from 'src/common/businessLines/businessLines.types';
+import { BusinessLineValue } from 'src/common/business-lines/business-lines.types';
 import {
   CandidateAccommodation,
   CandidateAdministrativeSituation,

diff --git a/src/cvs/cvs.module.ts b/src/cvs/cvs.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { SequelizeModule } from '@nestjs/sequelize';
 import { AmbitionsModule } from 'src/common/ambitions/ambitions.module';
-import { BusinessLinesModule } from 'src/common/businessLines/businessLines.module';
+import { BusinessLinesModule } from 'src/common/business-lines/business-lines.module';
 import { ContractsModule } from 'src/common/contracts/contracts.module';
 import { ExperiencesModule } from 'src/common/experiences/experiences.module';
 import { LanguagesModule } from 'src/common/languages/languages.module';