WIP fix schemas tickets

tacxou · tacxou · commit 42ee74715473 · 2023-09-05T15:37:14.000+02:00
diff --git a/service/src/_common/schemas/parts/idfs.part.schema.ts b/service/src/_common/schemas/parts/idfs.part.schema.ts
@@ -0,0 +1,26 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Document, Types } from 'mongoose'
+import { SourceRequest } from '~/tickets/source-request/_schemas/source-request.schema'
+import { IdnamePart } from '~/_common/schemas/parts/idname.part.schema'
+
+@Schema({ _id: false })
+export class IdfsPart extends IdnamePart {
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public namespace: string
+
+  @Prop({
+    type: String,
+    required: true,
+  })
+  public path: string
+
+  @Prop({
+    type: String,
+  })
+  public mime: string
+}
+
+export const IdfsPartSchema = SchemaFactory.createForClass(IdfsPart)
diff --git a/service/src/_common/schemas/parts/idname.part.schema.ts b/service/src/_common/schemas/parts/idname.part.schema.ts
@@ -1,5 +1,6 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { Document, Types } from 'mongoose'
+import { SourceRequest } from '~/tickets/source-request/_schemas/source-request.schema'
 
 @Schema({ _id: false })
 export class IdnamePart extends Document {
diff --git a/service/src/core/entities/_schemas/parts/phone.part.schema.ts b/service/src/core/entities/_schemas/parts/phone.part.schema.ts
@@ -1,11 +1,17 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
-import { Document } from 'mongoose'
+import { Document, Types } from 'mongoose'
 import { EntityState, EntityStateList } from '~/core/entities/_enum/entity-state.enum'
 import { ProfilePart } from '~/core/entities/_schemas/parts/profile.part.schema'
 import { PhoneType, PhoneTypeList } from '~/core/entities/_enum/phone-type.enum'
 
 @Schema({ _id: false })
 export class PhonePart extends Document {
+  @Prop({
+    type: Types.ObjectId,
+    required: true,
+  })
+  public id: Types.ObjectId
+
   @Prop({
     type: Number,
     enum: PhoneTypeList,
diff --git a/service/src/core/filestorage/_schemas/filestorage.schema.ts b/service/src/core/filestorage/_schemas/filestorage.schema.ts
@@ -14,6 +14,12 @@ export class Filestorage extends AbstractSchema {
   })
   public type: FsType
 
+  // text/html, application/pdf
+  @Prop({
+    type: String,
+  })
+  public mime?: string
+
   @Prop({
     required: true,
     type: String,
diff --git a/service/src/core/projects/_schemas/project.schema.ts b/service/src/core/projects/_schemas/project.schema.ts
@@ -7,8 +7,9 @@ import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
 })
 export class Project extends AbstractSchema {
   @Prop({
-    required: true,
     type: String,
+    required: true,
+    unique: true,
   })
   public name: string
 
diff --git a/service/src/core/triggers/_schemas/triggers.schema.ts b/service/src/core/triggers/_schemas/triggers.schema.ts
@@ -8,8 +8,9 @@ import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
 })
 export class Triggers extends AbstractSchema {
   @Prop({
-    required: true,
     type: String,
+    required: true,
+    unique: true,
   })
   public name: string
 
diff --git a/service/src/tickets/sla/_schemas/sla.schema.ts b/service/src/tickets/sla/_schemas/sla.schema.ts
@@ -10,26 +10,24 @@ export class Sla extends AbstractSchema {
   @Prop({
     type: String,
     required: true,
+    unique: true,
   })
   public name: string
 
   @Prop({
     type: String,
-    required: true,
   })
   public description: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public icon: string
+  public icon?: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public color: string
+  public color?: string
 
   @Prop({
     type: [RulePartSchema],
@@ -39,13 +37,12 @@ export class Sla extends AbstractSchema {
 
   @Prop({
     type: String,
-    required: true,
   })
-  public backgroundColor: string
+  public backgroundColor?: string
 
   @Prop({
     type: Number,
-    required: true,
+    default: 0,
   })
   public order: number
 
diff --git a/service/src/tickets/sla/sla.controller.ts b/service/src/tickets/sla/sla.controller.ts
@@ -4,10 +4,11 @@ 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 { ApiParam, ApiTags } from '@nestjs/swagger'
 import { ObjectIdValidationPipe } from '~/_common/pipes/object-id-validation.pipe'
 import { Types } from 'mongoose'
 
+@ApiTags('tickets')
 @Controller('sla')
 export class SlaController extends AbstractController {
   protected readonly projection = {
diff --git a/service/src/tickets/source-request/_schemas/source-request.schema.ts b/service/src/tickets/source-request/_schemas/source-request.schema.ts
@@ -10,26 +10,24 @@ export class SourceRequest extends AbstractSchema {
   @Prop({
     type: String,
     required: true,
+    unique: true,
   })
   public name: string
 
   @Prop({
     type: String,
-    required: true,
   })
   public description: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public icon: string
+  public icon?: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public color: string
+  public color?: string
 
   @Prop({
     type: [RulePartSchema],
@@ -39,13 +37,12 @@ export class SourceRequest extends AbstractSchema {
 
   @Prop({
     type: String,
-    required: true,
   })
-  public backgroundColor: string
+  public backgroundColor?: string
 
   @Prop({
     type: Number,
-    required: true,
+    default: 0,
   })
   public order: number
 
diff --git a/service/src/tickets/source-request/source-request.controller.ts b/service/src/tickets/source-request/source-request.controller.ts
@@ -1,13 +1,14 @@
 import { Body, Controller, Delete, Get, HttpStatus, Param, Patch, Post, Req, Res } from '@nestjs/common'
 import { AbstractController } from '~/_common/abstracts/abstract.controller'
 import { Request, Response } from 'express'
-import { FilterOptions, SearchFilterOptions, FilterSchema, SearchFilterSchema  } from '@streamkits/nestjs_module_scrud'
-import { ApiParam } from '@nestjs/swagger'
+import { FilterOptions, FilterSchema, SearchFilterOptions, SearchFilterSchema } from '@streamkits/nestjs_module_scrud'
+import { ApiParam, ApiTags } from '@nestjs/swagger'
 import { ObjectIdValidationPipe } from '~/_common/pipes/object-id-validation.pipe'
 import { Types } from 'mongoose'
 import { SourceRequestCreateDto, SourceRequestUpdateDto } from '~/tickets/source-request/_dto/source-request.dto'
 import { SourceRequestService } from '~/tickets/source-request/source-request.service'
 
+@ApiTags('tickets')
 @Controller('source-request')
 export class SourceRequestController extends AbstractController {
   protected readonly projection = {
diff --git a/service/src/tickets/state/_schemas/state.schema.ts b/service/src/tickets/state/_schemas/state.schema.ts
@@ -10,26 +10,24 @@ export class State extends AbstractSchema {
   @Prop({
     type: String,
     required: true,
+    unique: true,
   })
   public name: string
 
   @Prop({
     type: String,
-    required: true,
   })
   public description: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public icon: string
+  public icon?: string
 
   @Prop({
     type: String,
-    required: true,
   })
-  public color: string
+  public color?: string
 
   @Prop({
     type: [RulePartSchema],
@@ -39,13 +37,12 @@ export class State extends AbstractSchema {
 
   @Prop({
     type: String,
-    required: true,
   })
-  public backgroundColor: string
+  public backgroundColor?: string
 
   @Prop({
     type: Number,
-    required: true,
+    default: 0,
   })
   public order: number
 
diff --git a/service/src/tickets/state/state.controller.ts b/service/src/tickets/state/state.controller.ts
@@ -3,11 +3,12 @@ import { StateService } from './state.service'
 import { AbstractController } from '~/_common/abstracts/abstract.controller'
 import { Request, Response } from 'express'
 import { FilterOptions, FilterSchema, SearchFilterOptions, SearchFilterSchema } from '@streamkits/nestjs_module_scrud'
-import { ApiParam } from '@nestjs/swagger'
+import { ApiParam, ApiTags } from '@nestjs/swagger'
 import { ObjectIdValidationPipe } from '~/_common/pipes/object-id-validation.pipe'
 import { Types } from 'mongoose'
 import { StatesCreateDto, StatesUpdateDto } from '~/tickets/state/_dto/state.dto'
 
+@ApiTags('tickets')
 @Controller('state')
 export class StateController extends AbstractController {
   protected readonly projection = {
diff --git a/service/src/tickets/thread/_enum/fragment-type.enum.ts b/service/src/tickets/thread/_enum/fragment-type.enum.ts
@@ -1,6 +1,6 @@
 export enum FragmentType {
-  INLINE = 'inline',
-  ATTACHMENT = 'attachment',
+  RAW = 'raw',
+  FILE = 'file',
 }
 
 export const FragmentTypeList: number[] = Object.keys(FragmentType)
diff --git a/service/src/tickets/thread/_schemas/parts/fragment.part.schema.ts b/service/src/tickets/thread/_schemas/parts/fragment.part.schema.ts
@@ -1,9 +1,16 @@
 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'
+import { Document, Types } from 'mongoose'
+import { IdfsPart, IdfsPartSchema } from '~/_common/schemas/parts/idfs.part.schema'
 
 @Schema({ _id: false })
-export class FragmentPart extends IdnamePart {
+export class FragmentPart extends Document {
+  @Prop({
+    type: Types.ObjectId,
+    required: true,
+  })
+  public id: Types.ObjectId
+
   @Prop({
     type: String,
     enum: FragmentTypeList,
@@ -13,15 +20,13 @@ export class FragmentPart extends IdnamePart {
 
   @Prop({
     type: String,
-    required: true,
   })
-  public type: string
+  public message?: string
 
   @Prop({
-    type: String,
-    required: true,
+    type: IdfsPartSchema,
   })
-  public path: string
+  public filestorage?: IdfsPart
 
   @Prop({
     type: Object,
@@ -30,3 +35,23 @@ export class FragmentPart extends IdnamePart {
 }
 
 export const FragmentPartSchema = SchemaFactory.createForClass(FragmentPart)
+  .pre('validate', function(this: FragmentPart, next: Function): void {
+    switch (this.disposition) {
+      case FragmentType.RAW: {
+        delete this.filestorage
+        if (!this.message) {
+          next(new Error('Message is required'))
+        }
+        break
+      }
+
+      case FragmentType.FILE: {
+        delete this.message
+        if (!this.filestorage) {
+          next(new Error('Filestorage is required'))
+        }
+        break
+      }
+    }
+    next()
+  })
diff --git a/service/src/tickets/thread/_schemas/thread.schema.ts b/service/src/tickets/thread/_schemas/thread.schema.ts
@@ -3,6 +3,7 @@ import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
 import { Types } from 'mongoose'
 import { IdnamePart, IdnamePartSchema } from '~/_common/schemas/parts/idname.part.schema'
 import { FragmentPart, FragmentPartSchema } from '~/tickets/thread/_schemas/parts/fragment.part.schema'
+import { IdfsPart, IdfsPartSchema } from '~/_common/schemas/parts/idfs.part.schema'
 
 @Schema({
   collection: 'threads',
@@ -21,15 +22,8 @@ export class Thread extends AbstractSchema {
   })
   public sourceRequest: IdnamePart
 
-  @Prop({
-    required: true,
-    type: String,
-  })
-  public message: string
-
   @Prop({
     type: Number,
-    required: true,
     default: 0,
   })
   public timeSpend: number
@@ -40,10 +34,22 @@ export class Thread extends AbstractSchema {
   })
   public fragments: FragmentPart[]
 
+  @Prop({
+    type: [IdfsPartSchema],
+    default: [],
+  })
+  public attachments: IdfsPart[]
+
   @Prop({
     type: Object,
   })
   public customFields?: { [key: string]: any }
 }
 
 export const ThreadSchema = SchemaFactory.createForClass(Thread)
+  .pre('validate', function (next) {
+    if (this.fragments.length === 0) {
+      next(new Error('Un fragment est obligatoire'))
+    }
+    next()
+  })
diff --git a/service/src/tickets/thread/thread.controller.ts b/service/src/tickets/thread/thread.controller.ts
diff --git a/service/src/tickets/ticket/_schemas/parts/envelope.part.schema.ts b/service/src/tickets/ticket/_schemas/parts/envelope.part.schema.ts
diff --git a/service/src/tickets/ticket/_schemas/ticket.schema.ts b/service/src/tickets/ticket/_schemas/ticket.schema.ts
diff --git a/service/src/tickets/ticket/ticket.controller.ts b/service/src/tickets/ticket/ticket.controller.ts
diff --git a/service/src/tickets/tickets.controller.ts b/service/src/tickets/tickets.controller.ts
