diff --git a/database/connection.ts b/database/connection.ts index 926e372..45ecca3 100755 --- a/database/connection.ts +++ b/database/connection.ts @@ -24,4 +24,3 @@ export const connectionSource = new DataSource({ migrationsTableName: "typeorm_migrations", migrationsRun: false, }); -console.log(join(process.cwd(), PATH, "modules/**/*.entity{.ts,.js}")); diff --git a/src/modules/announcements/DTO/update-announcement.dto.ts b/src/modules/announcements/DTO/update-announcement.dto.ts index 028e7cb..b5f0579 100755 --- a/src/modules/announcements/DTO/update-announcement.dto.ts +++ b/src/modules/announcements/DTO/update-announcement.dto.ts @@ -1,26 +1,5 @@ -import { IsDate, IsOptional, IsString, IsUUID } from "class-validator"; +import { PartialType } from "@nestjs/swagger"; -export class UpdateAnnouncementDto { - @IsOptional() - @IsString() - title?: string; +import { CreateAnnouncementDto } from "./create-announcement.dto"; - @IsOptional() - @IsString() - content?: string; - - @IsOptional() - @IsDate() - publishAt?: Date; - - @IsOptional() - @IsUUID() - serviceId?: string; - - @IsOptional() - @IsUUID(undefined, { each: true }) - userIds?: string[]; - - @IsOptional() - isImportant?: boolean; -} +export class UpdateAnnouncementDto extends PartialType(CreateAnnouncementDto) {} diff --git a/src/modules/announcements/providers/announcement.service.ts b/src/modules/announcements/providers/announcement.service.ts index 99854a6..6ec115d 100755 --- a/src/modules/announcements/providers/announcement.service.ts +++ b/src/modules/announcements/providers/announcement.service.ts @@ -32,7 +32,7 @@ export class AnnouncementService { const announcement = this.announcementRepository.create({ ...createAnnouncementDto }); if (!announcement.publishAt) { - announcement.publishAt = new Date(); + announcement.publishAt = dayjs().toDate(); } if (dayjs(announcement.publishAt).isBefore(dayjs().subtract(1, "day")))