Commit 3e916a17 authored by nanahira's avatar nanahira

fix

parent 8c07399c
Pipeline #7281 passed with stages
in 1 minute and 59 seconds
...@@ -2,6 +2,7 @@ import { CreateDateColumn, DeleteDateColumn, UpdateDateColumn } from 'typeorm'; ...@@ -2,6 +2,7 @@ import { CreateDateColumn, DeleteDateColumn, UpdateDateColumn } from 'typeorm';
import { Exclude } from 'class-transformer'; import { Exclude } from 'class-transformer';
import { PageSettingsDto } from '../../dto/PageSettings.dto'; import { PageSettingsDto } from '../../dto/PageSettings.dto';
import { ApiProperty } from '@nestjs/swagger'; import { ApiProperty } from '@nestjs/swagger';
import { NotColumn } from '../decorators/base';
export interface DeletionWise { export interface DeletionWise {
deleteTime?: Date; deleteTime?: Date;
...@@ -9,18 +10,15 @@ export interface DeletionWise { ...@@ -9,18 +10,15 @@ export interface DeletionWise {
export class TimeBase extends PageSettingsDto implements DeletionWise { export class TimeBase extends PageSettingsDto implements DeletionWise {
@CreateDateColumn({ select: false }) @CreateDateColumn({ select: false })
@ApiProperty({ required: false }) @NotColumn()
@Exclude()
createTime: Date; createTime: Date;
@UpdateDateColumn({ select: false }) @UpdateDateColumn({ select: false })
@ApiProperty({ required: false }) @NotColumn()
@Exclude()
updateTime: Date; updateTime: Date;
@DeleteDateColumn({ select: false }) @DeleteDateColumn({ select: false })
@ApiProperty({ required: false }) @NotColumn()
@Exclude()
deleteTime: Date; deleteTime: Date;
toObject() { toObject() {
......
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
} from 'class-validator'; } from 'class-validator';
import { ColumnWithWidthOptions } from 'typeorm/decorator/options/ColumnWithWidthOptions'; import { ColumnWithWidthOptions } from 'typeorm/decorator/options/ColumnWithWidthOptions';
import { BigintTransformer } from '../utility/bigint-transform'; import { BigintTransformer } from '../utility/bigint-transform';
import { Exclude } from 'class-transformer';
export function MergePropertyDecorators( export function MergePropertyDecorators(
decs: PropertyDecorator[], decs: PropertyDecorator[],
...@@ -109,3 +110,6 @@ export const EnumColumn = <T>( ...@@ -109,3 +110,6 @@ export const EnumColumn = <T>(
...(required ? [] : [IsOptional()]), ...(required ? [] : [IsOptional()]),
IsEnum(targetEnum), IsEnum(targetEnum),
]); ]);
export const NotColumn = (): PropertyDecorator =>
MergePropertyDecorators([Exclude(), ApiProperty({ required: false })]);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment