fix identities & entity schema

Author: tacxou

app/src/pages/index.vue

@@ -17,7 +17,7 @@ definePageMeta({ auth: true })
 import { useApiFetch } from '~/composables/useApiFetch'
 
 const { signIn, signOut, session, status, cookies, getProviders, user, sessionToken } = useAuth()
-// type TicketCreateDto = components['schemas']['TicketCreateDto']
+// type TicketCreateDto = components['_schemas']['TicketCreateDto']
 
 const formData = {
   subject: 'toto'

app/src/pages/tickets.vue

@@ -17,7 +17,7 @@ definePageMeta({ auth: true })
 import { useApiFetch } from '~/composables/useApiFetch'
 
 const { signIn, signOut, session, status, cookies, getProviders, user, sessionToken } = useAuth()
-// type TicketCreateDto = components['schemas']['TicketCreateDto']
+// type TicketCreateDto = components['_schemas']['TicketCreateDto']
 
 const formData = {
   subject: 'toto'

service/src/core/core.module.ts

@@ -9,7 +9,7 @@ import { TriggersModule } from './triggers/triggers.module'
 import { CrontabsModule } from './crontabs/crontabs.module'
 import { PreferencesModule } from './preferences/preferences.module'
 import { FilestorageModule } from './filestorage/filestorage.module'
-import { EntitesModule } from '~/core/entites/entites.module'
+import { EntitiesModule } from '~/core/entities/entities.module'
 import { IdentitiesModule } from '~/core/identities/identities.module'
 
 @Module({
@@ -25,7 +25,7 @@ import { IdentitiesModule } from '~/core/identities/identities.module'
     ProjectModule,
     TriggersModule,
     CrontabsModule,
-    EntitesModule,
+    EntitiesModule,
     IdentitiesModule,
   ],
   providers: [CoreService],

service/src/core/entites/entites.module.ts

@@ -0,0 +1,9 @@
+export enum EntityState {
+  ARCHIVED = -1,
+  INACTIVE = 0,
+  ACTIVE = 1,
+}
+
+export const EntityStateList: number[] = Object.keys(EntityState)
+  .filter((k) => typeof EntityState[k as any] === 'number')
+  .map((k) => parseInt(EntityState[k as any], 10))

…ice/src/core/entites/_dto/entites.dto.ts …ce/src/core/entities/_dto/entites.dto.tsservice/src/core/entites/_dto/entites.dto.ts renamed to service/src/core/entities/_dto/entites.dto.ts service/src/core/entites/_dto/entites.dto.ts renamed to service/src/core/entities/_dto/entites.dto.ts

@@ -1,9 +1,10 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
 import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
-import { ProfilePart, ProfilePartSchema } from '~/core/entites/_schemas/parts/profile.part.schema'
+import { ProfilePart, ProfilePartSchema } from '~/core/entities/_schemas/parts/profile.part.schema'
+import { StatePart, StatePartSchema } from '~/core/entities/_schemas/parts/state.part.schema'
 
 @Schema({
-  collection: 'entites',
+  collection: 'entities',
   versionKey: false,
 })
 export class Entity extends AbstractSchema {
@@ -18,6 +19,17 @@ export class Entity extends AbstractSchema {
     required: true,
   })
   public profile: ProfilePart
+
+  @Prop({
+    type: StatePartSchema,
+    required: true,
+  })
+  public state: StatePart
+
+  @Prop({
+    type: Object,
+  })
+  public customFields: object
 }
 
 export const EntitySchema = SchemaFactory.createForClass(Entity)

service/src/core/entities/_enum/entity-state.enum.ts

@@ -0,0 +1,22 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
+import { Document } from 'mongoose'
+import { EntityState, EntityStateList } from '~/core/entities/_enum/entity-state.enum'
+
+@Schema({ _id: false })
+export class StatePart extends Document {
+  @Prop({
+    required: true,
+    type: Number,
+    enum: EntityStateList,
+    default: EntityState.ACTIVE,
+  })
+  public current: number
+
+  @Prop({
+    type: Date,
+    default: new Date(),
+  })
+  public lastChangedAt?: Date
+}
+
+export const StatePartSchema = SchemaFactory.createForClass(StatePart)

…/core/entites/_schemas/entites.schema.ts …ore/entities/_schemas/entities.schema.tsservice/src/core/entites/_schemas/entites.schema.ts renamed to service/src/core/entities/_schemas/entities.schema.ts service/src/core/entites/_schemas/entites.schema.ts renamed to service/src/core/entities/_schemas/entities.schema.ts

@@ -1,17 +1,17 @@
 import { DeleteResult } from 'mongodb'
 import { Test, TestingModule } from '@nestjs/testing'
-import { EntitesController } from './entites.controller'
-import { EntitesService } from './entites.service'
-import { UsersDto } from '~/core/entites/_dto/entites.dto'
-import { Users } from '~/core/entites/_schemas/entites.schema'
+import { EntitiesController } from './entities.controller'
+import { EntitiesService } from './entities.service'
+import { UsersDto } from '~/core/entities/_dto/entites.dto'
+import { Users } from '~/core/entities/_schemas/entities.schema'
 import { HttpException, HttpStatus } from '@nestjs/common'
 import { Types } from 'mongoose'
 import { Response, Request } from 'express'
 import { getMockReq, getMockRes } from '@jest-mock/express'
 
 describe('UsersController', () => {
-  let controller: EntitesController
-  let service: EntitesService
+  let controller: EntitiesController
+  let service: EntitiesService
   const date = new Date()
   const _id = new Types.ObjectId()
   const { res, mockClear } = getMockRes()
@@ -29,11 +29,11 @@ describe('UsersController', () => {
   beforeEach(async () => {
     mockClear()
     const module: TestingModule = await Test.createTestingModule({
-      controllers: [EntitesController],
+      controllers: [EntitiesController],
       providers: [
-        EntitesService,
+        EntitiesService,
         {
-          provide: EntitesService,
+          provide: EntitiesService,
           useValue: {
             search: jest.fn().mockResolvedValue([[object], 1]),
             create: jest.fn().mockResolvedValue(object),
@@ -48,8 +48,8 @@ describe('UsersController', () => {
       ],
     }).compile()
 
-    controller = module.get<EntitesController>(EntitesController)
-    service = module.get<EntitesService>(EntitesService)
+    controller = module.get<EntitiesController>(EntitiesController)
+    service = module.get<EntitiesService>(EntitiesService)
   })
 
   describe('search', () => {