Dockery/Picsur
1
0
Fork 0
mirror of https://github.com/CaramelFur/Picsur.git synced 2026-01-23 23:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

move to required ids

Browse Source
This commit is contained in:
rubikscraft
2022-04-01 12:04:49 +02:00
parent c6d1206e29
commit 9bcf09ff4f
18 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/src/dto/idobject.dto.ts
View File

@@ -2,5 +2,5 @@ import { EntityID } from '../validators/entity-id.validator';
export class EntityIDObject {
@EntityID()
id: number;
id: string;
}

6
shared/src/dto/jwt.dto.ts
View File

@@ -1,12 +1,12 @@
import { Type } from 'class-transformer';
import { IsDefined, IsInt, IsOptional, ValidateNested } from 'class-validator';
import { NameRolesUser } from '../entities/user.entity';
import { EUser } from '../entities/user.entity';
export class JwtDataDto {
@IsDefined()
@ValidateNested()
@Type(() => NameRolesUser)
user: NameRolesUser;
@Type(() => EUser)
user: EUser;
@IsOptional()
@IsInt()

2
shared/src/entities/image.entity.ts
View File

@@ -4,7 +4,7 @@ import { EntityID } from '../validators/entity-id.validator';
export class EImage {
@EntityID()
id?: string;
id: string;
@IsHash('sha256')
hash: string;

2
shared/src/entities/role.entity.ts
View File

@@ -19,5 +19,5 @@ export class RoleNamePermsObject extends RoleNameObject {
export class ERole extends RoleNamePermsObject {
@EntityID()
id?: string;
id: string;
}

2
shared/src/entities/syspreference.entity.ts
View File

@@ -3,7 +3,7 @@ import { EntityID } from '../validators/entity-id.validator';
export class ESysPreference {
@EntityID()
id?: string;
id: string;
@IsNotEmpty()
@IsString()

2
shared/src/entities/user.entity.ts
View File

@@ -28,7 +28,7 @@ export class NameRolesUser extends UsernameUser {
// Actual entity that goes in the db
export class EUser extends NameRolesUser {
@EntityID()
id?: string;
id: string;
@IsOptional()
@Exclude()

2
shared/src/entities/usrpreference.ts
View File

@@ -4,7 +4,7 @@ import { IsPosInt } from '../validators/positive-int.validator';
export class EUsrPreference {
@EntityID()
id?: string;
id: string;
@IsNotEmpty()
@IsString()

5
shared/src/validators/entity-id.validator.ts
View File

@@ -1,5 +1,4 @@
import { IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
import { IsNotEmpty, IsUUID } from 'class-validator';
import { CombinePDecorators } from '../util/decorator';
export const EntityID = CombinePDecorators(IsOptional(), IsUUID('4'));
export const EntityIDRequired = CombinePDecorators(IsNotEmpty(), IsUUID('4'));
export const EntityID = CombinePDecorators(IsNotEmpty(), IsUUID('4'));