From 6d5a4c1266a1d121eaae6f520c9809d7b8bbf612 Mon Sep 17 00:00:00 2001 From: kitelev Date: Fri, 3 Jan 2025 11:22:23 +0500 Subject: [PATCH] Refactor VaultAdapter.ts and AppUtils.ts --- app/src/adapters/input/CreateEffortUnderAreaExoCommand.ts | 1 - app/src/adapters/input/OpenRandomNoteExoCommand.ts | 2 +- app/src/adapters/output/EffortPersistenceAdapter.ts | 2 +- app/src/utils/KObjectUtility.ts | 2 +- core/src/service/CreateEffortService.ts | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/adapters/input/CreateEffortUnderAreaExoCommand.ts b/app/src/adapters/input/CreateEffortUnderAreaExoCommand.ts index 36e05e2..137adca 100644 --- a/app/src/adapters/input/CreateEffortUnderAreaExoCommand.ts +++ b/app/src/adapters/input/CreateEffortUnderAreaExoCommand.ts @@ -12,7 +12,6 @@ export default class CreateEffortUnderAreaExoCommand implements ExoCommand { async execute() { const activeFile = this.ctx.appUtils.getActiveFileOrThrow(); const activeKo = this.ctx.kObjectCreator.createFromTFileTyped(activeFile); - if (!(activeKo instanceof Area)) { throw new Error("Active file is not an Area"); } diff --git a/app/src/adapters/input/OpenRandomNoteExoCommand.ts b/app/src/adapters/input/OpenRandomNoteExoCommand.ts index 0bbce94..42bed39 100644 --- a/app/src/adapters/input/OpenRandomNoteExoCommand.ts +++ b/app/src/adapters/input/OpenRandomNoteExoCommand.ts @@ -7,7 +7,7 @@ export default class OpenRandomNoteExoCommand implements ExoCommand { slug = "open-random-note"; async execute(ctx: ExoContext): Promise { - const files = ctx.vaultAdapter.getAllMdFiles(); + const files = ctx.appUtils.getAllMdFiles(); const today = new Date(); const lastMonth = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate()).setHours(0, 0, 0, 0); // Дата месяц назад без времени diff --git a/app/src/adapters/output/EffortPersistenceAdapter.ts b/app/src/adapters/output/EffortPersistenceAdapter.ts index 1010635..650c4d8 100644 --- a/app/src/adapters/output/EffortPersistenceAdapter.ts +++ b/app/src/adapters/output/EffortPersistenceAdapter.ts @@ -16,7 +16,7 @@ export default class EffortPersistenceAdapter implements EffortRepository { // TODO should be in EffortPathRulesHelper in app module getPathForCreate(effort: Effort): string { if (effort.area !== null) { - const areaFile = this.ctx.vaultAdapter.getObjectFileOrThrow(effort.area); + const areaFile = this.ctx.appUtils.getObjectFileOrThrow(effort.area); const areaFolder = areaFile.parent; if (!areaFolder) { throw new Error("Area file has no parent folder"); diff --git a/app/src/utils/KObjectUtility.ts b/app/src/utils/KObjectUtility.ts index 822cfd2..e39f879 100644 --- a/app/src/utils/KObjectUtility.ts +++ b/app/src/utils/KObjectUtility.ts @@ -5,7 +5,7 @@ export default class KObjectUtility { } async addMissingId(): Promise { - let allMdFiles = this.ctx.vaultAdapter.getAllMdFiles(); + let allMdFiles = this.ctx.appUtils.getAllMdFiles(); const KOs = allMdFiles.filter(f => { const tags = this.ctx.appUtils.getTagsFromFile(f); diff --git a/core/src/service/CreateEffortService.ts b/core/src/service/CreateEffortService.ts index bea19d2..64e62c1 100644 --- a/core/src/service/CreateEffortService.ts +++ b/core/src/service/CreateEffortService.ts @@ -15,6 +15,7 @@ export default class CreateEffortService implements CreateEffortUseCase { const effort = new Effort(id, title, EffortStatus.DRAFT, null, null, area); this.effortRepository.save(effort); + return effort; }