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