Resolve domain-error handle todo in note settings

codex-team · Jan 15, 2024 · 62aba5a · 62aba5a
1 parent ae9dd33
commit 62aba5a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/domain/service/noteSettings.ts b/src/domain/service/noteSettings.ts
@@ -70,7 +70,13 @@ export default class NoteSettingsService {
    * @param id - note internal id
    */
   public async getNoteSettingsByNoteId(id: NoteInternalId): Promise<NoteSettings> {
-    return await this.noteSettingsRepository.getNoteSettingsByNoteId(id);
+    const settings = await this.noteSettingsRepository.getNoteSettingsByNoteId(id);
+
+    if (settings === null) {
+      throw new DomainError(`Note settings not found`);
+    }
+
+    return settings;
   }
 
   /**
@@ -98,6 +104,10 @@ export default class NoteSettingsService {
   public async patchNoteSettingsByNoteId(noteId: NoteInternalId, data: Partial<NoteSettings>): Promise<NoteSettings | null> {
     const noteSettings = await this.noteSettingsRepository.getNoteSettingsByNoteId(noteId);
 
+    if (noteSettings === null) {
+      throw new DomainError(`Note settings not found`);
+    }
+
     return await this.noteSettingsRepository.patchNoteSettingsById(noteSettings.id, data);
   }
 

diff --git a/src/repository/noteSettings.repository.ts b/src/repository/noteSettings.repository.ts
@@ -47,7 +47,7 @@ export default class NoteSettingsRepository {
    * @param id - note id
    * @returns found note settings
    */
-  public async getNoteSettingsByNoteId(id: NoteInternalId): Promise<NoteSettings> {
+  public async getNoteSettingsByNoteId(id: NoteInternalId): Promise<NoteSettings | null> {
     return await this.storage.getNoteSettingsByNoteId(id);
   }
 

diff --git a/src/repository/storage/postgres/orm/sequelize/noteSettings.ts b/src/repository/storage/postgres/orm/sequelize/noteSettings.ts
@@ -147,18 +147,15 @@ export default class NoteSettingsSequelizeStorage {
    * @param noteId - note id
    * @returns { Promise<NoteSettings | null> } - note settings
    */
-  public async getNoteSettingsByNoteId(noteId: NoteSettings['noteId']): Promise<NoteSettings> {
+  public async getNoteSettingsByNoteId(noteId: NoteSettings['noteId']): Promise<NoteSettings | null> {
     const settings = await this.model.findOne({
       where: {
         noteId: noteId,
       },
     });
 
     if (!settings) {
-      /**
-       * TODO: improve exceptions
-       */
-      throw new Error('Note settings not found');
+      return null;
     }
 
     return settings;