Merge branch '1-schematics' of https://github.com/Libertech-FR/teaket into 1-schematics

RICHARD-Quentin · RICHARD-Quentin · commit 895bfb92920b · 2023-09-04T18:04:10.000+02:00
diff --git a/service/src/_common/enum/user-type.enum.ts b/service/src/_common/enum/user-type.enum.ts
@@ -3,6 +3,7 @@ export enum UserType {
   OPERATOR = 1,
   AGENT = 2,
   CLIENT = 3,
+  COMPANY = 4,
   OTHER = 99,
 }
 
diff --git a/service/src/tickets/sla/_schemas/parts/rules.part.schema.ts b/service/src/tickets/sla/_schemas/parts/rules.part.schema.ts
@@ -0,0 +1,9 @@
+import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Document } from 'mongoose'
+
+@Schema({ _id: false })
+export class RulePart extends Document {
+
+}
+
+export const RulePartSchema = SchemaFactory.createForClass(RulePart)
diff --git a/service/src/tickets/sla/_schemas/sla.schema.ts b/service/src/tickets/sla/_schemas/sla.schema.ts
@@ -1,8 +1,65 @@
-import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
+import { RulePart, RulePartSchema } from '~/tickets/sla/_schemas/parts/rules.part.schema'
 
-@Schema({ versionKey: false })
+@Schema({
+  collection: 'sla',
+  versionKey: false,
+})
 export class Sla extends AbstractSchema {
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public name: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public description: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public icon: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public color: string
+
+  @Prop({
+    type: [RulePartSchema],
+    required: true,
+  })
+  public rules: RulePart[]
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public backgroundColor: string
+
+  @Prop({
+    type: Number,
+    required: true,
+  })
+  public order: number
+
+  @Prop({
+    type: Number,
+    required: true,
+    validate: (value: number) => value > 0,
+  })
+  public timeToExpire: number
+
+  @Prop({
+    type: Object,
+  })
+  public customFields: object
 }
 
 export const SlaSchema = SchemaFactory.createForClass(Sla)
diff --git a/service/src/tickets/sla/sla.controller.spec.ts b/service/src/tickets/sla/sla.controller.spec.ts
@@ -2,8 +2,8 @@ import { DeleteResult } from 'mongodb'
 import { Test, TestingModule } from '@nestjs/testing'
 import { SlaController } from './sla.controller'
 import { SlaService } from './sla.service'
-import { SlaDto } from '~/tickets/sla/_dto/sla.dto'
-import { Sla } from '~/tickets/sla/_schemas/sla.schema'
+import { SlaDto } from './dto/sla.dto'
+import { Sla } from './schemas/sla.schema'
 import { HttpException, HttpStatus } from '@nestjs/common'
 import { Types } from 'mongoose'
 import { Response, Request } from 'express'
