feat: 技術的知識の方が多く含まれており

他UseCase層から使用したいというニーズがあるので、Serviceに名称を変更した。
pantasystem · Jan 14, 2024 · 17776ca · 17776ca
1 parent 9a33cfe
commit 17776ca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/modules/features/note/src/main/java/net/pantasystem/milktea/note/viewmodel/NotesViewModel.kt b/modules/features/note/src/main/java/net/pantasystem/milktea/note/viewmodel/NotesViewModel.kt
@@ -19,7 +19,7 @@ import net.pantasystem.milktea.model.note.DeleteAndEditUseCase
 import net.pantasystem.milktea.model.note.DeleteNoteUseCase
 import net.pantasystem.milktea.model.note.Note
 import net.pantasystem.milktea.model.note.NoteRelation
-import net.pantasystem.milktea.model.note.RecursiveSearchHasContentNoteUseCase
+import net.pantasystem.milktea.model.note.NoteService
 import net.pantasystem.milktea.model.note.bookmark.CreateBookmarkUseCase
 import net.pantasystem.milktea.model.note.bookmark.DeleteBookmarkUseCase
 import net.pantasystem.milktea.model.note.draft.DraftNote
@@ -39,7 +39,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class NotesViewModel @Inject constructor(
-    private val recursiveSearchHasContentNoteUseCase: RecursiveSearchHasContentNoteUseCase,
+    private val noteService: NoteService,
     private val toggleReactionUseCase: ToggleReactionUseCase,
     private val createFavoriteUseCase: CreateFavoriteUseCase,
     private val deleteFavoriteUseCase: DeleteFavoriteUseCase,
@@ -114,7 +114,7 @@ class NotesViewModel @Inject constructor(
     }
 
     private suspend fun recursiveSearchHasContentNote(noteId: Note.Id): Result<Note> =
-        recursiveSearchHasContentNoteUseCase(noteId)
+        noteService.findHasContentNote(noteId)
 
     /**
      * リアクションを送信する

diff --git a/modules/model/src/main/java/net/pantasystem/milktea/model/note/GetShareNoteUrlUseCase.kt b/modules/model/src/main/java/net/pantasystem/milktea/model/note/GetShareNoteUrlUseCase.kt
@@ -8,11 +8,11 @@ import javax.inject.Singleton
 
 @Singleton
 class GetShareNoteUrlUseCase @Inject constructor(
-    private val recursiveSearchHasContentNoteUseCase: RecursiveSearchHasContentNoteUseCase,
+    private val noteService: NoteService,
     private val accountRepository: AccountRepository,
 ) : UseCase {
     suspend operator fun invoke(noteId: Note.Id): Result<String> {
-        return recursiveSearchHasContentNoteUseCase(noteId).mapCancellableCatching { note ->
+        return noteService.findHasContentNote(noteId).mapCancellableCatching { note ->
             note.getOriginUrl(
                 accountRepository.get(noteId.accountId).getOrThrow()
             )

diff --git a/...e/RecursiveSearchHasContentNoteUseCase.kt → ...asystem/milktea/model/note/NoteService.kt b/...e/RecursiveSearchHasContentNoteUseCase.kt → ...asystem/milktea/model/note/NoteService.kt
@@ -4,16 +4,16 @@ import net.pantasystem.milktea.common.mapCancellableCatching
 import net.pantasystem.milktea.model.UseCase
 import javax.inject.Inject
 
-class RecursiveSearchHasContentNoteUseCase @Inject constructor(
+class NoteService @Inject constructor(
     private val noteRepository: NoteRepository,
 ) : UseCase {
 
-    suspend operator fun invoke(noteId: Note.Id): Result<Note> {
+    suspend fun findHasContentNote(noteId: Note.Id): Result<Note> {
         return noteRepository.find(noteId).mapCancellableCatching { note ->
             if (note.hasContent()) {
                 note
             } else {
-                invoke(requireNotNull(note.renoteId)).getOrThrow()
+                findHasContentNote(requireNotNull(note.renoteId)).getOrThrow()
             }
         }
     }