diff --git a/src/admin/admin.controller.ts b/src/admin/admin.controller.ts index 0b8c9a286a2d239d86abd4f8e92c1109c334d720..f803d1f6b2f1324b5abc3652c3ff9f3c12034ba4 100644 --- a/src/admin/admin.controller.ts +++ b/src/admin/admin.controller.ts @@ -218,6 +218,7 @@ export class AdminController { return formatUsers.map((user) => { return { id: user._id, + createdAt: user.createdAt ? user.createdAt.toLocaleDateString() : '', surname: user.surname, name: user.name, email: user.email, diff --git a/src/structures/services/structure.service.spec.ts b/src/structures/services/structure.service.spec.ts index a6df6d26dcc30fdc185c972793b8c43b89ac6141..372acfac42280768f60c03c6ee16d17a0d4717ac 100644 --- a/src/structures/services/structure.service.spec.ts +++ b/src/structures/services/structure.service.spec.ts @@ -420,6 +420,7 @@ describe('StructuresService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), } as IUser; jest .spyOn(service, 'findOne') @@ -470,6 +471,7 @@ describe('StructuresService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), } as IUser; jest .spyOn(service, 'findOne') diff --git a/src/structures/services/structures.service.ts b/src/structures/services/structures.service.ts index 14bf1e2859859e3aa7196d8319ec0be22ac46ce1..97f2e931c03c99a6ecfd338cd8d79c04b12a91f7 100644 --- a/src/structures/services/structures.service.ts +++ b/src/structures/services/structures.service.ts @@ -771,6 +771,7 @@ export class StructuresService { users.map(async (user) => { return { id: user._id, + createdAt: user.createdAt ? user.createdAt.toLocaleDateString() : '', surname: user.surname, name: user.name, email: user.email, diff --git a/src/structures/structures.controller.spec.ts b/src/structures/structures.controller.spec.ts index 91af044377b8818545e7630527812a8c0e2e2c9e..cd63a079ed1fff39531b388ca5b23fbefc78359f 100644 --- a/src/structures/structures.controller.spec.ts +++ b/src/structures/structures.controller.spec.ts @@ -138,6 +138,7 @@ describe('AuthController', () => { name: user.name, surname: user.surname, emailVerified: true, + createdAt: new Date('2022-05-25T09:48:28.824Z'), password: user.password, validationToken: null, role: null, @@ -210,6 +211,7 @@ describe('AuthController', () => { name: user.name, surname: user.surname, emailVerified: true, + createdAt: new Date('2022-05-25T09:48:28.824Z'), password: user.password, validationToken: null, role: null, diff --git a/src/users/schemas/user.schema.ts b/src/users/schemas/user.schema.ts index da301c119110d6bd8bf16f710b4698067afc8077..20123c65d0fb507671c751507222a547539e729d 100644 --- a/src/users/schemas/user.schema.ts +++ b/src/users/schemas/user.schema.ts @@ -5,8 +5,11 @@ import { Employer } from './employer.schema'; import { Job } from './job.schema'; import { UserRole } from '../enum/user-role.enum'; -@Schema() +@Schema({ timestamps: true }) export class User { + @Prop() + createdAt: Date; + @Prop({ required: true }) email: string; diff --git a/src/users/services/users.service.spec.ts b/src/users/services/users.service.spec.ts index 3b0ad2daf7f8317a8bdca8215cd9f3f272741d1c..fc897ae8ec4c5ab0a1d2f7cc671e8d096cdbc05c 100644 --- a/src/users/services/users.service.spec.ts +++ b/src/users/services/users.service.spec.ts @@ -75,6 +75,7 @@ describe('UsersService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), employer: { name: 'test', validated: true, @@ -145,6 +146,7 @@ describe('UsersService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), employer: { name: 'test', validated: true, @@ -218,6 +220,7 @@ describe('UsersService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), changeEmailToken: '9bb3542bdc5ca8801ad4cee00403c1052bc95dee768dcbb65b1f719870578ed79f71f52fdc3e6bf02fd200a72b8b6f56fc26950df30c8cd7e427a485f80181b9', employer: { @@ -263,6 +266,7 @@ describe('UsersService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), employer: { name: 'test', validated: true, @@ -370,6 +374,7 @@ describe('UsersService', () => { name: 'Jacques', surname: 'Dupont', phone: '06 06 06 06 06', + createdAt: new Date('2022-05-25T09:48:28.824Z'), } as IUser, ]; jest.spyOn(service, 'findAllUnattached').mockImplementation(async (): Promise<IUser[]> => result);