diff --git a/service/src/tickets/sla/sla.controller.ts b/service/src/tickets/sla/sla.controller.ts
@@ -2,13 +2,11 @@ import { Body, Controller, Delete, Get, HttpStatus, Param, Patch, Post, Req, Res
 import { SlaService } from './sla.service'
 import { AbstractController } from '~/_common/abstracts/abstract.controller'
 import { Request, Response } from 'express'
+import { SlaCreateDto, SlaUpdateDto } from '~/tickets/sla/_dto/sla.dto'
 import { FilterOptions, FilterSchema, SearchFilterOptions, SearchFilterSchema } from '@streamkits/nestjs_module_scrud'
 import { ApiParam } from '@nestjs/swagger'
 import { ObjectIdValidationPipe } from '~/_common/pipes/object-id-validation.pipe'
 import { Types } from 'mongoose'
-import { SlaCreateDto, SlaDto, SlaUpdateDto } from '~/tickets/sla/_dto/sla.dto'
-import { ApiOkResponse } from '@nestjs/swagger/dist/decorators/api-response.decorator'
-import { ApiPaginatedResponse } from '~/_common/decorators/api-paginated-response.decorator'
 
 @Controller('sla')
 export class SlaController extends AbstractController {
@@ -32,10 +30,6 @@ export class SlaController extends AbstractController {
   }
 
   @Get()
-  @ApiOkResponse({
-    description: 'Search sla with pagination',
-  })
-  @ApiPaginatedResponse(SlaDto)
   public async search(@Res() res: Response, @SearchFilterSchema() searchFilterSchema: FilterSchema, @SearchFilterOptions() searchFilterOptions: FilterOptions) {
     const [data, total] = await this._service.findAndCount(searchFilterSchema, this.projection, searchFilterOptions)
     return res.status(HttpStatus.OK).json({
diff --git a/service/src/tickets/sla/sla.module.ts b/service/src/tickets/sla/sla.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common'
 import { MongooseModule } from '@nestjs/mongoose'
-import { SlaSchema, Sla } from '~/tickets/sla/_schemas/sla.schema'
+import { SlaSchema, Sla } from './_schemas/sla.schema'
 import { SlaService } from './sla.service'
 import { SlaController } from './sla.controller'
 
diff --git a/service/src/tickets/sla/sla.service.spec.ts b/service/src/tickets/sla/sla.service.spec.ts
@@ -2,7 +2,7 @@ import { DeleteResult } from 'mongodb'
 import { Test, TestingModule } from '@nestjs/testing'
 import { SlaService } from './sla.service'
 import { getModelToken } from '@nestjs/mongoose'
-import { Sla } from '~/tickets/sla/_schemas/sla.schema'
+import { Sla } from './schemas/sla.schema'
 import { Model, Types } from 'mongoose'
 
 describe('SlaService', () => {
diff --git a/service/src/tickets/sla/sla.service.ts b/service/src/tickets/sla/sla.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@nestjs/common'
 import { InjectModel } from '@nestjs/mongoose'
+import { Sla } from './_schemas/sla.schema'
 import { Model } from 'mongoose'
-import { Sla } from '~/tickets/sla/_schemas/sla.schema'
 import { AbstractServiceSchema } from '~/_common/abstracts/abstract.service.schema'
 
 @Injectable()
 export class SlaService extends AbstractServiceSchema {
-  public constructor(@InjectModel(Sla.name) protected _model: Model<Sla>) {
+  constructor(@InjectModel(Sla.name) protected _model: Model<Sla>,
+  ) {
     super()
   }
 }
diff --git a/service/src/tickets/source-request/_schemas/parts/rules.part.schema.ts b/service/src/tickets/source-request/_schemas/parts/rules.part.schema.ts
@@ -0,0 +1,9 @@
+import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Document } from 'mongoose'
+
+@Schema({ _id: false })
+export class RulePart extends Document {
+
+}
+
+export const RulePartSchema = SchemaFactory.createForClass(RulePart)
diff --git a/service/src/tickets/source-request/_schemas/source-request.schema.ts b/service/src/tickets/source-request/_schemas/source-request.schema.ts
@@ -1,13 +1,58 @@
-import { Schema, SchemaFactory } from '@nestjs/mongoose'
-import { Document } from 'mongoose'
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
-
-export type SourceRequestDocument = SourceRequest & Document
+import { RulePart, RulePartSchema } from '~/tickets/source-request/_schemas/parts/rules.part.schema'
 
 @Schema({
   collection: 'source-requests',
   versionKey: false,
 })
-export class SourceRequest extends AbstractSchema {}
+export class SourceRequest extends AbstractSchema {
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public name: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public description: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public icon: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public color: string
+
+  @Prop({
+    type: [RulePartSchema],
+    required: true,
+  })
+  public rules: RulePart[]
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public backgroundColor: string
+
+  @Prop({
+    type: Number,
+    required: true,
+  })
+  public order: number
+
+  @Prop({
+    type: Object,
+  })
+  public customFields: object
+}
 
 export const SourceRequestSchema = SchemaFactory.createForClass(SourceRequest)
diff --git a/service/src/tickets/state/_schemas/parts/rules.part.schema.ts b/service/src/tickets/state/_schemas/parts/rules.part.schema.ts
@@ -0,0 +1,9 @@
+import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Document } from 'mongoose'
+
+@Schema({ _id: false })
+export class RulePart extends Document {
+
+}
+
+export const RulePartSchema = SchemaFactory.createForClass(RulePart)
diff --git a/service/src/tickets/state/_schemas/state.schema.ts b/service/src/tickets/state/_schemas/state.schema.ts
@@ -1,11 +1,58 @@
-import { Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
+import { RulePart, RulePartSchema } from '~/tickets/state/_schemas/parts/rules.part.schema'
 
 @Schema({
   collection: 'states',
   versionKey: false,
 })
 export class State extends AbstractSchema {
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public name: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public description: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public icon: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public color: string
+
+  @Prop({
+    type: [RulePartSchema],
+    required: true,
+  })
+  public rules: RulePart[]
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public backgroundColor: string
+
+  @Prop({
+    type: Number,
+    required: true,
+  })
+  public order: number
+
+  @Prop({
+    type: Object,
+  })
+  public customFields: object
 }
 
 export const StateSchema = SchemaFactory.createForClass(State)
diff --git a/service/src/tickets/state/state.controller.ts b/service/src/tickets/state/state.controller.ts
@@ -2,11 +2,11 @@ import { Body, Controller, Delete, Get, HttpStatus, Param, Patch, Post, Req, Res
 import { StateService } from './state.service'
 import { AbstractController } from '~/_common/abstracts/abstract.controller'
 import { Request, Response } from 'express'
-import { FilterOptions, SearchFilterOptions, FilterSchema, SearchFilterSchema  } from '@streamkits/nestjs_module_scrud'
+import { FilterOptions, FilterSchema, SearchFilterOptions, SearchFilterSchema } from '@streamkits/nestjs_module_scrud'
 import { ApiParam } from '@nestjs/swagger'
 import { ObjectIdValidationPipe } from '~/_common/pipes/object-id-validation.pipe'
 import { Types } from 'mongoose'
-import { SlaCreateDto, SlaUpdateDto } from '~/tickets/sla/_dto/sla.dto'
+import { StatesCreateDto, StatesUpdateDto } from '~/tickets/state/_dto/state.dto'
 
 @Controller('state')
 export class StateController extends AbstractController {
@@ -21,7 +21,7 @@ export class StateController extends AbstractController {
   }
 
   @Post()
-  public async create(@Req() req: Request, @Res() res: Response, @Body() body: SlaCreateDto) {
+  public async create(@Req() req: Request, @Res() res: Response, @Body() body: StatesCreateDto) {
     const data = await this._service.create(body)
     return res.status(HttpStatus.CREATED).json({
       statusCode: HttpStatus.CREATED,
@@ -51,7 +51,7 @@ export class StateController extends AbstractController {
 
   @Patch(':_id([0-9a-fA-F]{24})')
   @ApiParam({ name: '_id', type: String })
-  public async update(@Param('_id', ObjectIdValidationPipe) _id: Types.ObjectId, @Body() body: SlaUpdateDto, @Res() res: Response) {
+  public async update(@Param('_id', ObjectIdValidationPipe) _id: Types.ObjectId, @Body() body: StatesUpdateDto, @Res() res: Response) {
     const data = await this._service.update(_id, body)
     return res.status(HttpStatus.OK).json({
       statusCode: HttpStatus.OK,
diff --git a/service/src/tickets/thread/_enum/fragment-type.enum.ts b/service/src/tickets/thread/_enum/fragment-type.enum.ts
@@ -0,0 +1,8 @@
+export enum FragmentType {
+  INLINE = 'inline',
+  ATTACHMENT = 'attachment',
+}
+
+export const FragmentTypeList: number[] = Object.keys(FragmentType)
+  .filter((k) => typeof FragmentType[k] === 'string')
+  .map((k) => FragmentType[k])
diff --git a/service/src/tickets/thread/_schemas/parts/fragment.part.schema.ts b/service/src/tickets/thread/_schemas/parts/fragment.part.schema.ts
@@ -0,0 +1,32 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
+import { IdnamePart } from '~/_common/schemas/parts/idname.part.schema'
+import { FragmentType, FragmentTypeList } from '~/tickets/thread/_enum/fragment-type.enum'
+
+@Schema({ _id: false })
+export class FragmentPart extends IdnamePart {
+  @Prop({
+    type: String,
+    enum: FragmentTypeList,
+    required: true,
+  })
+  public disposition: FragmentType
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public type: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public path: string
+
+  @Prop({
+    type: Object,
+  })
+  public metadata: object
+}
+
+export const FragmentPartSchema = SchemaFactory.createForClass(FragmentPart)
diff --git a/service/src/tickets/thread/_schemas/thread.schema.ts b/service/src/tickets/thread/_schemas/thread.schema.ts
diff --git a/service/src/tickets/tickets.module.ts b/service/src/tickets/tickets.module.ts

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ export enum UserType {`
`3`	`3`	`OPERATOR = 1,`
`4`	`4`	`AGENT = 2,`
`5`	`5`	`CLIENT = 3,`
	`6`	`+ COMPANY = 4,`
`6`	`7`	`OTHER = 99,`
`7`	`8`	`}`
`8`	`9`