feat: improve meetup date setting

- Support both unix time and date string for meetup date in create and update.
- Hard set UTC time to 00:00:00.000
- Improve Open API spec for date

Author: ShGKme

package.json

@@ -1,6 +1,6 @@
 {
   "name": "course-vue-backend",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "API backend for learn.javascript.ru VueJS Course",
   "author": "Grigorii K. Shartsev <me@shgk.me>",
   "private": true,

src/main.ts

@@ -35,7 +35,7 @@ async function bootstrap() {
 
   const options = new DocumentBuilder()
     .setTitle('Meetups API')
-    .setVersion('1.3.9')
+    .setVersion('1.4.0')
     .addSecurity('cookie-session', {
       type: 'apiKey',
       in: 'cookie',

src/meetups/dto/create-meetup.dto.ts

@@ -1,11 +1,27 @@
 import { CreateAgendaItemDto } from './create-agenda-item.dto';
 import {
   Allow,
-  IsDateString,
   IsNotEmpty,
+  Validate,
   ValidateNested,
+  ValidationArguments,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
 } from 'class-validator';
 import { Type } from 'class-transformer';
+import { ApiProperty } from '@nestjs/swagger';
+
+@ValidatorConstraint()
+class DateAsStringOrNumberValidator implements ValidatorConstraintInterface {
+  validate(text: string | number) {
+    if (typeof text === 'string') {
+      return /^\d\d\d\d-\d\d-\d\d/.test(text) && !isNaN(Date.parse(text));
+    } else if (typeof text === 'number') {
+      return true;
+    }
+    return false;
+  }
+}
 
 export class CreateMeetupDto {
   @IsNotEmpty({ message: 'Название не может быть пустым' })
@@ -14,9 +30,20 @@ export class CreateMeetupDto {
   @IsNotEmpty({ message: 'Описание не может быть пустым' })
   readonly description: string;
 
-  @IsNotEmpty({ message: 'Название не может быть пустым' })
-  @IsDateString({ message: 'Некорректный формат даты' })
-  readonly date: string;
+  @IsNotEmpty({ message: 'Митап должен иметь дату' })
+  @ApiProperty({
+    description: 'Дата митапа в 00:00:00.000 по UTC',
+    example: 1609459200000,
+    oneOf: [
+      { type: 'number', description: 'Unix Timestamp', example: 1609459200000 },
+      { type: 'string', description: 'YYYY-MM-DD', example: '2021-01-01' },
+    ],
+  })
+  @Validate(DateAsStringOrNumberValidator, {
+    message:
+      'Дата должна быть либо числом, либо строковой датой в формате YYYY-MM-DD ',
+  })
+  readonly date: string | number;
 
   @Allow()
   readonly imageId: number;

src/meetups/dto/meetup.dto.ts

@@ -1,3 +1,4 @@
+import { ApiProperty } from '@nestjs/swagger';
 import { MeetupEntity } from '../entities/meetup.entity';
 
 export class MeetupDto {
@@ -6,7 +7,10 @@ export class MeetupDto {
   readonly description: string;
   readonly imageId: number | null;
   readonly date: number | string;
-  readonly organizer: number | string;
+  @ApiProperty({
+    title: 'Дата митапа в формате UNIX Timestamp в 00:00:00.000 по UTC',
+  })
+  readonly organizer: string;
   readonly place: string;
   readonly organizing?: boolean;
   readonly attending?: boolean;

src/meetups/entities/meetup.entity.ts

@@ -64,7 +64,9 @@ export class MeetupEntity {
   constructor(meetupDto: Partial<CreateMeetupDto>) {
     this.title = meetupDto.title;
     this.description = meetupDto.description;
-    this.date = new Date(meetupDto.date);
     this.place = meetupDto.place;
+
+    this.date = new Date(meetupDto.date);
+    this.date.setUTCHours(0, 0, 0, 0);
   }
 }

src/meetups/meetups.service.ts

@@ -104,6 +104,7 @@ export class MeetupsService {
     meetup.description = newMeetup.description;
     meetup.place = newMeetup.place;
     meetup.date = new Date(newMeetup.date);
+    meetup.date.setUTCHours(0, 0, 0, 0);
     if (newMeetup.imageId) {
       meetup.image = await this.imagesRepository.findOne({
         id: newMeetup.imageId,