mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-09-19 07:28:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refactor: move configs from revision to note

Browse source 
Signed-off-by: yamashush <38120991+yamashush@users.noreply.github.com>
This commit is contained in:
yamashush 2024-05-05 18:25:16 +09:00
parent 883677d072
commit 733afe0f25
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
backend/src/revisions/revisions.service.spec.ts
View file

@ -18,10 +18,10 @@ import authConfigMock from '../config/mock/auth.config.mock';
import databaseConfigMock from '../config/mock/database.config.mock';
import noteConfigMock from '../config/mock/note.config.mock';
import {
createDefaultMockRevisionConfig,
registerRevisionConfig,
} from '../config/mock/revision.config.mock';
import { RevisionConfig } from '../config/revision.config';
createDefaultMockNoteConfig,
registerNoteConfig,
} from '../config/mock/note.config.mock';
import { NoteConfig } from '../config/note.config';
import { NotInDBError } from '../errors/errors';
import { eventModuleConfig } from '../events';
import { Group } from '../groups/group.entity';
@ -44,7 +44,7 @@ describe('RevisionsService', () => {
let service: RevisionsService;
let revisionRepo: Repository<Revision>;
let noteRepo: Repository<Note>;
const revisionConfig: RevisionConfig = createDefaultMockRevisionConfig();
const noteConfig: NoteConfig = createDefaultMockNoteConfig();
beforeEach(async () => {
noteRepo = new Repository<Note>(
@ -81,7 +81,7 @@ describe('RevisionsService', () => {
databaseConfigMock,
authConfigMock,
noteConfigMock,
registerRevisionConfig(revisionConfig),
registerNoteConfig(noteConfig),
],
}),
EventEmitterModule.forRoot(eventModuleConfig),
@ -460,7 +460,7 @@ describe('RevisionsService', () => {
const retentionDays = 30;
beforeEach(() => {
revisionConfig.retentionDays = retentionDays;
noteConfig.revisionRetentionDays = retentionDays;
note = Mock.of<Note>({ publicId: 'test-note', id: 1 });
notes = [note];
@ -616,7 +616,7 @@ describe('RevisionsService', () => {
});
it('do nothing when retention days config is zero', async () => {
revisionConfig.retentionDays = 0;
noteConfig.revisionRetentionDays = 0;
const spyOnRemove = jest.spyOn(revisionRepo, 'remove');
await service.removeOldRevisions();

10
backend/src/revisions/revisions.service.ts
View file

@ -9,9 +9,9 @@ import { InjectRepository } from '@nestjs/typeorm';
import { createPatch } from 'diff';
import { Repository } from 'typeorm';
import revisionConfiguration, {
RevisionConfig,
} from '../config/revision.config';
import noteConfiguration, {
NoteConfig,
} from '../config/note.config';
import { NotInDBError } from '../errors/errors';
import { ConsoleLoggerService } from '../logger/console-logger.service';
import { Note } from '../notes/note.entity';
@ -35,7 +35,7 @@ export class RevisionsService {
private revisionRepository: Repository<Revision>,
@InjectRepository(Note)
private noteRepository: Repository<Note>,
@Inject(revisionConfiguration.KEY) private revisionConfig: RevisionConfig,
@Inject(noteConfiguration.KEY) private noteConfig: NoteConfig,
private editService: EditService,
) {
this.logger.setContext(RevisionsService.name);
@ -241,7 +241,7 @@ export class RevisionsService {
async removeOldRevisions(): Promise<void> {
const currentTime = new Date().getTime();
const revisionRetentionDays: number = this.revisionConfig.retentionDays;
const revisionRetentionDays: number = this.noteConfig.revisionRetentionDays;
if (revisionRetentionDays <= 0) {
return;
}