mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-29 05:34:30 -05:00
Format with Prettier 2
Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
parent
1ecf5def66
commit
3801b1b042
15 changed files with 36 additions and 94 deletions
|
@ -23,10 +23,10 @@ export class MediaUpload {
|
||||||
@PrimaryColumn()
|
@PrimaryColumn()
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
@ManyToOne(_ => Note, { nullable: false })
|
@ManyToOne((_) => Note, { nullable: false })
|
||||||
note: Note;
|
note: Note;
|
||||||
|
|
||||||
@ManyToOne(_ => User, { nullable: false })
|
@ManyToOne((_) => User, { nullable: false })
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
|
|
@ -25,7 +25,7 @@ async function getServerVersionFromPackageJson() {
|
||||||
const packageInfo: { version: string } = JSON.parse(rawFileContent);
|
const packageInfo: { version: string } = JSON.parse(rawFileContent);
|
||||||
const versionParts: number[] = packageInfo.version
|
const versionParts: number[] = packageInfo.version
|
||||||
.split('.')
|
.split('.')
|
||||||
.map(x => parseInt(x, 10));
|
.map((x) => parseInt(x, 10));
|
||||||
versionCache = {
|
versionCache = {
|
||||||
major: versionParts[0],
|
major: versionParts[0],
|
||||||
minor: versionParts[1],
|
minor: versionParts[1],
|
||||||
|
|
|
@ -10,16 +10,12 @@ import { Note } from './note.entity';
|
||||||
|
|
||||||
@Entity()
|
@Entity()
|
||||||
export class AuthorColor {
|
export class AuthorColor {
|
||||||
@ManyToOne(
|
@ManyToOne((_) => Note, (note) => note.authorColors, {
|
||||||
_ => Note,
|
|
||||||
note => note.authorColors,
|
|
||||||
{
|
|
||||||
primary: true,
|
primary: true,
|
||||||
},
|
})
|
||||||
)
|
|
||||||
note: Note;
|
note: Note;
|
||||||
|
|
||||||
@ManyToOne(_ => User, {
|
@ManyToOne((_) => User, {
|
||||||
primary: true,
|
primary: true,
|
||||||
})
|
})
|
||||||
user: User;
|
user: User;
|
||||||
|
|
|
@ -36,36 +36,22 @@ export class Note {
|
||||||
})
|
})
|
||||||
alias?: string;
|
alias?: string;
|
||||||
@OneToMany(
|
@OneToMany(
|
||||||
_ => NoteGroupPermission,
|
(_) => NoteGroupPermission,
|
||||||
groupPermission => groupPermission.note,
|
(groupPermission) => groupPermission.note,
|
||||||
)
|
)
|
||||||
groupPermissions: NoteGroupPermission[];
|
groupPermissions: NoteGroupPermission[];
|
||||||
@OneToMany(
|
@OneToMany((_) => NoteUserPermission, (userPermission) => userPermission.note)
|
||||||
_ => NoteUserPermission,
|
|
||||||
userPermission => userPermission.note,
|
|
||||||
)
|
|
||||||
userPermissions: NoteUserPermission[];
|
userPermissions: NoteUserPermission[];
|
||||||
@Column({
|
@Column({
|
||||||
nullable: false,
|
nullable: false,
|
||||||
default: 0,
|
default: 0,
|
||||||
})
|
})
|
||||||
viewcount: number;
|
viewcount: number;
|
||||||
@ManyToOne(
|
@ManyToOne((_) => User, (user) => user.ownedNotes, { onDelete: 'CASCADE' })
|
||||||
_ => User,
|
|
||||||
user => user.ownedNotes,
|
|
||||||
{ onDelete: 'CASCADE' },
|
|
||||||
)
|
|
||||||
owner: User;
|
owner: User;
|
||||||
@OneToMany(
|
@OneToMany((_) => Revision, (revision) => revision.note, { cascade: true })
|
||||||
_ => Revision,
|
|
||||||
revision => revision.note,
|
|
||||||
{ cascade: true },
|
|
||||||
)
|
|
||||||
revisions: Promise<Revision[]>;
|
revisions: Promise<Revision[]>;
|
||||||
@OneToMany(
|
@OneToMany((_) => AuthorColor, (authorColor) => authorColor.note)
|
||||||
_ => AuthorColor,
|
|
||||||
authorColor => authorColor.note,
|
|
||||||
)
|
|
||||||
authorColors: AuthorColor[];
|
authorColors: AuthorColor[];
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
@ -77,11 +63,7 @@ export class Note {
|
||||||
})
|
})
|
||||||
title?: string;
|
title?: string;
|
||||||
|
|
||||||
@ManyToMany(
|
@ManyToMany((_) => Tag, (tag) => tag.notes, { eager: true, cascade: true })
|
||||||
_ => Tag,
|
|
||||||
tag => tag.notes,
|
|
||||||
{ eager: true, cascade: true },
|
|
||||||
)
|
|
||||||
@JoinTable()
|
@JoinTable()
|
||||||
tags: Tag[];
|
tags: Tag[];
|
||||||
|
|
||||||
|
|
|
@ -113,20 +113,22 @@ export class NotesService {
|
||||||
// TODO: Get actual createTime
|
// TODO: Get actual createTime
|
||||||
createTime: new Date(),
|
createTime: new Date(),
|
||||||
description: note.description,
|
description: note.description,
|
||||||
editedBy: note.authorColors.map(authorColor => authorColor.user.userName),
|
editedBy: note.authorColors.map(
|
||||||
|
(authorColor) => authorColor.user.userName,
|
||||||
|
),
|
||||||
// TODO: Extract into method
|
// TODO: Extract into method
|
||||||
permissions: {
|
permissions: {
|
||||||
owner: this.usersService.toUserDto(note.owner),
|
owner: this.usersService.toUserDto(note.owner),
|
||||||
sharedToUsers: note.userPermissions.map(noteUserPermission => ({
|
sharedToUsers: note.userPermissions.map((noteUserPermission) => ({
|
||||||
user: this.usersService.toUserDto(noteUserPermission.user),
|
user: this.usersService.toUserDto(noteUserPermission.user),
|
||||||
canEdit: noteUserPermission.canEdit,
|
canEdit: noteUserPermission.canEdit,
|
||||||
})),
|
})),
|
||||||
sharedToGroups: note.groupPermissions.map(noteGroupPermission => ({
|
sharedToGroups: note.groupPermissions.map((noteGroupPermission) => ({
|
||||||
group: noteGroupPermission.group,
|
group: noteGroupPermission.group,
|
||||||
canEdit: noteGroupPermission.canEdit,
|
canEdit: noteGroupPermission.canEdit,
|
||||||
})),
|
})),
|
||||||
},
|
},
|
||||||
tags: note.tags.map(tag => tag.name),
|
tags: note.tags.map((tag) => tag.name),
|
||||||
updateTime: (await this.getLastRevision(note)).createdAt,
|
updateTime: (await this.getLastRevision(note)).createdAt,
|
||||||
// TODO: Get actual updateUser
|
// TODO: Get actual updateUser
|
||||||
updateUser: {
|
updateUser: {
|
||||||
|
|
|
@ -17,9 +17,6 @@ export class Tag {
|
||||||
})
|
})
|
||||||
name: string;
|
name: string;
|
||||||
|
|
||||||
@ManyToMany(
|
@ManyToMany((_) => Note, (note) => note.tags)
|
||||||
_ => Note,
|
|
||||||
note => note.tags,
|
|
||||||
)
|
|
||||||
notes: Note[];
|
notes: Note[];
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,14 +10,10 @@ import { Note } from '../notes/note.entity';
|
||||||
|
|
||||||
@Entity()
|
@Entity()
|
||||||
export class NoteGroupPermission {
|
export class NoteGroupPermission {
|
||||||
@ManyToOne(_ => Group, { primary: true })
|
@ManyToOne((_) => Group, { primary: true })
|
||||||
group: Group;
|
group: Group;
|
||||||
|
|
||||||
@ManyToOne(
|
@ManyToOne((_) => Note, (note) => note.groupPermissions, { primary: true })
|
||||||
_ => Note,
|
|
||||||
note => note.groupPermissions,
|
|
||||||
{ primary: true },
|
|
||||||
)
|
|
||||||
note: Note;
|
note: Note;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
|
|
|
@ -10,14 +10,10 @@ import { User } from '../users/user.entity';
|
||||||
|
|
||||||
@Entity()
|
@Entity()
|
||||||
export class NoteUserPermission {
|
export class NoteUserPermission {
|
||||||
@ManyToOne(_ => User, { primary: true })
|
@ManyToOne((_) => User, { primary: true })
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
@ManyToOne(
|
@ManyToOne((_) => Note, (note) => note.userPermissions, { primary: true })
|
||||||
_ => Note,
|
|
||||||
note => note.userPermissions,
|
|
||||||
{ primary: true },
|
|
||||||
)
|
|
||||||
note: Note;
|
note: Note;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
|
|
|
@ -27,16 +27,13 @@ export class Authorship {
|
||||||
/**
|
/**
|
||||||
* Revisions this authorship appears in
|
* Revisions this authorship appears in
|
||||||
*/
|
*/
|
||||||
@ManyToMany(
|
@ManyToMany((_) => Revision, (revision) => revision.authorships)
|
||||||
_ => Revision,
|
|
||||||
revision => revision.authorships,
|
|
||||||
)
|
|
||||||
revisions: Revision[];
|
revisions: Revision[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User this authorship represents
|
* User this authorship represents
|
||||||
*/
|
*/
|
||||||
@ManyToOne(_ => User)
|
@ManyToOne((_) => User)
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
|
|
|
@ -56,19 +56,12 @@ export class Revision {
|
||||||
/**
|
/**
|
||||||
* Note this revision belongs to.
|
* Note this revision belongs to.
|
||||||
*/
|
*/
|
||||||
@ManyToOne(
|
@ManyToOne((_) => Note, (note) => note.revisions, { onDelete: 'CASCADE' })
|
||||||
_ => Note,
|
|
||||||
note => note.revisions,
|
|
||||||
{ onDelete: 'CASCADE' },
|
|
||||||
)
|
|
||||||
note: Note;
|
note: Note;
|
||||||
/**
|
/**
|
||||||
* All authorship objects which are used in the revision.
|
* All authorship objects which are used in the revision.
|
||||||
*/
|
*/
|
||||||
@ManyToMany(
|
@ManyToMany((_) => Authorship, (authorship) => authorship.revisions)
|
||||||
_ => Authorship,
|
|
||||||
authorship => authorship.revisions,
|
|
||||||
)
|
|
||||||
@JoinTable()
|
@JoinTable()
|
||||||
authorships: Authorship[];
|
authorships: Authorship[];
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ export class RevisionsService {
|
||||||
note: note.id,
|
note: note.id,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return revisions.map(revision => this.toMetadataDto(revision));
|
return revisions.map((revision) => this.toMetadataDto(revision));
|
||||||
}
|
}
|
||||||
|
|
||||||
async getNoteRevision(
|
async getNoteRevision(
|
||||||
|
|
|
@ -17,10 +17,7 @@ export class AuthToken {
|
||||||
@PrimaryGeneratedColumn()
|
@PrimaryGeneratedColumn()
|
||||||
id: number;
|
id: number;
|
||||||
|
|
||||||
@ManyToOne(
|
@ManyToOne((_) => User, (user) => user.authToken)
|
||||||
_ => User,
|
|
||||||
user => user.authToken,
|
|
||||||
)
|
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
|
|
|
@ -19,10 +19,7 @@ export class Identity {
|
||||||
@PrimaryGeneratedColumn()
|
@PrimaryGeneratedColumn()
|
||||||
id: number;
|
id: number;
|
||||||
|
|
||||||
@ManyToOne(
|
@ManyToOne((_) => User, (user) => user.identities)
|
||||||
_ => User,
|
|
||||||
user => user.identities,
|
|
||||||
)
|
|
||||||
user: User;
|
user: User;
|
||||||
|
|
||||||
@Column()
|
@Column()
|
||||||
|
|
|
@ -42,22 +42,13 @@ export class User {
|
||||||
})
|
})
|
||||||
email?: string;
|
email?: string;
|
||||||
|
|
||||||
@OneToMany(
|
@OneToMany((_) => Note, (note) => note.owner)
|
||||||
_ => Note,
|
|
||||||
note => note.owner,
|
|
||||||
)
|
|
||||||
ownedNotes: Note[];
|
ownedNotes: Note[];
|
||||||
|
|
||||||
@OneToMany(
|
@OneToMany((_) => AuthToken, (authToken) => authToken.user)
|
||||||
_ => AuthToken,
|
|
||||||
authToken => authToken.user,
|
|
||||||
)
|
|
||||||
authToken: AuthToken[];
|
authToken: AuthToken[];
|
||||||
|
|
||||||
@OneToMany(
|
@OneToMany((_) => Identity, (identity) => identity.user)
|
||||||
_ => Identity,
|
|
||||||
identity => identity.user,
|
|
||||||
)
|
|
||||||
identities: Identity[];
|
identities: Identity[];
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||||
|
|
|
@ -84,9 +84,7 @@ describe('Notes', () => {
|
||||||
|
|
||||||
it(`DELETE /notes/{note}`, async () => {
|
it(`DELETE /notes/{note}`, async () => {
|
||||||
await notesService.createNote('This is a test note.', 'test3');
|
await notesService.createNote('This is a test note.', 'test3');
|
||||||
await request(app.getHttpServer())
|
await request(app.getHttpServer()).delete('/notes/test3').expect(200);
|
||||||
.delete('/notes/test3')
|
|
||||||
.expect(200);
|
|
||||||
return expect(notesService.getNoteByIdOrAlias('test3')).rejects.toEqual(
|
return expect(notesService.getNoteByIdOrAlias('test3')).rejects.toEqual(
|
||||||
new NotInDBError("Note with id/alias 'test3' not found."),
|
new NotInDBError("Note with id/alias 'test3' not found."),
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue