Fix nullable property types in Note DTOs

Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2021-05-02 18:33:07 +02:00
parent 73997d4693
commit 6471ba92ef
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
3 changed files with 6 additions and 8 deletions

View file

@ -31,7 +31,7 @@ export class NoteMetadataDto {
@IsString()
@IsOptional()
@ApiPropertyOptional()
alias?: string;
alias: string | null;
/**
* Title of the note
@ -74,7 +74,7 @@ export class NoteMetadataDto {
@ValidateNested()
@ApiPropertyOptional({ type: UserInfoDto })
@IsOptional()
updateUser?: UserInfoDto;
updateUser: UserInfoDto | null;
/**
* Counts how many times the published note has been viewed

View file

@ -92,7 +92,7 @@ export class NotePermissionsDto {
@ValidateNested()
@ApiPropertyOptional({ type: UserInfoDto })
@IsOptional()
owner?: UserInfoDto;
owner: UserInfoDto | null;
/**
* List of users the note is shared with

View file

@ -337,7 +337,7 @@ export class NotesService {
*/
toNotePermissionsDto(note: Note): NotePermissionsDto {
return {
owner: note.owner ? this.usersService.toUserDto(note.owner) : undefined,
owner: note.owner ? this.usersService.toUserDto(note.owner) : null,
sharedToUsers: note.userPermissions.map((noteUserPermission) => ({
user: this.usersService.toUserDto(noteUserPermission.user),
canEdit: noteUserPermission.canEdit,
@ -360,7 +360,7 @@ export class NotesService {
return {
// TODO: Convert DB UUID to base64
id: note.id,
alias: note.alias ?? undefined,
alias: note.alias ?? null,
title: note.title ?? '',
createTime: (await this.getFirstRevision(note)).createdAt,
description: note.description ?? '',
@ -370,9 +370,7 @@ export class NotesService {
permissions: this.toNotePermissionsDto(note),
tags: this.toTagList(note),
updateTime: (await this.getLatestRevision(note)).createdAt,
updateUser: updateUser
? this.usersService.toUserDto(updateUser)
: undefined,
updateUser: updateUser ? this.usersService.toUserDto(updateUser) : null,
viewCount: note.viewCount,
};
}